stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-20 19:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disabled visual sloping for game configurations that do not support plane equation slopes. Fixes #828

Browse source 
Added toasts for visual sloping events
This commit is contained in:
biwa 2022-11-27 11:02:26 +01:00
parent 30548f1765
commit f839269a72
8 changed files with 209 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

317
Build/Configurations/Includes/Zandronum_common.cfg
View file

@ -1,170 +1,185 @@
// ***********************************************************
// * *
// * Text map format *
// * *
// ***********************************************************
// Contains the differences to the GZDoom UDMF settings
mapformat_udmf
{
// Disables support for plane equation slopes
planeequationsupport = false;
}
// New things available in all games
zandronum
things
{
//dynamic lights
include("GZDoom_things.cfg", "gzdoom_lights")
// Team player starts
players
zandronum
{
color = 10; // Light Green
arrow = 1;
title = "Player Starts";
width = 16;
sort = 1;
height = 56;
hangs = 0;
blocking = 2;
error = 2;
5080
//dynamic lights
include("GZDoom_things.cfg", "gzdoom_lights")
// Team player starts
players
{
title = "Player Blue start (team start)";
sprite = "PLAYE2E8";
color = 10; // Light Green
arrow = 1;
title = "Player Starts";
width = 16;
sort = 1;
height = 56;
hangs = 0;
blocking = 2;
error = 2;
5080
{
title = "Player Blue start (team start)";
sprite = "PLAYE2E8";
}
5081
{
title = "Player Red start (team start)";
sprite = "PLAYF2F8";
}
5082
{
title = "Player Temporary start (team start)";
sprite = "PLAYF1";
}
}
5081
flags
{
title = "Player Red start (team start)";
sprite = "PLAYF2F8";
}
5082
{
title = "Player Temporary start (team start)";
sprite = "PLAYF1";
color = 13; // Light Magenta
arrow = 0;
title = "Flags";
width = 20;
sort = 1;
height = 20;
hangs = 0;
blocking = 0;
5130
{
title = "Blue flag";
sprite = "internal:ZandFlagBlue";
}
5131
{
title = "Red flag";
sprite = "internal:ZandFlagRed";
}
5132
{
title = "White flag";
sprite = "internal:ZandFlagWhite";
}
5133
{
title = "Green flag";
sprite = "internal:ZandFlagGreen";
}
5134
{
title = "Gold flag";
sprite = "internal:ZandFlagGold";
}
}
}
flags
// New things available in Doom, Heretic, Hexen and Strife but not Chex Quest
doomheretichexenstrife
{
color = 13; // Light Magenta
arrow = 0;
title = "Flags";
width = 20;
sort = 1;
height = 20;
hangs = 0;
blocking = 0;
5130
flags
{
title = "Blue flag";
sprite = "internal:ZandFlagBlue";
}
5131
{
title = "Red flag";
sprite = "internal:ZandFlagRed";
}
5132
{
title = "White flag";
sprite = "internal:ZandFlagWhite";
}
5133
{
title = "Green flag";
sprite = "internal:ZandFlagGreen";
}
5134
{
title = "Gold flag";
sprite = "internal:ZandFlagGold";
color = 13; // Light Magenta
arrow = 0;
title = "Flags";
width = 20;
sort = 1;
height = 20;
hangs = 0;
blocking = 0;
5025
{
title = "Red skull";
sprite = "RSKUB0";
}
5026
{
title = "Blue skull";
sprite = "BSKUB0";
}
}
}
}
// New things available in Doom, Heretic, Hexen and Strife but not Chex Quest
doomheretichexenstrife
{
flags
// New things available in Doom, Heretic and Hexen; but not in Chex or Strife
doomheretichexen
{
color = 13; // Light Magenta
arrow = 0;
title = "Flags";
width = 20;
sort = 1;
height = 20;
hangs = 0;
blocking = 0;
5025
// Zandronum runes
runes
{
title = "Red skull";
sprite = "RSKUB0";
}
5026
{
title = "Blue skull";
sprite = "BSKUB0";
}
}
}
// New things available in Doom, Heretic and Hexen; but not in Chex or Strife
doomheretichexen
{
// Zandronum runes
runes
{
color = 17; // Light Orange
arrow = 0;
title = "Runes";
width = 20;
sort = 1;
height = 45;
hangs = 0;
blocking = 0;
5100
{
title = "Strength";
sprite = "internal:ZandRuneStrength";
}
5101
{
title = "Rage";
sprite = "internal:ZandRuneRage";
}
5102
{
title = "Drain";
sprite = "internal:ZandRuneDrain";
}
5103
{
title = "Spread";
sprite = "internal:ZandRuneSpread";
}
5104
{
title = "Resistance";
sprite = "internal:ZandRuneResistance";
}
5105
{
title = "Regeneration";
sprite = "internal:ZandRuneRegeneration";
}
5106
{
title = "Prosperity";
sprite = "internal:ZandRuneProsperity";
}
5107
{
title = "Reflection";
sprite = "internal:ZandRuneReflection";
}
5108
{
title = "High Jumper";
sprite = "internal:ZandRuneHighJump";
}
5109
{
title = "Haste";
sprite = "internal:ZandRuneHaste";
color = 17; // Light Orange
arrow = 0;
title = "Runes";
width = 20;
sort = 1;
height = 45;
hangs = 0;
blocking = 0;
5100
{
title = "Strength";
sprite = "internal:ZandRuneStrength";
}
5101
{
title = "Rage";
sprite = "internal:ZandRuneRage";
}
5102
{
title = "Drain";
sprite = "internal:ZandRuneDrain";
}
5103
{
title = "Spread";
sprite = "internal:ZandRuneSpread";
}
5104
{
title = "Resistance";
sprite = "internal:ZandRuneResistance";
}
5105
{
title = "Regeneration";
sprite = "internal:ZandRuneRegeneration";
}
5106
{
title = "Prosperity";
sprite = "internal:ZandRuneProsperity";
}
5107
{
title = "Reflection";
sprite = "internal:ZandRuneReflection";
}
5108
{
title = "High Jumper";
sprite = "internal:ZandRuneHighJump";
}
5109
{
title = "Haste";
sprite = "internal:ZandRuneHaste";
}
}
}
}

