Changeset 254 for dev/common/includes/class.kill.php

Timestamp:

12/05/07 20:53:40 (15 years ago)

Author:

exi

Message:

Merging 242:253 branch into dev

Files:

• dev/common/includes/class.kill.php (modified) (20 diffs)

dev/common/includes/class.kill.php

@@ -15 +15 @@
         $this->involvedparties_ = array();
         $this->destroyeditems_ = array();
+        $this->droppeditems_ = array();
+    }
+
+    function set($var, $value)
+    {
+        $this->$var = $value;
     }
 
@@ -202 +208 @@
         $system = $this->getSystem();
         $mail .= "System: ".$system->getName()."\r\n";
-        $mail .= "Security: ".$system->getSecurity(true)."\r\n\r\n";
+        $mail .= "Security: ".$system->getSecurity(true)."\r\n";
+        $mail .= "Damage Taken: ".$this->VictimDamageTaken."\r\n\r\n";
         $mail .= "Involved parties:\r\n\r\n";
 
@@ -236 +243 @@
                 $mail .= "Ship: ".$ship->getName()."\r\n";
                 $mail .= "Weapon: ".$weapon->getName()."\r\n";
+                $mail .= "Damage Done: ".$inv->dmgdone_."\r\n";
+            }
+            else
+            {
+                $mail .= "Damage Done: ".$inv->dmgdone_."\r\n";
             }
             $mail .= "\r\n";
@@ -269 +281 @@
                     $mail .= " (Cargo)";
                 if ($destroyed->getLocationID() == 6) // drone
+                    $mail .= " (Drone Bay)";
+                $mail .= "\r\n";
+            }
+        }
+
+        if (count($this->droppeditems_) > 0)
+        {
+            $mail .= "\r\nDropped items:\r\n\r\n";
+
+            foreach($this->droppeditems_ as $dropped)
+            {
+                $item = $dropped->getItem();
+                $mail .= $item->getName();
+                if ($dropped->getQuantity() > 1)
+                {
+                    // if the option is enabled and the item is fitted then split it up
+                    // this is aworkaround for the lazy parser of griefwatch
+                    if (config::get('kill_splitfit') && $dropped->getQuantity() < 9 && ($dropped->getLocationID() == 1
+                        || $dropped->getLocationID() == 2 || $dropped->getLocationID() == 3))
+                    {
+                        for ($i = $dropped->getQuantity(); $i > 1; $i--)
+                        {
+                            $mail .= "\r\n".$item->getName();
+                        }
+
+                    }
+                    else
+                    {
+                        $mail .= ", Qty: ".$dropped->getQuantity();
+                    }
+                }
+                if ($dropped->getLocationID() == 4) // cargo
+                    $mail .= " (Cargo)";
+                if ($dropped->getLocationID() == 6) // drone
                     $mail .= " (Drone Bay)";
                 $mail .= "\r\n";
@@ -324 +370 @@
                               fbplt.plt_name as fbplt_name,
                               fbcrp.crp_name as fbcrp_name,
-                              fbali.all_name as fbali_name
+                              fbali.all_name as fbali_name,
+                              kll_dmgtaken
                          from kb3_kills kll, kb3_pilots plt, kb3_corps crp,
                               kb3_alliances ali, kb3_alliances fbali, kb3_corps fbcrp,
@@ -366 +413 @@
             $this->plt_ext_ = $row['plt_externalid'];
             $this->fbplt_ext_ = $row['fbplt_externalid'];
+            $this->VictimDamageTaken = $row['kll_dmgtaken'];
 
             // involved
             $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status,
-                    ind_shp_id, ind_wep_id
+                    ind_shp_id, ind_wep_id, ind_dmgdone
                     from kb3_inv_detail
                     where ind_kll_id = ".$this->getID()."
@@ -383 +431 @@
                     new Ship($row['ind_shp_id']),
                     new Item($row['ind_wep_id']));
+                $involved->dmgdone_ = $row['ind_dmgdone'];
                 array_push($this->involvedparties_, $involved);
             }
             // destroyed items
