Changeset 1d608be039e5eccc7714f3bc6c485331a6e215fd

Show
Ignore:
Timestamp:
02/09/08 11:44:59 (7 months ago)
Author:
Christopher Jung <bktheg@bktheg-mobile.(none)>
git-committer:
Christopher Jung <bktheg@bktheg-mobile.(none)> 1202553899 +0100
git-parent:

[0041fabfb63f5477f54e09b761a298668c9fd108]

git-author:
Christopher Jung <bktheg@bktheg-mobile.(none)> 1202553899 +0100
Message:

Datenkonsistenz hergestellt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • db/tables/ammo.sql

    r3924571 r1d608be  
    2828ALTER TABLE ammo ADD CONSTRAINT ammo_fk_ammo FOREIGN KEY (replaces) REFERENCES ammo(id); 
    2929 
    30 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (1, 'Flakmagazine', 'Die Standard-Flakmunition: \r\nKaliber 10,5 - Titanlegierung\r\nSprengkraft 20 kg TNT', NULL, 21, 0, 0, 'flak', 6, 3, 0, 50, 65, 4, 0, 5, 1, 0.00, 0, 150, 0.05, '0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0', 'open.gif'); 
    31 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (2, 'GTM MX-64 Rockeye', 'Die GTM MX-64 Rockeye ist eine schnellere, zielgenauere und mit gr&ouml;&szlig;erem Sprengkopf ausgestattete Variante der MX-50, welche zur Zeit des GroÃŞen Krieges verwendet wurde. ', NULL, 21, 0, 0, 'rak', 45, 25, 0, 80, 50, 0, 0, 1, 0, 0.00, 0, 151, 0.1, '0,2,0,3,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0', 'rockeye.gif'); 
    32 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (3, 'GTM-13 Helios', 'Keine Beschreibung verfÃŒgbar', NULL, 16, 0, 0, 'torp', 6800, 6800, 0, 45, 14, 0, 0, 1, 0, 1.00, 0, 152, 1.9, '0,0,18,0,0,29,18,10,10,8,0,2,0,0,0,0,0,0,0', 'heliosbombe.gif'); 
    33 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (5, 'Schwere Flakmagazine', 'Schwere-Flakmunition: \r\nKaliber 15,5 - Adamatiumlegierung,\r\nSprengkraft 35 kg TNT', NULL, 21, 0, 0, 'heavyflak', 10, 5, 0, 50, 65, 8, 0, 5, 2, 0.00, 0, 154, 0.15, '0,0,0,1,3,0,3,0,0,0,0,0,0,0,0,0,0,0,0', 'open.gif'); 
    34 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (7, 'GTM-4 Hornet', 'Die Hornet-Schwarmraketen sind zielsuchend und tödlich fÃŒr JÀger und Bomber', NULL, 42, 0, 0, 'rak', 50, 25, 0, 95, 58, 0, 0, 4, 0, 0.00, 0, 155, 0.3, '0,12,2,3,12,0,0,4,4,0,0,0,0,0,0,0,0,0,0,0', 'hornet.gif'); 
    35 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (12, 'GTM-10 Piranha', 'Die Piranha ist die dritte Generation der alten Synaptic sowie Havoc-Raketen. Die Piranha erm&ouml;glicht einem Bombern einen effektiven Schutz vor angreifenden J&auml;gergruppen indem sie bei der Z&uuml;ndung alles im Umkreis von mehreren Metern zerst&ou', NULL, 70, 0, 0, 'rak', 150, 160, 0, 95, 100, 0, 0, 1, 2, 0.00, 1, 153, 0.5, '0,20,2,0,20,0,10,5,5,5,0,0,0,0,0,0,0,0,0,0', 'piranha.gif'); 
    36 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (14, 'GTM-11 Infyrno', 'Multihoming Rakete gegen JÀger und Bomber', 24, 61, 0, 0, 'rak', 150, 122, 0, 95, 60, 0, 0, 2, 3, 0.00, 0, 161, 1.5, '0,45,18,0,45,16,10,12,12,8,0,2,0,0,0,0,0,0,0', 'infyrno.gif'); 
    37 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (20, 'NTF EM-Plasma', 'EM-Plasma ist primÀr zur Lahmlegung von Schilden gedacht - die Wirkung auf die normale Panzerung ist denkbar schlecht.', NULL, 53, 0, 0, 'hhplasma', 500, 24000, 0, 80, 20, 0, 0, 1, 0, 0.00, 0, 168, 1, '0,20,0,2,20,5,10,5,0,0,0,0,0,0,0,0,0,0,0,0', 'emplasmashell.png'); 
    38 INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (33, 'Bergbausprengstoff', 'Der Bergbausprengstoff ersetzt das bisherige riskante Verfahren der Nutzung von Helios-Gefechtsk&ouml;pfen f&uuml;r den Asteroiden-Ausbau.', NULL, 11, 0, 0, 'bum', 6800, 6800, 0, 0, 0, 0, 0, 1, 0, 1.00, 0, 182, 1, '0,0,15,10,10,20,8,0,10,0,0,1,0,0,0,0,0,0,0', 'explosive_large.png'); 
     30INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (1, 'Flakmagazine', 'Die Standard-Flakmunition: \r\nKaliber 10,5 - Titanlegierung\r\nSprengkraft 20 kg TNT', NULL, 21, 0, 0, 'flak', 6, 3, 0, 50, 65, 4, 0, 5, 1, 0.00, 0, 150, 0.05, '0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,', 'open.gif'); 
     31INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (2, 'GTM MX-64 Rockeye', 'Die GTM MX-64 Rockeye ist eine schnellere, zielgenauere und mit gr&ouml;&szlig;erem Sprengkopf ausgestattete Variante der MX-50, welche zur Zeit des GroÃŞen Krieges verwendet wurde. ', NULL, 21, 0, 0, 'rak', 45, 25, 0, 80, 50, 0, 0, 1, 0, 0.00, 0, 151, 0.1, '0,2,0,3,0,0,0,0,1,0,0,0,0,0,0,0,0,0,', 'rockeye.gif'); 
     32INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (3, 'GTM-13 Helios', 'Keine Beschreibung verfÃŒgbar', NULL, 16, 0, 0, 'torp', 6800, 6800, 0, 45, 14, 0, 0, 1, 0, 1.00, 0, 152, 1.9, '0,0,18,0,0,29,18,10,10,8,0,2,0,0,0,0,0,0,', 'heliosbombe.gif'); 
     33INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (5, 'Schwere Flakmagazine', 'Schwere-Flakmunition: \r\nKaliber 15,5 - Adamatiumlegierung,\r\nSprengkraft 35 kg TNT', NULL, 21, 0, 0, 'heavyflak', 10, 5, 0, 50, 65, 8, 0, 5, 2, 0.00, 0, 154, 0.15, '0,0,0,1,3,0,3,0,0,0,0,0,0,0,0,0,0,0,', 'open.gif'); 
     34INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (7, 'GTM-4 Hornet', 'Die Hornet-Schwarmraketen sind zielsuchend und tödlich fÃŒr JÀger und Bomber', NULL, 42, 0, 0, 'rak', 50, 25, 0, 95, 58, 0, 0, 4, 0, 0.00, 0, 155, 0.3, '0,12,2,3,12,0,0,4,4,0,0,0,0,0,0,0,0,0,', 'hornet.gif'); 
     35INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (12, 'GTM-10 Piranha', 'Die Piranha ist die dritte Generation der alten Synaptic sowie Havoc-Raketen. Die Piranha erm&ouml;glicht einem Bombern einen effektiven Schutz vor angreifenden J&auml;gergruppen indem sie bei der Z&uuml;ndung alles im Umkreis von mehreren Metern zerst&ou', NULL, 70, 0, 0, 'rak', 150, 160, 0, 95, 100, 0, 0, 1, 2, 0.00, 1, 153, 0.5, '0,20,2,0,20,0,10,5,5,5,0,0,0,0,0,0,0,0,', 'piranha.gif'); 
     36INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (14, 'GTM-11 Infyrno', 'Multihoming Rakete gegen JÀger und Bomber', 24, 61, 0, 0, 'rak', 150, 122, 0, 95, 60, 0, 0, 2, 3, 0.00, 0, 161, 1.5, '0,45,18,0,45,16,10,12,12,8,0,2,0,0,0,0,0,0,', 'infyrno.gif'); 
     37INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (20, 'NTF EM-Plasma', 'EM-Plasma ist primÀr zur Lahmlegung von Schilden gedacht - die Wirkung auf die normale Panzerung ist denkbar schlecht.', NULL, 53, 0, 0, 'hhplasma', 500, 24000, 0, 80, 20, 0, 0, 1, 0, 0.00, 0, 168, 1, '0,20,0,2,20,5,10,5,0,0,0,0,0,0,0,0,0,0,', 'emplasmashell.png'); 
     38INSERT INTO `ammo` (`id`, `name`, `description`, `replaces`, `res1`, `res2`, `res3`, `type`, `damage`, `shielddamage`, `subdamage`, `trefferws`, `smalltrefferws`, `torptrefferws`, `subws`, `shotspershot`, `areadamage`, `destroyable`, `flags`, `itemid`, `dauer`, `buildcosts`, `picture`) VALUES (33, 'Bergbausprengstoff', 'Der Bergbausprengstoff ersetzt das bisherige riskante Verfahren der Nutzung von Helios-Gefechtsk&ouml;pfen f&uuml;r den Asteroiden-Ausbau.', NULL, 11, 0, 0, 'bum', 6800, 6800, 0, 0, 0, 0, 0, 1, 0, 1.00, 0, 182, 1, '0,0,15,10,10,20,8,0,10,0,0,1,0,0,0,0,0,0,', 'explosive_large.png'); 

  • db/tables/battles.sql

    r678b16a r1d608be  
    11CREATE TABLE `battles` ( 
    2   `id` smallint(6) NOT NULL auto_increment, 
     2  `id` smallint(5) unsigned NOT NULL auto_increment, 
    33  `x` smallint(6) NOT NULL default '1', 
    44  `y` smallint(6) NOT NULL default '1', 

  • web/WEB-INF/cfg/items.xml

    rbed664f r1d608be  
    2121        <!-- 1 - Bauplan: GTSG Alastor --> 
    2222        <item id="1" cargo="10"> 
    23                 <name>Bauplan: GTSG Alastor</name> 
     23                <name>Bauplan: GTF Ulysses</name> 
    2424                <picture>buildalastor.png</picture> 
    2525                <large-picture>buildalastor_large.gif</large-picture> 
    26                 <effect type="draft-ship" shiptype="64" race="0" system-req="true" flagschiff="false"> 
     26                <effect type="draft-ship" shiptype="56" race="0" system-req="true" flagschiff="false"> 
    2727                        <buildcosts> 
    2828                                <res:Kunststoffe count="43" /> 
    …… 
    8080        </item> 
    8181 
    82         <!-- 7 - Bauplan: GTF Perseus --> 
     82        <!-- 7 - Bauplan: GTB Zeus --> 
    8383        <item id="7" cargo="10"> 
    84                 <name>Bauplan: GTF Perseus</name> 
     84                <name>Bauplan: GTB Zeus</name> 
    8585                <picture>buildperseus.png</picture> 
    8686                <large-picture>buildperseus_large.png</large-picture> 
    87                 <effect type="draft-ship" shiptype="57" race="0" system-req="true" flagschiff="false"> 
     87                <effect type="draft-ship" shiptype="54" race="0" system-req="true" flagschiff="false"> 
    8888                        <buildcosts> 
    8989                                <res:Kunststoffe count="152" /> 
    …… 
    112112        <!-- 9 - NTF-Boykott Samurai --> 
    113113        <item id="9" cargo="1"> 
    114                 <name>NTF-Boykott Samurai</name> 
     114                <name>NTF-Boykott Zeus</name> 
    115115                <picture>falsesamurai.png</picture> 
    116116                <large-picture>falsesamurai_large.png</large-picture> 
    117                 <effect ally-effect="true" type="disable-ship" shiptype="53" /> 
     117                <effect ally-effect="true" type="disable-ship" shiptype="54" /> 
    118118                <description>Die NTF besitzt keine BauplÀne fÃŒr die Bomber der Samurai-Klasse</description> 
    119119        </item> 
    …… 
    121121        <!-- 10 - NTF-Boykott Hercules MK2 --> 
    122122        <item id="10" cargo="1"> 
    123                 <name>NTF-Boykott Hercules MK2</name> 
     123                <name>NTF-Boykott Ulysses</name> 
    124124                <picture>falseherkmk2.png</picture> 
    125125                <large-picture>falseherkmk2_large.png</large-picture> 
    126                 <effect ally-effect="true" type="disable-ship" shiptype="70" /> 
     126                <effect ally-effect="true" type="disable-ship" shiptype="56" /> 
    127127                <description>Die NTF besitzt keine BauplÀne fÃŒr den verbesserten JÀger der Hercules 2 Klasse</description> 
    128128        </item> 
    …… 
    130130        <!-- 11 - Bauplan: GTF Ares --> 
    131131        <item id="11" cargo="10"> 
    132                 <name>Bauplan: GTF Ares</name> 
     132                <name>Bauplan: GVD Hatshepsut</name> 
    133133                <picture>buildares.png</picture> 
    134134                <large-picture>buildares_large.png</large-picture> 
    135                 <effect type="draft-ship" shiptype="38" race="0" system-req="true" flagschiff="false"> 
     135                <effect type="draft-ship" shiptype="3" race="0" system-req="true" flagschiff="false"> 
    136136                        <buildcosts> 
    137137                                <res:Kunststoffe count="68" /> 
    …… 
    475475        <!-- 321 - Kayser --> 
    476476        <item id="321" cargo="2"> 
    477                 <name>Kayser</name> 
     477                <name>Terran Turret</name> 
    478478                <picture>module/kayser.png</picture> 
    479479                <large-picture>module/kayser_large.png</large-picture> 
    …… 
    482482                        <shipdata> 
    483483                                <shd:weapons> 
    484                                         <shd:weapon name="Kayser" count="4" maxheat="20" /> 
     484                                        <shd:weapon name="Terran_Turret" count="4" maxheat="20" /> 
    485485                                </shd:weapons> 
    486486                                <shd:cargo value="-2" /> 

  • web/WEB-INF/cfg/weapons.xml

    rc8ee59d r1d608be  
    2424                <cost ap="6" e="32" /> 
    2525                <damage hull="9600" shields="9600" /> 
     26                <flags> 
     27                        <flag id="LONG_RANGE" /> 
     28                </flags> 
     29        </weapon> 
     30         
     31        <weapon id="BVas" handler="net.driftingsouls.ds2.server.config.BeamWeapon"> 
     32                <name>Schwere Strahlengeschuetze</name> 
     33                <treffer-ws default="70" sub="0" /> 
     34                <cost ap="6" e="25" /> 
     35                <damage hull="7700" shields="7700" /> 
    2636                <flags> 
    2737                        <flag id="LONG_RANGE" /> 
    …… 
    6777        </weapon> 
    6878         
     79        <weapon id="doubleraketen"> 
     80                <name>Doppelraketenwerfer</name> 
     81                <cost ap="1" e="3" /> 
     82                <shots single="2" ammo="rak" /> 
     83                <flags> 
     84                        <flag id="AMMO_SELECT" /> 
     85                </flags> 
     86        </weapon> 
     87 
    6988        <weapon id="standard_flak"> 
    7089                <name>Flakgeschuetze</name> 
    …… 
    83102        </weapon> 
    84103         
     104        <weapon id="set_hol_shrine_of_sacrifice"> 
     105                <name>Letztes Opfer</name> 
     106                <treffer-ws default="70" small="25" torpedo="0" sub="0" /> 
     107                <cost ap="1" e="0" /> 
     108                <damage hull="15000" shields="15000" area="2" /> 
     109                <shots single="6" /> 
     110                <flags> 
     111                        <flag id="DESTROY_AFTER" /> 
     112                        <flag id="AD_FULL" /> 
     113                        <flag id="SPECIAL" /> 
     114                </flags> 
     115        </weapon> 
     116         
    85117        <weapon id="ntf_cm_shipwrek"> 
    86118                <name>NTF-CM Shipwrek</name>