24
Build/Configurations/Includes/Zandronum_things.cfg
View file

@ -5,18 +5,18 @@
doom
{
include("Zandronum_common.cfg", "zandronum")
include("Zandronum_common.cfg", "doomheretichexenstrife")
include("Zandronum_common.cfg", "doomheretichexen")
include("Zandronum_common.cfg", "things.zandronum")
include("Zandronum_common.cfg", "things.doomheretichexenstrife")
include("Zandronum_common.cfg", "things.doomheretichexen")
include("Skulltag_things.cfg", "doomheretichexen")
include("Skulltag_things.cfg", "doom")
}
heretic
{
include("Zandronum_common.cfg", "zandronum")
include("Zandronum_common.cfg", "doomheretichexenstrife")
include("Zandronum_common.cfg", "doomheretichexen")
include("Zandronum_common.cfg", "things.zandronum")
include("Zandronum_common.cfg", "things.doomheretichexenstrife")
include("Zandronum_common.cfg", "things.doomheretichexen")
include("Skulltag_things.cfg", "doomheretichexen")
include("Skulltag_things.cfg", "raven")
include("Skulltag_things.cfg", "heretic")
@ -24,9 +24,9 @@ heretic
hexen
{
include("Zandronum_common.cfg", "zandronum")
include("Zandronum_common.cfg", "doomheretichexenstrife")
include("Zandronum_common.cfg", "doomheretichexen")
include("Zandronum_common.cfg", "things.zandronum")
include("Zandronum_common.cfg", "things.doomheretichexenstrife")
include("Zandronum_common.cfg", "things.doomheretichexen")
include("Skulltag_things.cfg", "doomheretichexen")
include("Skulltag_things.cfg", "raven")
include("Skulltag_things.cfg", "hexen")
@ -34,13 +34,13 @@ hexen
strife
{
include("Zandronum_common.cfg", "zandronum")
include("Zandronum_common.cfg", "doomheretichexenstrife")
include("Zandronum_common.cfg", "things.zandronum")
include("Zandronum_common.cfg", "things.doomheretichexenstrife")
include("Skulltag_things.cfg", "strife")
}
default
{
include("Zandronum_common.cfg", "zandronum")
include("Zandronum_common.cfg", "things.zandronum")
include("Skulltag_things.cfg", "skulltag")
}

1
Build/Configurations/Zandronum_DoomUDMF.cfg
View file

@ -25,6 +25,7 @@ include("Includes\\ZDoom_common.cfg", "common");
// Settings common to text map format
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_linedefs.cfg");
// Zandronum doesn't support sectors with multiple tags. Defaults to false, but is set to true

1
Build/Configurations/Zandronum_HereticUDMF.cfg
View file

@ -25,6 +25,7 @@ include("Includes\\ZDoom_common.cfg", "common");
// Settings common to text map format
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_linedefs.cfg");
// Zandronum doesn't support sectors with multiple tags. Defaults to false, but is set to true

1
Build/Configurations/Zandronum_HexenUDMF.cfg
View file

@ -25,6 +25,7 @@ include("Includes\\ZDoom_common.cfg", "common");
// Settings common to text map format
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_linedefs.cfg");
// Zandronum doesn't support sectors with multiple tags. Defaults to false, but is set to true

1
Build/Configurations/Zandronum_StrifeUDMF.cfg
View file

@ -25,6 +25,7 @@ include("Includes\\ZDoom_common.cfg", "common");
// Settings common to text map format
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_common.cfg", "mapformat_udmf");
include("Includes\\Zandronum_linedefs.cfg");
// Zandronum doesn't support sectors with multiple tags. Defaults to false, but is set to true

10
Source/Plugins/BuilderModes/General/BuilderPlug.cs
View file

@ -42,6 +42,11 @@ using System.Runtime.CompilerServices;
namespace CodeImp.DoomBuilder.BuilderModes
{
internal class ToastMessages
{
public static readonly string VISUALSLOPING = "visualsloping";
}
public class BuilderPlug : Plug
{
#region ================== API Declarations
@ -249,8 +254,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd
General.Actions.BindMethods(this);
// Register toasts
General.ToastManager.RegisterToast(ToastMessages.VISUALSLOPING, "Visual sloping", "Toasts related to visual sloping");
}
// Disposer
public override void Dispose()
{

21
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -4457,7 +4457,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
if (!General.Map.UDMF)
{
General.Interface.DisplayStatus(StatusType.Warning, "Visual sloping is supported in UDMF only!");
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is supported in UDMF only.");
return;
}
else if(!General.Map.Config.PlaneEquationSupport)
{
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is not supported in this game configuration.");
return;
}
@ -4483,7 +4488,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
if (!General.Map.UDMF)
{
General.Interface.DisplayStatus(StatusType.Warning, "Visual sloping is supported in UDMF only!");
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is supported in UDMF only.");
return;
}
else if (!General.Map.Config.PlaneEquationSupport)
{
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is not supported in this game configuration.");
return;
}
@ -4509,7 +4519,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
if (!General.Map.UDMF)
{
General.Interface.DisplayStatus(StatusType.Warning, "Visual sloping is supported in UDMF only!");
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is not supported in this game configuration.");
return;
}
else if (!General.Map.Config.PlaneEquationSupport)
{
General.ToastManager.ShowToast(ToastMessages.VISUALSLOPING, ToastType.WARNING, "Visual sloping", "Visual sloping is not supported in this game configuration.");
return;
}