From a8bdb211138f3035cad633c4550e91eb9cf21efa Mon Sep 17 00:00:00 2001
From: Cong <congusbongus@gmail.com>
Date: Sat, 30 Apr 2022 19:02:39 +1000
Subject: [PATCH] Gun adjustments (fixes #268)

---
 missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json | 7 ++++---
 missions/custom/techdemo/cyberdogs.cdogscpn/guns.json    | 8 ++++----
 src/cdogs/handle_game_events.c                           | 3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json b/missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json
index bb414e3f1..9fe59315c 100644
--- a/missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json
+++ b/missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json
@@ -166,7 +166,8 @@
         "Wall": {}
       },
       "Falling": {
-        "GravityFactor": 0.3
+        "GravityFactor": 0.7,
+        "FallsDown": true
       },
       "OutOfRangeGuns": [
         "blast_weak",
@@ -294,7 +295,7 @@
       "Name": "demo_weak",
       "Range": 1,
       "Power": 40,
-      "Size": [2, 2],
+      "Size": [4, 4],
       "Spark": "",
       "Hit": {
         "Object": {}
@@ -304,7 +305,7 @@
       "Name": "demo_strong",
       "Range": 1,
       "Power": 200,
-      "Size": [2, 2],
+      "Size": [4, 4],
       "Spark": "",
       "Hit": {
         "Object": {}
diff --git a/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json b/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json
index 5ca06ea1a..08e694137 100644
--- a/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json
+++ b/missions/custom/techdemo/cyberdogs.cdogscpn/guns.json
@@ -89,7 +89,7 @@
       "Lock": 30,
       "Sound": "bottle_pop",
       "SwitchSound": "swarmer_switch",
-      "Elevation": 12,
+      "Elevation": 14,
       "Ammo": "Grenades"
     },
     {
@@ -120,7 +120,7 @@
       "Name": "Lazer",
       "Bullet": "laser",
       "Lock": 65,
-      "Sound": "powergun",
+      "Sound": "pistol",
       "MuzzleFlashSprite": "muzzle_flash_big",
       "MuzzleFlashColor": "ffff00",
       "MuzzleFlashDuration": 5
@@ -130,7 +130,7 @@
       "Name": "TurboLazer",
       "Bullet": "turbo_laser",
       "Lock": 35,
-      "Sound": "powergun",
+      "Sound": "pistol",
       "MuzzleFlashSprite": "muzzle_flash_big",
       "MuzzleFlashColor": "ffff00",
       "MuzzleFlashDuration": 5
@@ -141,7 +141,7 @@
       "Icon": "blaster",
       "Bullet": "pulse",
       "Lock": 12,
-      "Sound": "pulse",
+      "Sound": "pistol",
       "SwitchSound": "pulse_switch",
       "MuzzleFlashParticle": "muzzle_flash_pulse",
       "Ammo": "Mini cells"
diff --git a/src/cdogs/handle_game_events.c b/src/cdogs/handle_game_events.c
index 081a0200d..7957c00a9 100644
--- a/src/cdogs/handle_game_events.c
+++ b/src/cdogs/handle_game_events.c
@@ -283,7 +283,8 @@ static void HandleGameEvent(
 		ActorAddAmmo(a, e.u.AddAmmo.Ammo.Id, e.u.AddAmmo.Ammo.Amount);
 		// Tell the spawner that we took ammo so we can
 		// spawn more (but only if we're the server)
-		if (e.u.AddAmmo.IsRandomSpawned && !gCampaign.IsClient)
+		if (e.u.AddAmmo.IsRandomSpawned &&
+			gCampaign.Setting.RandomPickups && !gCampaign.IsClient)
 		{
 			PowerupSpawnerRemoveOne(
 				CArrayGet(ammoSpawners, e.u.AddAmmo.Ammo.Id));