move slots to DoomPlayer

ZDoom · Jan 13, 2025 · f4c51f4 · f4c51f4
1 parent aa94fba
commit f4c51f4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/wadsrc/static/zscript/actors/doom/doomplayer.zs b/wadsrc/static/zscript/actors/doom/doomplayer.zs
@@ -23,8 +23,8 @@ class DoomPlayer : PlayerPawn
 		Player.WeaponSlot 3, "Shotgun", "SuperShotgun";
 		Player.WeaponSlot 4, "Chaingun";
 		Player.WeaponSlot 5, "RocketLauncher";
-		Player.WeaponSlot 6, "PlasmaRifle";
-		Player.WeaponSlot 7, "BFG9000";
+		Player.WeaponSlot 6, "PlasmaRifle", "ID24Incinerator";
+		Player.WeaponSlot 7, "BFG9000", "ID24CalamityBlade";
 
 		Player.ColorRange 112, 127;
 		Player.Colorset 0, "$TXT_COLOR_GREEN",		0x70, 0x7F,  0x72;

diff --git a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
@@ -24,7 +24,6 @@ class ID24CalamityBlade : DoomWeapon // Heatwave Generator
 		Weapon.AmmoUse 10;
 		Weapon.AmmoGive 40;
 		Weapon.AmmoType "ID24Fuel";
-		Weapon.SlotNumber 7;
 		Inventory.PickupMessage "$ID24_GOTCALAMITYBLADE";
 		Tag "$TAG_ID24CALAMITYBLADE";
 	}

diff --git a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
@@ -24,7 +24,6 @@ class ID24Incinerator : DoomWeapon // Incinerator
 		Weapon.AmmoUse 1;
 		Weapon.AmmoGive 40;
 		Weapon.AmmoType "ID24Fuel";
-		Weapon.SlotNumber 6;
 		Inventory.PickupMessage "$ID24_GOTINCINERATOR";
 		Tag "$TAG_ID24INCINERATOR";
 	}