walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added laser.

This commit is contained in:
Steve 2015-11-18 16:02:10 +00:00
parent f642a80305
commit 0bd067e552
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/battle/bullets.json
View File

@ -29,5 +29,13 @@
"textureName" : "gfx/bullets/magBolt.png", "textureName" : "gfx/bullets/magBolt.png",
"sound" : "SND_MAG", "sound" : "SND_MAG",
"flags" : "BF_SYSTEM_DAMAGE" "flags" : "BF_SYSTEM_DAMAGE"
},
{
"type" : "BT_LASER",
"damage" : 5,
"textureName" : "gfx/bullets/laser.png",
"sound" : "SND_LASER",
"flags" : "BF_SHIELD_DAMAGE"
} }
] ]

BIN
gfx/bullets/laser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

BIN
sound/146725__fins__laser.ogg Normal file
View File

Binary file not shown.

5
src/defs.h
View File

@ -60,7 +60,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define BF_NONE 0 #define BF_NONE 0
#define BF_ENGINE (2 << 0) #define BF_ENGINE (2 << 0)
#define BF_SYSTEM_DAMAGE (2 << 1) #define BF_SYSTEM_DAMAGE (2 << 1)
#define BF_EXPLODES (2 << 2) #define BF_SHIELD_DAMAGE (2 << 2)
#define BF_EXPLODES (2 << 3)
#define EF_NONE 0 #define EF_NONE 0
#define EF_NO_KILL (2 << 0) #define EF_NO_KILL (2 << 0)
@ -155,9 +156,11 @@ enum
{ {
SND_PARTICLE, SND_PARTICLE,
SND_PLASMA, SND_PLASMA,
SND_LASER,
SND_MAG, SND_MAG,
SND_ARMOUR_HIT, SND_ARMOUR_HIT,
SND_SHIELD_HIT, SND_SHIELD_HIT,
SND_SHIELD_BREAK,
SND_EXPLOSION_1, SND_EXPLOSION_1,
SND_EXPLOSION_2, SND_EXPLOSION_2,
SND_EXPLOSION_3, SND_EXPLOSION_3,

2
src/system/lookup.c
View File

@ -69,6 +69,7 @@ void initLookups(void)
addLookup("SND_PARTICLE", SND_PARTICLE); addLookup("SND_PARTICLE", SND_PARTICLE);
addLookup("SND_PLASMA", SND_PLASMA); addLookup("SND_PLASMA", SND_PLASMA);
addLookup("SND_LASER", SND_LASER);
addLookup("SND_MAG", SND_MAG); addLookup("SND_MAG", SND_MAG);
addLookup("SND_MISSILE", SND_MISSILE); addLookup("SND_MISSILE", SND_MISSILE);
@ -82,6 +83,7 @@ void initLookups(void)
addLookup("BF_NONE", BF_NONE); addLookup("BF_NONE", BF_NONE);
addLookup("BF_ENGINE", BF_ENGINE); addLookup("BF_ENGINE", BF_ENGINE);
addLookup("BF_SYSTEM_DAMAGE", BF_SYSTEM_DAMAGE); addLookup("BF_SYSTEM_DAMAGE", BF_SYSTEM_DAMAGE);
addLookup("BF_SHIELD_DAMAGE", BF_SHIELD_DAMAGE);
addLookup("BF_EXPLODES", BF_EXPLODES); addLookup("BF_EXPLODES", BF_EXPLODES);
addLookup("MISSILE_ROCKET", MISSILE_ROCKET); addLookup("MISSILE_ROCKET", MISSILE_ROCKET);