From 0bd067e5524d92798599ec1d4bf479baf5358153 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 18 Nov 2015 16:02:10 +0000 Subject: [PATCH] Added laser. --- data/battle/bullets.json | 8 ++++++++ gfx/bullets/laser.png | Bin 0 -> 327 bytes sound/146725__fins__laser.ogg | Bin 0 -> 3926 bytes src/defs.h | 5 ++++- src/system/lookup.c | 2 ++ 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gfx/bullets/laser.png create mode 100644 sound/146725__fins__laser.ogg 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 0000000000000000000000000000000000000000..b50c5e6903091d88c179baac9bf90d021ea75ab1 GIT binary patch literal 327 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 Se;IguOM98(xf|`Nu>Cg{Z9<*^ literal 0 HcmV?d00001 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);