Update some sounds #712

cxong · May 3, 2024 · 62a5f24 · 62a5f24
1 parent 9a90ca4
commit 62a5f24
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 37 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/ammo.json b/data/.wolf3d/N3Ddata.cdogscpn/ammo.json
@@ -2,14 +2,14 @@
   "Version": 2,
   "Ammo": [
     {
-      "Name": "Ammo",
+      "Name": "Feed",
       "Pic": {
         "Type": "Normal",
         "Pic": "ammo_clip"
       },
       "Sound": "ammo_pickup",
-      "Amount": 4,
-      "Max": 99
+      "Amount": 5,
+      "Max": 299
     }
   ]
 }
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/characters.json b/data/.wolf3d/N3Ddata.cdogscpn/characters.json
@@ -36,7 +36,7 @@
 		"Hat": "9a9a9aff",
 		"Glasses": "9a9a9aff",
 		"speed": 193,
-		"Gun": "Guard Pistol",
+		"Gun": "Sheep Spit",
 		"maxHealth": 25,
 		"excessHealth": 50,
 		"flags": 128,
@@ -102,7 +102,7 @@
 		"Hat": "000000ff",
 		"Glasses": "000000ff",
 		"speed": 194,
-		"Gun": "Guard Pistol",
+		"Gun": "Sheep Spit",
 		"maxHealth": 55,
 		"excessHealth": 110,
 		"flags": 128,
@@ -124,7 +124,7 @@
 		"Hat": "ff1709ff",
 		"Glasses": "ff1709ff",
 		"speed": 330,
-		"Gun": "Guard Pistol",
+		"Gun": "Sheep Spit",
 		"maxHealth": 50,
 		"excessHealth": 100,
 		"flags": 128,

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/guns.json b/data/.wolf3d/N3Ddata.cdogscpn/guns.json
@@ -23,8 +23,7 @@
       "Sound": "small_feeder",
       "SwitchSound": "pistol_switch",
       "Recoil": 0.1,
-      "Brass": "brass",
-      "Ammo": "Ammo"
+      "Ammo": "Feed"
     },
     {
       "Pic": "smg",
@@ -38,8 +37,7 @@
       "Sound": "large_feeder",
       "SwitchSound": "machine_gun_switch",
       "Recoil": 0.17,
-      "Brass": "brass",
-      "Ammo": "Ammo"
+      "Ammo": "Feed"
     },
     {
       "Pic": "chaingun",
@@ -51,21 +49,17 @@
       "Sound": "super_feeder",
       "SwitchSound": "chaingun_pickup",
       "Recoil": 0.23,
-      "Brass": "brass",
-      "Ammo": "Ammo"
+      "Ammo": "Feed"
     },
     {
       "Pic": "pistol",
-      "Name": "Guard Pistol",
-      "Icon": "pistol",
+      "Name": "Sheep Spit",
       "Bullet": "bullet_enemy",
       "Cost": 1,
       "Lock": 70,
-      "Sound": "pistol_guard",
-      "SwitchSound": "pistol_switch",
+      "Sound": "spit",
       "Recoil": 0.3,
-      "Brass": "brass",
-      "Ammo": "Ammo",
+      "Ammo": "Feed",
       "CanDrop": false
     },
     {
@@ -78,8 +72,7 @@
       "Lock": 70,
       "Sound": "machine_gun_burst",
       "Recoil": 0.3,
-      "Brass": "brass",
-      "Ammo": "Ammo",
+      "Ammo": "Feed",
       "CanDrop": false
     },
     {
@@ -88,8 +81,7 @@
       "Bullet": "bullet_boss",
       "Lock": 70,
       "Sound": "dual_chain_gun",
-      "Recoil": 0.3,
-      "Brass": "brass"
+      "Recoil": 0.3
     },
     {
       "Name": "Dual Chain Gun",
@@ -187,8 +179,7 @@
       "Bullet": "bullet_boss",
       "Lock": 70,
       "Sound": "",
-      "Recoil": 0.3,
-      "Brass": "brass"
+      "Recoil": 0.3
     },
     {
       "Pic": "quad_chaingun",
@@ -198,8 +189,7 @@
       "Sound": "dual_chain_gun",
       "SpreadCount": 2,
       "Recoil": 0.3,
-      "MuzzleHeight": 12,
-      "Brass": "brass"
+      "MuzzleHeight": 12
     },
     {
       "Pic": "quad_chaingun",
@@ -209,26 +199,23 @@
       "Sound": "",
       "SpreadCount": 2,
       "Recoil": 0.3,
-      "MuzzleHeight": 12,
-      "Brass": "brass"
+      "MuzzleHeight": 12
     },
     {
       "Pic": "chaingun",
       "Name": "dual_chaingun_rocket_launcher1",
       "Bullets": ["bullet_boss", "rocket"],
       "Lock": 70,
       "Sound": "knight_rocket",
-      "Recoil": 0.3,
-      "Brass": "brass"
+      "Recoil": 0.3
     },
     {
       "Pic": "chaingun",
       "Name": "dual_chaingun_rocket_launcher2",
       "Bullets": ["bullet_boss", "rocket"],
       "Lock": 70,
       "Sound": "dual_chaingun",
-      "Recoil": 0.3,
-      "Brass": "brass"
+      "Recoil": 0.3
     }
   ]
 }
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/pickups.json b/data/.wolf3d/N3Ddata.cdogscpn/pickups.json
@@ -48,7 +48,7 @@
         "Health": 200
       }, {
         "Type": "Ammo",
-        "Ammo": "Ammo",
+        "Ammo": "Feed",
         "Amount": 25
       }, {
         "Type": "Lives",
@@ -124,7 +124,14 @@
       },
       "Effects": [{
         "Type": "Score",
-        "Score": 500
+        "Score": 1000
+      }, {
+        "Type": "Health",
+        "Health": 25
+      }, {
+        "Type": "Ammo",
+        "Ammo": "Feed",
+        "Amount": 10
       }],
       "Sound": "pickup_chalice"
     },
@@ -160,8 +167,8 @@
       },
       "Effects": [{
         "Type": "Ammo",
-        "Ammo": "Ammo",
-        "Amount": 8
+        "Ammo": "Feed",
+        "Amount": 5
       }],
       "Sound": "ammo_pickup"
     },
@@ -173,7 +180,7 @@
       },
       "Effects": [{
         "Type": "Ammo",
-        "Ammo": "Ammo",
+        "Ammo": "Feed",
         "Amount": 25
       }],
       "Sound": "ammo_box"