OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Replace 8-unit shell pickup with a 6-unit one.

Browse source 
Some other tweaks to ammo as well.
This commit is contained in:
Mari the Deer 2022-12-13 19:16:41 +01:00
commit 4ad2e4c7ba
8 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

154
MAPPING.md
View file

@ -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"
}
```

4
language.version
View file

@ -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-";

4
modeldef/items/ammo.txt
View file

@ -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

BIN
models/ShellAmmo_Eight.iqm
View file

Binary file not shown.

BIN
models/ShellAmmo_Six.iqm Normal file
View file

Binary file not shown.

4
zscript/dlc1/swwm_ammoitems_dlc.zsc
View file

@ -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;

12
zscript/items/swwm_ammoitems.zsc
View file

@ -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;

4
zscript/items/swwm_ammospawn.zsc
View file

@ -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