Changeset 301

Timestamp:

12/27/07 12:02:37 (14 years ago)

Author:

ralle030583

Message:

FIX: Items without slotID used slot of partent items (attribute used_with..)<br>
FIX: Items witch has the attribbute used_with(launcher) arent shown in fitting image of fitting mod<br>
DEL: Settings of fitting mod, not needed anymore, if already set, you can delete it in the kb3_config

Location:

dev

Files:

• common/includes/class.item.php (modified) (3 diffs)
• common/includes/globals.php (modified) (1 diff)
• mods/fitting/kill_detail.php (modified) (4 diffs)
• mods/fitting/settings.php (modified) (1 diff)

dev/common/includes/class.item.php

@@ -67 +67 @@
     {
         $this->execQuery();
+        
+        // if item has no slot get the slot from parent item
+        if ($this->row_['itt_slot'] == 0)
+        {
+            $qry = new DBQuery();
+            $query = "select itt_slot from kb3_item_types
+                        inner join kb3_dgmtypeattributes d
+                        where itt_id = d.value
+                        and d.typeID = ".$this->row_['typeID']."
+                        and d.attributeID in (137,602);";
+            $qry->execute($query);
+            $row = $qry->getRow();
+            return $row['itt_slot'];
+        }  
         return $this->row_['itt_slot'];
     }
-
+    
     function execQuery()
     {
@@ -156 +170 @@
         $this->id_ = $row['itm_id'];
     }
-
+ 
+    
     function get_item_id($name)
     {
@@ -175 +190 @@
     }
     
+    function get_used_launcher_group($name)
+    {
+             $qry  = new DBQuery();
+             // I dont think CCP will change this attribute in near future ;-)
+             $query = "SELECT value
+                     FROM kb3_dgmtypeattributes d
+                     INNER JOIN kb3_invtypes i ON i.typeID = d.typeID
+                     WHERE i.typeName = '".slashfix($name)."' AND d.attributeID IN (137,602);";
+             $qry->execute($query);
+             $row = $qry->getRow();
+             return $row['value'];
+    }   
+    
         function get_group_id($name)
     {

dev/common/includes/globals.php

@@ -1 +1 @@
 <?php
 // current subversion revision
-preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 298 $', $match);
+preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 301 $', $match);
 define('SVN_REV', $match[1]);
 

dev/mods/fitting/kill_detail.php

@@ -122 +122 @@
 {
         //Admin is able to see classified Systems
-        if ($page->isAdmin()){
+        if ($page->isAdmin())
+        {
             $smarty->assign('System', $system->getName().' (Classified)');
         $smarty->assign('SystemURL', "?a=system_detail&sys_id=".$system->getID());
             $smarty->assign('SystemSecurity', $system->getSecurity(true));
-        }else{
+        }
+        else
+        {
                 $smarty->assign('System', 'Classified');
         $smarty->assign('SystemURL', "");
@@ -164 +167 @@
                 
                 
-                $fitting_unwanted_groups = explode(";",config::get('fitting_unwanted_types'));
                 //Fitting, KE - add destroyed items to an array of all fitted items.
-                if($destroyed->getLocationID() < 6 && !in_array($item->get_group_id($item->getName()), $fitting_unwanted_groups)){
-                $count_quntity = 0;
+                if($destroyed->getLocationID() < 6 && ($item->get_used_launcher_group($item->getName()) == 0)
+                {
+                        $count_quntity = 0;
                         while ($count_quntity < $destroyed->getQuantity())
                         {
@@ -200 +203 @@
                 
                 //Fitting -KE, add dropped items to the list
-                if(($dropped->getLocationID() != 4) && !in_array($item->get_group_id($item->getName()) , $fitting_unwanted_groups))
+                if(($dropped->getLocationID() != 4) && ($item->get_used_launcher_group($item->getName()) == 0))
                 {
-                $count_quntity = 0;
+                        $count_quntity = 0;
                         while ($count_quntity < $dropped->getQuantity())
                         {
-                        $fitting_array[$dropped->getLocationID()][]=array('Name'=>$item->getName(), 'Icon' => $item->getIcon(32), 'itemID' => $item->getID());          
-                        ++$count_quntity;       
+                                $fitting_array[$dropped->getLocationID()][]=array('Name'=>$item->getName(), 'Icon' => $item->getIcon(32), 'itemID' => $item->getID());          
+                                ++$count_quntity;       
                         }
                 }
@@ -222 +225 @@
                  $sort_by_nameh["Name"][] = $array_rowh["Name"];
         }
-array_multisort($sort_by_nameh["Name"],SORT_ASC,$fitting_array[1]);
+        array_multisort($sort_by_nameh["Name"],SORT_ASC,$fitting_array[1]);
 }
 

dev/mods/fitting/settings.php

@@ -6 +6 @@
 $html .= "No settings to make yet.";
 
-if(!is_array(config::get('fitting_unwanted_types'))){
-//Array of item types we dont want added to the fitted items array.. ammo, scripts etc. 
-// - need to find a better place for this.
-$fitting_unwanted_groups = array("",85,377,86,374,376,83,479,492,548,87,482,372,386,655,476,721,); 
-config::set('fitting_unwanted_types', implode(";",$fitting_unwanted_groups));
-$html .= "<p>Config option added. Nothing else needs doing<br/><br/>Greetings Knifee & Ralle030583</p>";
-}
-
 $page->setContent( $html );
 $page->addContext( $menubox->generate() );