Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] New ships/fleets

Browse Source
This commit is contained in:
Allanis 2013-08-21 21:11:47 +01:00
parent 12e6a2b87b
commit 95c9cef39c
12 changed files with 957 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dat/fleet.xml
View File

@ -60,7 +60,14 @@
<ai>pirate</ai>
<faction>Pirate</faction>
<pilots>
<pilot chance="100">Pirate Admonisher</pilot>
<pilot name="Admonisher" chance="100">Pirate Admonisher</pilot>
</pilots>
</fleet>
<fleet name="Pirate Vendetta">
<ai>pirate</ai>
<faction>Pirate</faction>
<pilots>
<pilot name="Vendetta" chance="100">Pirate Vendetta</pilot>
</pilots>
</fleet>
<fleet name="Collective Drone">

4
dat/outfit.xml
View File

@ -23,7 +23,7 @@
</outfit>
<outfit name="Laser Cannon">
<general>
<max>5</max>
<max>6</max>
<tech>2</tech>
<mass>5</mass>
<price>5000</price>
@ -100,7 +100,7 @@
<delay>800</delay>
<speed>500</speed>
<range>400</range>
<accuracy>10</accuracy>
<accuracy>13</accuracy>
<energy>13</energy>
<damage type="ion">15</damage>
</specific>

131
dat/ship.xml
View File

