Adjust gun names, use 1up sound in util menu #71

cxong · Jan 15, 2024 · 7cf7ba7 · 7cf7ba7
1 parent e996774
commit 7cf7ba7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/characters.json b/missions/custom/techdemo/cyberdogs.cdogscpn/characters.json
@@ -105,7 +105,7 @@
 		"Hat": "ff1616ff",
 		"Glasses": "ff1616ff",
 		"speed": 384,
-		"Gun": "Lazer",
+		"Gun": "Gun",
 		"Melee": "Fists",
 		"maxHealth": 12,
 		"excessHealth": 24,
@@ -128,7 +128,7 @@
 		"Hat": "ff1616ff",
 		"Glasses": "020000ff",
 		"speed": 128,
-		"Gun": "Gun",
+		"Gun": "Lazer",
 		"Melee": "Fists",
 		"maxHealth": 60,
 		"excessHealth": 120,
@@ -151,7 +151,7 @@
 		"Hat": "ff1616ff",
 		"Glasses": "ff1616ff",
 		"speed": 512,
-		"Gun": "Lazer",
+		"Gun": "Gun",
 		"Melee": "Chainsaw",
 		"maxHealth": 12,
 		"excessHealth": 24,

diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json b/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json
@@ -142,9 +142,9 @@
     },
     {
       "Pic": "blaster_yellow",
-      "Name": "Lazer",
+      "Name": "Gun",
       "Bullet": "laser",
-      "Lock": 65,
+      "Lock": 30,
       "Sound": "pistol",
       "MuzzleFlashSprite": "muzzle_flash_big",
       "MuzzleFlashColor": "ffff00",
@@ -193,14 +193,18 @@
       "Name": "DumbGun",
       "Bullet": "laser_dumb",
       "Lock": 40,
-      "Sound": "pistol"
+      "Sound": "pistol",
+      "MuzzleFlashColor": "ff0000"
     },
     {
       "Pic": "zapper_green",
-      "Name": "Gun",
+      "Name": "Lazer",
       "Bullet": "pulse_green",
-      "Lock": 30,
-      "Sound": "pistol"
+      "Lock": 65,
+      "Sound": "pulse",
+      "MuzzleFlashSprite": "muzzle_flash_big",
+      "MuzzleFlashColor": "00ff00",
+      "MuzzleFlashDuration": 5
     }
   ],
   "PseudoGuns" : [

diff --git a/src/util_menu.c b/src/util_menu.c
@@ -127,7 +127,7 @@ static void OnSelect(menu_t *menu, int cmd, void *data)
 			max = CampaignGetMaxLives(&gCampaign);
 			delta = 1;
 			price = LIFE_PRICE;
-			sound = "spawn";
+			sound = "1up";
 			break;
 		case OPTION_COUNT:
 			d->SelectResult = UTIL_MENU_CANCEL;