mirror of
https://git.do.srb2.org/STJr/ZoneBuilder.git
synced 2025-02-10 17:51:17 +00:00
Update config and restore copy slope rendering in Visual Mode.
This commit is contained in:
parent
9ffb23be71
commit
cc93734354
5 changed files with 110 additions and 13 deletions
|
@ -42,6 +42,8 @@ linetagindicatesectors = true;
|
||||||
// The format interface handles the map data format - DoomMapSetIO for SRB2DB2, SRB2MapSetIO for Zone Builder
|
// The format interface handles the map data format - DoomMapSetIO for SRB2DB2, SRB2MapSetIO for Zone Builder
|
||||||
formatinterface = "SRB2MapSetIO";
|
formatinterface = "SRB2MapSetIO";
|
||||||
|
|
||||||
|
newflatalignment = true;
|
||||||
|
|
||||||
//Sky textures for vanilla maps
|
//Sky textures for vanilla maps
|
||||||
defaultskytextures
|
defaultskytextures
|
||||||
{
|
{
|
||||||
|
@ -750,12 +752,6 @@ linedeftypes
|
||||||
prefix = "(20)";
|
prefix = "(20)";
|
||||||
}
|
}
|
||||||
|
|
||||||
21
|
|
||||||
{
|
|
||||||
title = "Explicitly Include Line <disabled>";
|
|
||||||
prefix = "(21)";
|
|
||||||
}
|
|
||||||
|
|
||||||
22
|
22
|
||||||
{
|
{
|
||||||
title = "Parameters";
|
title = "Parameters";
|
||||||
|
@ -2603,13 +2599,13 @@ linedeftypes
|
||||||
|
|
||||||
500
|
500
|
||||||
{
|
{
|
||||||
title = "Scroll Wall Front Side Left";
|
title = "Scroll Front Wall Left";
|
||||||
prefix = "(500)";
|
prefix = "(500)";
|
||||||
}
|
}
|
||||||
|
|
||||||
501
|
501
|
||||||
{
|
{
|
||||||
title = "Scroll Wall Front Side Right";
|
title = "Scroll Front Wall Right";
|
||||||
prefix = "(501)";
|
prefix = "(501)";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2617,31 +2613,49 @@ linedeftypes
|
||||||
{
|
{
|
||||||
title = "Scroll Wall According to Linedef";
|
title = "Scroll Wall According to Linedef";
|
||||||
prefix = "(502)";
|
prefix = "(502)";
|
||||||
|
flags128text = "[7] Use texture offsets";
|
||||||
|
flags256text = "[8] Scroll back side";
|
||||||
}
|
}
|
||||||
|
|
||||||
503
|
503
|
||||||
{
|
{
|
||||||
title = "Scroll Wall According to Linedef (Accelerative)";
|
title = "Scroll Wall According to Linedef (Accelerative)";
|
||||||
prefix = "(503)";
|
prefix = "(503)";
|
||||||
|
flags128text = "[7] Use texture offsets";
|
||||||
|
flags256text = "[8] Scroll back side";
|
||||||
}
|
}
|
||||||
|
|
||||||
504
|
504
|
||||||
{
|
{
|
||||||
title = "Scroll Wall According to Linedef (Displacement)";
|
title = "Scroll Wall According to Linedef (Displacement)";
|
||||||
prefix = "(504)";
|
prefix = "(504)";
|
||||||
|
flags128text = "[7] Use texture offsets";
|
||||||
|
flags256text = "[8] Scroll back side";
|
||||||
}
|
}
|
||||||
|
|
||||||
505
|
505
|
||||||
{
|
{
|
||||||
title = "Scroll Texture by Front Side Offsets";
|
title = "Scroll Front Wall by Front Side Offsets";
|
||||||
prefix = "(505)";
|
prefix = "(505)";
|
||||||
}
|
}
|
||||||
|
|
||||||
506
|
506
|
||||||
{
|
{
|
||||||
title = "Scroll Texture by Back Side Offsets";
|
title = "Scroll Front Wall by Back Side Offsets";
|
||||||
prefix = "(506)";
|
prefix = "(506)";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
507
|
||||||
|
{
|
||||||
|
title = "Scroll Back Wall by Front Side Offsets";
|
||||||
|
prefix = "(507)";
|
||||||
|
}
|
||||||
|
|
||||||
|
508
|
||||||
|
{
|
||||||
|
title = "Scroll Back Wall by Back Side Offsets";
|
||||||
|
prefix = "(508)";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
planescroll
|
planescroll
|
||||||
|
@ -3028,6 +3042,84 @@ linedeftypes
|
||||||
slopeargs = 3;
|
slopeargs = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
723
|
||||||
|
{
|
||||||
|
title = "Copy Backside Floor Slope from Line Tag";
|
||||||
|
prefix = "(720)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
724
|
||||||
|
{
|
||||||
|
title = "Copy Backside Ceiling Slope from Line Tag";
|
||||||
|
prefix = "(721)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
725
|
||||||
|
{
|
||||||
|
title = "Copy Backside Floor and Ceiling Slope from Line Tag";
|
||||||
|
prefix = "(722)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 12;
|
||||||
|
}
|
||||||
|
|
||||||
|
730
|
||||||
|
{
|
||||||
|
title = "Copy Frontside Floor Slope to Backside";
|
||||||
|
prefix = "(730)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 1;
|
||||||
|
copyslopeargs = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
731
|
||||||
|
{
|
||||||
|
title = "Copy Frontside Ceiling Slope to Backside";
|
||||||
|
prefix = "(731)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 2;
|
||||||
|
copyslopeargs = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
732
|
||||||
|
{
|
||||||
|
title = "Copy Frontside Floor and Ceiling Slope to Backside";
|
||||||
|
prefix = "(732)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 3;
|
||||||
|
copyslopeargs = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
733
|
||||||
|
{
|
||||||
|
title = "Copy Backside Floor Slope to Frontside";
|
||||||
|
prefix = "(730)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 1;
|
||||||
|
copyslopeargs = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
734
|
||||||
|
{
|
||||||
|
title = "Copy Backside Ceiling Slope to Frontside";
|
||||||
|
prefix = "(731)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 2;
|
||||||
|
copyslopeargs = 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
735
|
||||||
|
{
|
||||||
|
title = "Copy Backside Floor and Ceiling Slope to Frontside";
|
||||||
|
prefix = "(732)";
|
||||||
|
slope = "copy";
|
||||||
|
slopeargs = 3;
|
||||||
|
copyslopeargs = 10;
|
||||||
|
}
|
||||||
|
|
||||||
799
|
799
|
||||||
{
|
{
|
||||||
title = "Set Tagged Dynamic Slope Vertex to Front Sector Height";
|
title = "Set Tagged Dynamic Slope Vertex to Front Sector Height";
|
||||||
|
@ -4922,7 +5014,7 @@ thingtypes
|
||||||
1011
|
1011
|
||||||
{
|
{
|
||||||
title = "Stalagmite (DSZ2)";
|
title = "Stalagmite (DSZ2)";
|
||||||
sprite = "DSTGA0";
|
sprite = "DSTGB0";
|
||||||
width = 8;
|
width = 8;
|
||||||
height = 116;
|
height = 116;
|
||||||
flags4text = "[4] Double size";
|
flags4text = "[4] Double size";
|
||||||
|
|
0
Build/Plugins/BuilderModes.dll.CodeAnalysisLog.xml
Normal file
0
Build/Plugins/BuilderModes.dll.CodeAnalysisLog.xml
Normal file
0
SVN_Build/Changelog.xml
Normal file
0
SVN_Build/Changelog.xml
Normal file
|
@ -48,6 +48,7 @@ namespace CodeImp.DoomBuilder.Config
|
||||||
private IDictionary<string, string> flags;
|
private IDictionary<string, string> flags;
|
||||||
private readonly string slope;
|
private readonly string slope;
|
||||||
private readonly int slopeargs;
|
private readonly int slopeargs;
|
||||||
|
private readonly int copyslopeargs;
|
||||||
private readonly bool threedfloor;
|
private readonly bool threedfloor;
|
||||||
private readonly bool threedfloorcustom;
|
private readonly bool threedfloorcustom;
|
||||||
private readonly int threedfloorflags;
|
private readonly int threedfloorflags;
|
||||||
|
@ -72,6 +73,7 @@ namespace CodeImp.DoomBuilder.Config
|
||||||
public bool IsCopySlope { get { return slope == "copy"; } }
|
public bool IsCopySlope { get { return slope == "copy"; } }
|
||||||
public bool IsVertexSlope { get { return slope == "vertex"; } }
|
public bool IsVertexSlope { get { return slope == "vertex"; } }
|
||||||
public int SlopeArgs { get { return slopeargs; } }
|
public int SlopeArgs { get { return slopeargs; } }
|
||||||
|
public int CopySlopeArgs { get { return copyslopeargs; } }
|
||||||
public bool ThreeDFloor { get { return threedfloor; } }
|
public bool ThreeDFloor { get { return threedfloor; } }
|
||||||
public bool ThreeDFloorCustom { get { return threedfloorcustom; } }
|
public bool ThreeDFloorCustom { get { return threedfloorcustom; } }
|
||||||
public int ThreeDFloorFlags { get { return threedfloorflags; } }
|
public int ThreeDFloorFlags { get { return threedfloorflags; } }
|
||||||
|
@ -102,6 +104,7 @@ namespace CodeImp.DoomBuilder.Config
|
||||||
ReadLinedefSpecificFlags(cfg);
|
ReadLinedefSpecificFlags(cfg);
|
||||||
this.slope = cfg.ReadSetting(actionsetting + ".slope", "");
|
this.slope = cfg.ReadSetting(actionsetting + ".slope", "");
|
||||||
this.slopeargs = cfg.ReadSetting(actionsetting + ".slopeargs", 0);
|
this.slopeargs = cfg.ReadSetting(actionsetting + ".slopeargs", 0);
|
||||||
|
this.copyslopeargs = cfg.ReadSetting(actionsetting + ".copyslopeargs", 0);
|
||||||
this.threedfloor = cfg.ReadSetting(actionsetting + ".3dfloor", false);
|
this.threedfloor = cfg.ReadSetting(actionsetting + ".3dfloor", false);
|
||||||
this.threedfloorcustom = cfg.ReadSetting(actionsetting + ".3dfloorcustom", false);
|
this.threedfloorcustom = cfg.ReadSetting(actionsetting + ".3dfloorcustom", false);
|
||||||
try { this.threedfloorflags = Convert.ToInt32(cfg.ReadSetting(actionsetting + ".3dfloorflags", "0"), 16); }
|
try { this.threedfloorflags = Convert.ToInt32(cfg.ReadSetting(actionsetting + ".3dfloorflags", "0"), 16); }
|
||||||
|
@ -137,6 +140,7 @@ namespace CodeImp.DoomBuilder.Config
|
||||||
this.flags = new Dictionary<string, string>();
|
this.flags = new Dictionary<string, string>();
|
||||||
this.slope = "";
|
this.slope = "";
|
||||||
this.slopeargs = 0;
|
this.slopeargs = 0;
|
||||||
|
this.copyslopeargs = 0;
|
||||||
this.threedfloor = false;
|
this.threedfloor = false;
|
||||||
this.threedfloorcustom = false;
|
this.threedfloorcustom = false;
|
||||||
this.threedfloorflags = 0;
|
this.threedfloorflags = 0;
|
||||||
|
|
|
@ -880,7 +880,8 @@ namespace CodeImp.DoomBuilder.Map
|
||||||
{
|
{
|
||||||
//+1 = frontside floor, +2 = frontside ceiling, +4 = backside floor, +8 = backside ceiling
|
//+1 = frontside floor, +2 = frontside ceiling, +4 = backside floor, +8 = backside ceiling
|
||||||
int slopeargs = General.Map.Config.GetLinedefActionInfo(Action).SlopeArgs;
|
int slopeargs = General.Map.Config.GetLinedefActionInfo(Action).SlopeArgs;
|
||||||
bool frontfloor = (slopeargs & 0x1) == 0x1;
|
int copyslopeargs = General.Map.Config.GetLinedefActionInfo(Action).CopySlopeArgs;
|
||||||
|
bool frontfloor = (slopeargs & 0x1) == 0x1;
|
||||||
bool frontceiling = (slopeargs & 0x2) == 0x2;
|
bool frontceiling = (slopeargs & 0x2) == 0x2;
|
||||||
bool backfloor = (slopeargs & 0x4) == 0x4;
|
bool backfloor = (slopeargs & 0x4) == 0x4;
|
||||||
bool backceiling = (slopeargs & 0x8) == 0x8;
|
bool backceiling = (slopeargs & 0x8) == 0x8;
|
||||||
|
@ -888,7 +889,7 @@ namespace CodeImp.DoomBuilder.Map
|
||||||
if (frontceiling) Args[1] = Tag; //front ceiling
|
if (frontceiling) Args[1] = Tag; //front ceiling
|
||||||
if (backfloor) Args[2] = Tag; //back floor
|
if (backfloor) Args[2] = Tag; //back floor
|
||||||
if (backceiling) Args[3] = Tag; //back ceiling
|
if (backceiling) Args[3] = Tag; //back ceiling
|
||||||
Args[4] = 0; //share (irrelevant for SRB2)
|
Args[4] = copyslopeargs; //for copying slopes without tags
|
||||||
}
|
}
|
||||||
|
|
||||||
//Set slope arguments for SRB2-style vertex slopes. These are fake arguments I invented to make their handling easier.
|
//Set slope arguments for SRB2-style vertex slopes. These are fake arguments I invented to make their handling easier.
|
||||||
|
|
Loading…
Reference in a new issue