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

[Add] New ship: Leapard!

Browse Source
This commit is contained in:
Allanis 2013-02-13 16:42:42 +00:00
parent c4e7a8a9ee
commit 6ace8da900
7 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dat/fleet.xml
View File

@ -28,7 +28,7 @@
<ai>pirate</ai> <ai>pirate</ai>
<faction>Pirate</faction> <faction>Pirate</faction>
<pilots> <pilots>
<pilot chance='100'>Merchant Ship</pilot> <pilot chance='100'>Leapard</pilot>
</pilots> </pilots>
</fleet> </fleet>
</Fleets> </Fleets>

37
dat/ship.xml
View File

@ -5,12 +5,12 @@
<GUI>minimal</GUI> <GUI>minimal</GUI>
<class>1</class> <class>1</class>
<movement> <movement>
<thrust>400</thrust> <thrust>320</thrust>
<turn>180</turn> <turn>150</turn>
<speed>360</speed> <speed>360</speed>
</movement> </movement>
<health> <health>
<shield>50</shield> <shield>70</shield>
<armor>80</armor> <armor>80</armor>
<energy>240</energy> <energy>240</energy>
<shield_regen>80</shield_regen> <shield_regen>80</shield_regen>
@ -21,11 +21,38 @@
<crew>2</crew> <crew>2</crew>
<mass>7</mass> <mass>7</mass>
<cap_weapon>20</cap_weapon> <cap_weapon>20</cap_weapon>
<cap_cargo>20</cap_cargo> <cap_cargo>25</cap_cargo>
</characteristics> </characteristics>
<outfits> <outfits>
<outfit quantity='2'>laser</outfit> <outfit quantity='1'>laser</outfit>
</outfits> </outfits>
</ship>
<ship name = "Leapard">
<GFX>leapard</GFX>
<GUI>minimal</GUI>
<class>1</class>
<movement>
<thrust>400</thrust>
<turn>180</turn>
<speed>380</speed>
</movement>
<health>
<shield>50</shield>
<armor>60</armor>
<energy>180</energy>
<shield_regen>100</shield_regen>
<armor_regen>60</armor_regen>
<energy_regen>40</energy_regen>
</health>
<characteristics>
<crew>2</crew>
<mass>5</mass>
<cap_weapon>25</cap_weapon>
<cap_cargo>10</cap_cargo>
</characteristics>
<outfits>
<outfit quantity ='2'>laser</outfit>
</outfits>
</ship> </ship>
<ship name="Enemy Test"> <ship name="Enemy Test">
<GFX>ship1</GFX> <GFX>ship1</GFX>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 87 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
gfx/ship/ship1_target.xcf
View File

Binary file not shown.

BIN
gfx/ship/ship_target.xcf
View File

Binary file not shown.

2
src/joystick.c
View File

@ -50,7 +50,7 @@ int joystick_init(void) {
// Figure out how many joysticks there are. // Figure out how many joysticks there are.
numjoysticks = SDL_NumJoysticks(); numjoysticks = SDL_NumJoysticks();
LOG("%d joysticks detected", numjoysticks); LOG("%d joystick%s detected", numjoysticks, (numjoysticks==1)?"":"s");
for(i = 0; i < numjoysticks; i++) for(i = 0; i < numjoysticks; i++)
LOG("\t\t%d. %s", i, SDL_JoystickName(i)); LOG("\t\t%d. %s", i, SDL_JoystickName(i));