stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-06-01 09:22:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed, UDMF: rearranged linedef activation flags to make their order more logical.

Browse source 
Linedef/Thing Edit forms: cosmetic changes to named/numbered script drop-down locations.
This commit is contained in:
MaxED 2015-01-26 09:45:27 +00:00
parent 0374a0bf90
commit b047dc4ae1
7 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Build/Configurations/Includes/ZDoom_common.cfg
View file

@ -392,7 +392,6 @@ mapformat_udmf
// LINEDEF ACTIVATIONS
linedefactivations
{
include("UDMF_misc.cfg", "linedefactivations");
include("ZDoom_misc.cfg", "linedefactivations_udmf");
}

14
Build/Configurations/Includes/ZDoom_misc.cfg
View file

@ -57,9 +57,19 @@ linedefflags_udmf
linedefactivations_udmf
{
firstsideonly = "Front side only";
checkswitchrange = "Switch height check";
repeatspecial = "Repeatable action";
playeruse = "When player presses use";
playercross = "When player walks over";
playerpush = "When player bumps";
monsteruse = "When monster presses use";
monstercross = "When monster walks over";
monsterpush = "When monsters bumps";
anycross = "Any crossing non-missile activates";
missilecross = "When projectile crosses";
impact = "On projectile impact";
checkswitchrange = "Switch height check";
passuse = "Pass use on";
firstsideonly = "Front side only";
playeruseback = "Player can use from back side";
}

6
Source/Core/Config/GameConfiguration.cs
View file

@ -607,9 +607,13 @@ namespace CodeImp.DoomBuilder.Config
linedefactivates.Add(new LinedefActivateInfo(de.Key.ToString(), de.Value.ToString()));
}
// Sort the list
//mxd. Sort only when activations are numeric
MapSetIO io = MapSetIO.Create(formatinterface);
if(io.HasNumericLinedefActivations)
{
linedefactivates.Sort();
}
}
// Linedef generalized actions
private void LoadLinedefGeneralizedActions()

3
Source/Core/Windows/LinedefEditForm.cs
View file

@ -125,7 +125,7 @@ namespace CodeImp.DoomBuilder.Windows
backlow.Initialize();
//mxd. Setup script numbers
scriptNumbers.Location = arg0.Location;
scriptNumbers.Location = new Point(arg0.Location.X, arg0.Location.Y + 2);
foreach(ScriptItem si in General.Map.NumberedScripts)
scriptNumbers.Items.Add(si);
@ -422,6 +422,7 @@ namespace CodeImp.DoomBuilder.Windows
private void UpdateScriptControls()
{
scriptNumbers.Visible = (Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1);
arg0.Visible = !scriptNumbers.Visible;
}
#endregion

6
Source/Core/Windows/LinedefEditFormUDMF.cs
View file

@ -216,12 +216,12 @@ namespace CodeImp.DoomBuilder.Windows
backlow.Initialize();
//mxd. Setup script numbers
scriptNumbers.Location = arg0.Location;
scriptNumbers.Location = new Point(arg0.Location.X, arg0.Location.Y + 2);
foreach(ScriptItem si in General.Map.NumberedScripts) scriptNumbers.Items.Add(si);
scriptNumbers.DropDownWidth = Tools.GetDropDownWidth(scriptNumbers);
//mxd. Setup script names
scriptNames.Location = arg0.Location;
scriptNames.Location = scriptNumbers.Location;
foreach(ScriptItem nsi in General.Map.NamedScripts) scriptNames.Items.Add(nsi);
scriptNames.DropDownWidth = Tools.GetDropDownWidth(scriptNames);
@ -693,6 +693,8 @@ namespace CodeImp.DoomBuilder.Windows
scriptNumbers.Visible = false;
cbArgStr.Checked = false;
}
arg0.Visible = (!scriptNames.Visible && !scriptNumbers.Visible);
}
//mxd

3
Source/Core/Windows/ThingEditForm.cs
View file

@ -114,7 +114,7 @@ namespace CodeImp.DoomBuilder.Windows
}
else //mxd. Setup script numbers
{
scriptNumbers.Location = arg0.Location;
scriptNumbers.Location = new Point(arg0.Location.X, arg0.Location.Y + 2);
foreach(ScriptItem si in General.Map.NumberedScripts)
scriptNumbers.Items.Add(si);
@ -306,6 +306,7 @@ namespace CodeImp.DoomBuilder.Windows
private void UpdateScriptControls()
{
scriptNumbers.Visible = (Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1);
arg0.Visible = !scriptNumbers.Visible;
}
#endregion

6
Source/Core/Windows/ThingEditFormUDMF.cs
View file

@ -137,8 +137,8 @@ namespace CodeImp.DoomBuilder.Windows
fieldslist.ListFixedFields(General.Map.Config.ThingFields);
// Tag/Effects
scriptNames.Location = arg0.Location;
scriptNumbers.Location = arg0.Location;
scriptNumbers.Location = new Point(arg0.Location.X, arg0.Location.Y + 2);
scriptNames.Location = scriptNumbers.Location;
// Setup script names
foreach(ScriptItem nsi in General.Map.NamedScripts) scriptNames.Items.Add(nsi);
@ -402,6 +402,8 @@ namespace CodeImp.DoomBuilder.Windows
scriptNumbers.Visible = false;
cbArgStr.Checked = false;
}
arg0.Visible = (!scriptNames.Visible && !scriptNumbers.Visible);
}
#endregion