Changeset 244

Timestamp:

10/20/07 17:11:00 (15 years ago)

Author:

exi

Message:

Removed rig0rs mail on request.
New option in Mapoptions to cache region maps.
Added several NPC corp images.
Improved corp image handling, you can now store the logo as <corpname>.jpg in img/corps/.
Killmails now handle the Killmail Mk1.5 format.
A reinforced killboard will now cache all generated maps regardless of their type.
Page kill_detail will now show damage and dropped items.
Upgraded category icons on kill_detail to ones with alpha channel.

Location:

branch/rev3

Files:

• common/about.php (modified) (1 diff)
• common/admin/admin_mapoptions.php (modified) (3 diffs)
• common/corp_detail.php (modified) (2 diffs)
• common/includes/class.corp.php (modified) (2 diffs)
• common/includes/class.kill.php (modified) (14 diffs)
• common/includes/class.map.php (modified) (2 diffs)
• common/includes/class.parser.php (modified) (7 diffs)
• common/includes/class.pilot.php (modified) (1 diff)
• common/includes/class.thumb.php (modified) (1 diff)
• common/includes/globals.php (modified) (1 diff)
• common/kill_detail.php (modified) (5 diffs)
• img/corps/2374.jpg (deleted)
• img/corps/498.jpg (deleted)
• img/corps/archangels.jpg (added)
• img/corps/bloodraider.jpg (added)
• img/corps/concord.jpg (added)
• img/corps/guardianangels.jpg (added)
• img/corps/guristas.jpg (added)
• img/corps/morduslegion.jpg (added)
• img/corps/sanshasnation.jpg (added)
• img/corps/serpentiscorporation.jpg (added)
• img/icon02_10.png (added)
• img/icon03_14.png (added)
• img/icon08_09.png (added)
• img/icon08_10.png (added)
• img/icon08_11.png (added)
• img/icon68_01.png (added)
• templates/kill_detail.tpl (modified) (7 diffs)

branch/rev3/common/about.php

@@ -22 +22 @@
 // Please leave the information on the next line as is so that other people can easily find the EVE-Dev website.
 // Remember to share any modifications to the EVE-Dev Killboard.
-$html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by <a href=\"mailto:rig0r@eve-killboard.net\">rig0r,</a> it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>"
+$html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>"
         ."All EVE graphics and data used are property of <a href=\"http://www.ccpgames.com/\">CCP</a>.<br/><br/>";
 $html .= '<a href="http://www.eve-dev.net/" target="_blank"><img src="http://www.eve-dev.net/e107_images/evedev_button.png" border="0"/></a><br/><br/>';

branch/rev3/common/admin/admin_mapoptions.php

@@ -1 +1 @@
 <?php
-require_once('common/includes/class.contract.php');
 require_once('common/includes/class.http.php');
 require_once('common/admin/admin_menu.php');
@@ -12 +11 @@
     config::checkCheckbox('map_map_showlines');
     config::checkCheckbox('map_reg_showlines');
+    config::checkCheckbox('map_region_cache');
     config::checkCheckbox('map_con_showlines');
     config::checkCheckbox('map_con_shownames');
@@ -76 +76 @@
 
 $options[1]['name'] = 'Constellation Options';
+$options[1]['option'][] = array('descr' => 'Cache const maps', 'name' => 'map_region_cache');
 $options[1]['option'][] = array('descr' => 'Show Lines', 'name' => 'map_reg_showlines');
 $options[1]['option'][] = array('descr' => 'Paint Security', 'name' => 'map_reg_security');

branch/rev3/common/corp_detail.php

@@ -24 +24 @@
 $html .= "<table class=kb-table width=\"100%\" border=\"0\" cellspacing=1><tr class=kb-table-row-even><td rowspan=8 width=128 align=center bgcolor=black>";
 
