From 43bea0d22ab4776dc44d1efc5f03da1a509033ef Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 27 Jul 2022 16:57:52 +0200 Subject: [PATCH] Properly set drop ammo types for weapons. --- FuturePlans.md | 7 +++++++ language.version | 4 ++-- zscript/dlc1/swwm_blueballs.zsc | 2 +- zscript/dlc1/swwm_heavymahsheengun.zsc | 2 +- zscript/dlc1/swwm_mister.zsc | 2 +- zscript/dlc1/swwm_notashotgun.zsc | 2 +- zscript/dlc1/swwm_rebolber.zsc | 2 +- zscript/dlc1/swwm_supermarioworld.zsc | 2 +- zscript/dlc1/swwm_thiccbolts.zsc | 2 +- zscript/dlc1/swwm_ultimate.zsc | 2 +- zscript/weapons/swwm_cbt.zsc | 2 +- zscript/weapons/swwm_danmaku.zsc | 2 +- zscript/weapons/swwm_deathlydeathcannon.zsc | 2 +- zscript/weapons/swwm_sparkyboi.zsc | 2 +- zscript/weapons/swwm_tastytreat.zsc | 2 +- zscript/weapons/swwm_thiccboolet.zsc | 2 +- 16 files changed, 23 insertions(+), 16 deletions(-) diff --git a/FuturePlans.md b/FuturePlans.md index 546fb1b32..248ed95ce 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -138,6 +138,13 @@ Add-ons and other related stuff. - Big focus on melee, as well as quick spellcasting - Featuring a summonable AI companion - Basically even more of what **UNDEATH** will feature +* ***"Hardcore Mode"* side mod *(Maid for Combat)*:** + - Demo-chan enters the fray in full military maidbot gear + - Things get quite a lot more challenging + - No jetpack, just standard humanoid mobility + - Simplified mechanics and controls + - Exploring a more conventional arsenal, but with some familiar faces + - Demo can use **MAGIC**??? *(yes, they can)* * **Official Game *(VOID - The Dark Alliance)*:** - Retell the events of UnSX 2 *(but with the Demolitionist's participation)* - Basically give the Demolitionist their own standalone game diff --git a/language.version b/language.version index eb570d618..d864cef0a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r223 \cu(Wed 27 Jul 13:23:06 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r223 \cu(2022-07-27 13:23:06)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r224 \cu(Wed 27 Jul 16:57:52 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r224 \cu(2022-07-27 16:57:52)\c-"; diff --git a/zscript/dlc1/swwm_blueballs.zsc b/zscript/dlc1/swwm_blueballs.zsc index a08ddd253..2be42d350 100644 --- a/zscript/dlc1/swwm_blueballs.zsc +++ b/zscript/dlc1/swwm_blueballs.zsc @@ -22,7 +22,7 @@ Class ModernSparkster : SWWMWeapon Weapon.AmmoGive1 1; Weapon.AmmoType2 "SparksterRAmmo"; Weapon.AmmoGive2 1; - SWWMWeapon.DropAmmoType "RocketAmmo"; + SWWMWeapon.DropAmmoType "Cell"; ModernSparkster.ClipCount 4; ModernSparkster.ClipCount2 4; Stamina 220000; diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index b5dc9a772..bd5aa6920 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -294,7 +294,7 @@ Class HeavyMahSheenGun : SWWMWeapon Weapon.SelectionOrder 100; Weapon.AmmoType1 "SheenAmmo"; Weapon.AmmoGive1 30; - SWWMWeapon.DropAmmoType "SheenAmmo"; + SWWMWeapon.DropAmmoType "ClipBox"; +SWWMWEAPON.HASSCRTEX; Stamina 100000; Radius 30; diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 019969e29..87c7e8906 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -23,7 +23,7 @@ Class MisterRifle : SWWMWeapon Weapon.AmmoGive1 1; Weapon.AmmoType2 "MisterGAmmo"; Weapon.AmmoGive2 1; - SWWMWeapon.DropAmmoType "MisterAmmo"; + SWWMWeapon.DropAmmoType "Cell"; MisterRifle.ClipCount 20; Stamina 1600000; +SWWMWEAPON.NOFIRSTGIVE; diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index e4b93f3e3..de76db1c5 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -21,7 +21,7 @@ Class Quadravol : SWWMWeapon Weapon.SelectionOrder 650; Weapon.AmmoType1 "QuadravolAmmo"; Weapon.AmmoGive1 1; - SWWMWeapon.DropAmmoType "QuadravolAmmo"; + SWWMWeapon.DropAmmoType "RocketAmmo"; Quadravol.ClipCount 5; Stamina 80000; +SWWMWEAPON.NOFIRSTGIVE; diff --git a/zscript/dlc1/swwm_rebolber.zsc b/zscript/dlc1/swwm_rebolber.zsc index 18225fc44..5984a1ecb 100644 --- a/zscript/dlc1/swwm_rebolber.zsc +++ b/zscript/dlc1/swwm_rebolber.zsc @@ -19,7 +19,7 @@ Class PuntzerBeta : SWWMWeapon Weapon.SelectionOrder 450; Weapon.AmmoType1 "SMW05Ammo"; Weapon.AmmoGive1 6; - SWWMWeapon.DropAmmoType "SMW05Ammo"; + SWWMWeapon.DropAmmoType "Shell"; Stamina 10000; +SWWMWEAPON.NOFIRSTGIVE; } diff --git a/zscript/dlc1/swwm_supermarioworld.zsc b/zscript/dlc1/swwm_supermarioworld.zsc index 404d5f8c6..1854e075c 100644 --- a/zscript/dlc1/swwm_supermarioworld.zsc +++ b/zscript/dlc1/swwm_supermarioworld.zsc @@ -21,7 +21,7 @@ Class PuntzerGamma : SWWMWeapon PuntzerGamma.ClipCount 30; Weapon.AmmoType1 "SMW05Ammo"; Weapon.AmmoGive1 30; - SWWMWeapon.DropAmmoType "SMW05Ammo"; + SWWMWeapon.DropAmmoType "ShellBox"; Stamina 30000; +SWWMWEAPON.NOFIRSTGIVE; } diff --git a/zscript/dlc1/swwm_thiccbolts.zsc b/zscript/dlc1/swwm_thiccbolts.zsc index d47bf6e9a..04f73aae0 100644 --- a/zscript/dlc1/swwm_thiccbolts.zsc +++ b/zscript/dlc1/swwm_thiccbolts.zsc @@ -21,7 +21,7 @@ Class RayKhom : SWWMWeapon Weapon.SelectionOrder 850; Weapon.AmmoType1 "RayAmmo"; Weapon.AmmoGive1 1; - SWWMWeapon.DropAmmoType "RayAmmo"; + SWWMWeapon.DropAmmoType "Cell"; RayKhom.ClipCount 10; Stamina 500000; +SWWMWEAPON.NOFIRSTGIVE; diff --git a/zscript/dlc1/swwm_ultimate.zsc b/zscript/dlc1/swwm_ultimate.zsc index 4e1568047..61be71e94 100644 --- a/zscript/dlc1/swwm_ultimate.zsc +++ b/zscript/dlc1/swwm_ultimate.zsc @@ -22,7 +22,7 @@ Class RafanKos : SWWMWeapon Weapon.SelectionOrder 8000; Weapon.AmmoType1 "UltimateAmmo"; Weapon.AmmoGive1 1; - SWWMWeapon.DropAmmoType "UltimateAmmo"; + SWWMWeapon.DropAmmoType "CellPack"; RafanKos.ClipCount 4; Stamina -5000000; +SWWMWEAPON.NOFIRSTGIVE; diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index d194baf7a..ea126ee3e 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -765,7 +765,7 @@ Class Wallbuster : SWWMWeapon Weapon.UpSound "wallbuster/select"; Weapon.AmmoType1 "RedShell"; Weapon.AmmoGive1 5; - SWWMWeapon.DropAmmoType "Shell"; + SWWMWeapon.DropAmmoType "ShellBox"; Stamina 35000; +SWWMWEAPON.NOFIRSTGIVE; Radius 30; diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index 1766fb07f..6ec2d602a 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -279,7 +279,7 @@ Class Eviscerator : SWWMWeapon Stamina 50000; Weapon.AmmoType1 "EvisceratorShell"; Weapon.AmmoGive1 4; - SWWMWeapon.DropAmmoType "EvisceratorShell"; + SWWMWeapon.DropAmmoType "ClipBox"; +WEAPON.EXPLOSIVE; Radius 20; Height 32; diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index f60fd0090..b37bf093b 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -224,7 +224,7 @@ Class Ynykron : SWWMWeapon Stamina -5000000; Weapon.AmmoType1 "YnykronAmmo"; Weapon.AmmoGive1 1; - SWWMWeapon.DropAmmoType "YnykronAmmo"; + SWWMWeapon.DropAmmoType "CellPack"; +SWWMWEAPON.NOFIRSTGIVE; Ynykron.ClipCount 1; +WEAPON.BFG; diff --git a/zscript/weapons/swwm_sparkyboi.zsc b/zscript/weapons/swwm_sparkyboi.zsc index ef0a71cb5..c07884338 100644 --- a/zscript/weapons/swwm_sparkyboi.zsc +++ b/zscript/weapons/swwm_sparkyboi.zsc @@ -216,7 +216,7 @@ Class Sparkster : SWWMWeapon Stamina 200000; Weapon.AmmoType1 "SparkUnit"; Weapon.AmmoGive1 1; - SWWMWeapon.DropAmmoType "SparkUnit"; + SWWMWeapon.DropAmmoType "Cell"; Sparkster.ClipCount 4; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.EXPLOSIVE; diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc index 9b449b2c4..871f94589 100644 --- a/zscript/weapons/swwm_tastytreat.zsc +++ b/zscript/weapons/swwm_tastytreat.zsc @@ -383,7 +383,7 @@ Class CandyGun : SWWMWeapon Weapon.AmmoGive1 1; Weapon.AmmoGive2 0; Weapon.AmmoUse2 0; - SWWMWeapon.DropAmmoType "CandyGunAmmo"; + SWWMWeapon.DropAmmoType "CellPack"; CandyGun.ClipCount 7; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.EXPLOSIVE; diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index 623e80694..9dac3a496 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -970,7 +970,7 @@ Class SilverBullet : SWWMWeapon Weapon.AmmoGive1 1; Weapon.AmmoType2 "SilverBulletAmmo2"; Weapon.AmmoGive2 0; - SWWMWeapon.DropAmmoType "SilverBulletAmmo"; + SWWMWeapon.DropAmmoType "Cell"; SilverBullet.ClipCount 5; +SWWMWEAPON.NOFIRSTGIVE; +WEAPON.ALT_AMMO_OPTIONAL;