diff --git a/data/battle/bullets.json b/data/battle/bullets.json index 0eeeefd..ff64547 100644 --- a/data/battle/bullets.json +++ b/data/battle/bullets.json @@ -29,5 +29,13 @@ "textureName" : "gfx/bullets/magBolt.png", "sound" : "SND_MAG", "flags" : "BF_SYSTEM_DAMAGE" + }, + + { + "type" : "BT_LASER", + "damage" : 5, + "textureName" : "gfx/bullets/laser.png", + "sound" : "SND_LASER", + "flags" : "BF_SHIELD_DAMAGE" } ] diff --git a/gfx/bullets/laser.png b/gfx/bullets/laser.png new file mode 100644 index 0000000..b50c5e6 Binary files /dev/null and b/gfx/bullets/laser.png differ diff --git a/sound/146725__fins__laser.ogg b/sound/146725__fins__laser.ogg new file mode 100644 index 0000000..0946d30 Binary files /dev/null and b/sound/146725__fins__laser.ogg differ diff --git a/src/defs.h b/src/defs.h index 1c279ea..9390205 100644 --- a/src/defs.h +++ b/src/defs.h @@ -60,7 +60,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define BF_NONE 0 #define BF_ENGINE (2 << 0) #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_NO_KILL (2 << 0) @@ -155,9 +156,11 @@ enum { SND_PARTICLE, SND_PLASMA, + SND_LASER, SND_MAG, SND_ARMOUR_HIT, SND_SHIELD_HIT, + SND_SHIELD_BREAK, SND_EXPLOSION_1, SND_EXPLOSION_2, SND_EXPLOSION_3, diff --git a/src/system/lookup.c b/src/system/lookup.c index 317ed00..ece324f 100644 --- a/src/system/lookup.c +++ b/src/system/lookup.c @@ -69,6 +69,7 @@ void initLookups(void) addLookup("SND_PARTICLE", SND_PARTICLE); addLookup("SND_PLASMA", SND_PLASMA); + addLookup("SND_LASER", SND_LASER); addLookup("SND_MAG", SND_MAG); addLookup("SND_MISSILE", SND_MISSILE); @@ -82,6 +83,7 @@ void initLookups(void) addLookup("BF_NONE", BF_NONE); addLookup("BF_ENGINE", BF_ENGINE); addLookup("BF_SYSTEM_DAMAGE", BF_SYSTEM_DAMAGE); + addLookup("BF_SHIELD_DAMAGE", BF_SHIELD_DAMAGE); addLookup("BF_EXPLODES", BF_EXPLODES); addLookup("MISSILE_ROCKET", MISSILE_ROCKET);