Merge pull request #23 from Thecrik/main

added a 20mm box pickup

Author: UndeadZeratul

LANGUAGE

@@ -27,6 +27,7 @@ TAG_45ACP = ".45 ACP round";
 TAG_3006 = ".30-06 round";
 TAG_3006BRASS=".30-06 casing";
 TAG_20MMGREN = "20mm grenade";
+TAG_20MMGRENBOX = "20mm grenade box";
 TAG_10MMAUTO = "10mm Auto round";
 TAG_10MMCASING = "10mm Auto casing";
 TAG_6MMFLECH = "6x42mm SCF Round";
@@ -79,6 +80,7 @@ PICKUP_3006BRASS="Picked up some .30-06 brass.";
 PICKUP_50OMG="Picked up a .50 OMG round.";
 PICKUP_50OMGBOX="Picked up some .50 OMG ammo.";
 PICKUP_20MM="Picked up a 20mm grenade.";
+PICKUP_20MMBOX="Picked up a box of 20mm grenades.";
 PICKUP_THUNROCKET="Picked up a thunder rocket.";
 PICKUP_TORTROCKET="Picked up a tortoise rocket.";
 PICKUP_4GB="Picked up a 4 gauge 00 Buck shell.";

sprites/20mm Grenades/MA7GC0.png

@@ -203,6 +203,21 @@ class WAN_20mmGrenadeAmmo:HDAmmo{
 	}
 }
 
+class WAN_20mmGrenadeBox:HDUPK{
+	default{
+		scale 0.33;
+		tag "$TAG_20MMGRENBOX";
+		hdupk.pickupmessage "$PICKUP_20MMBOX";
+		hdupk.pickuptype "WAN_20mmGrenadeAmmo";
+		hdupk.amount 10;
+	}
+	states{
+	spawn:
+		MA7G C -1;
+		stop;
+	}
+}
+
 class WAN_Dud20mmGrenade:HDActor{ //You can't use them for anything so there's no need to be able to pick them up currently
 	//bool isrocket;
 	default{

zscript/HDBulletLib/Ammunition/20mm Grenades.zsc

@@ -416,7 +416,7 @@ class HDBulletLibAmmoSpawner: EventHandler {
         // 20mm Grenade Ammo
         Array<HDBLRSpawnAmmoEntry> spawns_20mmgrenades;
         spawns_20mmgrenades.push(addAmmoEntry('RocketBoxRandom', hdb_20mm_rbox_spawn_bias));
-        addAmmo('WAN_20mmGrenadeAmmo', spawns_20mmgrenades, hdb_20mm_persistent_spawning);
+        addAmmo('WAN_20mmGrenadeBox', spawns_20mmgrenades, hdb_20mm_persistent_spawning);
 
         // Thunder Rockets
         Array<HDBLRSpawnAmmoEntry> spawns_thunderrockets;