@ -30,7 +30,7 @@
<cap_cargo>20</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='1'>Laser Cannon</outfit>
<outfit quantity="1">Laser Cannon</outfit>
</outfits>
</ship>
<ship name="Hyena">
@ -63,7 +63,7 @@
<cap_cargo>10</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='2'>Laser Cannon</outfit>
<outfit quantity="2">Laser Cannon</outfit>
</outfits>
</ship>
<ship name="Pacifier">
@ -96,10 +96,10 @@
<cap_cargo>30</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='2'>Laser Cannon</outfit>
<outfit quantity='1'>Laser Turret</outfit>
<outfit quantity='2'>Headhunter Launcher</outfit>
<outfit quantity='40'>Headhunter</outfit>
<outfit quantity="2">Laser Cannon</outfit>
<outfit quantity="1">Laser Turret</outfit>
<outfit quantity="2">Headhunter Launcher</outfit>
<outfit quantity="40">Headhunter</outfit>
</outfits>
</ship>
<ship name="Hawking">
@ -132,9 +132,9 @@
<cap_cargo>70</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='3'>Laser Turret</outfit>
<outfit quantity='2'>Headhunter Launcher</outfit>
<outfit quantity='40'>Headhunter</outfit>
<outfit quantity="3">Laser Turret</outfit>
<outfit quantity="2">Headhunter Launcher</outfit>
<outfit quantity="40">Headhunter</outfit>
</outfits>
</ship>
<ship name="Lancelot">
@ -145,8 +145,7 @@
<price>500000</price>
<fabricator>Nexus</fabricator>
<tech>7</tech>
<description>One of the Nexus' prize heavy fighters. Was originally a secret design for the Empire military, but then disclosed. Now a modified version is available for civilians, although it doesn't meet up to the original specifications.
Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since UST 1132.</description>
<description>One of the Nexus' prize heavy fighters. Was originally a secret design for the Empire military, but then disclosed. Now a modified version is available for civilians, although it doesn't meet up to the original specifications.Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since UST 1132.</description>
<movement>
<thrust>220</thrust>
<turn>135</turn>
@ -168,9 +167,9 @@ Used by security agencies all over the universe for it's reliability and availab
<cap_cargo>10</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='2'>Ripper MK2</outfit>
<outfit quantity='1'>Headhunter Launcher</outfit>
<outfit quantity='20'>Headhunter</outfit>
<outfit quantity="2">Ripper MK2</outfit>
<outfit quantity="1">Headhunter Launcher</outfit>
<outfit quantity="20">Headhunter</outfit>
</outfits>
</ship>
<ship name="Mule">
@ -203,7 +202,7 @@ Used by security agencies all over the universe for it's reliability and availab
<cap_cargo>250</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='2'>Laser Turret</outfit>
<outfit quantity="2">Laser Turret</outfit>
</outfits>
</ship>
<ship name="Drone">
@ -236,7 +235,7 @@ Used by security agencies all over the universe for it's reliability and availab
<cap_cargo>1</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='3'>Neutron Disruptor</outfit>
<outfit quantity="3">Neutron Disruptor</outfit>
</outfits>
</ship>
<ship name="Gawain">
@ -269,7 +268,7 @@ Used by security agencies all over the universe for it's reliability and availab
<cap_cargo>15</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='1'>Ion Cannon</outfit>
<outfit quantity="1">Ion Cannon</outfit>
</outfits>
</ship>
<ship name="Goddard">
@ -280,8 +279,7 @@ Used by security agencies all over the universe for it's reliability and availab
<price>11500000</price>
<fabricator>House Goddard</fabricator>
<tech>1001</tech>
<description>The archaic design of the Goddard is decieving. Although it takes the shape of traditional flying intra-planet vessels, it's very suited for space travel.
Production is entirely done on Zhiru en the Goddard system by House Goddard, the sole providor and dealer in Goddards. Over time, specialization and improvements on the original time have kept it very competitive in the market. It's a classic of space.</description>
<description>The archaic design of the Goddard is decieving. Although it takes the shape of traditional flying intra-planet vessels, it's very suited for space travel.Production is entirely done on Zhiru en the Goddard system by House Goddard the sole providor and dealer in Goddards. Over time, specialization and improvements on the original time have kept it very competitive in the market. It's a classic of space.</description>
<movement>
<thrust>100</thrust>
<turn>80</turn>
@ -303,10 +301,10 @@ Production is entirely done on Zhiru en the Goddard system by House Goddard, the
<cap_cargo>60</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='2'>Heavy Ion Turret</outfit>
<outfit quantity='2'>Laser Turret</outfit>
<outfit quantity='2'>Headhunter Launcher</outfit>
<outfit quantity='40'>Headhunter</outfit>
<outfit quantity="2">Heavy Ion Turret</outfit>
<outfit quantity="2">Laser Turret</outfit>
<outfit quantity="2">Headhunter Launcher</outfit>
<outfit quantity="40">Headhunter</outfit>
</outfits>
</ship>
<ship name="Admonisher">
@ -339,10 +337,10 @@ Production is entirely done on Zhiru en the Goddard system by House Goddard, the
<cap_cargo>20</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='1'>Laser Cannon</outfit>
<outfit quantity='2'>Plasma Blaster</outfit>
<outfit quantity='1'>Headhunter Launcher</outfit>
<outfit quantity='10'>Headhunter</outfit>
<outfit quantity="1">Laser Cannon</outfit>
<outfit quantity="2">Plasma Blaster</outfit>
<outfit quantity="1">Headhunter Launcher</outfit>
<outfit quantity="10">Headhunter</outfit>
</outfits>
</ship>
<ship name="Pirate Admonisher">
@ -351,7 +349,7 @@ Production is entirely done on Zhiru en the Goddard system by House Goddard, the
<sound>engine</sound>
<class>2</class>
<price>850000</price>
<fabricator>Pirate</fabricator>
<fabricator>Skull and Bones</fabricator>
<tech>9009</tech>
<description>What do you get when you rip apart an Admonisher, hack up the internals and slap it back together? A Pirate Admonisher, which surprisingly works quite well.</description>
<movement>
@ -375,10 +373,10 @@ Production is entirely done on Zhiru en the Goddard system by House Goddard, the
<cap_cargo>15</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='3'>Plasma Blaster</outfit>
<outfit quantity='1'>Missile Launcher</outfit>
<outfit quantity='12'>Missile</outfit>
<outfit quantity='1'>Milspec Jammer</outfit>
<outfit quantity="3">Plasma Blaster</outfit>
<outfit quantity="1">Missile Launcher</outfit>
<outfit quantity="12">Missile</outfit>
<outfit quantity="1">Milspec Jammer</outfit>
</outfits>
</ship>
<ship name="Schroedinger">
@ -411,7 +409,74 @@ Production is entirely done on Zhiru en the Goddard system by House Goddard, the
<cap_cargo>15</cap_cargo>
</characteristics>
<outfits>
<outfit quantity='1'>Civilian Jammer</outfit>
<outfit quantity="1">Civilian Jammer</outfit>
</outfits>
</ship>
<ship name="Vendetta">
<GFX>vendetta</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
<class>1</class>
<price>400000</price>
<fabricator>House Dvaered</fabricator>
<tech>8</tech>
<description>The Vendetta displays the House Dvaered philosophy very well. Give a ship as many intimidating guns as you can, layer it with as much armour and you can, and sort of forget about giving it proper electronics. It's amazing to see that these fly.</description>
<movement>
<thrust>200</thrust>
<turn>125</turn>
<speed>180</speed>
</movement>
<health>
<shield>70</shield>
<armour>160</armour>
<energy>500</energy>
<shield_regen>90</shield_regen>
<armour_regen>30</armour_regen>
<energy_regen>600</energy_regen>
</health>
<characteristics>
<crew>4</crew>
<mass>67</mass>
<fuel>300</fuel>
<cap_weapon>60</cap_weapon>
<cap_cargo>5</cap_cargo>
</characteristics>
<outfits>
<outfit quantity="6">Laser Cannon</outfit>
</outfits>
</ship>
<ship name="Pirate Vendetta">
<GFX target="vendetta">vendetta_pirate</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
<class>1</class>
<price>450000</price>
<fabricator>Skull and Bones</fabricator>
<tech>9009</tech>
<description>The Pirate Vendetta is even more intimidating then it's regular counterpart. It's been heavily tweaked to be more adjusted to the pirate style of flying. Some of the armour has been removed to make more room for loot, while the reactor has been jacked up by a dubious technician. The ship ends up being much more solid then the original, but every so often the reactor goes nova destroying the ship. You hope it won't happen to you if you get in one.</description>
<movement>
<thrust>210</thrust>
<turn>135</turn>
<speed>190</speed>
</movement>
<health>
<shield>80</shield>
<armour>150</armour>
<energy>540</energy>
<shield_regen>95</shield_regen>
<armour_regen>32</armour_regen>
<energy_regen>625</energy_regen>
</health>
<characteristics>
<crew>4</crew>
<mass>65</mass>
<fuel>300</fuel>
<cap_weapon>60</cap_weapon>
<cap_cargo>10</cap_cargo>
</characteristics>
<outfits>
<outfit quantity="4">Plasma Blaster</outfit>
<outfit quantity="2">Laser Cannon</outfit>
</outfits>
</ship>
</Ships>