-if (file_exists("img/corps/".$corp->getID().".jpg"))
+if (file_exists("img/corps/".$corp->getID().".jpg") || file_exists("img/corps/".$corp->getUnique().".jpg"))
 {
     $html .= "<img src=\"".$corp->getPortraitURL(128)."\" border=\"0\"></td>";
@@ -30 +30 @@
 else
 {
-    $html .= "<img src=\"" . IMG_URL . "/campaign-big.gif\" border=\"0\"></td>";
+    $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" border=\"0\"></td>";
 }
 

branch/rev3/common/includes/class.corp.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("class.alliance.php");
+require_once('class.alliance.php');
 
 class Corporation
@@ -20 +19 @@
     }
 
+    function getUnique()
+    {
+        return preg_replace('/[^a-z0-9]/', '', strtolower($this->getName()));
+    }
+
     function getPortraitURL($size = 64)
     {
-        return '?a=thumb&amp;type=corp&amp;id='.$this->id_.'&amp;size='.$size;
+        if ($this->isNPCCorp() || file_exists('img/corps/'.$this->getUnique().'.jpg'))
+        {
+            return '?a=thumb&type=corp&id='.$this->getUnique().'&size='.$size;
+        }
+        return '?a=thumb&type=corp&id='.$this->id_.'&size='.$size;
     }
 

branch/rev3/common/includes/class.kill.php

@@ -15 +15 @@
         $this->involvedparties_ = array();
         $this->destroyeditems_ = array();
+        $this->droppeditems_ = array();
+    }
+
+    function set($var, $value)
+    {
+        $this->$var = $value;
     }
 
@@ -324 +330 @@
                               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 +373 @@
             $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 +391 @@
                     new Ship($row['ind_shp_id']),
                     new Item($row['ind_wep_id']));
+                $involved->dmgdone_ = $row['ind_dmgdone'];
                 array_push($this->involvedparties_, $involved);
             }
@@ -413 +422 @@
                 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);
+                }
+            }
         }
     }
@@ -676 +704 @@
         {
             $qid = $id;
+        }
+        if (!$this->dmgtaken)
+        {
+            $this->dmgtaken = 0;
         }
 
@@ -684 +716 @@
                 ".$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);
 
@@ -711 +743 @@
             }
 
+            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());
 
@@ -747 +784 @@
 
             $sql = "insert into kb3_items_destroyed
+                        values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
+                    .$loc_id." )";
+            $qry->execute($sql);
+        }
+
+        // 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." )";
@@ -771 +826 @@
         $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)
         {
@@ -785 +841 @@
     {
         array_push($this->destroyeditems_, $destroyed);
+    }
+
+    function addDroppedItem($dropped)
+    {
+        array_push($this->droppeditems_, $dropped);
     }
 }
@@ -851 +912 @@
     }
 
+    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()
         {
+            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()."'");
@@ -861 +963 @@
                 if ($row['price'])
                 {
-                    return $row['price'];
+                    $this->value = $row['price'];
                 }
-                return $row['basePrice'];
-            }
-            return 0;
+                else
+                {
+                    $this->value = $row['basePrice'];
+                }
+            }
+            return $this->value;
             }
 
@@ -899 +1004 @@
     }
 }
+
+class DroppedItem extends DestroyedItem
+{
+    function DroppedItem($item, $quantity, $location)
+    {
+        $this->item_ = $item;
+        $this->quantity_ = $quantity;
+        $this->location_ = $location;
+    }
+}
 ?>

branch/rev3/common/includes/class.map.php

@@ -139 +139 @@
                    and sjp.sjp_from = sys.sys_eve_id';
 
-        $regioncache = 'cache/map/'.KB_SITE.'_'.$this->regionid_.'_'.$this->imgwidth_.'.png';
-        $cached = false;
-
         if ($this->mode_ == "map")
         {
-            if (file_exists($regioncache))
-            {
-                header("Content-type: image/png");
-                readfile($regioncache);
-                return;
-            }
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->regionid_.'_'.$this->imgwidth_.'.png';
             $caption = $this->regname_;
         }
