From 670d8a601ff5e5547d14b45a21ddc4441ec537d4 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 5 Aug 2021 15:39:35 +0200 Subject: [PATCH] Spent mag dropping is now optional and disabled by default. --- cvarinfo.txt | 1 + language.def_menu | 2 ++ language.es_menu | 2 ++ language.version | 4 ++-- menudef.txt | 1 + zscript/weapons/swwm_sparkyboi.zsc | 1 + zscript/weapons/swwm_splode.zsc | 2 ++ zscript/weapons/swwm_tastytreat.zsc | 1 + zscript/weapons/swwm_thiccboolet.zsc | 1 + 9 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cvarinfo.txt b/cvarinfo.txt index d1a6b87cf..a4b278355 100644 --- a/cvarinfo.txt +++ b/cvarinfo.txt @@ -114,6 +114,7 @@ nosave bool swwm_buttsfx = true; // buttslam homerun SFX nosave int swwm_sewercount = 0; // I'm sorry Civvie server bool swwm_ondemandammo = false; // don't spawn ammo for unavailable weapons user float swwm_bumpstrength = 1.0; // intensity of fov bumping +server bool swwm_nomagdrop = true; // does not drop spent magazines (the "environmentally conscious" option) // minimap settings nosave bool swwm_mm_enable = true; // show a minimap below the score counter diff --git a/language.def_menu b/language.def_menu index bfe862750..6a960060d 100644 --- a/language.def_menu +++ b/language.def_menu @@ -195,6 +195,7 @@ SWWM_ONDEMANDAMMO = "On Demand Ammo Placement"; SWWM_BUMP = "FOV Bump Strength"; SWWM_ENGINE = "Engine"; SWWM_ITEMGLOWS = "Distant Items Glow"; +SWWM_NOMAGDROP = "Drop Spent Mags"; SWWM_MMTITLE = "Minimap Settings"; SWWM_MM_ENABLE = "Show Minimap"; SWWM_MM_ROTATE = "Rotate Minimap"; @@ -338,6 +339,7 @@ TOOLTIP_SWWM_ONDEMANDAMMO = "Only ammo for weapons that are currently available TOOLTIP_SWWM_BUMPSTRENGTH = "Controls how strong the bumping of the FOV is from weapon recoil and other actions."; TOOLTIP_SWWM_ENGINE = "Don't touch this."; TOOLTIP_SWWM_ITEMGLOWS = "If enabled, items that are far away from the player will display a shimmering glow (requires a map restart to take full effect)."; +TOOLTIP_SWWM_NOMAGDROP = "By default, the Demolitionist will be somewhat environmentally conscious and not leave spent magazines lying around. Enable if you prefer the added clutter."; TOOLTIP_SWWM_MM_ENABLE = "Displays a minimap under the score counter."; TOOLTIP_SWWM_MM_ROTATE = "Rotates the minimap view."; TOOLTIP_SWWM_MM_GRID = "Shows a 128x128 grid on the minimap."; diff --git a/language.es_menu b/language.es_menu index f893d7aaf..b91724f6b 100644 --- a/language.es_menu +++ b/language.es_menu @@ -194,6 +194,7 @@ SWWM_ONDEMANDAMMO = "Colocar Munición por Demanda"; SWWM_BUMP = "Intensidad de Sacudida de FOV"; SWWM_ENGINE = "Motor"; SWWM_ITEMGLOWS = "Los Ítems Lejanos Brillan"; +SWWM_NOMAGDROP = "Tirar Cargadores Usados"; SWWM_MMTITLE = "Opciones de Minimapa"; SWWM_MM_ENABLE = "Mostrar Minimapa"; SWWM_MM_ROTATE = "Rotar Minimapa"; @@ -337,6 +338,7 @@ TOOLTIP_SWWM_ONDEMANDAMMO = "Solo coloca en el mapa munición para armas que est TOOLTIP_SWWM_BUMPSTRENGTH = "Controla lo intensa que es la sacudida del FOV por el retroceso de armas y otras acciones."; TOOLTIP_SWWM_ENGINE = "No toques esto."; TOOLTIP_SWWM_ITEMGLOWS = "Al activar, los ítems que se encuentren lejos del jugador mostrarán un ligero destello (requiere un reinicio del mapa para tener efecto completamente)."; +TOOLTIP_SWWM_NOMAGDROP = "Por defecto, la Demolicionista será un poco consciente con el medio ambiente y no dejará cargadores usados por ahí. Activa si prefieres la basura adicional."; TOOLTIP_SWWM_MM_ENABLE = "Muestra un minimapa bajo el contador de puntuación."; TOOLTIP_SWWM_MM_ROTATE = "Gira la vista del minimapa."; TOOLTIP_SWWM_MM_GRID = "Muestra una cuadrícula de 128x128 en el minimapa."; diff --git a/language.version b/language.version index 955eb337f..66bfdba66 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r582 \cu(Fri 30 Jul 18:52:08 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r582 \cu(2021-07-30 18:52:08)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r583 \cu(Thu 5 Aug 15:39:35 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r583 \cu(2021-08-05 15:39:35)\c-"; diff --git a/menudef.txt b/menudef.txt index 5b91d9e01..203a0853d 100644 --- a/menudef.txt +++ b/menudef.txt @@ -138,6 +138,7 @@ OptionMenu "SWWMOptionMenu" Option "$SWWM_ITEMSPARKLES", "swwm_itemsparkles", "YesNo" Option "$SWWM_ITEMGLOWS", "swwm_itemglows", "YesNo" Option "$SWWM_BLOOD", "swwm_blood", "YesNo" + Option "$SWWM_NOMAGDROP", "swwm_nomagdrop", "NoYes" ScaleSlider "$SWWM_MAXBLOOD", "swwm_maxblood", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED" ScaleSlider "$SWWM_MAXGIBS", "swwm_maxgibs", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED" ScaleSlider "$SWWM_MAXCASINGS", "swwm_maxcasings", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED" diff --git a/zscript/weapons/swwm_sparkyboi.zsc b/zscript/weapons/swwm_sparkyboi.zsc index e39461925..5b249c007 100644 --- a/zscript/weapons/swwm_sparkyboi.zsc +++ b/zscript/weapons/swwm_sparkyboi.zsc @@ -157,6 +157,7 @@ Class Sparkster : SWWMWeapon action void A_DropMag( bool stacc = false ) { + if ( swwm_nomagdrop ) return; Vector3 x, y, z; [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x-2*y-10*z); diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index 93f31d3e9..2d905a0fc 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -191,6 +191,7 @@ Class ExplodiumGun : SWWMWeapon action void A_DropMag() { + if ( swwm_nomagdrop ) return; Vector3 x, y, z; [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x-2*y-10*z); @@ -658,6 +659,7 @@ Class DualExplodiumGun : SWWMWeapon action void A_DropMag( int side = 1 ) { + if ( swwm_nomagdrop ) return; Vector3 x, y, z; [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x-2*side*y-10*z); diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc index 44376ceeb..9cc7c415f 100644 --- a/zscript/weapons/swwm_tastytreat.zsc +++ b/zscript/weapons/swwm_tastytreat.zsc @@ -237,6 +237,7 @@ Class CandyGun : SWWMWeapon action void A_DropMag() { + if ( swwm_nomagdrop ) return; Vector3 x, y, z; [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x-2*y-10*z); diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index 1976b2d30..eaba3ef66 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -790,6 +790,7 @@ Class SilverBullet : SWWMWeapon if ( min(ma.Amount,invoker.clipcount-dropamt) > 0 ) ma.PlayPickupSound(self); } invoker.ClipCount = 0; + if ( swwm_nomagdrop ) return; Vector3 x, y, z; [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),6*x-15*z);