Common Library changes.
This commit is contained in:
parent
7041b3f6ff
commit
776f0539b1
|
|
@ -1,33 +1,2 @@
|
|||
// shared cvars
|
||||
nosave float oni_flashstrength = 1.0;
|
||||
user float oni_bumpstrength = 1.0;
|
||||
nosave int oni_hudmargin = 10;
|
||||
nosave bool oni_hudscale = false;
|
||||
nosave int oni_maxshown = 4;
|
||||
nosave int oni_maxshownbig = 10;
|
||||
nosave int oni_maxpickup = 5;
|
||||
nosave int oni_chatduration = 25;
|
||||
nosave int oni_msgduration = 5;
|
||||
nosave int oni_pickduration = 3;
|
||||
nosave bool oni_shaders = true;
|
||||
server bool oni_blood = true;
|
||||
server int oni_maxblood = 400;
|
||||
server int oni_maxgibs = 100;
|
||||
server int oni_maxcasings = 200;
|
||||
server int oni_maxdebris = 500;
|
||||
nosave bool oni_fuzz = true;
|
||||
server int oni_enemydrops = 0;
|
||||
server bool oni_shadows = true;
|
||||
nosave int oni_shadowdist = 2000;
|
||||
nosave int oni_forcestats = 1;
|
||||
server int oni_drlaskill = 3;
|
||||
server int oni_ps_fullreset = 0;
|
||||
server int oni_ps_resetammo = 0;
|
||||
server int oni_ps_resetitems = 0;
|
||||
server int oni_ps_resethealth = 0;
|
||||
nosave bool oni_weapontooltips = true;
|
||||
nosave string oni_tooltipshown = "";
|
||||
nosave noarchive bool oni_tooltipnote = false;
|
||||
nosave bool oni_mm_enable = true;
|
||||
nosave int oni_playtime = 0;
|
||||
// mod-specific cvars
|
||||
nosave int oni_playtime = 0; // total playtime in seconds
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[default]
|
||||
ONI_MODVER="\crRED ONI\c- \cw0.1a r55 \cu(Mon 28 Feb 17:29:59 CET 2022)\c-";
|
||||
ONI_SHORTVER="\cw0.1a r55 \cu(2022-02-28 17:29:59)\c-";
|
||||
ONI_MODVER="\crRED ONI\c- \cw0.1a r56 \cu(Tue 1 Mar 18:52:07 CET 2022)\c-";
|
||||
ONI_SHORTVER="\cw0.1a r56 \cu(2022-03-01 18:52:07)\c-";
|
||||
|
|
|
|||
93
menudef.txt
93
menudef.txt
|
|
@ -1,100 +1,11 @@
|
|||
OptionValue "SWWMEnemyDropType"
|
||||
{
|
||||
-1, "$SWWM_DROPS_NONE"
|
||||
0, "$SWWM_DROPS_AMMO"
|
||||
1, "$SWWM_DROPS_WEAPONS"
|
||||
}
|
||||
OptionValue "SWWMForceStats"
|
||||
{
|
||||
0, "$SWWM_STATS_DISABLED"
|
||||
1, "$SWWM_STATS_ALWAYS"
|
||||
2, "$SWWM_STATS_MAPNAME"
|
||||
}
|
||||
OptionValue "SWWMDRLASkill"
|
||||
{
|
||||
0, "$SWWM_DRLASKILL_BABY"
|
||||
1, "$SWWM_DRLASKILL_EASY"
|
||||
2, "$SWWM_DRLASKILL_NORMAL"
|
||||
3, "$SWWM_DRLASKILL_HARD"
|
||||
4, "$SWWM_DRLASKILL_NIGHTMARE"
|
||||
5, "$SWWM_DRLASKILL_TECHNOPHOBIA"
|
||||
6, "$SWWM_DRLASKILL_ARMAGEDDON"
|
||||
7, "$SWWM_DRLASKILL_ADAPTIVE"
|
||||
}
|
||||
OptionValue "SWWMPistolStart"
|
||||
{
|
||||
0, "$TXT_NO"
|
||||
1, "$SWWM_PISTOLSTART_MAP"
|
||||
2, "$SWWM_PISTOLSTART_CLUSTER"
|
||||
}
|
||||
OptionValue "SWWMHUDScale"
|
||||
{
|
||||
0, "$SWWM_TFITSCALE"
|
||||
1, "$SWWM_LFITSCALE"
|
||||
}
|
||||
OptionMenu "OniOptionMenu"
|
||||
{
|
||||
Class "SWWMOptionMenu"
|
||||
Title "$ONI_MTITLE"
|
||||
|
||||
SafeCommand "$SWWM_CRESET", "event swwmresetcvars"
|
||||
StaticText " "
|
||||
|
||||
StaticText "$SWWM_PTITLE", "DarkRed"
|
||||
SWWMPlayTime "$SWWM_PLAYTIME", "oni_playtime"
|
||||
StaticText " "
|
||||
StaticText "$SWWM_OTITLE", "DarkRed"
|
||||
Option "$SWWM_SHADERS", "oni_shaders", "YesNo"
|
||||
Slider "$SWWM_FLASH", "oni_flashstrength", 0.0, 1.0, 0.1, 1
|
||||
Slider "$SWWM_BUMP", "oni_bumpstrength", 0.0, 1.0, 0.1, 1
|
||||
Option "$SWWM_MM_ENABLE", "oni_mm_enable", "YesNo"
|
||||
Option "$SWWM_FORCESTATS", "oni_forcestats", "SWWMForceStats"
|
||||
Slider "$SWWM_HUDMARGIN", "oni_hudmargin", 0, 40, 1, 0
|
||||
Option "$SWWM_HUDSCALE", "oni_hudscale", "SWWMHudScale"
|
||||
Slider "$SWWM_MAXMSG", "oni_maxshown", 1, 10, 1, 0
|
||||
Slider "$SWWM_MAXMSGBIG", "oni_maxshownbig", 1, 20, 1, 0
|
||||
Slider "$SWWM_MAXPICK", "oni_maxpickup", 1, 10, 1, 0
|
||||
Slider "$SWWM_CHATLEN", "oni_chatduration", 1, 30, 1, 0
|
||||
Slider "$SWWM_MSGLEN", "oni_msgduration", 1, 30, 1, 0
|
||||
Slider "$SWWM_PICKLEN", "oni_pickduration", 1, 30, 1, 0
|
||||
Option "$SWWM_FUZZ", "oni_fuzz", "YesNo"
|
||||
StaticText " "
|
||||
StaticText "$SWWM_ETITLE", "DarkRed"
|
||||
Option "$SWWM_SHADOWS", "oni_shadows", "YesNo"
|
||||
ScaleSlider "$SWWM_SHADOWDIST", "oni_shadowdist", -1, 4000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
|
||||
Option "$SWWM_BLOOD", "oni_blood", "YesNo"
|
||||
ScaleSlider "$SWWM_MAXBLOOD", "oni_maxblood", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
|
||||
ScaleSlider "$SWWM_MAXGIBS", "oni_maxgibs", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
|
||||
ScaleSlider "$SWWM_MAXCASINGS", "oni_maxcasings", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
|
||||
ScaleSlider "$SWWM_MAXDEBRIS", "oni_maxdebris", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
|
||||
SafeCommand "$SWWM_CLEARFX", "netevent swwmcleareffects"
|
||||
StaticText " "
|
||||
StaticText "$SWWM_BTITLE", "DarkRed"
|
||||
Option "$SWWM_PS_FULLRESET", "oni_ps_fullreset", "SWWMPistolStart"
|
||||
Option "$SWWM_PS_RESETAMMO", "oni_ps_resetammo", "SWWMPistolStart"
|
||||
Option "$SWWM_PS_RESETITEMS", "oni_ps_resetitems", "SWWMPistolStart"
|
||||
Option "$SWWM_PS_RESETHEALTH", "oni_ps_resethealth", "SWWMPistolStart"
|
||||
Option "$SWWM_ENEMYDROPS", "oni_enemydrops", "SWWMEnemyDropType"
|
||||
StaticText " "
|
||||
StaticText "$SWWM_ITITLE", "DarkRed"
|
||||
Option "$SWWM_WEAPONTOOLTIPS", "oni_weapontooltips", "YesNo"
|
||||
SafeCommand "$SWWM_RESETTOOLTIPS", "event swwmresettooltips"
|
||||
IfGame(Doom)
|
||||
{
|
||||
StaticText " "
|
||||
StaticText "$SWWM_MCTITLE", "DarkRed"
|
||||
Option "$SWWM_DRLASKILL", "oni_drlaskill", "SWWMDRLASkill"
|
||||
}
|
||||
|
||||
}
|
||||
AddOptionMenu "OptionsMenu"
|
||||
{
|
||||
Submenu "$ONI_MTITLE", "OniOptionMenu"
|
||||
Submenu "$ONI_MTITLE", "SWWMOptionMenu"
|
||||
Submenu "$ONI_MCREDS", "OniCreditsMenu"
|
||||
}
|
||||
AddOptionMenu "OptionsMenuSimple"
|
||||
{
|
||||
Submenu "$ONI_MTITLE", "OniOptionMenu"
|
||||
Submenu "$ONI_MTITLE", "SWWMOptionMenu"
|
||||
Submenu "$ONI_MCREDS", "OniCreditsMenu"
|
||||
}
|
||||
ListMenu "MainMenu"
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ const SWWMMAXAMOUNT = 5;
|
|||
#include "zscript/handler/swwm_handler_process.zsc"
|
||||
#include "zscript/handler/swwm_handler_queues.zsc"
|
||||
#include "zscript/handler/swwm_handler_replacements.zsc"
|
||||
#include "zscript/handler/swwm_handler_shaders.zsc"
|
||||
#include "zscript/handler/swwm_handler_worldload.zsc"
|
||||
#include "zscript/handler/swwm_handler_worldthings.zsc"
|
||||
// menu code
|
||||
|
|
|
|||
|
|
@ -2,16 +2,8 @@
|
|||
|
||||
extend Class SWWMHandler
|
||||
{
|
||||
private ui void RenderShaders( RenderEvent e )
|
||||
private ui bool RenderModShaders( RenderEvent e, PlayerInfo p, PlayerPawn mo )
|
||||
{
|
||||
PlayerInfo p = players[consoleplayer];
|
||||
let mo = p.mo;
|
||||
bool pc = (p.camera == mo);
|
||||
if ( !mo || !oni_shaders || !pc )
|
||||
{
|
||||
if ( !oni_shaders ) ClearAllShaders(p,true);
|
||||
return;
|
||||
}
|
||||
let coat = BarrierPower(mo.FindInventory("BarrierPower"));
|
||||
if ( coat )
|
||||
{
|
||||
|
|
@ -19,45 +11,11 @@ extend Class SWWMHandler
|
|||
Shader.SetUniform1f(p,"BarrierShader","timer",(gametic+e.FracTic)/GameTicRate);
|
||||
}
|
||||
else Shader.SetEnabled(p,"BarrierShader",false);
|
||||
if ( !(mo is 'SWWMPlayer') )
|
||||
{
|
||||
Shader.SetEnabled(p,"WaterWarp",false);
|
||||
Shader.SetEnabled(p,"LavaWarp",false);
|
||||
Shader.SetEnabled(p,"SlimeWarp",false);
|
||||
return;
|
||||
}
|
||||
let demo = SWWMPlayer(mo);
|
||||
if ( demo.lastunder == SWWMPlayer.UNDER_WATER )
|
||||
{
|
||||
Shader.SetEnabled(p,"WaterWarp",true);
|
||||
Shader.SetUniform1f(p,"WaterWarp","timer",(gametic+e.FracTic)/GameTicRate);
|
||||
Shader.SetUniform1f(p,"WaterWarp","dfact",coat?.25:1.);
|
||||
Shader.SetUniform3f(p,"WaterWarp","lightcol",(demo.undercol.r/255.,demo.undercol.g/255.,demo.undercol.b/255.));
|
||||
}
|
||||
else Shader.SetEnabled(p,"WaterWarp",false);
|
||||
if ( demo.lastunder == SWWMPlayer.UNDER_LAVA )
|
||||
{
|
||||
Shader.SetEnabled(p,"LavaWarp",true);
|
||||
Shader.SetUniform1f(p,"LavaWarp","timer",(gametic+e.FracTic)/GameTicRate);
|
||||
Shader.SetUniform1f(p,"LavaWarp","dfact",coat?.25:1.);
|
||||
Shader.SetUniform3f(p,"LavaWarp","lightcol",(demo.undercol.r/255.,demo.undercol.g/255.,demo.undercol.b/255.));
|
||||
}
|
||||
else Shader.SetEnabled(p,"LavaWarp",false);
|
||||
if ( demo.lastunder == SWWMPlayer.UNDER_SLIME )
|
||||
{
|
||||
Shader.SetEnabled(p,"SlimeWarp",true);
|
||||
Shader.SetUniform1f(p,"SlimeWarp","timer",(gametic+e.FracTic)/GameTicRate);
|
||||
Shader.SetUniform1f(p,"SlimeWarp","dfact",coat?.25:1.);
|
||||
Shader.SetUniform3f(p,"SlimeWarp","lightcol",(demo.undercol.r/255.,demo.undercol.g/255.,demo.undercol.b/255.));
|
||||
}
|
||||
else Shader.SetEnabled(p,"SlimeWarp",false);
|
||||
return !!coat;
|
||||
}
|
||||
|
||||
static clearscope void ClearAllShaders( PlayerInfo p, bool noscope = false )
|
||||
static clearscope void ClearAllModShaders( PlayerInfo p, bool noscope )
|
||||
{
|
||||
Shader.SetEnabled(p,"WaterWarp",false);
|
||||
Shader.SetEnabled(p,"LavaWarp",false);
|
||||
Shader.SetEnabled(p,"SlimeWarp",false);
|
||||
Shader.SetEnabled(p,"BarrierShader",false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ Class OniStatScreen : SWWMStatScreen
|
|||
override void drawSWWMBg()
|
||||
{
|
||||
double GameSecs = (bcnt+FracTic)/GameTicRate;
|
||||
if ( oni_fuzz )
|
||||
if ( swwm_fuzz )
|
||||
{
|
||||
if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
|
||||
Vector2 tsize = TexMan.GetScaledSize(bgtex);
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ Class OniTitleStuff : EventHandler
|
|||
if ( !logotex[3] ) logotex[3] = TexMan.CheckForTexture("graphics/OniLogoR_Glow.png",TexMan.Type_Any);
|
||||
if ( !gradtex ) gradtex = TexMan.CheckForTexture("graphics/title_grad.png",TexMan.Type_Any);
|
||||
double GameSecs = (titletimer+e.FracTic)/GameTicRate;
|
||||
if ( oni_fuzz )
|
||||
if ( swwm_fuzz )
|
||||
{
|
||||
if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
|
||||
Vector2 tsize = TexMan.GetScaledSize(bgtex);
|
||||
|
|
|
|||
Loading…
Reference in New Issue