From 3bf73b5d7012438f2a426a9840b0d7a0dac2a2df Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 1 Apr 2016 10:49:41 +0100 Subject: [PATCH] Updates to mines. --- README.md | 3 + gfx/entities/mineWarning.png | Bin 0 -> 988 bytes .../172870__escortmarius__carbidexplosion.ogg | Bin 0 -> 17644 bytes sound/254174__kwahmah-02__s.ogg | Bin 0 -> 5373 bytes src/battle/effects.c | 20 +++++ src/battle/mine.c | 78 ++++++++++++++++-- src/battle/mine.h | 6 ++ src/battle/player.c | 2 +- src/defs.h | 3 + src/system/sound.c | 2 + 10 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 gfx/entities/mineWarning.png create mode 100644 sound/172870__escortmarius__carbidexplosion.ogg create mode 100644 sound/254174__kwahmah-02__s.ogg diff --git a/README.md b/README.md index 0595634..d958f40 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,9 @@ CC BY-NC-SA 3.0, with the following attribution: Copyright 2015-2016, Stephen J * 251431__onlytheghosts__fusion-gun-flash0-by-onlytheghosts.ogg - fusion-gun_flash0_by_OnlyTheGhosts.wav, by OnlyTheGhosts - https://freesound.org/people/OnlyTheGhosts/sounds/251431/ * 172591__timbre__zapitydooda.ogg - d1clsstf.wav, by wildweasel - https://freesound.org/people/wildweasel/sounds/39030/ * 39030__wildweasel__d1clsstf.ogg - push_button_switch_07.wav, by joedeshon - https://freesound.org/people/joedeshon/sounds/139061/ +* 254174__kwahmah-02__s.ogg - s.wav, by kwahmah_02 - https://freesound.org/people/kwahmah_02/sounds/254174/ +* 172870__escortmarius__carbidexplosion.ogg - carbidexplosion.wav, by escortmarius - https://freesound.org/people/escortmarius/sounds/172870/ + ### MUSIC diff --git a/gfx/entities/mineWarning.png b/gfx/entities/mineWarning.png new file mode 100644 index 0000000000000000000000000000000000000000..8b78308fb9b299ebdb85bd2e9d9f2eb4ef09c7f6 GIT binary patch literal 988 zcmV<210(#2P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00TrxL_t(Y$F-HsZ(CIm#eZ|} zeRdMZalS}sf@HgDtHy~a3y|1##g-+oDD*!=LKPB7toRSIM6f_rW0eHe2@(xTLsEam zj^Dd?SokI~iIb)hj5NFZ&YYPy=M20>C@B9|)M_<-8v^D{tQ16HQemd(Jqjg-X@z85 zaRIpmE+C`KBIqoz5_5GaO#xPcTfi-a1%=!haJ^oa(PA>L`c}Q32j+niQ2eS~{y9;_ z0s%-x_-1eKW1s`HKDvMZk6)fYzl0@Y#*jR`dv~z8v-AF!F2uy}RP8F+)iZBqN zFGAN^TE_50qfrG8WmxPy+?X-XZtm=CJT8}?&3n&`_Y^{4LKUNm0s~_>5h1UNwU*dr zrZ5l~jAgD+0N#C6sr){lWh{74$$N_4GZ6wVj-|A`gj-l-uhrtWqa%)-4d5?< zzpr9m0HzBePz-^h_snJ)rN};~isW*vmS$P3Rw*1D@bd7GzV~O}PAN16vWu%|fczJg z%CGr2=Ryd~gutBlypv@tXBi9qKJNIK-u^zc+f0SPq$-cg<)45F;`Ur*?f{nni7JUI zxe%C$Mdspo`o_@Q-{)1g%gZz)(Lkb#Q$5Ex2UO7YT8$4vU^&ZJN>c2D8V=zPI;YH{hLoNjDaAg^Y&@+a1 zEbwF~pw~d_CdRc0%zs|3ZWp{~Qk8s^|Cw=}8bj9@zTMqje|YcS*5>whPDbW^34GKx zqutH`)1OtVTS;6^1u_x7Ycw95xgzj-y;e&vTJE)1Mj@{-r?8?>{^ZUbRj4Sur?99n z^~OteliR3}JXl*(g+#}U^U5^pqm~s~PdMcO0000< KMNUMnLSTZ`Vz(mz literal 0 HcmV?d00001 diff --git a/sound/172870__escortmarius__carbidexplosion.ogg b/sound/172870__escortmarius__carbidexplosion.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e65522f06554873dba184c5ce92f0c51e129f0e2 GIT binary patch literal 17644 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 literal 0 HcmV?d00001 diff --git a/sound/254174__kwahmah-02__s.ogg b/sound/254174__kwahmah-02__s.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8ef31a62bd85d6ba1cdfa1887369200fc85c374c GIT binary patch literal 5373 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 -= e->size / 2; e->y -= e->size / 2; } + + e = malloc(sizeof(Effect)); + + memset(e, 0, sizeof(Effect)); + battle.effectTail->next = e; + battle.effectTail = e; + + e->type = EFFECT_HALO; + e->x = self->x; + e->y = self->y; + e->size = 32; + e->scaleAmount = 2; + e->texture = haloTexture; + + e->r = 255; + e->g = 255; + e->b = 255; + e->a = 128; + + e->health = 128; } void addLargeExplosion(void) diff --git a/src/battle/mine.c b/src/battle/mine.c index 0100c23..6d4403f 100644 --- a/src/battle/mine.c +++ b/src/battle/mine.c @@ -23,6 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static void think(void); static void die(void); static void lookForFighters(void); +static void doSplashDamage(void); + +static SDL_Texture *mineWarning; +static SDL_Texture *mineNormal; Entity *spawnMine(void) { @@ -30,16 +34,22 @@ Entity *spawnMine(void) mine->type = ET_MINE; mine->health = mine->maxHealth = 1; + mine->systemPower = SYSTEM_POWER; mine->texture = getTexture("gfx/entities/mine.png"); mine->action = think; mine->die = die; - mine->flags = EF_TAKES_DAMAGE+EF_SHORT_RADAR_RANGE; + mine->flags = EF_TAKES_DAMAGE+EF_SHORT_RADAR_RANGE+EF_NO_TARGET; + + mineNormal = getTexture("gfx/entities/mine.png"); + mineWarning = getTexture("gfx/entities/mineWarning.png"); return mine; } static void think(void) { + self->texture = mineNormal; + self->angle += 0.1; if (self->angle >= 360) @@ -48,13 +58,13 @@ static void think(void) } lookForFighters(); -} - -static void die(void) -{ - addMineExplosion(); - self->alive = ALIVE_DEAD; + if (self->systemPower < SYSTEM_POWER && SDL_GetTicks() % 150 < 75) + { + playBattleSound(SND_MINE_WARNING, self->x, self->y); + + self->texture = mineWarning; + } } static void lookForFighters(void) @@ -62,13 +72,63 @@ static void lookForFighters(void) Entity *e, **candidates; int i; + candidates = getAllEntsWithin(self->x - (self->w / 2) - DAMAGE_RANGE, self->y - (self->h / 2) - DAMAGE_RANGE, self->w + DAMAGE_RANGE, self->h + DAMAGE_RANGE, self); + + for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i]) + { + if (e->health > 0 && e->type == ET_FIGHTER && getDistance(self->x, self->y, e->x, e->y) <= TRIGGER_RANGE) + { + self->systemPower--; + + if (self->systemPower <= 0) + { + self->health = 0; + } + + return; + } + } + + self->systemPower = SYSTEM_POWER; +} + + +static void die(void) +{ + addMineExplosion(); + + doSplashDamage(); + + playBattleSound(SND_EXPLOSION_5, self->x, self->y); + + self->alive = ALIVE_DEAD; +} + +static void doSplashDamage(void) +{ + Entity *e, **candidates; + int i, dist; + float damage, percent; + candidates = getAllEntsWithin(self->x - (self->w / 2), self->y - (self->h / 2), self->w, self->h, self); for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i]) { - if (e->health > 0 && e->type == ET_FIGHTER && getDistance(self->x, self->y, e->x, e->y) <= 128) + if (e->health > 0 && e->type == ET_FIGHTER) { - self->health = 0; + dist = getDistance(self->x, self->y, e->x, e->y); + + if (dist <= DAMAGE_RANGE) + { + percent = dist; + percent /= DAMAGE_RANGE; + percent = 1 - percent; + + damage = 100; + damage *= percent; + + damageFighter(e, damage, 0); + } } } } diff --git a/src/battle/mine.h b/src/battle/mine.h index 2eef022..71299db 100644 --- a/src/battle/mine.h +++ b/src/battle/mine.h @@ -20,10 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" +#define TRIGGER_RANGE 150 +#define DAMAGE_RANGE 255 +#define SYSTEM_POWER 75 + extern Entity *spawnEntity(void); extern SDL_Texture *getTexture(char *filename); extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); extern int getDistance(int x1, int y1, int x2, int y2); extern void addMineExplosion(void); +extern void damageFighter(Entity *e, int amount, long flags); +extern void playBattleSound(int id, int x, int y); extern Entity *self; diff --git a/src/battle/player.c b/src/battle/player.c index a47e192..221326a 100644 --- a/src/battle/player.c +++ b/src/battle/player.c @@ -480,7 +480,7 @@ static void selectTarget(void) for (e = battle.entityHead.next ; e != NULL ; e = e->next) { - if (e->active && e != player && (e->flags & EF_TAKES_DAMAGE) && e->side != player->side && e->alive == ALIVE_ALIVE && e->systemPower > 0 && i < MAX_SELECTABLE_TARGETS) + if (e->active && e != player && (e->flags & EF_TAKES_DAMAGE) && (!(e->flags & EF_NO_TARGET)) && e->side != player->side && e->alive == ALIVE_ALIVE && e->systemPower > 0 && i < MAX_SELECTABLE_TARGETS) { dist = getDistance(self->x, self->y, e->x, e->y); if (dist < closest) diff --git a/src/defs.h b/src/defs.h index a9bad27..605874b 100644 --- a/src/defs.h +++ b/src/defs.h @@ -98,6 +98,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define EF_ROPED_ATTACHED (2 << 15) #define EF_NO_KILL_INC (2 << 16) #define EF_SHORT_RADAR_RANGE (2 << 17) +#define EF_NO_TARGET (2 << 18) #define AIF_NONE 0 #define AIF_FOLLOWS_PLAYER (2 << 0) @@ -228,6 +229,7 @@ enum SND_EXPLOSION_2, SND_EXPLOSION_3, SND_EXPLOSION_4, + SND_EXPLOSION_5, SND_GET_ITEM, SND_MISSILE, SND_INCOMING, @@ -238,6 +240,7 @@ enum SND_POWER_DOWN, SND_BOOST, SND_RADIO, + SND_MINE_WARNING, SND_GUI_CLICK, SND_GUI_SELECT, SND_GUI_CLOSE, diff --git a/src/system/sound.c b/src/system/sound.c index 3b122b2..a2c68d3 100644 --- a/src/system/sound.c +++ b/src/system/sound.c @@ -112,11 +112,13 @@ static void loadSounds(void) sounds[SND_EXPLOSION_2] = loadSound("sound/207322__animationisaac__short-explosion.ogg"); sounds[SND_EXPLOSION_3] = loadSound("sound/254071__tb0y298__firework-explosion.ogg"); sounds[SND_EXPLOSION_4] = loadSound("sound/47252__nthompson__bad-explosion.ogg"); + sounds[SND_EXPLOSION_5] = loadSound("sound/172870__escortmarius__carbidexplosion.ogg"); sounds[SND_JUMP] = loadSound("sound/276912__pauldihor__transform.ogg"); sounds[SND_ECM] = loadSound("sound/251431__onlytheghosts__fusion-gun-flash0-by-onlytheghosts.ogg"); sounds[SND_MAG_HIT] = loadSound("sound/172591__timbre__zapitydooda.ogg"); sounds[SND_POWER_DOWN] = loadSound("sound/39030__wildweasel__d1clsstf.ogg"); sounds[SND_SELECT_WEAPON] = loadSound("sound/329359__bassoonrckr__reed-guillotine.ogg"); + sounds[SND_MINE_WARNING] = loadSound("sound/254174__kwahmah-02__s.ogg"); sounds[SND_GUI_CLICK] = loadSound("sound/257786__xtrgamr__mouse-click.ogg"); sounds[SND_GUI_SELECT] = loadSound("sound/321104__nsstudios__blip2.ogg");