-            $sql = "select sum( itd.itd_quantity ) as itd_quantity, itd_itm_id,
-                    itd_itl_id, itl_location
-                    from kb3_items_destroyed itd, kb3_items itm,
-                    kb3_item_locations itl
+            $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
+                        itd_itl_id, itl_location
+                    from kb3_items_destroyed itd
+                        left join kb3_items itm on itd.itd_itm_id = itm.itm_id
+                        left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
                     where itd.itd_kll_id = ".$this->getID()."
-                    and itd.itd_itm_id = itm.itm_id
-                    and ( itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
                     group by itd_itm_id, itd_itl_id
                     order by itd.itd_itl_id, itm.itm_type";
 
+            if (DB_USE_CCP)
+            {
+                $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
+                        itd_itl_id, itl_location
+                    from kb3_items_destroyed itd
+                        left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
+                    where itd.itd_kll_id = ".$this->getID()."
+                    group by itd_itm_id, itd_itl_id
+                    order by itd.itd_itl_id";
+            }
             $qry->execute($sql);
             while ($row = $qry->getRow())
@@ -404 +462 @@
                 array_push($this->destroyeditems_, $destroyed);
             }
+
+            if (DB_USE_CCP)
+            {
+                $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
+                        itd_itl_id, itl_location
+                    from kb3_items_dropped itd
+                        left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
+                    where itd.itd_kll_id = ".$this->getID()."
+                    group by itd_itm_id, itd_itl_id
+                    order by itd.itd_itl_id";
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                    $destroyed = new DroppedItem(new Item($row['itd_itm_id']),
+                        $row['itd_quantity'],
+                        $row['itl_location']);
+                    array_push($this->droppeditems_, $destroyed);
+                }
+            }
         }
     }
@@ -417 +494 @@
 
             $offset = config::get('kill_classified')*3600;
-            if (strtotime($this->timestamp_) > time()-$offset)
+            if (config::get('date_gmtime'))
+            {
+                $time = time()-date('Z');
+            }
+            else
+            {
+                $time = time();
+            }
+            if (strtotime($this->timestamp_) > $time-$offset)
             {
                 return true;
@@ -430 +515 @@
         {
             $offset = config::get('kill_classified')*3600;
-            if (strtotime($this->timestamp_) > time()-$offset)
-            {
-                return ($offset-time()+strtotime($this->timestamp_));
+            if (config::get('date_gmtime'))
+            {
+                $time = time()-date('Z');
+            }
+            else
+            {
+                $time = time();
+            }
+            if (strtotime($this->timestamp_) > $time-$offset)
+            {
+                return ($offset-$time+strtotime($this->timestamp_));
             }
         }
@@ -667 +760 @@
         {
             $qid = $id;
+        }
+        if (!$this->dmgtaken)
+        {
+            $this->dmgtaken = 0;
         }
 
@@ -675 +772 @@
                 ".$this->victimcorpid_.", ".$this->victimship_->getID().",
                 ".$this->solarsystem_->getID().", ".$this->getFBAllianceID().",
-                ".$this->getFBCorpID().", ".$this->getFBPilotID().", ".$this->calculateKillPoints()." )";
+                ".$this->getFBCorpID().", ".$this->getFBPilotID().", ".$this->calculateKillPoints().", ".$this->dmgtaken." )";
         $qry->execute($sql);
 
@@ -702 +799 @@
             }
 
