New weapon: Chili run

Author: simenheg

AUTHORS.md

@@ -1,26 +1,24 @@
-## Lead developer
+## Programming
 * Simen Heggestøyl (simenheg@gmail.com)
-
-## Code contributors
 * Gwilym Kuiper
 * Patrick Bauge Skevik (patrisk@student.matnat.uio.no)
 
-## Alpha testers
-* Anders Heggestøyl
+## Testing
+* Anders Heggestøyl (anders.heggestoyl@gmail.com)
 * Håkon Normann
 
-## Music
-* Charles Vaughan (cs.vaughan@tiscali.co.uk)
+## Graphics
+* Simen Heggestøyl
+* Anders Heggestøyl
+* Ravenmore (http://dycha.net)
 
 ## Sound effects
-* Charles Vaughan
+* Charles Vaughan (cs.vaughan@tiscali.co.uk)
 * Simen Heggestøyl
 
-## Logo design
-* Anders Heggestøyl (anders.heggestoyl@gmail.com)
-
-## Font: Anka/Coder (license: Open Font License)
-* Andrey Makarov (makarov at openfontlibrary.org)
+## Music
+* Charles Vaughan
 
-## Font: Jura (license: Open Font License)
-* Daniel Johnson (Daniel_J at openfontlibrary.org)
+## Fonts
+* Anka/Coder by Andrey Makarov (OFL)
+* Jura by Daniel Johnson (OFL)

NEWS.md

@@ -1,5 +1,6 @@
 ## 0.1.9 - ??.??.??
 * General:
+  * A new weapon has been added: Chili run.
   * The weapon Disable has been removed.
   * Autoconf is now used for building.
   * FPS is capped at 100, which should make Zatacka X less CPU hungry.

data/gfx/wi_chilirun.png

@@ -37,6 +37,7 @@ static Mix_Chunk *seMole = NULL;
 static Mix_Chunk *seWarp = NULL;
 static Mix_Chunk *seGhost = NULL;
 static Mix_Chunk *seTronmode = NULL;
+static Mix_Chunk *seChilirun = NULL;
 static Mix_Chunk *seSwitch = NULL;
 static Mix_Chunk *sounds[N_SOUNDS];
 
@@ -119,6 +120,8 @@ int initSound(void)
         return -1;
     if (loadSound(seTronmode, "tronmode", SOUND_TRON) == -1)
         return -1;
+    if (loadSound(seChilirun, "chilirun", SOUND_CHILIRUN) == -1)
+        return -1;
     if (loadSound(seSwitch, "switch", SOUND_SWITCH) == -1)
         return -1;
 

data/gfx/wis_chilirun.png

@@ -25,6 +25,7 @@ enum sounds {
     SOUND_WARP,
     SOUND_GHOST,
     SOUND_TRON,
+    SOUND_CHILIRUN,
     SOUND_SWITCH,
     N_SOUNDS
 };

data/sound/chilirun.ogg

@@ -3,7 +3,7 @@
 
 #include "player.h"
 
-#define N_WEAPONS               10
+#define N_WEAPONS               11
 #define N_ILLEGAL_2P_WEPS       1
 #define WEP_SPACEMOD            42
 #define WEP_SMALL_INIT_OFFSET   4    /* Offset between score and icon */
@@ -21,6 +21,7 @@
 #define DURATION_MOLE           350
 #define DURATION_GHOSTWALK      2100
 #define DURATION_TRON           3000
+#define DURATION_CHILIRUN       1500
 
 enum weapons {
     WEP_LIGHTNINGSPEED = 0,
@@ -32,6 +33,7 @@ enum weapons {
     WEP_WARP,
     WEP_GHOST,
     WEP_TRON,
+    WEP_CHILI_RUN,
     WEP_SWITCH
 };
 
@@ -52,6 +54,7 @@ int wepMole(struct player *p, bool on);
 int wepWarp(struct player *p, bool on);
 int wepGhost(struct player *p, bool on);
 int wepTron(struct player *p, bool on);
+int wepChilirun(struct player *p, bool on);
 int wepSwitch(struct player *p, bool on);
 
 static struct weapon wep_list[N_WEAPONS] = {
@@ -64,6 +67,7 @@ static struct weapon wep_list[N_WEAPONS] = {
     {wepWarp, 4, "Warp", "Warp to a random spot", "on the map."},
     {wepGhost, 1, "Ghost walk", "Transform into ghost", "form."},
     {wepTron, 1, "Tron-mode", "No more smooth turns.", ""},
+    {wepChilirun, 1, "Chili run", "Hot hot hot!", ""},
     {wepSwitch, 1, "Switch-aroo", "SWITCH-AROOOO!", ""}
 };
 

src/sound.c

@@ -1015,14 +1015,16 @@ void drawExtras(void)
     }
 
     /* Active weapons */
-    if (activeFreeze || activeConfusion || activeTron) {
+    if (activeFreeze || activeConfusion || activeTron || activeChilirun) {
         SDL_Rect offset = {WINDOW_W - wepIcons[0]->w, 0, 0, 0};
         if (activeFreeze)
             SDL_BlitSurface(wepIcons[WEP_FROSTWAVE + 1], NULL, screen, &offset);
         if (activeConfusion)
             SDL_BlitSurface(wepIcons[WEP_CONFUSION + 1], NULL, screen, &offset);
         if (activeTron)
             SDL_BlitSurface(wepIcons[WEP_TRON + 1], NULL, screen, &offset);
+        if (activeChilirun)
+            SDL_BlitSurface(wepIcons[WEP_CHILI_RUN + 1], NULL, screen, &offset);
     }
 }
 
@@ -1318,6 +1320,35 @@ int wepTron(struct player *p __attribute__ ((unused)), bool on)
     return DURATION_TRON;
 }
 
+/**
+ * Weapon: Chili run
+ *
+ * @param p Weapon user.
+ * @param on 1 to use weapon, 0 to disable weapon.
+ */
+int wepChilirun(struct player *p, bool on)
+{
+    struct player *target;
+    unsigned int i;
+
+    activeChilirun = on;
+
+    if (on) {
+        playSound(SOUND_CHILIRUN, sound);
+    }
+    else {
+        refreshGameScreen();
+    }
+
+    for (target = &players[0], i = 0; i < nPlayers; ++i, ++target) {
+        if (target != p) {
+            target->speed = on ? 2 : 1;
+        }
+    }
+
+    return DURATION_CHILIRUN;
+}
+
 /**
  * Weapon: switch-aroo
  *
@@ -2360,6 +2391,14 @@ int loadFiles(void)
         fileNotFound("data/gfx/wis_tron.png");
         return 0;
     }
+    if ((wiChilirun = loadImage("data/gfx/wi_chilirun.png")) == NULL) {
+        fileNotFound("data/gfx/wi_chilirun.png");
+        return 0;
+    }
+    if ((wisChilirun = loadImage("data/gfx/wis_chilirun.png")) == NULL) {
+        fileNotFound("data/gfx/wis_chilirun.png");
+        return 0;
+    }
     if ((wiSwitch = loadImage("data/gfx/wi_switch.png")) == NULL) {
         fileNotFound("data/gfx/wi_switch.png");
         return 0;
@@ -2448,6 +2487,7 @@ int loadFiles(void)
     wepIcons[WEP_WARP + 1] = wiWarp;
     wepIcons[WEP_GHOST + 1] = wiGhost;
     wepIcons[WEP_TRON + 1] = wiTron;
+    wepIcons[WEP_CHILI_RUN + 1] = wiChilirun;
     wepIcons[WEP_SWITCH + 1] = wiSwitch;
 
     smallWepIcons[WEP_LIGHTNINGSPEED] = wisSpeed;
@@ -2459,6 +2499,7 @@ int loadFiles(void)
     smallWepIcons[WEP_WARP] = wisWarp;
     smallWepIcons[WEP_GHOST] = wisGhost;
     smallWepIcons[WEP_TRON] = wisTron;
+    smallWepIcons[WEP_CHILI_RUN] = wisChilirun;
     smallWepIcons[WEP_SWITCH] = wisSwitch;
 
     return 1;

src/sound.h

@@ -118,6 +118,7 @@ static bool screenFreeze = false;
 static bool activeFreeze = false;
 static bool activeConfusion = false;
 static bool activeTron = false;
+static bool activeChilirun = false;
 
 static unsigned int scorecap = DEFAULT_SCORECAP;
 static bool fullscreen = DEFAULT_FULLSCREEN;
@@ -171,6 +172,8 @@ static SDL_Surface *wiGhost = NULL;
 static SDL_Surface *wisGhost = NULL;
 static SDL_Surface *wiTron = NULL;
 static SDL_Surface *wisTron = NULL;
+static SDL_Surface *wiChilirun = NULL;
+static SDL_Surface *wisChilirun = NULL;
 static SDL_Surface *wiSwitch = NULL;
 static SDL_Surface *wisSwitch = NULL;
 static struct SDL_Surface **parrows;