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

[Add] Added shield hit effects.

Browse Source 
[Fix] Fixed Makefile, cleans lua libs properly, and corrected typo
preventing lua from building.
This commit is contained in:
Allanis 2014-04-28 15:45:29 +01:00
parent 96a38a1f60
commit c450b11125
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/Makefile
View File

@ -139,7 +139,7 @@ $(APPNAME): $(OBJS)
lua: ../lib/lua/liblua.a lua: ../lib/lua/liblua.a
../lib/lua/lublua.a: ../lib/lua/liblua.a:
+@$(MAKE) -C ../lib/lua a +@$(MAKE) -C ../lib/lua a
csparse: ../lib/csparse/libcsparse.a csparse: ../lib/csparse/libcsparse.a
@ -179,9 +179,9 @@ distclean: clean
@$(MAKE) -C ../utils/pack clean @$(MAKE) -C ../utils/pack clean
@$(MAKE) -C ../utils/mkspr clean @$(MAKE) -C ../utils/mkspr clean
@echo " Cleaning Lua" @echo " Cleaning Lua"
@$(MAKE) -C ../lib/lua distclean @$(MAKE) -C ../lib/lua clean
@echo " Cleaning CSparse." @echo " Cleaning CSparse."
@$(MAKE) -C ../lib/csparse disclean @$(MAKE) -C ../lib/csparse clean
@echo " Removing build tool binaries." @echo " Removing build tool binaries."
@$(RM) Lephisto mksprite ldata pack gmon.out VERSION @$(RM) Lephisto mksprite ldata pack gmon.out VERSION

22
dat/outfit.xml
View File

@ -13,7 +13,7 @@
<specific type="bolt"> <specific type="bolt">
<gfx>ripper</gfx> <gfx>ripper</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>700</delay> <delay>700</delay>
<speed>700</speed> <speed>700</speed>
@ -35,7 +35,7 @@
<specific type="bolt"> <specific type="bolt">
<gfx>laserred</gfx> <gfx>laserred</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>500</delay> <delay>500</delay>
<speed>550</speed> <speed>550</speed>
@ -58,7 +58,7 @@
<specific type="turret bolt"> <specific type="turret bolt">
<gfx>laserred</gfx> <gfx>laserred</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>300</delay> <delay>300</delay>
<speed>550</speed> <speed>550</speed>
@ -80,7 +80,7 @@
<specific type="bolt"> <specific type="bolt">
<gfx>plasma</gfx> <gfx>plasma</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>450</speed> <speed>450</speed>
@ -103,7 +103,7 @@
<specific type="bolt"> <specific type="bolt">
<gfx>ion</gfx> <gfx>ion</gfx>
<sound>ion</sound> <sound>ion</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>800</delay> <delay>800</delay>
<speed>500</speed> <speed>500</speed>
@ -126,7 +126,7 @@
<specific type="turret bolt"> <specific type="turret bolt">
<gfx>ion</gfx> <gfx>ion</gfx>
<sound>ion</sound> <sound>ion</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>500</speed> <speed>500</speed>
@ -149,8 +149,8 @@
<specific type="bolt" secondary="1"> <specific type="bolt" secondary="1">
<gfx>mass</gfx> <gfx>mass</gfx>
<sound>mass</sound> <sound>mass</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiM</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpM</spfx_armour>
<delay>1100</delay> <delay>1100</delay>
<speed>650</speed> <speed>650</speed>
<range>500</range> <range>500</range>
@ -175,7 +175,7 @@
<range>300</range> <range>300</range>
<energy>70</energy> <energy>70</energy>
<damage type="energy">40</damage> <damage type="energy">40</damage>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<gfx>beam_orion</gfx> <gfx>beam_orion</gfx>
<sound>beam0</sound> <sound>beam0</sound>
@ -198,7 +198,7 @@
<turn>50</turn> <turn>50</turn>
<energy>130</energy> <energy>130</energy>
<damage type="energy">100</damage> <damage type="energy">100</damage>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<gfx>beam_ragnarok</gfx> <gfx>beam_ragnarok</gfx>
<sound>beam0</sound> <sound>beam0</sound>
@ -292,7 +292,7 @@
<specific type="bolt"> <specific type="bolt">
<gfx>neutron</gfx> <gfx>neutron</gfx>
<sound>neutron</sound> <sound>neutron</sound>
<spfx_shield>ExpS</spfx_shield> <spfx_shield>ShiS</spfx_shield>
<spfx_armour>ExpS</spfx_armour> <spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>650</speed> <speed>650</speed>

BIN
gfx/spfx/shim.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
gfx/spfx/shis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

5
src/spfx.c
View File

@ -142,9 +142,14 @@ int spfx_load(void) {
spfx_base_load("ExpS", 400, 400, "exps.png", 6, 5); spfx_base_load("ExpS", 400, 400, "exps.png", 6, 5);
spfx_base_load("ExpM", 450, 450, "expm.png", 6, 5); spfx_base_load("ExpM", 450, 450, "expm.png", 6, 5);
spfx_base_load("ExpL", 500, 500, "expl.png", 6, 5); spfx_base_load("ExpL", 500, 500, "expl.png", 6, 5);
/* Cargo Rotation. */
spfx_base_load("cargo", 15000, 5000, "cargo.png", 6, 6); spfx_base_load("cargo", 15000, 5000, "cargo.png", 6, 6);
/* EMP Blasts. */
spfx_base_load("EmpS", 400, 400, "emps.png", 6, 5); spfx_base_load("EmpS", 400, 400, "emps.png", 6, 5);
spfx_base_load("EmpM", 450, 450, "empm.png", 6, 5); spfx_base_load("EmpM", 450, 450, "empm.png", 6, 5);
/* Shield hits. */
spfx_base_load("ShiS", 400, 400, "shis.png", 6, 5);
spfx_base_load("ShiM", 450, 450, "shim.png", 6, 5);
return 0; return 0;
} }