From eabd26d5bbc10a02ad3ca6e5000c37a5a8e80c9f Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 6 Dec 2022 00:29:36 +0100 Subject: [PATCH] Small Puntzer Gamma correction. --- language.def_base | 2 ++ language.def_lore | 2 +- language.es_base | 2 ++ language.es_lore | 2 +- language.version | 4 ++-- lore/default/puntzergamma.txt | 2 +- lore/es/puntzergamma.txt | 2 +- zscript/dlc1/swwm_ammoitems_dlc.zsc | 8 ++++---- zscript/dlc1/swwm_supermarioworld.zsc | 1 + 9 files changed, 15 insertions(+), 10 deletions(-) diff --git a/language.def_base b/language.def_base index f05d57096..5fef50fa2 100644 --- a/language.def_base +++ b/language.def_base @@ -669,6 +669,8 @@ SWWM_WIDESPREAD = "Wide Spread Mode"; SWWM_TIGHTSPREAD = "Tight Spread Mode"; SWWM_YNYKRONFORWARD = "Beam Mode"; // desya / forward SWWM_YNYKRONBACKWARD = "Vortex Mode"; // busa / backward +SWWM_GAMMASPEED1 = "Full Auto"; +SWWM_GAMMASPEED2 = "Fuller Auto"; SWWM_SHEENSPEED1 = "300 RPM"; SWWM_SHEENSPEED2 = "700 RPM"; SWWM_SHEENSPEED3 = "2100 RPM"; diff --git a/language.def_lore b/language.def_lore index c2d3afb9b..38d92c3ec 100644 --- a/language.def_lore +++ b/language.def_lore @@ -3232,7 +3232,7 @@ SWWM_LORETXT_PUNTZERGAMMA = "\n" "\cfPrimary Fire:\c- Full auto shooting.\n" "\n" -"\cfSecondary Fire:\c- \"Fuller auto\" unloading.\n" +"\cfSecondary Fire:\c- Switches between two firing speeds.\n" "\n" "\cfReloading:\c- Reloads, as expected. Your \cfHammerspace™ Container\c-'s autoloaders will provide you with a fresh mag every time.\n" "\n" diff --git a/language.es_base b/language.es_base index f67b162e5..90ae36fc2 100644 --- a/language.es_base +++ b/language.es_base @@ -562,6 +562,8 @@ SWWM_WIDESPREAD = "Modo Amplio"; SWWM_TIGHTSPREAD = "Modo Concentrado"; SWWM_YNYKRONFORWARD = "Modo de Rayo"; // desya / forward SWWM_YNYKRONBACKWARD = "Modo de Vórtice"; // busa / backward +SWWM_GAMMASPEED1 = "Automático"; +SWWM_GAMMASPEED2 = "Súper-Automático"; SWWM_MRMODE1 = "Disparo de Precisión"; SWWM_MRMODE2 = "Disparo en Clúster"; SWWM_MRMODE3 = "Disparo en Chorro"; diff --git a/language.es_lore b/language.es_lore index 854e99b3c..0d49f373f 100644 --- a/language.es_lore +++ b/language.es_lore @@ -3007,7 +3007,7 @@ SWWM_LORETXT_PUNTZERGAMMA = "\n" "\cfFuego Primario:\c- Disparo en modo automático.\n" "\n" -"\cfFuego Secundario:\c- Ráfaga en modo \"super-automático\".\n" +"\cfFuego Secundario:\c- Alterna entre dos velocidades de disparo.\n" "\n" "\cfRecarga:\c- Recarga, obviamente. Los autocargadores de tu \cfContenedor de Hammerspace™\c- te proveerán de un cargador nuevo en cada momento.\n" "\n" diff --git a/language.version b/language.version index 8c8cb33b7..508992a6f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r664 \cu(Tue 6 Dec 00:20:17 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r664 \cu(2022-12-06 00:20:17)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r665 \cu(Tue 6 Dec 00:29:36 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r665 \cu(2022-12-06 00:29:36)\c-"; diff --git a/lore/default/puntzergamma.txt b/lore/default/puntzergamma.txt index 10febd1f6..f210a5524 100644 --- a/lore/default/puntzergamma.txt +++ b/lore/default/puntzergamma.txt @@ -18,7 +18,7 @@ The **Puntzer Gamma** is a mostly compact submachine gun, featuring a peculiar h \cfPrimary Fire:\c- Full auto shooting. -\cfSecondary Fire:\c- "Fuller auto" unloading. +\cfSecondary Fire:\c- Switches between two firing speeds. \cfReloading:\c- Reloads, as expected. Your **Hammerspace™ Container**'s autoloaders will provide you with a fresh mag every time. diff --git a/lore/es/puntzergamma.txt b/lore/es/puntzergamma.txt index c395180cc..9a0bfcfb0 100644 --- a/lore/es/puntzergamma.txt +++ b/lore/es/puntzergamma.txt @@ -12,7 +12,7 @@ El **Puntzer Gamma** es un subfusil mayormente compacto, que emplea una peculiar \cfFuego Primario:\c- Disparo en modo automático. -\cfFuego Secundario:\c- Ráfaga en modo "super-automático". +\cfFuego Secundario:\c- Alterna entre dos velocidades de disparo. \cfRecarga:\c- Recarga, obviamente. Los autocargadores de tu **Contenedor de Hammerspace™** te proveerán de un cargador nuevo en cada momento. diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 51cf3bc14..11a287759 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -8,9 +8,9 @@ Class SMW05Ammo : SWWMAmmo SWWMAmmo.PickupTag "SMW05BULLET"; Stamina 600; Inventory.Amount 1; - Inventory.MaxAmount 80; - Ammo.BackpackAmount 20; - Ammo.BackpackMaxAmount 200; + Inventory.MaxAmount 90; + Ammo.BackpackAmount 30; + Ammo.BackpackMaxAmount 210; Ammo.DropAmount 3; +FLOATBOB; FloatBobStrength 0.25; @@ -48,7 +48,7 @@ Class SMW05BigAmmo : SMW05Ammo { Default { - Inventory.Amount 20; + Inventory.Amount 30; } } diff --git a/zscript/dlc1/swwm_supermarioworld.zsc b/zscript/dlc1/swwm_supermarioworld.zsc index cfbbf9ff7..a73db6f4f 100644 --- a/zscript/dlc1/swwm_supermarioworld.zsc +++ b/zscript/dlc1/swwm_supermarioworld.zsc @@ -4,6 +4,7 @@ Class PuntzerGamma : SWWMWeapon { int ClipCount; + bool bFullerAuto; Property ClipCount : ClipCount;