diff --git a/Build/Configurations/Includes/Hexen_linedefs.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg index 5f88753f..25f312d7 100644 --- a/Build/Configurations/Includes/Hexen_linedefs.cfg +++ b/Build/Configurations/Includes/Hexen_linedefs.cfg @@ -16,6 +16,7 @@ polyobj 1 { title = "Polyobj Start Line"; + requiresactivation = false; arg0 { @@ -117,6 +118,7 @@ polyobj 5 { title = "Polyobj Explicit Line"; + requiresactivation = false; arg0 { @@ -1703,40 +1705,84 @@ scroll 100 { title = "Scroll Texture Left"; + requiresactivation = false; arg0 { title = "Scroll Speed"; + type = 11; + enum = "scroll_speeds"; + default = 64; + } + + arg1 + { + title = "Sidedef part"; + type = 12; + enum = "sidedef_part"; } } 101 { title = "Scroll Texture Right"; + requiresactivation = false; arg0 { title = "Scroll Speed"; + type = 11; + enum = "scroll_speeds"; + default = 64; + } + + arg1 + { + title = "Sidedef part"; + type = 12; + enum = "sidedef_part"; } } 102 { title = "Scroll Texture Up"; + requiresactivation = false; arg0 { title = "Scroll Speed"; + type = 11; + enum = "scroll_speeds"; + default = 64; + } + + arg1 + { + title = "Sidedef part"; + type = 12; + enum = "sidedef_part"; } } 103 { title = "Scroll Texture Down"; + requiresactivation = false; arg0 { title = "Scroll Speed"; + type = 11; + enum = "scroll_speeds"; + default = 64; + } + + arg1 + { + title = "Sidedef part"; + type = 12; + enum = "sidedef_part"; } } } @@ -1811,13 +1857,16 @@ light arg2 { - title = "Fade Duration"; + title = "Fade Duration (tics)"; + type = 11; + enum = "delay_tics"; + default = 105; } } 114 { - title = "Light Flow"; + title = "Light Glow"; arg0 { @@ -1837,7 +1886,10 @@ light arg3 { - title = "Fade Duration"; + title = "Fade Duration (tics)"; + type = 11; + enum = "delay_tics"; + default = 105; } } @@ -1854,11 +1906,13 @@ light arg1 { title = "Brightest Level"; + default = 255; } arg2 { title = "Darkest Level"; + default = 128; } } @@ -1875,21 +1929,29 @@ light arg1 { title = "Brightest Level"; + default = 255; } arg2 { title = "Darkest Level"; + default = 128; } arg3 { title = "Brightest Duration"; + type = 11; + enum = "delay_tics"; + default = 35; } arg4 { title = "Darkest Duration"; + type = 11; + enum = "delay_tics"; + default = 35; } } } @@ -1910,17 +1972,22 @@ earthquake arg1 { - title = "Duration"; + title = "Duration (tics)"; + type = 11; + enum = "delay_tics"; + default = 35; } arg2 { - title = "Damage Radius"; + title = "Damage Radius * 64"; + default = 4; } arg3 { - title = "Tremor Radius"; + title = "Tremor Radius * 64"; + default = 4; } arg4 diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg index ef7fa7f6..76cc0899 100644 --- a/Build/Configurations/Includes/ZDoom_linedefs.cfg +++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg @@ -472,10 +472,14 @@ zdoom arg1 { title = "Speed"; + type = 11; + enum = "stair_speeds"; + default = 16; } arg2 { title = "Target MapSpot Tag"; + type = 14; } } 86 @@ -488,10 +492,14 @@ zdoom arg1 { title = "Speed"; + type = 11; + enum = "stair_speeds"; + default = 16; } arg2 { title = "Target MapSpot Tag"; + type = 14; } } 87 @@ -512,6 +520,9 @@ zdoom arg1 { title = "Speed"; + type = 11; + enum = "stair_speeds"; + default = 16; } arg2 { @@ -532,6 +543,9 @@ zdoom arg1 { title = "Speed"; + type = 11; + enum = "stair_speeds"; + default = 16; } arg2 { @@ -578,18 +592,20 @@ zdoom 182 { title = "Line Mirror"; + requiresactivation = false; } } door { - 10 + /*10 { arg1 { title = "Movement Speed"; type = 11; enum = "door_speeds"; + default = 32; } } 11 @@ -599,6 +615,7 @@ zdoom title = "Movement Speed"; type = 11; enum = "door_speeds"; + default = 32; } } 12 @@ -608,6 +625,7 @@ zdoom title = "Movement Speed"; type = 11; enum = "door_speeds"; + default = 32; } arg2 { @@ -630,7 +648,7 @@ zdoom type = 11; enum = "delays"; } - } + }*/ 14 { title = "Door Animated"; @@ -1538,6 +1556,7 @@ zdoom 50 { title = "Transfer Brightness Level"; + requiresactivation = false; arg0 { @@ -1559,6 +1578,7 @@ zdoom 209 { title = "Transfer Heights"; + requiresactivation = false; arg0 { @@ -1584,6 +1604,7 @@ zdoom 210 { title = "Transfer Floor Brightness"; + requiresactivation = false; arg0 { @@ -1594,6 +1615,7 @@ zdoom 211 { title = "Transfer Ceiling Brightness"; + requiresactivation = false; arg0 { @@ -1604,10 +1626,11 @@ zdoom 16 { title = "Transfer Wall Brightness"; + requiresactivation = false; arg0 { - title = "Line ID"; + title = "Line Tag"; type = 15; } arg1 @@ -2431,20 +2454,22 @@ zdoom arg0 { - title = "Line ID"; + title = "Line Tag"; type = 15; } arg1 { - title = "x"; + title = "Horizontal speed"; } arg2 { - title = "y"; + title = "Vertical speed"; } arg3 { title = "Side"; + type = 11; + enum = "frontback"; } arg4 { @@ -2724,10 +2749,11 @@ zdoom 48 { title = "Sector Attach 3D Midtex"; + requiresactivation = false; arg0 { - title = "Line ID"; + title = "Line Tag"; type = 15; } arg1 diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg index 67d92a7c..92e7c680 100644 --- a/Build/Configurations/Includes/ZDoom_misc.cfg +++ b/Build/Configurations/Includes/ZDoom_misc.cfg @@ -583,7 +583,11 @@ enums scroll_speeds { - 64 = "64: Normal"; + 16 = "16: Very slow"; + 32 = "64: Slow"; + 64 = "64: Normal"; + 96 = "64: Flast"; + 128 = "64: Very fast"; } stair_speeds @@ -598,7 +602,15 @@ enums { 0 = "0: Game default"; 1 = "1: Doom mode"; - 2 = "2: Hexen mode"; + 2 = "2: Hexen mode"; + } + + sidedef_part + { + 0 = "All"; + 1 = "Upper"; + 2 = "Middle"; + 4 = "Lower"; } generic_floor_target diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs index 236efbe1..94f1c332 100644 --- a/Source/Core/Windows/MainForm.cs +++ b/Source/Core/Windows/MainForm.cs @@ -2947,8 +2947,8 @@ namespace CodeImp.DoomBuilder.Windows //create path string date = DateTime.Now.ToString("dd.MM.yyyy HH-mm-ss"); - string revision = "[r" + General.ThisAssembly.GetName().Version.MinorRevision + "]"; - string path = Path.Combine(folder, name + date + " " + revision + ".jpg"); + string revision = "R" + General.ThisAssembly.GetName().Version.MinorRevision; + string path = Path.Combine(folder, name + date + " [" + revision + "].jpg"); //save image using(Bitmap bitmap = new Bitmap(bounds.Width, bounds.Height)) { @@ -2961,7 +2961,7 @@ namespace CodeImp.DoomBuilder.Windows //gather some info string info = string.Empty; if (editAreaOnly && General.Editing.Mode != null) { - info = General.Map.FileTitle + " (" + General.Map.Options.CurrentName + "): "; + info = General.Map.FileTitle + " | " + General.Map.Options.CurrentName + " | "; //get map coordinates if (General.Editing.Mode is ClassicMode) { @@ -2978,7 +2978,7 @@ namespace CodeImp.DoomBuilder.Windows } //add the revision number - info += " " + revision; + info += " | " + revision; } else { //just use the revision number info = revision;