Spent mag dropping is now optional and disabled by default.

This commit is contained in:
Mari the Deer 2021-08-05 15:39:35 +02:00
commit 670d8a601f
9 changed files with 13 additions and 2 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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