From 4ad2e4c7ba2425bc6588e9d24e1f0e7659e2b04b Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 13 Dec 2022 19:16:41 +0100 Subject: [PATCH] Replace 8-unit shell pickup with a 6-unit one. Some other tweaks to ammo as well. --- MAPPING.md | 154 ++++++++++++++-------------- language.version | 4 +- modeldef/items/ammo.txt | 4 +- models/ShellAmmo_Eight.iqm | Bin 25164 -> 0 bytes models/ShellAmmo_Six.iqm | Bin 0 -> 19408 bytes zscript/dlc1/swwm_ammoitems_dlc.zsc | 4 +- zscript/items/swwm_ammoitems.zsc | 12 +-- zscript/items/swwm_ammospawn.zsc | 4 +- 8 files changed, 90 insertions(+), 92 deletions(-) delete mode 100644 models/ShellAmmo_Eight.iqm create mode 100644 models/ShellAmmo_Six.iqm diff --git a/MAPPING.md b/MAPPING.md index 0765b6ea1..077bd847b 100644 --- a/MAPPING.md +++ b/MAPPING.md @@ -61,90 +61,88 @@ DoomEdNums 29021 = "RedShell" 29022 = "RedShell2" 29023 = "RedShell4" - 29024 = "RedShell8" - 29025 = "RedShell12" - 29026 = "RedShell16" - 29027 = "GoldShell" - 29028 = "GoldShell2" - 29029 = "GoldShell4" - 29030 = "EvisceratorShell" - 29031 = "EvisceratorShell2" - 29032 = "EvisceratorShell3" - 29033 = "EvisceratorSixPack" - 29034 = "HellblazerMissiles" - 29035 = "HellblazerMissiles2" - 29036 = "HellblazerMissiles3" - 29037 = "HellblazerMissileMag" - 29038 = "SparkUnit" - 29039 = "SparkUnit2" - 29040 = "SilverBulletAmmo" - 29041 = "SilverBullets" - 29042 = "SilverBullets2" - 29043 = "SilverBullets3" - 29044 = "CandyGunAmmo" - 29045 = "CandyGunBullets" - 29046 = "CandyGunBullets2" - 29047 = "CandyGunBullets3" - 29048 = "YnykronAmmo" + 29024 = "RedShell6" + 29025 = "GoldShell" + 29026 = "GoldShell2" + 29027 = "GoldShell4" + 29028 = "EvisceratorShell" + 29029 = "EvisceratorShell2" + 29030 = "EvisceratorShell3" + 29031 = "EvisceratorSixPack" + 29032 = "HellblazerMissiles" + 29033 = "HellblazerMissiles2" + 29034 = "HellblazerMissiles3" + 29035 = "HellblazerMissileMag" + 29036 = "SparkUnit" + 29037 = "SparkUnit2" + 29038 = "SilverBulletAmmo" + 29039 = "SilverBullets" + 29040 = "SilverBullets2" + 29041 = "SilverBullets3" + 29042 = "CandyGunAmmo" + 29043 = "CandyGunBullets" + 29044 = "CandyGunBullets2" + 29045 = "CandyGunBullets3" + 29046 = "YnykronAmmo" // DLC Ammo - 29049 = "SMW05Ammo" - 29050 = "SMW05Ammo2" - 29051 = "SMW05Ammo3" - 29052 = "SMW05SmallAmmo" - 29053 = "SMW05BigAmmo" - 29054 = "SheenAmmo" - 29055 = "SheenAmmo2" - 29056 = "SheenAmmo3" - 29057 = "SheenSmallAmmo" - 29058 = "SheenBigAmmo" - 29059 = "QuadravolAmmo" - 29060 = "QuadravolAmmo2" - 29061 = "QuadravolAmmo3" - 29062 = "SparksterBAmmo" - 29063 = "SparksterBAmmo2" - 29064 = "SparksterBAmmo3" - 29065 = "SparksterRAmmo" - 29066 = "SparksterRAmmo2" - 29067 = "SparksterRAmmo3" - 29068 = "RayBolt" - 29069 = "RayBolt2" - 29070 = "RayBolt5" - 29071 = "RayAmmo" - 29072 = "MisterRound" - 29073 = "MisterRound2" - 29074 = "MisterRound3" - 29075 = "MisterRound5" - 29076 = "MisterAmmo" - 29077 = "MisterGAmmo" - 29078 = "UltimatePod" - 29079 = "UltimateAmmo" + 29047 = "SMW05Ammo" + 29048 = "SMW05Ammo2" + 29049 = "SMW05Ammo3" + 29050 = "SMW05SmallAmmo" + 29051 = "SMW05BigAmmo" + 29052 = "SheenAmmo" + 29053 = "SheenAmmo2" + 29054 = "SheenAmmo3" + 29055 = "SheenSmallAmmo" + 29056 = "SheenBigAmmo" + 29057 = "QuadravolAmmo" + 29058 = "QuadravolAmmo2" + 29059 = "QuadravolAmmo3" + 29060 = "SparksterBAmmo" + 29061 = "SparksterBAmmo2" + 29062 = "SparksterBAmmo3" + 29063 = "SparksterRAmmo" + 29064 = "SparksterRAmmo2" + 29065 = "SparksterRAmmo3" + 29066 = "RayBolt" + 29067 = "RayBolt2" + 29068 = "RayBolt5" + 29069 = "RayAmmo" + 29070 = "MisterRound" + 29071 = "MisterRound2" + 29072 = "MisterRound3" + 29073 = "MisterRound5" + 29074 = "MisterAmmo" + 29075 = "MisterGAmmo" + 29076 = "UltimatePod" + 29077 = "UltimateAmmo" // For Hexen - 29080 = "FabricatorTier1" - 29081 = "FabricatorTier2" - 29082 = "FabricatorTier3" - 29083 = "FabricatorTier4" + 29078 = "FabricatorTier1" + 29079 = "FabricatorTier2" + 29080 = "FabricatorTier3" + 29081 = "FabricatorTier4" // Backpack - 29084 = "HammerspaceEmbiggener" + 29082 = "HammerspaceEmbiggener" // Health - 29085 = "HealthNuggetItem" - 29086 = "TetraHealthItem" - 29087 = "CubeHealthItem" - 29088 = "RefresherItem" + 29083 = "HealthNuggetItem" + 29084 = "TetraHealthItem" + 29085 = "CubeHealthItem" + 29086 = "RefresherItem" // Armor - 29089 = "ArmorNuggetItem" - 29090 = "BlastSuitItem" - 29091 = "WarArmorItem" + 29087 = "ArmorNuggetItem" + 29088 = "BlastSuitItem" + 29089 = "WarArmorItem" // Powerups - 29092 = "GrilledCheeseSandwich" - 29093 = "GhostArtifact" - 29094 = "GravitySuppressor" - 29095 = "FuckingInvinciball" - 29096 = "Ragekit" - 29097 = "SWWMLamp" - 29098 = "EBarrier" - 29099 = "Mykradvo" - 29100 = "DivineSprite" - 29101 = "AngerySigil" + 29090 = "GrilledCheeseSandwich" + 29091 = "GhostArtifact" + 29092 = "GravitySuppressor" + 29093 = "FuckingInvinciball" + 29094 = "Ragekit" + 29095 = "SWWMLamp" + 29096 = "EBarrier" + 29097 = "Mykradvo" + 29098 = "DivineSprite" + 29099 = "AngerySigil" } ``` diff --git a/language.version b/language.version index d4ed51a84..143d08f6e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r688 \cu(Tue 13 Dec 11:10:34 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r688 \cu(2022-12-13 11:10:34)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r689 \cu(Tue 13 Dec 19:16:41 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r689 \cu(2022-12-13 19:16:41)\c-"; diff --git a/modeldef/items/ammo.txt b/modeldef/items/ammo.txt index de24dd954..03984c177 100644 --- a/modeldef/items/ammo.txt +++ b/modeldef/items/ammo.txt @@ -36,11 +36,11 @@ Model "RedShell4" FrameIndex XZW1 A 0 0 } -Model "RedShell8" +Model "RedShell6" { Path "models" - Model 0 "ShellAmmo_Eight.iqm" + Model 0 "ShellAmmo_Six.iqm" SurfaceSkin 0 0 "Shell_Normal.png" SurfaceSkin 0 1 "envmap/silverenv.png" Scale 6 6 6 diff --git a/models/ShellAmmo_Eight.iqm b/models/ShellAmmo_Eight.iqm deleted file mode 100644 index c85f389b9f6bef98abc7c6230d305b885f7ddbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25164 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 literal 0 HcmV?d00001 diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 11a287759..d7700e71e 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -9,7 +9,7 @@ Class SMW05Ammo : SWWMAmmo Stamina 600; Inventory.Amount 1; Inventory.MaxAmount 90; - Ammo.BackpackAmount 30; + Ammo.BackpackAmount 6; Ammo.BackpackMaxAmount 210; Ammo.DropAmount 3; +FLOATBOB; @@ -61,7 +61,7 @@ Class SheenAmmo : SWWMAmmo Stamina 1500; Inventory.Amount 1; Inventory.MaxAmount 200; - Ammo.BackpackAmount 50; + Ammo.BackpackAmount 10; Ammo.BackpackMaxAmount 400; Ammo.DropAmount 20; +FLOATBOB; diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index 6693536f8..7da14176d 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -10,9 +10,9 @@ Class RedShell : SWWMAmmo SWWMAmmo.PickupTag "REDSHELL"; Stamina 500; Inventory.Amount 1; - Inventory.MaxAmount 50; - Ammo.BackpackAmount 8; - Ammo.BackpackMaxAmount 150; + Inventory.MaxAmount 40; + Ammo.BackpackAmount 4; + Ammo.BackpackMaxAmount 160; Ammo.DropAmount 2; +FLOATBOB; FloatBobStrength 0.25; @@ -39,11 +39,11 @@ Class RedShell4 : RedShell Inventory.Amount 4; } } -Class RedShell8 : RedShell +Class RedShell6 : RedShell { Default { - Inventory.Amount 8; + Inventory.Amount 6; } } @@ -198,7 +198,7 @@ Class HellblazerMissiles : SWWMAmmo Stamina 8000; Inventory.Amount 1; Inventory.MaxAmount 30; - Ammo.BackpackAmount 2; + Ammo.BackpackAmount 3; Ammo.BackpackMaxAmount 90; Ammo.DropAmount 1; +FLOATBOB; diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 3fa9d86e4..7843c8978 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -72,7 +72,7 @@ Class SWWMShellAmmoSmall : SWWMAmmoSpawner bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)), bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop)); if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) - return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05Ammo3'; + return Random[Replacements](0,2)?'SMW05Ammo2':'SMW05Ammo3'; return Random[Replacements](0,2)?'RedShell':'RedShell2'; } } @@ -84,7 +84,7 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop)); if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'SMW05SmallAmmo':'SMW05BigAmmo'; - return Random[Replacements](0,2)?'RedShell4':'RedShell8'; + return Random[Replacements](0,2)?'RedShell4':'RedShell6'; } } Class SWWMClipAmmoSmall : SWWMAmmoSpawner