2
dat/start.xml
View File

@ -2,7 +2,7 @@
<Start>
<name>Dark Tides</name>
<player>
<ship>Lancelot</ship>
<ship>Pirate Vendetta</ship>
<credits>
<low>500000</low>
<high>1500000</high>

BIN
gfx/ship/goddard_target.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
gfx/ship/schroedinger_target.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
gfx/ship/vendetta.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 KiB

BIN
gfx/ship/vendetta_pirate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 KiB

BIN
gfx/ship/vendetta_target.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

2
src/faction.c
View File

@ -400,7 +400,7 @@ int factions_load(void) {
free(buf);
xmlCleanupParser();
WARN("Loaded %d Faction%s", faction_nstack, (faction_nstack==1) ?"": "s");
DEBUG("Loaded %d Faction%s", faction_nstack, (faction_nstack==1) ?"": "s");
return 0;
}

1
src/opengl.c
View File

@ -913,6 +913,7 @@ int gl_init(void) {
}
/* Test the setup - aim for 32. */
gl_screen.depth = 32;
depth = SDL_VideoModeOK(SCREEN_W, SCREEN_H, gl_screen.depth, flags);
if(depth == 0)
WARN("Video mode %dx%d @ %d bpp not supported"

18
src/outfit.c
View File

@ -398,15 +398,15 @@ static void outfit_parseSWeapon(Outfit* tmp, const xmlNodePtr parent) {
else if(xml_isNode(node, "damage"))
outfit_parseDamage(&tmp->u.blt.dtype, &tmp->u.blt.damage, node);
} while((node = node->next));
#define MELEMENT(o,s) if((o) == 0) \
WARN("Outfit '%s' missing '"s"' element", tmp->name)
if(tmp->u.blt.gfx_space == NULL)
WARN("Outfit '%s' missing 'gfx' element", tmp->name);
MELEMENT(tmp->u.blt.sound, "sound");
MELEMENT(tmp->u.blt.delay, "delay");
MELEMENT(tmp->u.blt.speed, "speed");
MELEMENT(tmp->u.blt.range, "range");
MELEMENT(tmp->u.blt.accuracy, "accuracy");
#define MELEMENT(o,s) \
if (o) WARN("Outfit '%s' missing/invalid '"s"' element", tmp->name)
MELEMENT(tmp->u.blt.gfx_space==NULL, "gfx");
MELEMENT((sound_lock!=NULL) && (tmp->u.blt.sound==0), "sound");
MELEMENT(tmp->u.blt.delay==0, "delay");
MELEMENT(tmp->u.blt.speed==0, "speed");
MELEMENT(tmp->u.blt.range==0, "range");
MELEMENT(tmp->u.blt.accuracy==0, "accuracy");
MELEMENT(tmp->u.blt.damage==0, "damage");
#undef MELEMENT
}