Changeset 355 for dev

Show
Ignore:
Timestamp:
10/24/08 13:38:28 (14 years ago)
Author:
beans
Message:

* Added blueprint icons to the img folder and to template.
* Autoupgrade updated, updates blueprint info. Go to admin->Database to run it.
Thanks to EDG for these fixes

Location:
dev
Files:
7 modified

Legend:

Unmodified
Added
Removed

  • dev/common/about.php

    r343 r355  
    1515                     'FriedRoadKill', 
    1616                     'bunjiboys', 
    17                      'Karbowiak'); 
     17                     'Karbowiak', 
     18                     'EDG'); 
    1819sort($contributor); 
    1920 

  • dev/common/includes/autoupgrade.php

    r323 r355  
    1212define(CURRENT_DB_UPDATE,config::get("DBUpdate")); 
    1313//Update version of this autoupgrade.php 
    14 define(LASTEST_DB_UPDATE,"004"); 
     14define(LASTEST_DB_UPDATE,"005"); 
    1515 
    1616function updateDB(){ 
    … …  
    2121                update003(); 
    2222                update004(); 
     23                update005(); 
    2324        } 
    2425} 
    … …  
    109110} 
    110111 
     112function update005(){ 
     113        // Blueprints and small fixes 
     114        if (CURRENT_DB_UPDATE < "005" ) 
     115        { 
     116                $qry = new DBQuery(); 
     117$query = <<<EOF 
     118INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29249, 105, 'Magnate Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     119 
     120INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29267, 111, 'Apotheosis Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     121 
     122INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29338, 106, 'Omen Navy Issue Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     123 
     124INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29339, 106, 'Scythe Fleet Issue Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     125 
     126INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29341, 106, 'Osprey Navy Issue Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     127 
     128INSERT INTO `kb3_invtypes` (`typeID`, `groupID`, `typeName`, `description`, `icon`, `radius`, `mass`, `volume`, `capacity`, `portionSize`, `raceID`, `basePrice`, `marketGroupID`) VALUES (29345, 106, 'Exequror Navy Issue Blueprint', '', '0', 0, 0, 0.01, 0, 1, 0, 0, 0); 
     129 
     130INSERT INTO `kb3_dgmtypeattributes` (`typeID`, `attributeID`, `value`) VALUES ('29249', '422', '1'); 
     131 
     132UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='180'; 
     133UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='181'; 
     134 
     135UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='182'; 
     136UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='183'; 
     137UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='184'; 
     138 
     139UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='228'; 
     140UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='229'; 
     141UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='230'; 
     142UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='231'; 
     143UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='232'; 
     144 
     145UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='277'; 
     146UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='278'; 
     147UPDATE `kb3_dgmattributetypes` SET `icon` = '50_11' WHERE `attributeID`='279'; 
     148 
     149UPDATE `kb3_dgmattributetypes` SET `icon` = '04_12' WHERE `attributeID`='193'; 
     150UPDATE `kb3_dgmattributetypes` SET `icon` = '04_12' WHERE `attributeID`='235'; 
     151 
     152UPDATE `kb3_dgmattributetypes` SET `icon` = '22_14' WHERE `attributeID`='108'; 
     153UPDATE `kb3_dgmattributetypes` SET `icon` = '22_14' WHERE `attributeID`='197'; 
     154 
     155UPDATE `kb3_dgmattributetypes` SET `icon` = '07_15' WHERE `attributeID`='137'; 
     156 
     157UPDATE `kb3_dgmattributetypes` SET `icon` = '24_01' WHERE `attributeID`='77'; 
     158 
     159UPDATE `kb3_dgmattributetypes` SET `icon` = '22_08' WHERE `attributeID`='153'; 
     160 
     161UPDATE `kb3_dgmattributetypes` SET `icon` = '07_15' WHERE `attributeID`='484'; 
     162EOF; 
     163 
     164        $qry->execute($query); 
     165        config::set("DBUpdate","005"); 
     166 
     167        } 
     168} 
     169 
    111170function update_slot_of_group($id,$oldSlot = 0 ,$newSlot){ 
    112171        $qry  = new DBQuery(); 

  • dev/common/includes/class.item.php

    r343 r355  
    3939            $img = IMG_URL.'/ships/'.$size.'_'.$size.'/'.$this->row_['itm_externalid'].'.png'; 
    4040        } 
    41         else 
     41        // cat 9 are blueprints 
     42        elseif ($this->row_['itt_cat'] == 9) 
     43        { 
     44                $img = IMG_URL.'/blueprints/'.$size.'_'.$size.'/'.$this->row_['itm_externalid'].'.png'; 
     45        }  
     46        else 
    4247        { 
    4348            // fix for new db structure, just make sure old clients dont break 

  • dev/common/includes/globals.php

    r354 r355  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 354 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 355 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 

  • dev/mods/history/about.php

    r343 r355  
    1515                     'FriedRoadKill', 
    1616                     'bunjiboys', 
    17                      'Karbowiak'); 
     17                     'Karbowiak', 
     18                     'EDG'); 
    1819sort($contributor); 
    1920 

  • dev/mods/history/history.xml

    r354 r355  
    22<history> 
    33        <changeset> 
    4                 <rev>354</rev> 
    5                 <author>beans</author> 
    6                 <date>21.10.2008</date> 
    7                  <comment> 
    8                         <type>FIX</type> 
    9                         <text> 
    10                                 Session updated to better support multiple killboards on same domain (/kb1, /kb2, /kb3 and so on) 
     4                <rev>355</rev> 
     5                <author>beans</author> 
     6                <date>24.10.2008</date> 
     7                 <comment> 
     8                        <type>UPD</type> 
     9                        <text> 
     10                                Added blueprint icons to the img folder and to template. 
     11                        </text> 
     12                </comment> 
     13                 <comment> 
     14                        <type>UPD</type> 
     15                        <text> 
     16                                Autoupgrade updated, updates blueprint info. Go to admin->Database to run it. 
    1117                        </text> 
    1218                </comment> 

  • dev/templates/invtype_item.tpl

    r343 r355  
    77                <tr class="kb-table-row-even"> 
    88                    <td> 
    9                     <img style="float: left; margin-right: 10px;" src="{if $item->item.itt_cat == 18}{$img_url}/drones/32_32/{$item->item.typeID}.png{else}{$img_url}/items/32_32/icon{$item->item.icon}.png{/if}"> 
    10                     {if $item->attrib.techLevel.value == 2}<img style="position: relative; left: -42px; float: left; margin-right: -10px;" src="{$img_url}/items/32_32/t2.gif">{/if} 
     9                    <img style="float: left; margin-right: 10px;" src="{if $item->item.itt_cat == 18}{$img_url}/drones/32_32/{$item->item.typeID}.png{elseif $item->item.itt_cat == 9}{$img_url}/blueprints/64_64/{$item->item.typeID}.png{else}{$img_url}/items/32_32/icon{$item->item.icon}.png{/if}">  
     10                    {if $item->attrib.techLevel.value == 2}<img style="position: relative; left: -42px; float: left; margin-right: -10px;" src="{$img_url}/items/32_32/t2.gif">{/if} 
    1111                    {$item->item.description|nl2br}</td> 
    1212                </tr>