-
-        if ($this->mode_ == "region")
-        {
+        elseif ($this->mode_ == "region")
+        {
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->conid_.'_'.$this->imgwidth_.'.png';
             $sql .= " and reg.reg_id = ".$this->regionid_;
             $caption = $this->conname_;
         }
-
-        if ($this->mode_ == "cons")
-        {
+        elseif ($this->mode_ == "cons")
+        {
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->systemid_.'_'.$this->imgwidth_.'.png';
+
             $sql .= " and con.con_id = ".$this->conid_;
             $caption = $this->sysname_." (".roundsec($this->syssec_).")";
         }
-
-        if (!$cached)
+        if (file_exists($regioncache))
+        {
+            header("Content-type: image/png");
+            readfile($regioncache);
+            return;
+        }
+
+        if (true)
         {
             $qry = new DBQuery();
@@ -357 +356 @@
 
         imagestring($img, 1, 2, 2, $title, $captioncolor);
-        // imagettftext ( $img, 6, 0,
-        // 5,
-        // 10,
-        // $captioncolor,
-        // "../fonts/04B_03__.TTF",
-        // $title );
-        if ($this->mode_ == "map" && !$cached)
+        if ($this->mode_ == "map")
+        {
+            imagepng($img, $regioncache);
+        }
+        // optionally cache constellation maps
+        elseif ($this->mode_ == 'region' && config::get('map_region_cache'))
+        {
+            imagepng($img, $regioncache);
+        }
+        // cache everything if we are reinforced
+        elseif (config::get('is_reinforced'))
         {
             imagepng($img, $regioncache);

branch/rev3/common/includes/class.parser.php

@@ -96 +96 @@
         {
             $this->error('No security found.');
+        }
+        $dmgtaken = false;
+        if (preg_match("/Damage Taken: (.*)/", $header, $matches))
+        {
+            $dmgtaken = trim($matches[1]);
+            $this->dmgtaken = $dmgtaken;
         }
 
@@ -142 +148 @@
         $kill->setVictimShip($ship);
         $kill->setSolarSystem($system);
+        if ($dmgtaken)
+        {
+            $kill->set('dmgtaken', $dmgtaken);
+        }
 
         if (ALLIANCE_ID != 0 && $alliance->getID() == ALLIANCE_ID)
@@ -206 +216 @@
                 $isname = "Unknown";
                 $iwname = $pmatches[1];
+                if ($dmgtaken)
+                {
+                    preg_match("/Damage Done: (.*)/", $involved[++$i], $matches);
+                    $idmgdone = $matches[1];
+                }
 
                 if (!strlen($icname) && !strlen($iwname))
@@ -252 +267 @@
                 $iwname = $matches[1];
                 $i += 6;
+                if ($dmgtaken)
+                {
+                    preg_match("/Damage Done: (.*)/", $involved[$i++], $matches);
+                    $idmgdone = $matches[1];
+                }
 
                 $ialliance = new Alliance();
@@ -344 +364 @@
             $iparty = new InvolvedParty($ipilot->getID(), $icorp->getID(),
                 $ialliance->getID(), $secstatus, $iship, $iweapon);
+            if ($dmgtaken)
+            {
+                $iparty->dmgdone_ = $idmgdone;
+            }
             $kill->addInvolvedParty($iparty);
 
@@ -359 +383 @@
         if ($destroyedpos > 0)
         {
-            $destroyed = explode("\n", trim(substr($this->killmail_,
-                         strpos($this->killmail_, "Destroyed items:") + 16,
-                         strlen($this->killmail_) - (strpos($this->killmail_, "Destroyed items:") + 16))));
-
-            $i = 0;
-            $num = count($destroyed);
-            while ($i < $num)
-            {
-                $destroyed[$i] = trim($destroyed[$i]);
-                if ($destroyed[$i] == "")
-                {
-                    $i++;
-                    continue;
-                }
-
-                if ($destroyed[$i] == "Empty.")
-                {
-                    $container = false;
-                    $i++;
-                    continue;
-                }
-
-                $qtypos = 0;
-                $locpos = 0;
-                $itemname = "";
-                $quantity = "";
-                $location = "";
-
-                $qtypos = strpos($destroyed[$i], ", Qty: ");
-                $locpos = strrpos($destroyed[$i], "(");
-
-                if ($container && $locpos != false)
-                {
-                    $container = false;
-                }
-                if (strpos($destroyed[$i], "Container"))
-                {
-                    $container = true;
-                }
-                if ($qtypos <= 0 && !$locpos)
-                {
-                    $itemlen = strlen($destroyed[$i]);
-                    if ($container) $location = "Cargo";
-                }
-                if ($qtypos > 0 && !$locpos)
-                {
-                    $itemlen = $qtypos;
-                    $qtylen = strlen($destroyed[$i]) - $qtypos;
-                    if ($container) $location = "Cargo";
-                }
-                if ($locpos > 0 && $qtypos <= 0)
-                {
-                    $itemlen = $locpos - 1;
-                    $qtylen = 0;
-                    $loclen = strlen($destroyed[$i]) - $locpos - 2;
-                    if (!$locpos) $container = false;
-                }
-                if ($locpos > 0 && $qtypos > 0)
-                {
-                    $itemlen = $qtypos;
-                    $qtylen = $locpos - $qtypos - 7;
-                    $loclen = strlen($destroyed[$i]) - $locpos - 2;
-                    if (!$locpos) $container = false;
-                }
-
-                $itemname = substr($destroyed[$i], 0, $itemlen);
-                if ($qtypos) $quantity = substr($destroyed[$i], $qtypos + 6, $qtylen);
-                if ($locpos) $location = substr($destroyed[$i], $locpos + 1, $loclen);
-
-                if ($quantity == "")
-                {
-                    $quantity = 1;
-                }
-
-                $item = new Item();
-                $item->lookup(trim($itemname));
-                if (!$item->getID())
-                {
-                    $this->error('Item not found.', trim($itemname));
-                }
-                $ditem = new DestroyedItem($item, $quantity, $location);
+            $endpos = strlen($this->killmail_) - $destroyedpos + 16;
+            if ($dmgtaken)
+            {
+                $endpos = strpos($this->killmail_, "Dropped items:") - $destroyedpos - 16;
+            }
+
+            $destroyed = explode("\n", trim(substr($this->killmail_, $destroyedpos + 16, $endpos)));
+            #var_dump($destroyed); exit;
+            $destroyed_items = $this->scanForItems($destroyed);
+            foreach ($destroyed_items as $item)
+            {
+                $ditem = new DestroyedItem($item['item'], $item['quantity'], $item['location']);
                 $kill->addDestroyedItem($ditem);
-
-                $i++;
-            }
-        }
+            }
+        }
+        if ($dmgtaken)
+        {
+            $startpos = strpos($this->killmail_, "Dropped items:");
+            $endpos = strlen($this->killmail_) - $startpos + 16;
+
+            $dropped = explode("\n", trim(substr($this->killmail_, $startpos + 16, $endpos)));
+            #var_dump($dropped); exit;
+
+            $dropped_items = $this->scanForItems($dropped);
+            foreach ($dropped_items as $item)
+            {
+                $ditem = new DroppedItem($item['item'], $item['quantity'], $item['location']);
+                $kill->addDroppedItem($ditem);
+            }
+        }
+
 
         if (!$authorized)
@@ -462 +431 @@
 
         return $id;
+    }
+
+    function scanForItems($destroyed)
+    {
+        $i = 0;
+        $num = count($destroyed);
+        while ($i < $num)
+        {
+            $destroyed[$i] = trim($destroyed[$i]);
+            if ($destroyed[$i] == "")
+            {
+                $i++;
+                continue;
+            }
+
+            if ($destroyed[$i] == "Empty.")
+            {
+                $container = false;
+                $i++;
+                continue;
+            }
+
+            $qtypos = 0;
+            $locpos = 0;
+            $itemname = "";
+            $quantity = "";
+            $location = "";
+
+            $qtypos = strpos($destroyed[$i], ", Qty: ");
+            $locpos = strrpos($destroyed[$i], "(");
+
+            if ($container && $locpos != false)
+            {
+                $container = false;
+            }
+            if (strpos($destroyed[$i], "Container"))
+            {
+                $container = true;
+            }
+            if ($qtypos <= 0 && !$locpos)
+            {
+                $itemlen = strlen($destroyed[$i]);
+                if ($container) $location = "Cargo";
+            }
+            if ($qtypos > 0 && !$locpos)
+            {
+                $itemlen = $qtypos;
+                $qtylen = strlen($destroyed[$i]) - $qtypos;
+                if ($container) $location = "Cargo";
+            }
+            if ($locpos > 0 && $qtypos <= 0)
+            {
+                $itemlen = $locpos - 1;
+                $qtylen = 0;
+                $loclen = strlen($destroyed[$i]) - $locpos - 2;
+                if (!$locpos) $container = false;
+            }
+            if ($locpos > 0 && $qtypos > 0)
+            {
+                $itemlen = $qtypos;
+                $qtylen = $locpos - $qtypos - 7;
+                $loclen = strlen($destroyed[$i]) - $locpos - 2;
+                if (!$locpos) $container = false;
+            }
+
+            $itemname = substr($destroyed[$i], 0, $itemlen);
+            if ($qtypos) $quantity = substr($destroyed[$i], $qtypos + 6, $qtylen);
+            if ($locpos) $location = substr($destroyed[$i], $locpos + 1, $loclen);
+
+            if ($quantity == "")
+            {
+                $quantity = 1;
+            }
+
+            $item = new Item();
+            $item->lookup(trim($itemname));
+            if (!$item->getID())
+            {
+                $this->error('Item not found.', trim($itemname));
+            }
+            if ($location == 'In Container')
+            {
+                $location = 'Cargo';
+            }
+
+            $items[] = array('item' => $item, 'quantity' => $quantity, 'location' => $location);
+            $i++;
+        }
+
+        return $items;
     }
 

branch/rev3/common/includes/class.pilot.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("class.corp.php");
-require_once("class.item.php");
+require_once('class.corp.php');
+require_once('class.item.php');
 
 class Pilot

branch/rev3/common/includes/class.thumb.php

@@ -49 +49 @@
         {
             case 'corp':
-                $this->_id = intval($this->_id);
+                $this->_id = preg_replace('/[^a-z0-9]/', '', $this->_id);
                 break;
             case 'alliance':

branch/rev3/common/includes/globals.php

@@ -13 +13 @@
 
 // add new corporations here once you've added the logo to img/corps/
-$corp_npc = array("Guristas", 'Serpentis Corporation');
+$corp_npc = array('Guristas', 'Serpentis Corporation', 'Sansha\'s Nation', 'CONCORD',
+                  'Mordus Legion', 'Blood Raider', 'Archangels', 'Guardian Angels');
 
 function shorten($shorten, $by = 22)

branch/rev3/common/kill_detail.php

@@ -49 +49 @@
 $smarty->assign('VictimAllianceURL', "?a=alliance_detail&all_id=".$kill->getVictimAllianceID());
 $smarty->assign('VictimAllianceName', $kill->getVictimAllianceName());
+$smarty->assign('VictimDamageTaken', $kill->VictimDamageTaken);
 
 // involved
@@ -70 +71 @@
     $involved[$i]['ShipName'] = $ship->getName();
     $involved[$i]['ShipID'] = $ship->externalid_;
+    $involved[$i]['damageDone'] = $inv->dmgdone_;
 
     if ($pilot->getID() == $kill->getFBPilotID())
@@ -143 +145 @@
 {
     $dest_array = array();
-    $dest_array[1] = array('img' => 'fitted_-_high_slot.jpg', 'text' => 'Fitted - High slot', 'items' => array());
-    $dest_array[2] = array('img' => 'fitted_-_medium_slot.jpg', 'text' => 'Fitted - Mid slot', 'items' => array());
-    $dest_array[3] = array('img' => 'fitted_-_low_slot.jpg', 'text' => 'Fitted - Low slot', 'items' => array());
-    $dest_array[6] = array('img' => 'drone_bay.jpg', 'text' => 'Drone bay', 'items' => array());
-    $dest_array[4] = array('img' => 'cargo.jpg', 'text' => 'Cargo Bay', 'items' => array());
+    $dest_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
+    $dest_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
+    $dest_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
+    $dest_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
+    $dest_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
+    $dest_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
 
     foreach($kill->destroyeditems_ as $destroyed)
@@ -155 +158 @@
         {
             $value = $destroyed->getValue();
-            $value_single = $value;
-            if ($value > 0)
-            {
-                $value = $destroyed->getValue() * $destroyed->getQuantity();
-                $TotalValue = $TotalValue + $value;
-                // Value Manipulation for prettyness.
-                if (strlen($value) > 1) // 1000's ?
-                {
-                    $Formatted = number_format($value, 2);
-                    $Formatted = $Formatted." isk";
-                }
-
-                if (strlen($value) > 3) // 1000's ?
-                {
-                    $Formatted = round($value / 1000, 2);
-
-                    $Formatted = number_format($Formatted, 2);
-                    $Formatted = $Formatted." K";
-                }
-
-                if (strlen($value) > 6) // Is this value in the millions?
-                {
-                    $Formatted = round($value / 1000000, 2);
-                    $Formatted = number_format($Formatted, 2);
-                    $Formatted = $Formatted." M";
-                }
-            }
-            else
-            {
-                $value = 0;
-                $Formatted = "0 isk";
-            }
+            $TotalValue += $value*$destroyed->getQuantity();
+            $formatted = $destroyed->getFormatttedValue();
         }
-        $dest_array[$destroyed->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $Formatted, 'single_unit' => $value_single, 'itemID' => $item->getID());
+        $dest_array[$destroyed->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID());
+    }
+}
+
+if (count($kill->droppeditems_) > 0)
+{
+    $drop_array = array();
+    $drop_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
+    $drop_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
+    $drop_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
+    $drop_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
+    $drop_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
+    $drop_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
+
+    foreach($kill->droppeditems_ as $dropped)
+    {
+        $item = $dropped->getItem();
+        if (config::get('item_values'))
+        {
+            $value = $dropped->getValue();
+            $dropvalue += $value*$dropped->getQuantity();
+            $formatted = $dropped->getFormatttedValue();
+        }
+        $drop_array[$dropped->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $dropped->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID());
     }
 }
@@ -201 +197 @@
 $TotalLoss = number_format($TotalValue + $ShipValue, 2);
 $ShipValue = number_format($ShipValue, 2);
+$dropvalue = number_format($dropvalue, 2);
 
 $smarty->assign_by_ref('destroyed', $dest_array);
+$smarty->assign_by_ref('dropped', $drop_array);
 $smarty->assign('ItemValue', $Formatted);
+$smarty->assign('DropValue', $dropvalue);
 $smarty->assign('ShipValue', $ShipValue);
 $smarty->assign('TotalLoss', $TotalLoss);

branch/rev3/templates/kill_detail.tpl

@@ -4 +4 @@
         <td width=360 align=left valign=top><table class=kb-table width=360 cellpadding=0 cellspacing=1 border=0>
                 <tr class= {cycle name=ccl}>
-                    <td rowspan=3 width="64"><img src="{$VictimPortrait}" border="0" width="64" heigth="64"></td>
+                    <td rowspan=4 width="64"><img src="{$VictimPortrait}" border="0" width="64" heigth="64"></td>
                     <td class=kb-table-cell width=64><b>Victim:</b></td>
                     <td class=kb-table-cell><b><a href="{$VictimURL}">{$VictimName}</a></b></td>
@@ -15 +15 @@
                     <td class=kb-table-cell width=64><b>Alliance:</b></td>
                     <td class=kb-table-cell><b><a href="{$VictimAllianceURL}">{$VictimAllianceName}</a></b></td>
+                </tr>
+                <tr class={cycle name=ccl}>
+                    <td class=kb-table-cell width=64><b>Damage taken:</b></td>
+                    <td class=kb-table-cell><b>{$VictimDamageTaken}</b></td>
                 </tr>
             </table>
@@ -36 +40 @@
                 <tr class={cycle name=ccl}>
                     <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{if $i.weaponID}<a href="?a=invtype&id={$i.weaponID}">{$i.weaponName}</a>{else}{$i.weaponName}{/if}</td>
+                </tr>
+                <tr class={cycle name=ccl}>
+                    <td colspan=2 class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">Damage done:</td><td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{$i.damageDone}</td>
                 </tr>
 {/foreach}
@@ -60 +67 @@
             <div class="block-header">Ship details</div>
             <table class="kb-table" width="360" border="0" cellspacing="1">
-{foreach from=$destroyed item=slot}
+{foreach from=$destroyed item=slot key=slotindex}
 {* set to true to show empty slots *}
-{if $slot.items}
+{if $slot.items or $dropped.slotindex.items}
                 <tr class="kb-table-row-even">
                     <td class="item-icon" width="32"><img src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td>
@@ -72 +79 @@
     {foreach from=$slot.items item=i}
                 <tr class="kb-table-row-odd">
-                    <td class="item-icon" width="32" height="34" valign="top">{$i.Icon}</td>
-                    <td class="kb-table-cell"><a href="?a=invtype&id={$i.itemID}">{$i.Name}</a></td>
+                    <td class="item-icon" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>
+                    <td class="kb-table-cell">{$i.Name}</td>
                     <td width="30" align="center">{$i.Quantity}</td>
         {if $config->get('item_values')}
@@ -97 +104 @@
                 </tr>
     {/foreach}
+    {foreach from=$dropped.$slotindex.items item=i}
+                <tr class="kb-table-row-odd" style="background-color: green;">
+                    <td style="border: 1px solid green;" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>
+                    <td class="kb-table-cell">{$i.Name}</td>
+                    <td width="30" align="center">{$i.Quantity}</td>
+        {if $config->get('item_values')}
+                    <td align="center">{$i.Value}</td>
+        {/if}
+                </tr>
+        {if $admin and $config->get('item_values')}
+                    <tr class="kb-table-row-even">
+                      <form method="post" action="">
+                        <td height="34" colspan="3" valign="top">
+                            <div align="right">
+                                Current single Item Value:
+                                <input name="IID" value="{$i.itemID}" type="hidden">
+                                <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.single_unit}" size="6">
+                            </div>
+                        <td height="34" valign="top"><input type="submit" name="submit" value="Update" class="comment-button"></td>
+                      </form>
+                    </tr>
+        {/if}
+    {/foreach}
 {/if}
 {/foreach}
@@ -103 +133 @@
                     <td colspan="3"><div align="right"><strong>Total Module Loss:</strong></div></td>
                     <td align="right">{$ItemValue}</td>
+                </tr>
+                <tr class={cycle name=ccl}>
+                    <td colspan="3"><div align="right"><strong>Total Module Drop:</strong></div></td>
+                    <td align="right">{$DropValue}</td>
                 </tr>
                 <tr class={cycle name=ccl}>