+            if (!$inv->dmgdone_)
+            {
+                $inv->dmgdone_ = 0;
+            }
+
             $sql = "insert into kb3_inv_detail
                     values ( ".$this->getID().", ".$inv->getPilotID().", '".$inv->getSecStatus()."', "
                     .$inv->getAllianceID().", ".$inv->getCorpID().", ".$ship->getID().", "
-                    .$weapon->getID().", ".$order++." )";
+                    .$weapon->getID().", ".$order++.", ".$inv->dmgdone_.")";
             $qry->execute($sql) or die($qry->getErrorMsg());
 
@@ -730 +832 @@
             $item = $dest->getItem();
             $loc_id = $dest->getLocationID();
-            if (!is_numeric($item->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
+            if (!is_numeric($this->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
             {
                 trigger_error('error with destroyed item.', E_USER_WARNING);
@@ -743 +845 @@
         }
 
+        // dropped
+        foreach ($this->droppeditems_ as $dest)
+        {
+            $item = $dest->getItem();
+            $loc_id = $dest->getLocationID();
+            if (!is_numeric($this->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
+            {
+                trigger_error('error with dropped item.', E_USER_WARNING);
+                var_dump($dest);exit;
+                continue;
+            }
+
+            $sql = "insert into kb3_items_dropped
+                        values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
+                    .$loc_id." )";
+            $qry->execute($sql);
+        }
+
         // call the event that we added this mail
-        event::call('killmail_added', &$this);
+        event::call('killmail_added', $this);
         return $this->id_;
     }
@@ -753 +873 @@
             return;
 
-        event::call('killmail_delete', &$this);
+        event::call('killmail_delete', $this);
 
         $qry = new DBQuery();
@@ -762 +882 @@
         $qry->execute("delete from kb3_inv_plt where inp_kll_id = ".$this->id_);
         $qry->execute("delete from kb3_items_destroyed where itd_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_items_dropped where itd_kll_id = ".$this->id_);
         if ($delcomments)
         {
@@ -776 +897 @@
     {
         array_push($this->destroyeditems_, $destroyed);
+    }
+
+    function addDroppedItem($dropped)
+    {
+        array_push($this->droppeditems_, $dropped);
     }
 }
@@ -842 +968 @@
     }
 
+    function getFormatttedValue()
+    {
+        if (!isset($this->value))
+        {
+            $this->getValue();
+        }
+        if ($this->value > 0)
+        {
+            $value = $this->value * $this->getQuantity();
+            // Value Manipulation for prettyness.
+            if (strlen($value) > 6) // Is this value in the millions?
+            {
+                $formatted = round($value / 1000000, 2);
+                $formatted = number_format($formatted, 2);
+                $formatted = $formatted." M";
+            }
+            elseif (strlen($value) > 3) // 1000's ?
+            {
+                $formatted = round($value / 1000, 2);
+
+                $formatted = number_format($formatted, 2);
+                $formatted = $formatted." K";
+            }
+            else
+            {
+                $formatted = number_format($value, 2);
+                $formatted = $formatted." isk";
+            }
+        }
+        else
+        {
+            $formatted = "0 isk";
+        }
+        return $formatted;
+    }
+
         function getValue()
-        //returns the value of an item
         {
+            if ($this->value)
+            {
+                return $this->value;
+            }
+            if (DB_USE_CCP)
+            {
+                $this->value = 0;
+            $qry = new DBQuery();
+            $qry->execute("select basePrice, price from kb3_invtypes left join kb3_item_price using (typeID) where typeID='".$this->item_->getID()."'");
+            if ($row = $qry->getRow())
+            {
+                if ($row['price'])
+                {
+                    $this->value = $row['price'];
+                }
+                else
+                {
+                    $this->value = $row['basePrice'];
+                }
+            }
+            return $this->value;
+            }
+
+        //returns the value of an item
                 $value = 0;                             // Set 0 value incase nothing comes back
                 $id = $this->item_->getID(); // get Item ID
@@ -875 +1060 @@
     }
 }
+
+class DroppedItem extends DestroyedItem
+{
+    function DroppedItem($item, $quantity, $location)
+    {
+        $this->item_ = $item;
+        $this->quantity_ = $quantity;
+        $this->location_ = $location;
+    }
+}
 ?>