mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-18 14:31:50 +00:00
- More changes to properly use the format limitations
- Added default multiplayer flag to Skulltag (Hexen format) game configuration
This commit is contained in:
parent
c1b6728f74
commit
666154edfc
19 changed files with 21 additions and 24 deletions
|
@ -80,6 +80,7 @@ defaultthingflags
|
|||
128;
|
||||
256;
|
||||
512;
|
||||
1024;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,8 +74,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasActionArgs;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -73,8 +73,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "DoomMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasLinedefTag;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,8 +74,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasActionArgs;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -73,8 +73,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasThingAction;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,8 +74,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasThingAction && General.Map.FormatInterface.HasActionArgs;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -73,8 +73,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasThingTag;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,8 +74,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// This is called to test if the item should be displayed
|
||||
public override bool DetermineVisiblity()
|
||||
{
|
||||
return (General.Map.FormatInterface.GetType().Name == "HexenMapSetIO") ||
|
||||
(General.Map.FormatInterface.GetType().Name == "UniversalMapSetIO");
|
||||
return General.Map.FormatInterface.HasThingAction && General.Map.FormatInterface.HasThingTag;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -410,7 +410,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
// Raise/lower thing
|
||||
public virtual void OnChangeTargetHeight(int amount)
|
||||
{
|
||||
if(General.Map.FormatInterface.GetType().Name != "DoomMapSetIO")
|
||||
if(General.Map.FormatInterface.HasThingHeight)
|
||||
{
|
||||
if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
|
||||
undoticket = General.Map.UndoRedo.CreateUndo("Change thing height");
|
||||
|
|
|
@ -58,7 +58,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
string peggedness;
|
||||
|
||||
// Show/hide stuff depending on format
|
||||
if(General.Map.FormatInterface.GetType() == typeof(DoomMapSetIO))
|
||||
if(General.Map.FormatInterface.HasActionArgs)
|
||||
{
|
||||
arglbl1.Visible = false;
|
||||
arglbl2.Visible = false;
|
||||
|
|
|
@ -62,7 +62,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
float zvalue;
|
||||
|
||||
// Show/hide stuff depending on format
|
||||
if(General.Map.FormatInterface.GetType() == typeof(DoomMapSetIO))
|
||||
if(General.Map.FormatInterface.HasActionArgs)
|
||||
{
|
||||
arglbl1.Visible = false;
|
||||
arglbl2.Visible = false;
|
||||
|
|
|
@ -63,6 +63,7 @@ namespace CodeImp.DoomBuilder.IO
|
|||
public override bool HasActionArgs { get { return false; } }
|
||||
public override bool HasMixedActivations { get { return false; } }
|
||||
public override bool HasPresetActivations { get { return false; } }
|
||||
public override bool HasBuiltInActivations { get { return true; } }
|
||||
public override int HighestTag { get { return ushort.MaxValue; } }
|
||||
public override int HighestEffect { get { return ushort.MaxValue; } }
|
||||
public override int HighestBrightness { get { return short.MaxValue; } }
|
||||
|
|
|
@ -63,6 +63,7 @@ namespace CodeImp.DoomBuilder.IO
|
|||
public override bool HasActionArgs { get { return true; } }
|
||||
public override bool HasMixedActivations { get { return false; } }
|
||||
public override bool HasPresetActivations { get { return true; } }
|
||||
public override bool HasBuiltInActivations { get { return false; } }
|
||||
public override int HighestTag { get { return ushort.MaxValue; } }
|
||||
public override int HighestAction { get { return byte.MaxValue; } }
|
||||
public override int HighestEffect { get { return ushort.MaxValue; } }
|
||||
|
|
|
@ -49,6 +49,7 @@ namespace CodeImp.DoomBuilder.IO
|
|||
bool HasActionArgs { get; }
|
||||
bool HasMixedActivations { get; }
|
||||
bool HasPresetActivations { get; }
|
||||
bool HasBuiltInActivations { get; }
|
||||
int HighestTag { get; }
|
||||
int HighestAction { get; }
|
||||
int HighestEffect { get; }
|
||||
|
|
|
@ -65,6 +65,7 @@ namespace CodeImp.DoomBuilder.IO
|
|||
public abstract bool HasActionArgs { get; }
|
||||
public abstract bool HasMixedActivations { get; }
|
||||
public abstract bool HasPresetActivations { get; }
|
||||
public abstract bool HasBuiltInActivations { get; }
|
||||
public abstract int HighestTag { get; }
|
||||
public abstract int HighestAction { get; }
|
||||
public abstract int HighestEffect { get; }
|
||||
|
|
|
@ -114,6 +114,7 @@ namespace CodeImp.DoomBuilder.IO
|
|||
public override bool HasActionArgs { get { return true; } }
|
||||
public override bool HasMixedActivations { get { return true; } }
|
||||
public override bool HasPresetActivations { get { return false; } }
|
||||
public override bool HasBuiltInActivations { get { return false; } }
|
||||
public override int HighestTag { get { return int.MaxValue; } }
|
||||
public override int HighestAction { get { return int.MaxValue; } }
|
||||
public override int HighestEffect { get { return int.MaxValue; } }
|
||||
|
|
|
@ -64,7 +64,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
option5label, option6label, option7label };
|
||||
|
||||
// Show prefixes panel only for doom type maps
|
||||
if(!General.Map.IsType(typeof(DoomMapSetIO)))
|
||||
if(General.Map.FormatInterface.HasBuiltInActivations)
|
||||
{
|
||||
prefixespanel.Visible = false;
|
||||
actions.Height += actions.Top - prefixespanel.Top;
|
||||
|
|
|
@ -265,7 +265,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(frontsector.Text != l.Map.GetIndexForSector(l.Front.Sector).ToString()) frontsector.Text = "";
|
||||
if(frontoffsetx.Text != l.Front.OffsetX.ToString()) frontoffsetx.Text = "";
|
||||
if(frontoffsety.Text != l.Front.OffsetY.ToString()) frontoffsety.Text = "";
|
||||
if(General.Map.IsType(typeof(UniversalMapSetIO))) customfrontbutton.Visible = true;
|
||||
if(General.Map.FormatInterface.HasCustomFields) customfrontbutton.Visible = true;
|
||||
}
|
||||
|
||||
// Back settings
|
||||
|
@ -280,7 +280,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(backsector.Text != l.Map.GetIndexForSector(l.Back.Sector).ToString()) backsector.Text = "";
|
||||
if(backoffsetx.Text != l.Back.OffsetX.ToString()) backoffsetx.Text = "";
|
||||
if(backoffsety.Text != l.Back.OffsetY.ToString()) backoffsety.Text = "";
|
||||
if(General.Map.IsType(typeof(UniversalMapSetIO))) custombackbutton.Visible = true;
|
||||
if(General.Map.FormatInterface.HasCustomFields) custombackbutton.Visible = true;
|
||||
}
|
||||
|
||||
// Custom fields
|
||||
|
|
|
@ -61,11 +61,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// Fill universal fields list
|
||||
fieldslist.ListFixedFields(General.Map.Config.VertexFields);
|
||||
|
||||
// Not a UDMF map?
|
||||
if(!General.Map.IsType(typeof(UniversalMapSetIO)))
|
||||
{
|
||||
// Custom fields?
|
||||
if(!General.Map.FormatInterface.HasCustomFields)
|
||||
tabs.TabPages.Remove(tabcustom);
|
||||
}
|
||||
|
||||
// Decimals allowed?
|
||||
if(General.Map.FormatInterface.VertexDecimals > 0)
|
||||
|
|
Loading…
Reference in a new issue