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

Merge remote-tracking branch 'udb/master'

Browse source
This commit is contained in:
spherallic 2023-10-24 16:28:55 +02:00
commit aea6808cee
24 changed files with 5307 additions and 4823 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Build/Configurations/EdgeC_Doom2Doom.cfg
View file

@ -9,15 +9,10 @@ type = "Doom Builder 2 Game Configuration";
game = "EDGE-Classic: Doom 2 (Doom format)";
// This is the simplified game engine/sourceport name
engine = "edge";
engine = "edge-classic";
// *******************************************************
// * *
// * Note: all the elements that could be factorized *
// * because they were common to ZDoom, GZDoom and *
// * Zandronum have been moved to ZDoom_common.cfg. *
// * *
// *******************************************************
// Settings common to Doom games
include("Includes\\Game_Doom.cfg");
// STANDARD DOOM SETTINGS
// Settings common to all games and all map formats
@ -27,16 +22,16 @@ include("Includes\\Doom_common.cfg", "common");
include("Includes\\Boom_common.cfg", "mapformat_doom");
include("Includes\\MBF21_common.cfg", "mapformat_doom");
// Settings common to Doom games
include("Includes\\Game_Doom.cfg");
// Settings common to all games and all map formats
include("Includes\\EdgeC_common.cfg", "common");
// Settings common to doom map format
include("Includes\\EdgeC_misc.cfg", "mapformat_doom");
include("Includes\\EdgeC_common.cfg", "mapformat_doom");
// Map name format for Doom 2.
mapnameformat = "MAPxy";
//mxd. No DECORATE support in vanilla
decorategames = "";
// Default thing filters
// (these are not required, just useful for new users)
@ -45,16 +40,6 @@ thingsfilters
include("Includes\\Doom_misc.cfg", "thingsfilters");
}
// THING TYPES
// Each engine has its own additional thing types
// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
thingtypes
{
// Basic game actors
include("Includes\\Doom_things.cfg");
include("Includes\\Doom2_things.cfg");
include("Includes\\Boom_things.cfg");
}
// ENUMERATIONS
// Each engine has its own additional thing types
@ -65,10 +50,5 @@ enums
include("Includes\\Doom_misc.cfg", "enums");
}
// Dehacked data
dehacked
{
include("Includes\\Dehacked_Doom.cfg");
}

49
Build/Configurations/EdgeC_DoomUDMF.cfg Normal file
View file

@ -0,0 +1,49 @@
/*************************************************************\
Doom Builder 2 Game Configuration for ZDoom-compatible port
\*************************************************************/
// This is required to prevent accidental use of a different configuration
type = "Doom Builder 2 Game Configuration";
// This is the title to show for this game
game = "EDGE-Classic: Doom 2 (UDMF)";
// This is the simplified game engine/sourceport name
engine = "edge-classic";
// Settings common to all games and all map formats
include("Includes\\EdgeC_common.cfg", "common");
// Default testing parameters
include("Includes\\Test_params.cfg", "vanilla_mapxx");
// Settings common to text map format
include("Includes\\EdgeC_misc.cfg", "mapformat_udmf");
// Special linedefs
singlesidedflag = "blocking";
doublesidedflag = "twosided";
impassableflag = "blocking";
upperunpeggedflag = "dontpegtop";
lowerunpeggedflag = "dontpegbottom";
defaultlinedefactivation = "playercross"; //mxd. Used when translating a map to UDMF
// ENUMERATIONS
// Each engine has its own additional thing types
// These are enumerated lists for linedef types and UDMF fields.
enums
{
// Basic game enums
include("Includes\\Doom_misc.cfg", "enums");
// Standard ZDoom enums
include("Includes\\ZDoom_misc.cfg", "enums");
// Additional ZDoom enums for that game
include("Includes\\ZDoom_misc.cfg", "enums_doom");
}

334
Build/Configurations/Includes/EdgeC_common.cfg
View file

@ -1,6 +1,6 @@
// ***********************************************************
// * *
// * These values are mainly for UDMF EDGE-Classic *
// * These values are common for DiD and UDMF EDGE-Classic *
// * *
// ***********************************************************
@ -12,14 +12,9 @@ common
// Default testing parameters
include("Test_params.cfg", "modern");
// Default nodebuilder configurations
defaultsavecompiler = "glbsp_normal";
defaulttestcompiler = "glbsp_fast";
// Generalized actions
// generalizedlinedefs is true for Doom format and false for
// the other two, so it's not here.
generalizedsectors = true;
generalizedlinedefs = true;
//mxd. Maximum safe map size check (0 means skip check)
safeboundary = 0;
@ -30,10 +25,53 @@ common
defaultflatscale = 1.0f;
scaledtextureoffsets = true;
// When this is set to true, sectors with the same tag will light up when a line is highlighted
linetagindicatesectors = true;
// Enables multiple tags on sectors
sectormultitag = false;
//mxd. Sidedefs compression
// ioanch FIXME: what does this do? I made it false
sidedefcompressionignoresaction = false;
// Enables support for 3D floors (not really, since support for 3D floors is pretty much hard-coded, but
// this tells plugins that the game supports 3D floors)
effect3dfloorsupport = true;
//mxd. Sky textures for vanilla maps
defaultskytextures
{
SKY1 = "MAP01,MAP02,MAP03,MAP04,MAP05,MAP06,MAP07,MAP08,MAP09,MAP10,MAP11";
SKY2 = "MAP12,MAP13,MAP14,MAP15,MAP16,MAP17,MAP18,MAP19,MAP20";
SKY3 = "MAP21,MAP22,MAP23,MAP24,MAP25,MAP26,MAP27,MAP28,MAP29,MAP30,MAP31,MAP32";
}
// Default lump name for new map
defaultlumpname = "MAP01";
// No DECORATE support in EDGE ;)
decorategames = "";
//The default script compiler to use
defaultscriptcompiler = "";
// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";
nodebuildersave = "";
nodebuildertest = "";
damagetypes = "";
internalsoundnames = "";
// Default texture sets
// (these are not required, but useful for new users)
texturesets
{
include("Doom_texturesets.cfg");
}
// Texture sources
textures
{
@ -47,7 +85,6 @@ common
include("EdgeC_misc.cfg", "hires");
}
// Patch sources
patches
{
@ -72,43 +109,11 @@ common
include("Boom_misc.cfg", "colormaps");
}
compatibility
{
fixnegativepatchoffsets = true;
fixmaskedpatchoffsets = true;
}
}
mapformat_doom
{
mixtexturesflats = true;
// The format interface handles the map data format
formatinterface = "DoomMapSetIO";
maplumpnames
{
include("Doom_misc.cfg", "doommaplumpnames");
include("Boom_misc.cfg", "boommaplumpnames");
}
// When this is set to true, sectors with the same tag will light up when a line is highlighted
linetagindicatesectors = true;
// Default flags for first new thing
defaultthingflags
{
include("Doom_misc.cfg", "defaultthingflags");
}
// Door making
//include("ZDoom_misc.cfg", "doormaking_doom");
// Generalized actions
generalizedlinedefs = true;
generalizedsectors = true;
// GENERALIZED LINEDEF TYPES
gen_linedeftypes
@ -122,6 +127,12 @@ mapformat_doom
include("Boom_generalized.cfg", "gen_sectortypes");
}
// Door making
makedoortrack = "DOORTRAK";
makedoordoor = "BIGDOOR2";
makedoorceil = "FLAT20";
makedooraction = 1; // See linedeftypes
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
{
@ -135,27 +146,6 @@ mapformat_doom
include("EdgeC_sectors.cfg");
}
// LINEDEF FLAGS
linedefflags
{
include("Doom_misc.cfg", "linedefflags");
include("Boom_misc.cfg", "linedefflags");
}
// LINEDEF ACTIVATIONS
linedefactivations
{
}
// Linedef flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
linedefflagstranslation
{
include("Doom_misc.cfg", "linedefflagstranslation");
include("Boom_misc.cfg", "linedefflagstranslation");
}
// LINEDEF TYPES
linedeftypes
{
@ -164,227 +154,21 @@ mapformat_doom
include("EdgeC_linedefs.cfg");
}
thingtypes
{
// Basic game actors
include("Doom_things.cfg");
include("Doom2_things.cfg");
include("Boom_things.cfg");
include("EdgeC_things.cfg");
}
// THING FLAGS
thingflags
// Dehacked data
dehacked
{
include("Doom_misc.cfg", "thingflags");
include("Boom_misc.cfg", "thingflags");
}
// Thing flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
thingflagstranslation
{
include("Doom_misc.cfg", "thingflagstranslation");
include("Boom_misc.cfg", "thingflagstranslation");
}
// How to compare thing flags (for the stuck things error checker)
thingflagscompare
{
include("Doom_misc.cfg", "thingflagscompare");
include("Boom_misc.cfg", "thingflagscompare");
}
// Things flags masks
include("Doom_misc.cfg", "thingflagsmasks");
mixtexturesflats = true;
// Texture sources
textures
{
include("Doom_misc.cfg", "textures");
include("EdgeC_misc.cfg", "textures"); // works for Eternity too
}
//mxd. HiRes sources
hires
{
include("EdgeC_misc.cfg", "hires");
include("Dehacked_Doom.cfg");
}
}
// ***********************************************************
// * *
// * Text map format *
// * *
// ***********************************************************
mapformat_udmf
{
// The format interface handles the map data format
formatinterface = "UniversalMapSetIO";
//mxd. The default script compiler to use
defaultscriptcompiler = "zdoom_acs.cfg";
// Enables support for long (> 8 chars) texture names
// WARNING: this should only be enabled for UDMF game configurations!
// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
longtexturenames = false;
// Enables setting brightness for floor and ceiling independently from each other
distinctfloorandceilingbrightness = false;
// Default nodebuilder configurations
defaultsavecompiler = "zdbsp_udmf_normal";
defaulttestcompiler = "zdbsp_udmf_fast";
// ioanch: eternity
engine = "edge"; // override that so that DB2 uses the correct namespace
maplumpnames
{
include("UDMF_misc.cfg", "udmfmaplumpnames_begin");
include("EdgeC_misc.cfg", "udmfmaplumpnames");
include("UDMF_misc.cfg", "udmfmaplumpnames_end");
}
// eternity
universalfields
{
include("EdgeC_misc.cfg", "universalfields");
}
// When this is set to true, sectors with the same tag will light up when a line is highlighted
linetagindicatesectors = true;
// Special linedefs
//include("ZDoom_misc.cfg", "speciallinedefs_udmf"); // same in EE
// Default flags for first new thing
defaultthingflags
{
include("EdgeC_misc.cfg", "defaultthingflags_udmf");
}
// Door making
//include("Eternity_misc.cfg", "doormaking_udmf");
// Generalized actions
generalizedlinedefs = true;
generalizedsectors = true;
// GENERALIZED SECTOR TYPES
//gen_sectortypes
//{
// include("Eternity_generalized.cfg", "gen_sectortypes_udmf");
//}
// SECTOR FLAGS
//sectorflags
//{
// include("Eternity_misc.cfg", "sectorflags_udmf");
//}
// DEFAULT SECTOR BRIGHTNESS LEVELS
//sectorbrightness
//{
// include("ZDoom_misc.cfg", "sectorbrightness");
//}
// SECTOR TYPES
//sectortypes
//{
// include("Eternity_misc.cfg", "sectors_udmf");
//}
// SECTOR RENSERSTYLES
//sectorrenderstyles
//{
// include("UDMF_misc.cfg", "sectorrenderstyles");
//}
// LINEDEF FLAGS
//linedefflags
//{
// include("Eternity_misc.cfg", "linedefflags_udmf");
//}
// LINEDEF ACTIVATIONS
//linedefactivations
//{
// include("Eternity_misc.cfg", "linedefactivations_udmf");
//}
//mxd. Linedef flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
linedefflagstranslation
{
include("Doom_misc.cfg", "linedefflagstranslation");
//include("Hexen_misc.cfg", "linedefflagstranslation");
//include("ZDoom_misc.cfg", "linedefflagstranslation");
}
// LINEDEF RENSERSTYLES
//linedefrenderstyles
//{
// include("UDMF_misc.cfg", "linedefrenderstyles");
//}
//SIDEDEF FLAGS
//sidedefflags
//{
// include("Eternity_misc.cfg", "sidedefflags");
//}
// THING FLAGS
//thingflags
//{
// include("Eternity_misc.cfg", "thingflags_udmf");
//}
// THING RENSERSTYLES
//thingrenderstyles
//{
// include("UDMF_misc.cfg", "thingrenderstyles");
//}
// How to compare thing flags (for the stuck things error checker)
//thingflagscompare
//{
// include("Eternity_misc.cfg", "thingflagscompare_udmf");
//}
//mxd. Thing flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
thingflagstranslation
{
include("Doom_misc.cfg", "thingflagstranslation");
//include("Hexen_misc.cfg", "thingflagstranslation");
//include("ZDoom_misc.cfg", "thingflagstranslation");
}
// Things flags masks
//include("Hexen_misc.cfg", "thingflagsmasks");
// LINEDEF TYPES
//linedeftypes
//{
// include("Hexen_linedefs.cfg");
// include("Eternity_linedefs.cfg", "udmf");
//}
// Texture sources
textures
{
include("Doom_misc.cfg", "textures");
include("EdgeC_misc.cfg", "textures"); // works for Eternity too
}
//mxd. HiRes sources
hires
{
include("EdgeC_misc.cfg", "hires");
}
}

114
Build/Configurations/Includes/EdgeC_linedefs.cfg
View file

@ -1,3 +1,42 @@
Edge_Stretch_Texture
{
title = "Edge: Stretch Texture by Line length";
855
{
title = "Stretch Textures Width";
prefix = "";
requiresactivation = false;
}
856
{
title = "Stretch Textures Height";
prefix = "";
requiresactivation = false;
}
857
{
title = "Stretch Textures Width and Height";
prefix = "";
requiresactivation = false;
}
}
Edge_lightwall
{
title = "Edge: Light Wall";
850
{
title = "Light wall: transfer light to tagged";
prefix = "";
requiresactivation = false;
}
}
Edge_breakable_wall
{
title = "Edge: Breakable Wall";
@ -5,24 +44,28 @@ Edge_breakable_wall
{
title = "Breakable Wall: midtex to back lower";
prefix = "";
requiresactivation = false;
}
836
{
title = "Breakable Wall: midtex to back upper";
prefix = "";
requiresactivation = false;
}
837
{
title = "Breakable Wall: midtex to front lower";
prefix = "";
requiresactivation = false;
}
838
{
title = "Breakable Wall: midtex to front upper";
prefix = "";
requiresactivation = false;
}
}
@ -34,18 +77,21 @@ Edge_breakable_glass
{
title = "Breakable Glass: monster can see through, can break";
prefix = "";
requiresactivation = false;
}
831
{
title = "Breakable Glass: monster cannot see through, can break";
prefix = "";
requiresactivation = false;
}
832
{
title = "Breakable Glass: monster cannot see through, cannot break";
prefix = "";
requiresactivation = false;
}
}
@ -58,59 +104,69 @@ Edge_extrafloors_thick
{
title = "Legacy: Thick Extrafloor (dummy texture)";
prefix = "";
requiresactivation = false;
}
289
{
title = "Legacy: Thick Extrafloor (dummy texture, master light props)";
prefix = "";
requiresactivation = false;
}
600
{
title = "Thick Extrafloor: Trans 40% (dummy texture)";
prefix = "";
requiresactivation = false;
}
400
{
title = "Thick Extrafloor (dummy texture)";
prefix = "";
requiresactivation = false;
}
401
{
title = "Thick Extrafloor (master upper texture)";
prefix = "";
requiresactivation = false;
}
402
{
title = "Thick Extrafloor (master lower texture)";
prefix = "";
requiresactivation = false;
}
430
{
title = "Thick Translucent Liquid Extrafloor Scroll Down (20% translucent)";
prefix = "";
requiresactivation = false;
}
431
{
title = "Thick Translucent Liquid Extrafloor Scroll Down (40% translucent)";
prefix = "";
requiresactivation = false;
}
432
{
title = "Thick Translucent Liquid Extrafloor Scroll Down (60% translucent)";
prefix = "";
requiresactivation = false;
}
433
{
title = "Thick Translucent Liquid Extrafloor Scroll Down (80% translucent)";
prefix = "";
requiresactivation = false;
}
}
@ -122,36 +178,42 @@ Edge_extrafloors_liquid
{
title = "Liquid Extrafloor (solid)";
prefix = "";
requiresactivation = false;
}
404
{
title = "Liquid Extrafloor (20% translucent)";
prefix = "";
requiresactivation = false;
}
405
{
title = "Liquid Extrafloor (40% translucent)";
prefix = "";
requiresactivation = false;
}
406
{
title = "Liquid Extrafloor (60% translucent)";
prefix = "";
requiresactivation = false;
}
407
{
title = "Liquid Extrafloor (80% translucent)";
prefix = "";
requiresactivation = false;
}
408
{
title = "Liquid Extrafloor (invisible)";
prefix = "";
requiresactivation = false;
}
}
@ -162,24 +224,28 @@ Edge_translucent_linedef
{
title = "Translucent Linedef (20%) least transparent";
prefix = "";
requiresactivation = false;
}
410
{
title = "Translucent Linedef (40%)";
prefix = "";
requiresactivation = false;
}
411
{
title = "Translucent Linedef (60%)";
prefix = "";
requiresactivation = false;
}
412
{
title = "Translucent Linedef (80%) most transparent";
prefix = "";
requiresactivation = false;
}
}
@ -190,30 +256,35 @@ Edge_extrafloors_thin
{
title = "Thin Extrafloor (opaque)";
prefix = "";
requiresactivation = false;
}
414
{
title = "Thin Extrafloor (20% translucent)";
prefix = "";
requiresactivation = false;
}
415
{
title = "Thin Extrafloor (40% translucent)";
prefix = "";
requiresactivation = false;
}
416
{
title = "Thin Extrafloor (60% translucent)";
prefix = "";
requiresactivation = false;
}
417
{
title = "Thin Extrafloor (80% translucent)";
prefix = "";
requiresactivation = false;
}
}
@ -311,48 +382,56 @@ Edge_Scroller_lines
{
title = "Scroll Right";
prefix = "";
requiresactivation = false;
}
423
{
title = "Scroll Up";
prefix = "";
requiresactivation = false;
}
424
{
title = "Scroll Down";
prefix = "";
requiresactivation = false;
}
425
{
title = "Scroll Left And Up";
prefix = "";
requiresactivation = false;
}
426
{
title = "Scroll Left And Down";
prefix = "";
requiresactivation = false;
}
427
{
title = "Scroll Right And Up";
prefix = "";
requiresactivation = false;
}
428
{
title = "Scroll Right And Down";
prefix = "";
requiresactivation = false;
}
429
{
title = "Scroll Fast Lower And Middle Texture (liquid falls)";
prefix = "";
requiresactivation = false;
}
}
@ -591,30 +670,35 @@ Edge_Mirror
{
title = "Mirror, Plain";
prefix = "";
requiresactivation = false;
}
463
{
title = "Mirror, White";
prefix = "";
requiresactivation = false;
}
464
{
title = "Mirror, Blue";
prefix = "";
requiresactivation = false;
}
465
{
title = "Mirror, Red";
prefix = "";
requiresactivation = false;
}
466
{
title = "Mirror, Green";
prefix = "";
requiresactivation = false;
}
}
@ -718,30 +802,35 @@ Edge_portals
{
title = "Camera Portal, Plain";
prefix = "";
requiresactivation = false;
}
486
{
title = "Camera Portal, White";
prefix = "";
requiresactivation = false;
}
487
{
title = "Camera Portal, Cyan";
prefix = "";
requiresactivation = false;
}
488
{
title = "Camera Portal, Rusty";
prefix = "";
requiresactivation = false;
}
489
{
title = "Camera Portal, Green";
prefix = "";
requiresactivation = false;
}
}
Edge_doors
@ -896,6 +985,7 @@ Edge_doors
prefix = "S1";
}
}
Edge_HUB
{
title = "Edge: HUB Exits";
@ -1142,18 +1232,21 @@ Edge_slopes
{
title = "Detail Slope : FLOOR";
prefix = "";
requiresactivation = false;
}
568
{
title = "Detail Slope : CEILING";
prefix = "";
requiresactivation = false;
}
569
{
title = "Detail Slope : FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
}
@ -1165,109 +1258,128 @@ Edge_alignflats
{
title = "Align and rotate front sector's FLOOR";
prefix = "";
requiresactivation = false;
}
801
{
title = "Align and rotate back sector's FLOOR";
prefix = "";
requiresactivation = false;
}
802
{
title = "Align and rotate front sector's CEILING";
prefix = "";
requiresactivation = false;
}
803
{
title = "Align and rotate back sector's CEILING";
prefix = "";
requiresactivation = false;
}
804
{
title = "Align and rotate front sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
805
{
title = "Align and rotate back sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
810
{
title = "Align, scale and rotate front sector's FLOOR";
prefix = "";
requiresactivation = false;
}
811
{
title = "Align, scale and rotate back sector's FLOOR";
prefix = "";
requiresactivation = false;
}
812
{
title = "Align, scale and rotate front sector's CEILING";
prefix = "";
requiresactivation = false;
}
813
{
title = "Align, scale and rotate back sector's CEILING";
prefix = "";
requiresactivation = false;
}
814
{
title = "Align, scale and rotate front sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
815
{
title = "Align, scale and rotate back sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
820
{
title = "Scale front sector's FLOOR";
prefix = "";
requiresactivation = false;
}
821
{
title = "Scale back sector's FLOOR";
prefix = "";
requiresactivation = false;
}
822
{
title = "Scale front sector's CEILING";
prefix = "";
requiresactivation = false;
}
823
{
title = "Scale back sector's CEILING";
prefix = "";
requiresactivation = false;
}
824
{
title = "Scale front sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
825
{
title = "Scale back sector's FLOOR+CEILING";
prefix = "";
requiresactivation = false;
}
}

805
Build/Configurations/Includes/EdgeC_misc.cfg
View file

@ -1,8 +1,4 @@
// Texture loading options
mixtexturesflats = true;
defaulttexturescale = 1.0f;
defaultflatscale = 1.0f;
linedefflags
{
@ -16,8 +12,6 @@ linedefflagtooltips
}
// Linedef flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
@ -27,35 +21,6 @@ linedefflagstranslation
}
linedefflags_udmf
{
blocking = "Impassable";
blockmonsters = "Block monster";
twosided = "Doublesided";
dontpegtop = "Upper unpegged";
dontpegbottom = "Lower unpegged";
secret = "Secret";
blocksound = "Block sound";
dontdraw = "Hidden";
mapped = "Shown";
passuse = "PassThru";
}
linedefflagtooltips_udmf
{
blocking = "If set on a 2-sided linedef, the linedef blocks players and monsters from being able to move through it. \nThis is typically used for mid-textured cage bars.\nBy convention, most doom-related software sets it for 1-sided lines by default because the\nid Software maps did, but it doesn't actually do anything.";
blockmonsters = "If set, blocks only monster movement.\n(in addition to whatever existing blocking properties it would have).";
twosided = "If set, then it has 2 sidedefs and acts as a connection between two sectors.";
dontpegtop = "If set:\nIf the linedef is 2-sided, the upper texture starts at the height of the higher ceiling.\nIf not set: and the linedef is 2-sided, the upper texture starts at the lower ceiling instead.\nIf the linedef is 1-sided, this does nothing.";
dontpegbottom = "If set: If the linedef is 2-sided, the lower texture starts at the height of the higher ceiling.\nIf not set: and the linedef is 2-sided, the upper texture starts at the higher floor instead.\nIf the linedef is 1-sided, this makes the mid texture start at floor instead of the ceiling.\nYou probably want to use this for door tracks if you don't want them to move with the door.";
secret = "If set, this flag prevents it from being marked as a switch or a door on the automap.";
blocksound = "If set, this linedef will partially block monster-waking sound from passing into the sector on the other side of it.\nNote that a sound must try to pass through two of these lines before being blocked.\nThis does not block the actual audio that the player hears at all, it is only for the monster AI.\nThis does nothing for 1-sided linedefs.";
dontdraw = "If set, this line is not shown on the automap even if you are looking directly at it";
mapped = "If set, this line is always revealed on the automap even if you haven't actually visited the area.";
passuse = "Normally, if you try to pull a switch or use a door, then players are only able to activate\nthe closest linedef with a special. When PassThru is set, your use reaches\nthrough and allows players to activate both this line and whatever is behind this\nline.\nThis does nothing for 1-sided lines because they always block use actions.\n\nNote that if someone plays your map on ZDoom-derived ports like GZDoom or Zandronum,\nthen PassThru will be true for walkover specials & scrollers even when this flag\nis not set, unless you set 'compat_useblocking' in MAPINFO.";
}
thingflags
{
@ -66,35 +31,6 @@ thingflags
}
thingflags_udmf
{
skill1 = "Skill 1";
skill2 = "Skill 2";
skill3 = "Skill 3";
skill4 = "Skill 4";
skill5 = "Skill 5";
ambush = "Ambush";
single = "Singleplayer";
dm = "Deathmatch";
coop = "Cooperative";
friend = "Friendly";
}
thingflagtooltips_udmf
{
skill1 = "If set, this actor appears on 'I'm Too Young To Die' difficulty.";
skill2 = "If set, this actor appears on 'Hey, Not Too Rough' difficulty.";
skill3 = "If set, this actor appears on 'Hurt Me Plenty' difficulty.";
skill4 = "If set, this actor appears on 'Ultraviolence' difficulty.";
skill5 = "If set, this actor appears on 'Nightmare' difficulty.";
ambush = "If set, this actor does not wake up if it hears the player until the player comes within field of view\n(even if the actor is facing the away from the player).";
single = "If not set, the actor does not appear in singleplayer modes.";
dm = "If not set, the actor does not appear in deathmatch modes.";
coop = "If not set, the actor does not appear in co-op modes.";
friend = "If set, the actor is friendly to the player.\nIf it is a monster, it will attack other players.";
}
// Thing flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
@ -116,17 +52,7 @@ defaultthingflags
}
defaultthingflags_udmf
{
skill1;
skill2;
skill3;
skill4;
skill5;
single;
coop;
dm;
}
// Default sector brightness levels
@ -169,12 +95,331 @@ hires
/*
ADDITIONAL UNIVERSAL DOOM MAP FORMAT FIELD DEFINITIONS
See Documents\fielddatatypes.txt for informtion on the types.
*/
universalfields
// ***********************************************************
// * *
// * Doom map format *
// * *
// ***********************************************************
mapformat_doom
{
// The format interface handles the map data format
formatinterface = "DoomMapSetIO";
maplumpnames
{
include("Doom_misc.cfg", "doommaplumpnames");
include("Boom_misc.cfg", "boommaplumpnames");
}
// Enables support for individual offsets of upper/middle/lower sidedef textures
localsidedeftextureoffsets = false;
// Default flags for first new thing
defaultthingflags
{
include("Doom_misc.cfg", "defaultthingflags");
}
// LINEDEF FLAGS
linedefflags
{
include("Doom_misc.cfg", "linedefflags");
include("Boom_misc.cfg", "linedefflags");
}
// LINEDEF ACTIVATIONS
linedefactivations
{
}
// Linedef flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
linedefflagstranslation
{
include("Doom_misc.cfg", "linedefflagstranslation");
include("Boom_misc.cfg", "linedefflagstranslation");
}
// THING FLAGS
thingflags
{
include("Doom_misc.cfg", "thingflags");
include("Boom_misc.cfg", "thingflags");
}
// Thing flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
thingflagstranslation
{
include("Doom_misc.cfg", "thingflagstranslation");
include("Boom_misc.cfg", "thingflagstranslation");
}
// How to compare thing flags (for the stuck things error checker)
thingflagscompare
{
include("Doom_misc.cfg", "thingflagscompare");
include("Boom_misc.cfg", "thingflagscompare");
}
// Things flags masks
include("Doom_misc.cfg", "thingflagsmasks");
}
// ***********************************************************
// * *
// * Text map format *
// * *
// ***********************************************************
mapformat_udmf
{
// The format interface handles the map data format
formatinterface = "UniversalMapSetIO";
// Enables support for long (> 8 chars) texture names
// WARNING: this should only be enabled for UDMF game configurations!
// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
longtexturenames = false;
// Enables support for individual offsets of upper/middle/lower sidedef textures
localsidedeftextureoffsets = true;
// Enables setting brightness for floor, ceiling, and walls independently from each other
distinctfloorandceilingbrightness = false;
distinctwallbrightness = false;
// Enabled setting brightness for upper, middle, and lower sidedef independently from each other
distinctsidedefpartbrightness = false;
//engine = "edge-classic"; // override that so that DB2 uses the correct namespace
maplumpnames
{
include("UDMF_misc.cfg", "udmfmaplumpnames_begin");
include("UDMF_misc.cfg", "udmfmaplumpnames_end");
}
linedefflags
{
blocking = "Impassable";
blockmonsters = "Block monster";
twosided = "Doublesided";
dontpegtop = "Upper unpegged";
dontpegbottom = "Lower unpegged";
secret = "Secret";
blocksound = "Block sound";
dontdraw = "Hidden";
mapped = "Shown";
passuse = "PassThru";
blockplayers = "Block players";
blocksight = "Block monster line of sight";
}
linedefflagtooltips
{
blocking = "If set on a 2-sided linedef, the linedef blocks players and monsters from being able to move through it. \nThis is typically used for mid-textured cage bars.\nBy convention, most doom-related software sets it for 1-sided lines by default because the\nid Software maps did, but it doesn't actually do anything.";
blockmonsters = "If set, blocks only monster movement.\n(in addition to whatever existing blocking properties it would have).";
twosided = "If set, then it has 2 sidedefs and acts as a connection between two sectors.";
dontpegtop = "If set:\nIf the linedef is 2-sided, the upper texture starts at the height of the higher ceiling.\nIf not set: and the linedef is 2-sided, the upper texture starts at the lower ceiling instead.\nIf the linedef is 1-sided, this does nothing.";
dontpegbottom = "If set: If the linedef is 2-sided, the lower texture starts at the height of the higher ceiling.\nIf not set: and the linedef is 2-sided, the upper texture starts at the higher floor instead.\nIf the linedef is 1-sided, this makes the mid texture start at floor instead of the ceiling.\nYou probably want to use this for door tracks if you don't want them to move with the door.";
secret = "If set, this flag prevents it from being marked as a switch or a door on the automap.";
blocksound = "If set, this linedef will partially block monster-waking sound from passing into the sector on the other side of it.\nNote that a sound must try to pass through two of these lines before being blocked.\nThis does not block the actual audio that the player hears at all, it is only for the monster AI.\nThis does nothing for 1-sided linedefs.";
dontdraw = "If set, this line is not shown on the automap even if you are looking directly at it";
mapped = "If set, this line is always revealed on the automap even if you haven't actually visited the area.";
passuse = "Normally, if you try to pull a switch or use a door, then players are only able to activate\nthe closest linedef with a special. When PassThru is set, your use reaches\nthrough and allows players to activate both this line and whatever is behind this\nline.\nThis does nothing for 1-sided lines because they always block use actions.\n\nNote that if someone plays your map on ZDoom-derived ports like GZDoom or Zandronum,\nthen PassThru will be true for walkover specials & scrollers even when this flag\nis not set, unless you set 'compat_useblocking' in MAPINFO.";
}
thingflags
{
skill1 = "Skill 1";
skill2 = "Skill 2";
skill3 = "Skill 3";
skill4 = "Skill 4";
skill5 = "Skill 5";
ambush = "Ambush";
single = "Singleplayer";
dm = "Deathmatch";
coop = "Cooperative";
friend = "Friendly";
}
thingflagtooltips
{
skill1 = "If set, this actor appears on 'I'm Too Young To Die' difficulty.";
skill2 = "If set, this actor appears on 'Hey, Not Too Rough' difficulty.";
skill3 = "If set, this actor appears on 'Hurt Me Plenty' difficulty.";
skill4 = "If set, this actor appears on 'Ultraviolence' difficulty.";
skill5 = "If set, this actor appears on 'Nightmare' difficulty.";
ambush = "If set, this actor does not wake up if it hears the player until the player comes within field of view\n(even if the actor is facing the away from the player).";
single = "If not set, the actor does not appear in singleplayer modes.";
dm = "If not set, the actor does not appear in deathmatch modes.";
coop = "If not set, the actor does not appear in co-op modes.";
friend = "If set, the actor is friendly to the player.\nIf it is a monster, it will attack other players.";
}
// Default flags for first new thing
defaultthingflags
{
skill1;
skill2;
skill3;
skill4;
skill5;
single;
coop;
dm;
}
// Default thing filters
// (these are not required, just useful for new users)
thingsfilters
{
filter0
{
name = "Keys only";
category = "keys";
type = -1;
}
filter1
{
name = "Deathmatch";
category = "";
type = -1;
fields
{
dm = true;
}
}
filter2
{
name = "Cooperative";
category = "";
type = -1;
fields
{
coop = true;
}
}
filter3
{
name = "Skill 1";
category = "";
type = -1;
fields
{
skill1 = true;
}
}
filter4
{
name = "Skill 2";
category = "";
type = -1;
fields
{
skill2 = true;
}
}
filter5
{
name = "Skill 3";
category = "";
type = -1;
fields
{
skill3 = true;
}
}
filter6
{
name = "Skill 4";
category = "";
type = -1;
fields
{
skill4 = true;
}
}
filter7
{
name = "Skill 5";
category = "";
type = -1;
fields
{
skill5 = true;
}
}
}
// How to compare thing flags (for the stuck things error checker)
thingflagscompare
{
skills
{
skill1;
skill2;
skill3;
skill4;
skill5;
}
gamemodes
{
single { requiredgroups = "skills"; }
coop { requiredgroups = "skills"; }
dm { ignoredgroups = "skills"; }
}
}
//mxd. Thing flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
thingflagstranslation
{
include("Doom_misc.cfg", "thingflagstranslation");
}
//mxd. Linedef flags UDMF translation table
// This is needed for copy/paste and prefabs to work properly
// When the UDMF field name is prefixed with ! it is inverted
linedefflagstranslation
{
include("Doom_misc.cfg", "linedefflagstranslation");
}
universalfields
{
linedef
{
comment
@ -182,7 +427,6 @@ universalfields
type = 2;
default = "";
}
}
sidedef
@ -193,10 +437,106 @@ universalfields
default = "";
}
scalex_top
{
type = 1;
default = 1.0f;
}
scalex_mid
{
type = 1;
default = 1.0f;
}
scalex_bottom
{
type = 1;
default = 1.0f;
}
scaley_top
{
type = 1;
default = 1.0f;
}
scaley_mid
{
type = 1;
default = 1.0f;
}
scaley_bottom
{
type = 1;
default = 1.0f;
}
offsetx_top
{
type = 1;
default = 0.0f;
}
offsetx_mid
{
type = 1;
default = 0.0f;
}
offsetx_bottom
{
type = 1;
default = 0.0f;
}
offsety_top
{
type = 1;
default = 0.0f;
}
offsety_mid
{
type = 1;
default = 0.0f;
}
offsety_bottom
{
type = 1;
default = 0.0f;
}
}
thing
{
alpha
{
type = 1;
default = 1.0f;
}
health
{
type = 1;
default = 1.0f;
}
scalex
{
type = 1;
default = 1.0f;
}
scaley
{
type = 1;
default = 1.0f;
}
comment
{
type = 2;
@ -213,81 +553,94 @@ universalfields
default = "";
}
ypanningfloor
{
type = 1;
default = 0.0f;
}
ypanningceiling
{
type = 1;
default = 0.0f;
}
xpanningfloor
{
type = 1;
default = 0.0f;
}
xpanningceiling
{
type = 1;
default = 0.0f;
}
yscalefloor
{
type = 1;
default = 1.0f;
}
yscaleceiling
{
type = 1;
default = 1.0f;
}
xscalefloor
{
type = 1;
default = 1.0f;
}
xscaleceiling
{
type = 1;
default = 1.0f;
}
gravity
{
type = 1;
default = 1.0f;
}
fadecolor
{
type = 10;
default = 0;
}
fogdensity
{
type = 0;
default = 0;
}
lightcolor
{
type = 10;
default = 0;
}
rotationfloor
{
type = 1;
default = 0.0f;
}
rotationceiling
{
type = 1;
default = 0.0f;
}
}
}
}
/*
MAP LUMP NAMES
Map lumps are loaded with the map as long as they are right after each other. When the editor
meets a lump which is not defined in this list it will ignore the map if not satisfied.
The order of items defines the order in which lumps will be written to WAD file on save.
To indicate the map header lump, use ~MAP
Legenda:
required = Lump is required to exist.
blindcopy = Lump will be copied along with the map blindly. (usefull for lumps Doom Builder doesn't use)
nodebuild = The nodebuilder generates this lump.
allowempty = The nodebuilder is allowed to leave this lump empty.
script = This lump is a text-based script. Specify the filename of the script configuration to use.
*/
doommaplumpnames
{
REJECT
{
allowempty = true;
}
}
udmfmaplumpnames
{
BEHAVIOR
{
required = false;
nodebuild = false;
blindcopy = true;
}
DIALOGUE
{
required = false;
nodebuild = false;
script = "ZDoom_USDF.cfg";
}
ZNODES
{
required = false;
nodebuild = true;
allowempty = false;
}
BLOCKMAP
{
required = false;
nodebuild = true;
allowempty = true;
}
REJECT
{
required = false;
nodebuild = true;
allowempty = true;
}
SCRIPTS
{
required = false;
nodebuild = false;
script = "ZDoom_ACS.cfg";
}
}
enums
{
frontback
@ -488,149 +841,3 @@ enums
}
}
// Default thing filters
// (these are not required, just usefull for new users)
thingsfilters_udmf
{
filter0
{
name = "Keys only";
category = "keys";
type = -1;
}
filter2
{
name = "Skill 1";
category = "";
type = -1;
fields
{
skill1 = true;
}
}
filter3
{
name = "Skill 2";
category = "";
type = -1;
fields
{
skill2 = true;
}
}
filter4
{
name = "Skill 3";
category = "";
type = -1;
fields
{
skill3 = true;
}
}
filter5
{
name = "Skill 4";
category = "";
type = -1;
fields
{
skill4 = true;
}
}
/*
filter6
{
name = "Skill 5";
category = "";
type = -1;
fields
{
skill5 = true;
}
}
filter7
{
name = "Skill 6";
category = "";
type = -1;
fields
{
skill6 = true;
}
}
filter8
{
name = "Skill 7";
category = "";
type = -1;
fields
{
skill7 = true;
}
}
filter9
{
name = "Skill 8";
category = "";
type = -1;
fields
{
skill8 = true;
}
}
*/
}
// How thing flags should be compared (for the stuck thing error check)
thingflagscompare_udmf
{
skills {
skill6;
skill7;
skill8;
}
classes {
class4;
class5;
class6;
class7;
class8;
}
}

45
Build/Configurations/Includes/EdgeC_sectors.cfg
View file

@ -60,4 +60,49 @@
4474 = "Yellow Hue";
4475 = "Purple Hue";
4476 = "Grey Hue";
4480 = "EDGE fog: White 5%";
4481 = "EDGE fog: White 10%";
4482 = "EDGE fog: White 15%";
4483 = "EDGE fog: White 20%";
4484 = "EDGE fog: White 25%";
4485 = "EDGE fog: White 30%";
4486 = "EDGE fog: White 35%";
4487 = "EDGE fog: White 40%";
4488 = "EDGE fog: White 45%";
4489 = "EDGE fog: White 50%";
4490 = "EDGE fog: Green 5%";
4491 = "EDGE fog: Green 10%";
4492 = "EDGE fog: Green 15%";
4493 = "EDGE fog: Green 20%";
4494 = "EDGE fog: Green 25%";
4495 = "EDGE fog: Green 30%";
4496 = "EDGE fog: Green 35%";
4497 = "EDGE fog: Green 40%";
4498 = "EDGE fog: Green 45%";
4499 = "EDGE fog: Green 50%";
4500 = "EDGE fog: Red 5%";
4501 = "EDGE fog: Red 10%";
4502 = "EDGE fog: Red 15%";
4503 = "EDGE fog: Red 20%";
4504 = "EDGE fog: Red 25%";
4505 = "EDGE fog: Red 30%";
4506 = "EDGE fog: Red 35%";
4507 = "EDGE fog: Red 40%";
4508 = "EDGE fog: Red 45%";
4509 = "EDGE fog: Red 50%";
4510 = "EDGE fog: Blue 5%";
4511 = "EDGE fog: Blue 10%";
4512 = "EDGE fog: Blue 15%";
4513 = "EDGE fog: Blue 20%";
4514 = "EDGE fog: Blue 25%";
4515 = "EDGE fog: Blue 30%";
4516 = "EDGE fog: Blue 35%";
4517 = "EDGE fog: Blue 40%";
4518 = "EDGE fog: Blue 45%";
4519 = "EDGE fog: Blue 50%";
4530 = "EDGE Friction: Slippy";
4531 = "EDGE Friction: Very Slippy";
4532 = "EDGE Viscosity: Sticky";
4533 = "EDGE Viscosity: Very Sticky";

75
Build/Configurations/Includes/EdgeC_things.cfg
View file

@ -4,7 +4,7 @@ EDGE_monsters
{
color = 12; // Light Red
arrow = 1;
title = "Edge: Monsters";
title = "EDGE: Monsters";
width = 20;
sort = 1;
height = 56;
@ -145,37 +145,61 @@ edge_powerups
edge_glowlights
{
color = 9; // Light Blue
color = 11; // Light Cyan
arrow = 0;
title = "EDGE: Sector Light FX";
sprite = "internal:light";
width = 20;
height = 20;
width = 16;
height = 16;
hangs = 0;
blocking = 0;
7041
{
title = "EDGE Nukage Glow";
height = 32;
title = "EDGE Nukage Glow: Floor";
color = 10; // Light Green
}
7042
{
title = "EDGE Lava Glow";
height = 32;
title = "EDGE Lava Glow: Floor";
color = 12; // Light Red
}
7043
{
title = "EDGE Water Glow";
height = 32;
title = "EDGE Water Glow: Floor";
color = 9; // Light Blue
}
7070
{
title = "EDGE Nukage Glow: Wall";
color = 10; // Light Green
}
7071
{
title = "EDGE Lava Glow: Wall";
color = 12; // Light Red
}
7072
{
title = "EDGE Water Glow: Wall";
color = 9; // Light Blue
}
7073
{
title = "EDGE White Glow: Wall";
color = 15; // White
}
}
edge_lights
{
color = 9; // Light Blue
color = 11; // Light Cyan
arrow = 0;
title = "EDGE: Lights";
sprite = "internal:light";
@ -188,42 +212,42 @@ edge_lights
{
title = "White light: Floor";
height = 32;
color = 15;
color = 15; // White
}
7045
{
title = "Yellow light: Floor";
height = 32;
color = 15;
color = 14; // Yellow
}
7046
{
title = "Red light: Floor";
height = 32;
color = 15;
color = 12; // Light Red
}
7047
{
title = "Blue light: Floor";
height = 32;
color = 15;
color = 9; // Light Blue
}
7048
{
title = "Green light: Floor";
height = 32;
color = 15;
color = 10; // Light Green
}
7049
{
title = "Orange light: Floor";
height = 32;
color = 15;
color = 17; //Orange
}
7054
@ -231,7 +255,7 @@ edge_lights
title = "White light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 15; // White
}
7055
@ -239,7 +263,7 @@ edge_lights
title = "Yellow light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 14; // Yellow
}
7056
@ -247,7 +271,7 @@ edge_lights
title = "Red light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 12; // Light Red
}
7057
@ -255,7 +279,7 @@ edge_lights
title = "Blue light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 9; // Light Blue
}
7058
@ -263,7 +287,7 @@ edge_lights
title = "Green light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 10; // Light Green
}
7059
@ -271,7 +295,7 @@ edge_lights
title = "Orange light: Ceiling";
height = 16;
hangs = 1;
color = 15;
color = 17; //Orange
}
}
@ -293,11 +317,13 @@ edge_keys
{
title = "Green keycard";
sprite = "BKEYA0";
color = 10; // Light Green
}
7017
{
title = "Green skullkey";
sprite = "BSKUB0";
color = 10; // Light Green
}
}
@ -316,16 +342,19 @@ edge_armour
{
title = "Purple armor";
sprite = "ARM1A0";
color = 13;
}
7032
{
title = "Yellow armor";
sprite = "ARM2A0";
color = 14; // Yellow
}
7033
{
title = "Red armor";
sprite = "ARM2A0";
color = 12; // Light Red
}
}

6
Build/Configurations/Includes/Eternity_common.cfg
View file

@ -388,12 +388,6 @@ mapformat_udmf
include("Eternity_misc.cfg", "thingflags_udmf");
}
// THING RENSERSTYLES
thingrenderstyles
{
include("UDMF_misc.cfg", "thingrenderstyles");
}
// How to compare thing flags (for the stuck things error checker)
thingflagscompare
{

248
Build/Configurations/Includes/Eternity_misc.cfg
View file

@ -55,16 +55,30 @@ universalfields
type = 2;
default = "";
}
/* FIXME: should I add renderstyle and alpha? */
renderstyle
{
type = 2;
default = "";
}
alpha
{
type = 1;
default = 1.0;
}
tranmap
{
type = 2;
default = "";
managed = false;
}
portal
{
type = 0;
default = 0;
managed = false;
}
}
@ -76,40 +90,16 @@ universalfields
default = "";
}
offsetx_top
light
{
type = 1;
default = 0.0;
type = 0;
default = 0;
}
offsety_bottom
lightabsolute
{
type = 1;
default = 0.0;
}
offsetx_bottom
{
type = 1;
default = 0.0;
}
offsetx_mid
{
type = 1;
default = 0.0;
}
offsety_top
{
type = 1;
default = 0.0;
}
offsety_mid
{
type = 1;
default = 0.0;
type = 3;
default = false;
}
light_top
@ -153,6 +143,7 @@ universalfields
type = 16;
enum = "skew_type";
default = "none";
managed = false;
}
skew_middle_type
@ -160,6 +151,7 @@ universalfields
type = 16;
enum = "skew_type";
default = "none";
managed = false;
}
skew_bottom_type
@ -167,6 +159,43 @@ universalfields
type = 16;
enum = "skew_type";
default = "none";
managed = false;
}
offsetx_bottom
{
type = 1;
default = 0.0;
}
offsetx_mid
{
type = 1;
default = 0.0;
}
offsetx_top
{
type = 1;
default = 0.0;
}
offsety_bottom
{
type = 1;
default = 0.0;
}
offsety_mid
{
type = 1;
default = 0.0;
}
offsety_top
{
type = 1;
default = 0.0;
}
}
@ -177,6 +206,12 @@ universalfields
type = 2;
default = "";
}
health
{
type = 1;
default = 1.0;
}
}
sector
@ -186,48 +221,133 @@ universalfields
type = 2;
default = "";
}
friction
{
type = 0;
default = -1;
}
/* FIXME: should I add damagetype? Or lightfloor, lightceiling,
floorterain, ceilingterrain, floor/ceiling panning/rotation */
ceilingterrain
{
type = 2;
default = "";
}
floorterrain
{
type = 2;
default = "";
}
soundsequence
{
type = 2;
default = "";
}
lightceiling
{
type = 0;
default = 0;
}
lightceilingabsolute
{
type = 3;
default = false;
}
lightfloor
{
type = 0;
default = 0;
}
lightfloorabsolute
{
type = 3;
default = false;
}
rotationfloor
{
type = 1;
default = 0.0;
}
rotationceiling
{
type = 1;
default = 0.0;
}
damagetype
{
type = 2;
default = "";
}
damageamount
{
type = 0;
default = 0;
}
damageinterval
{
type = 0;
default = 32;
}
leakiness
{
type = 0;
default = 0;
}
colormaptop
{
type = 2;
default = "@default";
}
colormapmid
{
type = 2;
default = "@default";
}
colormapbottom
{
type = 2;
default = "@default";
}
portal_ceil_overlaytype
{
type = 2;
default = "none";
}
alphaceiling
{
type = 1;
default = 1;
default = 1.0;
}
portal_floor_overlaytype
{
type = 2;
default = "none";
}
alphafloor
{
type = 1;
default = 1;
default = 1.0;
}
portalfloor
{
type = 0;
@ -251,6 +371,7 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
}
}
}
portalceiling
{
type = 0;
@ -294,6 +415,7 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
}
}
}
ceilingid
{
type = 0;
@ -315,6 +437,7 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
}
}
}
attachfloor
{
type = 0;
@ -350,6 +473,7 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
}
}
}
attachceiling
{
type = 0;
@ -385,28 +509,34 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
}
}
}
scroll_ceil_x
{
type = 1;
}
scroll_ceil_y
{
type = 1;
}
scroll_ceil_type
{
type = 2;
default = "none";
tooltip = "Available options: none, visual. Controls whether to scroll the texture. Currently thing transporting is not supported for ceiling scrollers.";
}
scroll_floor_x
{
type = 1;
}
scroll_floor_y
{
type = 1;
}
scroll_floor_type
{
type = 2;
@ -414,6 +544,54 @@ floorterain, ceilingterrain, floor/ceiling panning/rotation */
tooltip = "Available options: none, visual, physical or both. Controls whether to scroll the texture and/or transport the things";
}
xpanningceiling
{
type = 1;
default = 0.0;
}
ypanningceiling
{
type = 1;
default = 0.0;
}
xscaleceiling
{
type = 1;
default = 1.0;
}
yscaleceiling
{
type = 1;
default = 1.0;
}
xpanningfloor
{
type = 1;
default = 0.0;
}
xpanningfloor
{
type = 1;
default = 0.0;
}
xscalefloor
{
type = 1;
default = 1.0;
}
yscalefloor
{
type = 1;
default = 1.0;
}
}
}

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

@ -298,38 +298,18 @@ universalfields
{
linedef
{
comment
alpha
{
type = 1;
default = 1.0;
}
arg0str
{
type = 2;
default = "";
}
health
{
type = 0;
default = 0;
}
healthgroup
{
type = 0;
default = 0;
}
// Should be moved to flags eventually
damagespecial
{
type = 3;
default = false;
}
// Should be moved to flags eventually
deathspecial
{
type = 3;
default = false;
}
automapstyle
{
type = 11;
@ -351,18 +331,43 @@ universalfields
12 = "Unexplored secret wall";
13 = "Portal line";
}
managed = false;
}
arg0str
comment
{
type = 2;
default = "";
}
alpha
// Should be moved to flags eventually
damagespecial
{
type = 1;
default = 1.0;
type = 3;
default = false;
managed = false;
}
// Should be moved to flags eventually
deathspecial
{
type = 3;
default = false;
managed = false;
}
health
{
type = 0;
default = 0;
managed = false;
}
healthgroup
{
type = 0;
default = 0;
managed = false;
}
locknumber
@ -381,24 +386,34 @@ universalfields
{
type = 0;
default = 0;
managed = false;
}
lm_sampledist_top
{
type = 0;
default = 0;
managed = false;
}
lm_sampledist_mid
{
type = 0;
default = 0;
managed = false;
}
lm_sampledist_bot
{
type = 0;
default = 0;
managed = false;
}
renderstyle
{
type = 2;
default = "";
}
}
@ -410,88 +425,16 @@ universalfields
default = "";
}
scalex_mid
{
type = 1;
default = 1.0;
}
lightabsolute
{
type = 3;
default = false;
}
offsetx_top
{
type = 1;
default = 0.0;
}
scalex_bottom
{
type = 1;
default = 1.0;
}
offsety_bottom
{
type = 1;
default = 0.0;
}
offsetx_bottom
{
type = 1;
default = 0.0;
}
scaley_bottom
{
type = 1;
default = 1.0;
}
light
{
type = 0;
default = 0;
}
offsetx_mid
lightabsolute
{
type = 1;
default = 0.0;
}
offsety_top
{
type = 1;
default = 0.0;
}
scaley_top
{
type = 1;
default = 1.0;
}
scaley_mid
{
type = 1;
default = 1.0;
}
offsety_mid
{
type = 1;
default = 0.0;
}
scalex_top
{
type = 1;
default = 1.0;
type = 3;
default = false;
}
light_top
@ -530,6 +473,78 @@ universalfields
default = false;
}
offsetx_bottom
{
type = 1;
default = 0.0;
}
offsetx_mid
{
type = 1;
default = 0.0;
}
offsetx_top
{
type = 1;
default = 0.0;
}
offsety_bottom
{
type = 1;
default = 0.0;
}
offsety_mid
{
type = 1;
default = 0.0;
}
offsety_top
{
type = 1;
default = 0.0;
}
scalex_bottom
{
type = 1;
default = 1.0;
}
scalex_mid
{
type = 1;
default = 1.0;
}
scalex_top
{
type = 1;
default = 1.0;
}
scaley_bottom
{
type = 1;
default = 1.0;
}
scaley_mid
{
type = 1;
default = 1.0;
}
scaley_top
{
type = 1;
default = 1.0;
}
lm_sampledist
{
type = 0;
@ -557,16 +572,194 @@ universalfields
thing
{
alpha
{
type = 1;
default = 1.0;
}
arg0str
{
type = 2;
default = "";
}
class6
{
type = 3;
default = false;
managed = false;
}
class7
{
type = 3;
default = false;
managed = false;
}
class8
{
type = 3;
default = false;
managed = false;
}
class9
{
type = 3;
default = false;
managed = false;
}
class10
{
type = 3;
default = false;
managed = false;
}
class11
{
type = 3;
default = false;
managed = false;
}
class12
{
type = 3;
default = false;
managed = false;
}
class13
{
type = 3;
default = false;
managed = false;
}
class14
{
type = 3;
default = false;
managed = false;
}
class15
{
type = 3;
default = false;
managed = false;
}
class16
{
type = 3;
default = false;
managed = false;
}
comment
{
type = 2;
default = "";
}
conversation
{
type = 0;
default = 0;
}
fillcolor
{
type = 0;
default = 0;
}
floatbobphase
{
type = 0;
default = -1;
}
gravity
{
type = 1;
default = 0.0;
}
health
{
type = 1;
default = 1.0;
}
lm_gridsize
{
type = 1;
default = 32.0;
thingtypespecific = true;
managed = false;
}
lm_sampledistance
{
type = 0;
default = 8;
thingtypespecific = true;
managed = false;
}
lm_suncolor
{
type = 10;
default = 16777215;
thingtypespecific = true;
managed = false;
}
pitch
{
type = 0;
}
renderstyle
{
type = 2;
default = "";
}
roll
{
type = 0;
}
scalex
{
type = 1;
default = 1.0;
}
scaley
{
type = 1;
default = 1.0;
}
score
{
type = 0;
default = 0;
}
skill6
{
type = 3;
default = false;
}
skill7
@ -585,194 +778,56 @@ universalfields
{
type = 3;
default = false;
managed = false;
}
skill10
{
type = 3;
default = false;
managed = false;
}
skill11
{
type = 3;
default = false;
managed = false;
}
skill12
{
type = 3;
default = false;
managed = false;
}
skill13
{
type = 3;
default = false;
managed = false;
}
skill14
{
type = 3;
default = false;
managed = false;
}
skill15
{
type = 3;
default = false;
managed = false;
}
skill16
{
type = 3;
default = false;
}
class6
{
type = 3;
default = false;
}
class7
{
type = 3;
default = false;
}
class8
{
type = 3;
default = false;
}
class9
{
type = 3;
default = false;
}
class10
{
type = 3;
default = false;
}
class11
{
type = 3;
default = false;
}
class12
{
type = 3;
default = false;
}
class13
{
type = 3;
default = false;
}
class14
{
type = 3;
default = false;
}
class15
{
type = 3;
default = false;
}
class16
{
type = 3;
default = false;
}
score
{
type = 0;
default = 0;
}
renderstyle
{
type = 2;
default = "";
}
gravity
{
type = 1;
default = 0.0;
}
floatbobphase
{
type = 0;
default = -1;
}
alpha
{
type = 1;
default = 1.0;
}
health
{
type = 1;
default = 1.0;
}
arg0str
{
type = 2;
default = "";
}
fillcolor
{
type = 0;
default = 0;
}
conversation
{
type = 0;
default = 0;
}
scalex
{
type = 1;
default = 1.0;
}
scaley
{
type = 1;
default = 1.0;
}
lm_suncolor
{
type = 10;
default = 16777215;
thingtypespecific = true;
}
lm_sampledist
{
type = 0;
default = 16;
thingtypespecific = true;
managed = false;
}
}
@ -788,6 +843,7 @@ universalfields
{
type = 0;
default = 0;
managed = false;
}
healthceiling

1
Source/Core/Builder.csproj
View file

@ -1483,7 +1483,6 @@
<None Include="Resources\PuzzlePiece.png" />
<None Include="Resources\Search.png" />
<None Include="Resources\SnapVerts.png" />
<EmbeddedResource Include="Resources\UDMF_UI.cfg" />
<None Include="Resources\Unlink.png" />
<None Include="Resources\Unpin.png" />
<None Include="Resources\Pin.png" />

1
Source/Core/BuilderMono.csproj
View file

@ -1461,7 +1461,6 @@
<None Include="Resources\PuzzlePiece.png" />
<None Include="Resources\Search.png" />
<None Include="Resources\SnapVerts.png" />
<EmbeddedResource Include="Resources\UDMF_UI.cfg" />
<None Include="Resources\Unlink.png" />
<None Include="Resources\Unpin.png" />
<None Include="Resources\Pin.png" />

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

@ -1434,6 +1434,57 @@ namespace CodeImp.DoomBuilder.Config
return supported;
}
/// <summary>
/// Checks if a MapElement type has a UDMF field or flag defined.
/// </summary>
/// <typeparam name="T">Type inherited from MapElement</typeparam>
/// <param name="name">Name of the UDMF field or flag</param>
/// <returns>true if the field or flag exists, false if it doesn't</returns>
public bool HasUniversalFieldOrFlag<T>(string name) where T : MapElement
{
Type type = typeof(T);
List<UniversalFieldInfo> ufi;
Dictionary<string, string> flags;
if (type == typeof(Thing))
{
ufi = thingfields;
flags = thingflags;
}
else if (type == typeof(Linedef))
{
ufi = linedeffields;
flags = linedefflags;
}
else if (type == typeof(Sidedef))
{
ufi = sidedeffields;
flags = sidedefflags;
}
else if (type == typeof(Sector))
{
ufi = sectorfields;
flags = sectorflags;
}
else if (type == typeof(Vertex))
{
ufi = vertexfields;
flags = new Dictionary<string, string>(); // Vertices don't have flags
}
else
throw new NotSupportedException("Unsupported MapElement type: " + type.Name);
// Check for regular UDMF fields
if (ufi.Where(f => f.Name == name).FirstOrDefault() != null)
return true;
// Check for flags
if (flags.ContainsKey(name))
return true;
return false;
}
#endregion
}
}

3
Source/Core/Config/UniversalFieldInfo.cs
View file

@ -61,6 +61,7 @@ namespace CodeImp.DoomBuilder.Config
private int type;
private object defaultvalue;
private bool thingtypespecific;
private bool managed;
private EnumList enumlist;
private Dictionary<string, UDMFFieldAssociation> associations;
@ -72,6 +73,7 @@ namespace CodeImp.DoomBuilder.Config
public int Type { get { return type; } }
public object Default { get { return defaultvalue; } }
public bool ThingTypeSpecific { get { return thingtypespecific; } }
public bool Managed { get { return managed; } }
public EnumList Enum { get { return enumlist; } }
public Dictionary<string, UDMFFieldAssociation> Associations { get { return associations; } }
@ -92,6 +94,7 @@ namespace CodeImp.DoomBuilder.Config
type = cfg.ReadSetting(setting + ".type", int.MinValue);
defaultvalue = cfg.ReadSettingObject(setting + ".default", null);
thingtypespecific = cfg.ReadSetting(setting + ".thingtypespecific", false);
managed = cfg.ReadSetting(setting + ".managed", true);
// Read enum
object enumsetting = cfg.ReadSettingObject(setting + ".enum", null);

4
Source/Core/Controls/FieldsEditorControl.cs
View file

@ -130,7 +130,9 @@ namespace CodeImp.DoomBuilder.Controls
// Add all fields
foreach(UniversalFieldInfo uf in list)
{
if(uifields.ContainsKey(uf.Name)) continue; //mxd
//if(uifields.ContainsKey(uf.Name)) continue; //mxd
// Only add fields that are not managed by the UI
if(!uf.Managed)
fieldslist.Rows.Add(new FieldsEditorRow(fieldslist, uf));
}

8
Source/Core/Controls/SidedefPartLightControl.cs
View file

@ -138,14 +138,6 @@ namespace CodeImp.DoomBuilder.Controls
{
reset.Visible = (cbAbsolute.CheckState != CheckState.Unchecked || light.GetResult(0) != 0);
if (!General.Map.Config.DistinctSidedefPartBrightness)
{
lbLight.Enabled = false;
light.Enabled = false;
cbAbsolute.Enabled = false;
reset.Enabled = false;
}
preventchanges = false;
}

60
Source/Core/IO/UniversalMapSetIO.cs
View file

@ -23,6 +23,8 @@ using System.IO;
using CodeImp.DoomBuilder.Map;
using System.Collections;
using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.Config;
using System.Linq;
#endregion
@ -30,13 +32,6 @@ namespace CodeImp.DoomBuilder.IO
{
internal class UniversalMapSetIO : MapSetIO
{
#region ================== Constants
// Name of the UDMF configuration file
private const string UDMF_UI_CONFIG_NAME = "UDMF_UI.cfg";
#endregion
#region ================== Constructor / Disposer
// Constructor
@ -44,48 +39,19 @@ namespace CodeImp.DoomBuilder.IO
{
if((manager != null) && (manager.Config != null))
{
// Make configuration
Configuration config = new Configuration();
//mxd. Find a resource named UDMF_UI.cfg
string[] resnames = General.ThisAssembly.GetManifestResourceNames();
foreach(string rn in resnames)
// Build the dictionary of UDMF fields that are managed by the UI and should not be shown in the custom UDMF field dialog
foreach ((MapElementType type, List<UniversalFieldInfo> data) in new[] {
(MapElementType.LINEDEF, General.Map.Config.LinedefFields),
(MapElementType.SECTOR, General.Map.Config.SectorFields),
(MapElementType.SIDEDEF, General.Map.Config.SidedefFields),
(MapElementType.THING, General.Map.Config.ThingFields),
(MapElementType.VERTEX, General.Map.Config.VertexFields)
})
{
// Found it?
if(rn.EndsWith(UDMF_UI_CONFIG_NAME, StringComparison.OrdinalIgnoreCase))
{
// Get a stream from the resource
Stream udmfcfg = General.ThisAssembly.GetManifestResourceStream(rn);
StreamReader udmfcfgreader = new StreamReader(udmfcfg, Encoding.ASCII);
uifields[type] = new Dictionary<string, UniversalType>(StringComparer.Ordinal);
// Load configuration from stream
config.InputConfiguration(udmfcfgreader.ReadToEnd());
Dictionary<string, MapElementType> elements = new Dictionary<string, MapElementType>
{
{ "vertex", MapElementType.VERTEX },
{ "linedef", MapElementType.LINEDEF },
{ "sidedef", MapElementType.SIDEDEF },
{ "sector", MapElementType.SECTOR },
{ "thing", MapElementType.THING }
};
foreach(KeyValuePair<string, MapElementType> group in elements)
{
IDictionary dic = config.ReadSetting("uifields." + group.Key, new Hashtable());
Dictionary<string, UniversalType> values = new Dictionary<string, UniversalType>(StringComparer.Ordinal);
foreach(DictionaryEntry de in dic)
{
values.Add(de.Key.ToString(), (UniversalType)de.Value);
}
uifields.Add(group.Value, values);
}
// Done
udmfcfgreader.Dispose();
break;
}
foreach (UniversalFieldInfo ufi in data.Where(o => o.Managed))
uifields[type].Add(ufi.Name, (UniversalType)ufi.Type);
}
}
}

118
Source/Core/Resources/UDMF_UI.cfg
View file

@ -1,118 +0,0 @@
/********************************************************************\
Configuration for UDMF map reader/writer (UniversalMapSetIO)
\********************************************************************/
//mxd. These are the fields, which are managed by GZDoom Builder's UI, but are still stored as UniversalFields. Values are UniversalType. I should turn all of these into properties one day. But not today.
uifields
{
linedef
{
alpha = 1;
renderstyle = 2;
arg0str = 2;
locknumber = 0;
comment = 2;
stringarg0 = 2;
stringarg1 = 2;
executordelay = 0;
}
sidedef
{
scalex_top = 1;
scaley_top = 1;
scalex_mid = 1;
scaley_mid = 1;
scalex_bottom = 1;
scaley_bottom = 1;
offsetx_top = 1;
offsety_top = 1;
offsetx_mid = 1;
offsety_mid = 1;
offsetx_bottom = 1;
offsety_bottom = 1;
light = 0;
lightabsolute = 3;
light_top = 0;
lightabsolute_top = 3;
light_mid = 0;
lightabsolute_mid = 3;
light_bottom = 0;
lightabsolute_bottom = 3;
repeatcnt = 0;
}
sector
{
xpanningfloor = 1;
ypanningfloor = 1;
xpanningceiling = 1;
ypanningceiling = 1;
xscalefloor = 1;
yscalefloor = 1;
xscaleceiling = 1;
yscaleceiling = 1;
rotationfloor = 1;
rotationceiling = 1;
lightfloor = 0;
lightfloorabsolute = 3;
lightceiling = 0;
lightceilingabsolute = 3;
alphafloor = 1;
alphaceiling = 1;
renderstylefloor = 2;
renderstyleceiling = 2;
gravity = 1;
lightcolor = 0;
fadecolor = 0;
desaturation = 1;
soundsequence = 2;
comment = 2;
damageamount = 0;
damagetype = 2;
damageinterval = 0;
leakiness = 0;
floorterrain = 2;
ceilingterrain = 2;
portal_ceil_overlaytype = 2;
portal_floor_overlaytype = 2;
floor_reflect = 1;
ceiling_reflect = 1;
floorglowcolor = 0;
floorglowheight = 1;
ceilingglowcolor = 0;
ceilingglowheight = 1;
fogdensity = 0;
color_ceiling = 0;
color_walltop = 0;
color_sprites = 0;
color_wallbottom = 0;
color_floor = 0;
lightalpha = 0;
fadealpha = 0;
fadestart = 0;
fadeend = 0;
triggertag = 15;
triggerer = 2;
friction = 1;
}
thing
{
arg0str = 2;
conversation = 0;
gravity = 1;
health = 1;
fillcolor = 0;
alpha = 1;
score = 0;
renderstyle = 2;
floatbobphase = 0;
comment = 2;
scalex = 1;
scaley = 1;
scale = 1;
stringarg0 = 2;
stringarg1 = 2;
}
}

33
Source/Core/Windows/LinedefEditFormUDMF.Designer.cs generated
View file

@ -193,6 +193,7 @@ namespace CodeImp.DoomBuilder.Windows
label6.Name = "label6";
label6.Size = new System.Drawing.Size(37, 13);
label6.TabIndex = 17;
label6.Tag = "alpha";
label6.Text = "Alpha:";
//
// labelrenderstyle
@ -202,6 +203,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelrenderstyle.Name = "labelrenderstyle";
this.labelrenderstyle.Size = new System.Drawing.Size(69, 13);
this.labelrenderstyle.TabIndex = 11;
this.labelrenderstyle.Tag = "renderstyle";
this.labelrenderstyle.Text = "Render style:";
//
// labellockpick
@ -211,6 +213,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labellockpick.Name = "labellockpick";
this.labellockpick.Size = new System.Drawing.Size(72, 13);
this.labellockpick.TabIndex = 15;
this.labellockpick.Tag = "locknumber";
this.labellockpick.Text = "Lock number:";
//
// labelLightFront
@ -219,7 +222,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelLightFront.Name = "labelLightFront";
this.labelLightFront.Size = new System.Drawing.Size(80, 14);
this.labelLightFront.TabIndex = 25;
this.labelLightFront.Tag = "";
this.labelLightFront.Tag = "light";
this.labelLightFront.Text = "Brightness:";
this.labelLightFront.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -402,6 +405,7 @@ namespace CodeImp.DoomBuilder.Windows
this.resetalpha.Name = "resetalpha";
this.resetalpha.Size = new System.Drawing.Size(23, 23);
this.resetalpha.TabIndex = 70;
this.resetalpha.Tag = "alpha";
this.tooltip.SetToolTip(this.resetalpha, "Reset");
this.resetalpha.UseVisualStyleBackColor = true;
this.resetalpha.Click += new System.EventHandler(this.resetalpha_Click);
@ -413,6 +417,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lockpick.Name = "lockpick";
this.lockpick.Size = new System.Drawing.Size(115, 21);
this.lockpick.TabIndex = 19;
this.lockpick.Tag = "locknumber";
//
// alpha
//
@ -431,6 +436,7 @@ namespace CodeImp.DoomBuilder.Windows
this.alpha.Size = new System.Drawing.Size(65, 24);
this.alpha.StepValues = null;
this.alpha.TabIndex = 18;
this.alpha.Tag = "alpha";
this.alpha.WhenTextChanged += new System.EventHandler(this.alpha_WhenTextChanged);
//
// renderStyle
@ -441,6 +447,7 @@ namespace CodeImp.DoomBuilder.Windows
this.renderStyle.Name = "renderStyle";
this.renderStyle.Size = new System.Drawing.Size(86, 21);
this.renderStyle.TabIndex = 12;
this.renderStyle.Tag = "renderstyle";
this.renderStyle.SelectedIndexChanged += new System.EventHandler(this.cbRenderStyle_SelectedIndexChanged);
//
// activationGroup
@ -576,7 +583,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontScaleBottom.Name = "labelFrontScaleBottom";
this.labelFrontScaleBottom.Size = new System.Drawing.Size(80, 14);
this.labelFrontScaleBottom.TabIndex = 42;
this.labelFrontScaleBottom.Tag = "";
this.labelFrontScaleBottom.Tag = "scalex_bottom";
this.labelFrontScaleBottom.Text = "Lower scale:";
this.labelFrontScaleBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -586,7 +593,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontScaleMid.Name = "labelFrontScaleMid";
this.labelFrontScaleMid.Size = new System.Drawing.Size(80, 14);
this.labelFrontScaleMid.TabIndex = 41;
this.labelFrontScaleMid.Tag = "";
this.labelFrontScaleMid.Tag = "scalex_mid";
this.labelFrontScaleMid.Text = "Middle scale:";
this.labelFrontScaleMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -596,7 +603,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontScaleTop.Name = "labelFrontScaleTop";
this.labelFrontScaleTop.Size = new System.Drawing.Size(80, 14);
this.labelFrontScaleTop.TabIndex = 28;
this.labelFrontScaleTop.Tag = "";
this.labelFrontScaleTop.Tag = "scalex_top";
this.labelFrontScaleTop.Text = "Upper scale:";
this.labelFrontScaleTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -617,6 +624,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleTop.Name = "pfcFrontScaleTop";
this.pfcFrontScaleTop.Size = new System.Drawing.Size(186, 26);
this.pfcFrontScaleTop.TabIndex = 38;
this.pfcFrontScaleTop.Tag = "scalex_top";
this.pfcFrontScaleTop.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleTop_OnValuesChanged);
//
// pfcFrontScaleBottom
@ -636,6 +644,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleBottom.Name = "pfcFrontScaleBottom";
this.pfcFrontScaleBottom.Size = new System.Drawing.Size(186, 26);
this.pfcFrontScaleBottom.TabIndex = 40;
this.pfcFrontScaleBottom.Tag = "scalex_bottom";
this.pfcFrontScaleBottom.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleBottom_OnValuesChanged);
//
// pfcFrontScaleMid
@ -655,6 +664,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontScaleMid.Name = "pfcFrontScaleMid";
this.pfcFrontScaleMid.Size = new System.Drawing.Size(186, 26);
this.pfcFrontScaleMid.TabIndex = 39;
this.pfcFrontScaleMid.Tag = "scalex_mid";
this.pfcFrontScaleMid.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleMid_OnValuesChanged);
//
// groupBox6
@ -690,7 +700,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontOffsetBottom.Name = "labelFrontOffsetBottom";
this.labelFrontOffsetBottom.Size = new System.Drawing.Size(80, 14);
this.labelFrontOffsetBottom.TabIndex = 45;
this.labelFrontOffsetBottom.Tag = "";
this.labelFrontOffsetBottom.Tag = "offsetx_bottom";
this.labelFrontOffsetBottom.Text = "Lower offset:";
this.labelFrontOffsetBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -713,7 +723,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontOffsetMid.Name = "labelFrontOffsetMid";
this.labelFrontOffsetMid.Size = new System.Drawing.Size(80, 14);
this.labelFrontOffsetMid.TabIndex = 44;
this.labelFrontOffsetMid.Tag = "";
this.labelFrontOffsetMid.Tag = "offsetx_mid";
this.labelFrontOffsetMid.Text = "Middle offset:";
this.labelFrontOffsetMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -734,6 +744,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontOffsetTop.Name = "pfcFrontOffsetTop";
this.pfcFrontOffsetTop.Size = new System.Drawing.Size(186, 26);
this.pfcFrontOffsetTop.TabIndex = 35;
this.pfcFrontOffsetTop.Tag = "offsetx_top";
this.pfcFrontOffsetTop.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetTop_OnValuesChanged);
//
// labelFrontOffsetTop
@ -742,7 +753,7 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontOffsetTop.Name = "labelFrontOffsetTop";
this.labelFrontOffsetTop.Size = new System.Drawing.Size(80, 14);
this.labelFrontOffsetTop.TabIndex = 43;
this.labelFrontOffsetTop.Tag = "";
this.labelFrontOffsetTop.Tag = "offsetx_top";
this.labelFrontOffsetTop.Text = "Upper offset:";
this.labelFrontOffsetTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -763,6 +774,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontOffsetMid.Name = "pfcFrontOffsetMid";
this.pfcFrontOffsetMid.Size = new System.Drawing.Size(186, 26);
this.pfcFrontOffsetMid.TabIndex = 36;
this.pfcFrontOffsetMid.Tag = "offsetx_mid";
this.pfcFrontOffsetMid.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetMid_OnValuesChanged);
//
// pfcFrontOffsetBottom
@ -782,6 +794,7 @@ namespace CodeImp.DoomBuilder.Windows
this.pfcFrontOffsetBottom.Name = "pfcFrontOffsetBottom";
this.pfcFrontOffsetBottom.Size = new System.Drawing.Size(186, 26);
this.pfcFrontOffsetBottom.TabIndex = 37;
this.pfcFrontOffsetBottom.Tag = "offsetx_bottom";
this.pfcFrontOffsetBottom.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetBottom_OnValuesChanged);
//
// groupBox5
@ -808,6 +821,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lightfrontlower.Name = "lightfrontlower";
this.lightfrontlower.Size = new System.Drawing.Size(262, 29);
this.lightfrontlower.TabIndex = 29;
this.lightfrontlower.Tag = "light_bottom";
//
// lightfrontmiddle
//
@ -815,6 +829,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lightfrontmiddle.Name = "lightfrontmiddle";
this.lightfrontmiddle.Size = new System.Drawing.Size(262, 29);
this.lightfrontmiddle.TabIndex = 29;
this.lightfrontmiddle.Tag = "light_mid";
//
// lightfrontupper
//
@ -822,6 +837,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lightfrontupper.Name = "lightfrontupper";
this.lightfrontupper.Size = new System.Drawing.Size(262, 29);
this.lightfrontupper.TabIndex = 29;
this.lightfrontupper.Tag = "light_top";
//
// resetfrontlight
//
@ -830,6 +846,7 @@ namespace CodeImp.DoomBuilder.Windows
this.resetfrontlight.Name = "resetfrontlight";
this.resetfrontlight.Size = new System.Drawing.Size(23, 23);
this.resetfrontlight.TabIndex = 28;
this.resetfrontlight.Tag = "light";
this.tooltip.SetToolTip(this.resetfrontlight, "Reset Front Brightness");
this.resetfrontlight.UseVisualStyleBackColor = true;
this.resetfrontlight.Click += new System.EventHandler(this.resetfrontlight_Click);
@ -879,7 +896,7 @@ namespace CodeImp.DoomBuilder.Windows
this.lightFront.Size = new System.Drawing.Size(62, 24);
this.lightFront.StepValues = null;
this.lightFront.TabIndex = 26;
this.lightFront.Tag = "";
this.lightFront.Tag = "light";
this.lightFront.WhenTextChanged += new System.EventHandler(this.lightFront_WhenTextChanged);
//
// cbLightAbsoluteFront

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

@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Controls;
@ -137,8 +138,12 @@ namespace CodeImp.DoomBuilder.Windows
// Initialize
InitializeComponent();
DoUDMFControls(tabproperties, General.Map.Config.LinedefFields);
DoUDMFControls(tabfront, General.Map.Config.SidedefFields);
DoUDMFControls(tabback, General.Map.Config.SidedefFields);
// Widow setup
if(General.Settings.StoreSelectedEditTab)
if (General.Settings.StoreSelectedEditTab)
{
int activetab = General.Settings.ReadSetting("windows." + configname + ".activetab", 0);
@ -179,8 +184,6 @@ namespace CodeImp.DoomBuilder.Windows
lockpick.Items.Add(item);
}
}
lockpick.Enabled = (keynumbers.Count > 0);
labellockpick.Enabled = (keynumbers.Count > 0);
// Initialize image selectors
fronthigh.Initialize();
@ -227,38 +230,6 @@ namespace CodeImp.DoomBuilder.Windows
lightbackupper.Setup(VisualModes.VisualGeometryType.WALL_UPPER);
lightbackmiddle.Setup(VisualModes.VisualGeometryType.WALL_MIDDLE);
lightbacklower.Setup(VisualModes.VisualGeometryType.WALL_LOWER);
// Disable top/mid/bottom texture offset controls?
if (!General.Map.Config.UseLocalSidedefTextureOffsets)
{
pfcFrontOffsetTop.Enabled = false;
pfcFrontOffsetMid.Enabled = false;
pfcFrontOffsetBottom.Enabled = false;
pfcBackOffsetTop.Enabled = false;
pfcBackOffsetMid.Enabled = false;
pfcBackOffsetBottom.Enabled = false;
labelFrontOffsetTop.Enabled = false;
labelFrontOffsetMid.Enabled = false;
labelFrontOffsetBottom.Enabled = false;
labelBackOffsetTop.Enabled = false;
labelBackOffsetMid.Enabled = false;
labelBackOffsetBottom.Enabled = false;
}
// Diable brightness controls?
if(!General.Map.Config.DistinctWallBrightness)
{
lightFront.Enabled = false;
cbLightAbsoluteFront.Enabled = false;
resetfrontlight.Enabled = false;
lightBack.Enabled = false;
cbLightAbsoluteBack.Enabled = false;
resetbacklight.Enabled = false;
}
}
#endregion
@ -707,6 +678,36 @@ namespace CodeImp.DoomBuilder.Windows
OnValuesChanged?.Invoke(this, EventArgs.Empty);
}
/// <summary>
/// Enables or disables controls depending on if their tag is one of the UDMF fields set in the game config.
/// </summary>
/// <param name="control">Control to process</param>
private void DoUDMFControls(Control control, List<UniversalFieldInfo> info)
{
if (control.Tag is string name && !string.IsNullOrWhiteSpace(name))
{
EnableDisableControlAndChildren(control, info.Any(f => f.Name == name));
}
else
{
foreach (Control c in control.Controls)
DoUDMFControls(c, info);
}
}
/// <summary>
/// Enables or disables a control and all its children.
/// </summary>
/// <param name="control">Control the enable or disable</param>
/// <param name="state">If to enable or disable</param>
private void EnableDisableControlAndChildren(Control control, bool state)
{
control.Enabled = state;
foreach (Control c in control.Controls)
EnableDisableControlAndChildren(c, state);
}
#endregion
#region ================== Events

190
Source/Core/Windows/SectorEditFormUDMF.Designer.cs generated
View file

@ -154,9 +154,9 @@
this.alphaceiling = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.ceilportalrenderstylelabel = new System.Windows.Forms.Label();
this.ceilportalrenderstyle = new System.Windows.Forms.ComboBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.gbFloorSlope = new System.Windows.Forms.GroupBox();
this.floorslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.gbCeilingSLope = new System.Windows.Forms.GroupBox();
this.ceilingslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
this.tabcomment = new System.Windows.Forms.TabPage();
this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
@ -201,8 +201,8 @@
this.tabslopes.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
this.gbFloorSlope.SuspendLayout();
this.gbCeilingSLope.SuspendLayout();
this.tabcomment.SuspendLayout();
this.tabcustom.SuspendLayout();
this.SuspendLayout();
@ -266,6 +266,7 @@
this.fogdensity.Size = new System.Drawing.Size(81, 24);
this.fogdensity.StepValues = null;
this.fogdensity.TabIndex = 10;
this.fogdensity.Tag = "fogdensity";
this.fogdensity.WhenTextChanged += new System.EventHandler(this.fogdensity_WhenTextChanged);
//
// label4
@ -276,6 +277,7 @@
label4.Name = "label4";
label4.Size = new System.Drawing.Size(74, 14);
label4.TabIndex = 9;
label4.Tag = "fogdensity";
label4.Text = "Fog density:";
label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.tooltip.SetToolTip(label4, resources.GetString("label4.ToolTip"));
@ -287,6 +289,7 @@
this.soundsequence.Name = "soundsequence";
this.soundsequence.Size = new System.Drawing.Size(167, 21);
this.soundsequence.TabIndex = 12;
this.soundsequence.Tag = "soundsequence";
this.soundsequence.TextChanged += new System.EventHandler(this.soundsequence_TextChanged);
this.soundsequence.MouseDown += new System.Windows.Forms.MouseEventHandler(this.soundsequence_MouseDown);
//
@ -297,6 +300,7 @@
this.resetsoundsequence.Name = "resetsoundsequence";
this.resetsoundsequence.Size = new System.Drawing.Size(28, 25);
this.resetsoundsequence.TabIndex = 13;
this.resetsoundsequence.Tag = "soundsequence";
this.resetsoundsequence.Text = " ";
this.tooltip.SetToolTip(this.resetsoundsequence, "Reset");
this.resetsoundsequence.UseVisualStyleBackColor = true;
@ -328,6 +332,7 @@
label14.Name = "label14";
label14.Size = new System.Drawing.Size(91, 13);
label14.TabIndex = 11;
label14.Tag = "soundsequence";
label14.Text = "Sound sequence:";
//
// label9
@ -356,6 +361,7 @@
this.gravity.Size = new System.Drawing.Size(81, 24);
this.gravity.StepValues = null;
this.gravity.TabIndex = 6;
this.gravity.Tag = "gravity";
//
// label2
//
@ -363,6 +369,7 @@
label2.Name = "label2";
label2.Size = new System.Drawing.Size(74, 14);
label2.TabIndex = 5;
label2.Tag = "gravity";
label2.Text = "Gravity:";
label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -532,6 +539,7 @@
label17.Name = "label17";
label17.Size = new System.Drawing.Size(74, 14);
label17.TabIndex = 3;
label17.Tag = "damageamount";
label17.Text = "Amount:";
label17.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.tooltip.SetToolTip(label17, "Amount of damage inflicted by this sector.\r\nIf this is 0, all other damage proper" +
@ -544,6 +552,7 @@
label16.Name = "label16";
label16.Size = new System.Drawing.Size(74, 14);
label16.TabIndex = 0;
label16.Tag = "damagetype";
label16.Text = "Type:";
label16.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -577,6 +586,7 @@
label13.Name = "label13";
label13.Size = new System.Drawing.Size(74, 14);
label13.TabIndex = 18;
label13.Tag = "desaturation";
label13.Text = "Desaturation:";
label13.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -609,10 +619,10 @@
this.tabproperties.Controls.Add(groupfloorceiling);
this.tabproperties.Cursor = System.Windows.Forms.Cursors.Arrow;
this.tabproperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabproperties.Location = new System.Drawing.Point(4, 24);
this.tabproperties.Location = new System.Drawing.Point(4, 22);
this.tabproperties.Name = "tabproperties";
this.tabproperties.Padding = new System.Windows.Forms.Padding(3);
this.tabproperties.Size = new System.Drawing.Size(570, 524);
this.tabproperties.Size = new System.Drawing.Size(570, 526);
this.tabproperties.TabIndex = 0;
this.tabproperties.Text = "Properties";
this.tabproperties.UseVisualStyleBackColor = true;
@ -652,6 +662,7 @@
this.leakiness.Size = new System.Drawing.Size(81, 24);
this.leakiness.StepValues = null;
this.leakiness.TabIndex = 8;
this.leakiness.Tag = "leakiness";
//
// damageinterval
//
@ -670,6 +681,7 @@
this.damageinterval.Size = new System.Drawing.Size(81, 24);
this.damageinterval.StepValues = null;
this.damageinterval.TabIndex = 6;
this.damageinterval.Tag = "damageinterval";
//
// resetdamagetype
//
@ -678,6 +690,7 @@
this.resetdamagetype.Name = "resetdamagetype";
this.resetdamagetype.Size = new System.Drawing.Size(28, 25);
this.resetdamagetype.TabIndex = 2;
this.resetdamagetype.Tag = "damagetype";
this.resetdamagetype.Text = " ";
this.tooltip.SetToolTip(this.resetdamagetype, "Reset");
this.resetdamagetype.UseVisualStyleBackColor = true;
@ -700,6 +713,7 @@
this.damageamount.Size = new System.Drawing.Size(81, 24);
this.damageamount.StepValues = null;
this.damageamount.TabIndex = 4;
this.damageamount.Tag = "damageamount";
//
// damagetype
//
@ -708,6 +722,7 @@
this.damagetype.Name = "damagetype";
this.damagetype.Size = new System.Drawing.Size(167, 21);
this.damagetype.TabIndex = 1;
this.damagetype.Tag = "damagetype";
this.damagetype.TextChanged += new System.EventHandler(this.damagetype_TextChanged);
this.damagetype.MouseDown += new System.Windows.Forms.MouseEventHandler(this.damagetype_MouseDown);
//
@ -741,9 +756,9 @@
this.tabColors.Controls.Add(this.groupBox9);
this.tabColors.Controls.Add(this.groupBox8);
this.tabColors.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabColors.Location = new System.Drawing.Point(4, 24);
this.tabColors.Location = new System.Drawing.Point(4, 22);
this.tabColors.Name = "tabColors";
this.tabColors.Size = new System.Drawing.Size(570, 528);
this.tabColors.Size = new System.Drawing.Size(570, 526);
this.tabColors.TabIndex = 5;
this.tabColors.Text = "Colors";
this.tabColors.UseVisualStyleBackColor = true;
@ -772,6 +787,7 @@
this.floorGlowEnabled.Name = "floorGlowEnabled";
this.floorGlowEnabled.Size = new System.Drawing.Size(74, 17);
this.floorGlowEnabled.TabIndex = 33;
this.floorGlowEnabled.Tag = "floorglowcolor";
this.floorGlowEnabled.Text = "Floor glow";
this.floorGlowEnabled.UseVisualStyleBackColor = true;
this.floorGlowEnabled.CheckedChanged += new System.EventHandler(this.floorGlowEnabled_CheckedChanged);
@ -784,6 +800,7 @@
this.floorglowheightrequired.Size = new System.Drawing.Size(16, 16);
this.floorglowheightrequired.TabIndex = 33;
this.floorglowheightrequired.TabStop = false;
this.floorglowheightrequired.Tag = "floorglowheight";
this.tooltip.SetToolTip(this.floorglowheightrequired, "Non-zero glow height required\r\nfor the glow to be shown ingame!");
this.floorglowheightrequired.Visible = false;
//
@ -794,6 +811,7 @@
this.resetfloorglowheight.Name = "resetfloorglowheight";
this.resetfloorglowheight.Size = new System.Drawing.Size(23, 23);
this.resetfloorglowheight.TabIndex = 32;
this.resetfloorglowheight.Tag = "floorglowheight";
this.tooltip.SetToolTip(this.resetfloorglowheight, "Reset");
this.resetfloorglowheight.UseVisualStyleBackColor = true;
this.resetfloorglowheight.Click += new System.EventHandler(this.resetfloorglowheight_Click);
@ -804,7 +822,7 @@
this.floorglowheightlabel.Name = "floorglowheightlabel";
this.floorglowheightlabel.Size = new System.Drawing.Size(80, 14);
this.floorglowheightlabel.TabIndex = 30;
this.floorglowheightlabel.Tag = "";
this.floorglowheightlabel.Tag = "floorglowheight";
this.floorglowheightlabel.Text = "Glow height:";
this.floorglowheightlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -825,7 +843,7 @@
this.floorglowheight.Size = new System.Drawing.Size(62, 24);
this.floorglowheight.StepValues = null;
this.floorglowheight.TabIndex = 31;
this.floorglowheight.Tag = "";
this.floorglowheight.Tag = "floorglowheight";
this.floorglowheight.WhenTextChanged += new System.EventHandler(this.floorglowheight_WhenTextChanged);
//
// floorglowcolor
@ -837,6 +855,7 @@
this.floorglowcolor.Name = "floorglowcolor";
this.floorglowcolor.Size = new System.Drawing.Size(210, 29);
this.floorglowcolor.TabIndex = 28;
this.floorglowcolor.Tag = "floorglowcolor";
this.floorglowcolor.OnValueChanged += new System.EventHandler(this.floorglowcolor_OnValueChanged);
//
// groupBox10
@ -863,6 +882,7 @@
this.ceilingGlowEnabled.Name = "ceilingGlowEnabled";
this.ceilingGlowEnabled.Size = new System.Drawing.Size(82, 17);
this.ceilingGlowEnabled.TabIndex = 21;
this.ceilingGlowEnabled.Tag = "ceilingglowcolor";
this.ceilingGlowEnabled.Text = "Ceiling glow";
this.ceilingGlowEnabled.UseVisualStyleBackColor = true;
this.ceilingGlowEnabled.CheckedChanged += new System.EventHandler(this.ceilingGlowEnabled_CheckedChanged);
@ -875,6 +895,7 @@
this.ceilingglowheightrequired.Size = new System.Drawing.Size(16, 16);
this.ceilingglowheightrequired.TabIndex = 32;
this.ceilingglowheightrequired.TabStop = false;
this.ceilingglowheightrequired.Tag = "ceilingglowheight";
this.tooltip.SetToolTip(this.ceilingglowheightrequired, "Non-zero glow height required\r\nfor the glow to be shown ingame!");
this.ceilingglowheightrequired.Visible = false;
//
@ -885,6 +906,7 @@
this.resetceilingglowheight.Name = "resetceilingglowheight";
this.resetceilingglowheight.Size = new System.Drawing.Size(23, 23);
this.resetceilingglowheight.TabIndex = 31;
this.resetceilingglowheight.Tag = "ceilingglowheight";
this.tooltip.SetToolTip(this.resetceilingglowheight, "Reset");
this.resetceilingglowheight.UseVisualStyleBackColor = true;
this.resetceilingglowheight.Click += new System.EventHandler(this.resetceilingglowheight_Click);
@ -895,7 +917,7 @@
this.ceilingglowheightlabel.Name = "ceilingglowheightlabel";
this.ceilingglowheightlabel.Size = new System.Drawing.Size(80, 14);
this.ceilingglowheightlabel.TabIndex = 29;
this.ceilingglowheightlabel.Tag = "";
this.ceilingglowheightlabel.Tag = "ceilingglowheight";
this.ceilingglowheightlabel.Text = "Glow height:";
this.ceilingglowheightlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -916,7 +938,7 @@
this.ceilingglowheight.Size = new System.Drawing.Size(62, 24);
this.ceilingglowheight.StepValues = null;
this.ceilingglowheight.TabIndex = 30;
this.ceilingglowheight.Tag = "";
this.ceilingglowheight.Tag = "ceilingglowheight";
this.ceilingglowheight.WhenTextChanged += new System.EventHandler(this.ceilingglowheight_WhenTextChanged);
//
// ceilingglowcolor
@ -928,6 +950,7 @@
this.ceilingglowcolor.Name = "ceilingglowcolor";
this.ceilingglowcolor.Size = new System.Drawing.Size(210, 29);
this.ceilingglowcolor.TabIndex = 27;
this.ceilingglowcolor.Tag = "ceilingglowcolor";
this.ceilingglowcolor.OnValueChanged += new System.EventHandler(this.ceilingglowcolor_OnValueChanged);
//
// groupBox9
@ -953,6 +976,7 @@
this.thingsColor.Name = "thingsColor";
this.thingsColor.Size = new System.Drawing.Size(207, 29);
this.thingsColor.TabIndex = 22;
this.thingsColor.Tag = "color_sprites";
this.thingsColor.OnValueChanged += new System.EventHandler(this.d64color_OnValueChanged);
//
// lowerWallColor
@ -964,6 +988,7 @@
this.lowerWallColor.Name = "lowerWallColor";
this.lowerWallColor.Size = new System.Drawing.Size(207, 29);
this.lowerWallColor.TabIndex = 21;
this.lowerWallColor.Tag = "color_wallbottom";
this.lowerWallColor.OnValueChanged += new System.EventHandler(this.d64color_OnValueChanged);
//
// upperWallColor
@ -975,6 +1000,7 @@
this.upperWallColor.Name = "upperWallColor";
this.upperWallColor.Size = new System.Drawing.Size(207, 29);
this.upperWallColor.TabIndex = 20;
this.upperWallColor.Tag = "color_walltop";
this.upperWallColor.OnValueChanged += new System.EventHandler(this.d64color_OnValueChanged);
//
// floorColor
@ -986,6 +1012,7 @@
this.floorColor.Name = "floorColor";
this.floorColor.Size = new System.Drawing.Size(207, 29);
this.floorColor.TabIndex = 19;
this.floorColor.Tag = "color_floor";
this.floorColor.OnValueChanged += new System.EventHandler(this.d64color_OnValueChanged);
//
// ceilingColor
@ -997,6 +1024,7 @@
this.ceilingColor.Name = "ceilingColor";
this.ceilingColor.Size = new System.Drawing.Size(207, 29);
this.ceilingColor.TabIndex = 18;
this.ceilingColor.Tag = "color_ceiling";
this.ceilingColor.OnValueChanged += new System.EventHandler(this.d64color_OnValueChanged);
//
// groupBox8
@ -1029,6 +1057,7 @@
this.desaturation.Size = new System.Drawing.Size(84, 24);
this.desaturation.StepValues = null;
this.desaturation.TabIndex = 19;
this.desaturation.Tag = "desaturation";
//
// lightColor
//
@ -1039,6 +1068,7 @@
this.lightColor.Name = "lightColor";
this.lightColor.Size = new System.Drawing.Size(207, 29);
this.lightColor.TabIndex = 16;
this.lightColor.Tag = "lightcolor";
this.lightColor.OnValueChanged += new System.EventHandler(this.lightColor_OnValueChanged);
//
// fadeColor
@ -1050,6 +1080,7 @@
this.fadeColor.Name = "fadeColor";
this.fadeColor.Size = new System.Drawing.Size(207, 31);
this.fadeColor.TabIndex = 17;
this.fadeColor.Tag = "fadecolor";
this.fadeColor.OnValueChanged += new System.EventHandler(this.fadeColor_OnValueChanged);
//
// tabSurfaces
@ -1057,9 +1088,9 @@
this.tabSurfaces.Controls.Add(this.groupBox2);
this.tabSurfaces.Controls.Add(this.groupBox1);
this.tabSurfaces.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabSurfaces.Location = new System.Drawing.Point(4, 24);
this.tabSurfaces.Location = new System.Drawing.Point(4, 22);
this.tabSurfaces.Name = "tabSurfaces";
this.tabSurfaces.Size = new System.Drawing.Size(570, 528);
this.tabSurfaces.Size = new System.Drawing.Size(570, 526);
this.tabSurfaces.TabIndex = 2;
this.tabSurfaces.Text = "Surfaces";
this.tabSurfaces.UseVisualStyleBackColor = true;
@ -1103,6 +1134,7 @@
this.reset_floor_reflect.Name = "reset_floor_reflect";
this.reset_floor_reflect.Size = new System.Drawing.Size(23, 23);
this.reset_floor_reflect.TabIndex = 19;
this.reset_floor_reflect.Tag = "floor_reflect";
this.tooltip.SetToolTip(this.reset_floor_reflect, "Reset");
this.reset_floor_reflect.UseVisualStyleBackColor = true;
this.reset_floor_reflect.Click += new System.EventHandler(this.reset_floor_reflect_Click);
@ -1113,7 +1145,7 @@
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(80, 14);
this.label23.TabIndex = 17;
this.label23.Tag = "";
this.label23.Tag = "floor_reflect";
this.label23.Text = "Reflectivity:";
this.label23.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1134,7 +1166,7 @@
this.floor_reflect.Size = new System.Drawing.Size(62, 24);
this.floor_reflect.StepValues = null;
this.floor_reflect.TabIndex = 18;
this.floor_reflect.Tag = "";
this.floor_reflect.Tag = "floor_reflect";
this.floor_reflect.WhenTextChanged += new System.EventHandler(this.floor_reflect_WhenTextChanged);
//
// resetfloorterrain
@ -1144,6 +1176,7 @@
this.resetfloorterrain.Name = "resetfloorterrain";
this.resetfloorterrain.Size = new System.Drawing.Size(23, 23);
this.resetfloorterrain.TabIndex = 8;
this.resetfloorterrain.Tag = "floorterrain";
this.resetfloorterrain.Text = " ";
this.tooltip.SetToolTip(this.resetfloorterrain, "Reset");
this.resetfloorterrain.UseVisualStyleBackColor = true;
@ -1155,7 +1188,7 @@
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(80, 14);
this.label3.TabIndex = 6;
this.label3.Tag = "";
this.label3.Tag = "floorterrain";
this.label3.Text = "Terrain:";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1166,6 +1199,7 @@
this.floorterrain.Name = "floorterrain";
this.floorterrain.Size = new System.Drawing.Size(130, 21);
this.floorterrain.TabIndex = 7;
this.floorterrain.Tag = "floorterrain";
this.floorterrain.TextChanged += new System.EventHandler(this.floorterrain_TextChanged);
this.floorterrain.MouseDown += new System.Windows.Forms.MouseEventHandler(this.floorterrain_MouseDown);
//
@ -1176,6 +1210,7 @@
this.resetfloorlight.Name = "resetfloorlight";
this.resetfloorlight.Size = new System.Drawing.Size(23, 23);
this.resetfloorlight.TabIndex = 12;
this.resetfloorlight.Tag = "lightfloor";
this.tooltip.SetToolTip(this.resetfloorlight, "Reset");
this.resetfloorlight.UseVisualStyleBackColor = true;
this.resetfloorlight.Click += new System.EventHandler(this.resetfloorlight_Click);
@ -1186,7 +1221,7 @@
this.labelFloorOffsets.Name = "labelFloorOffsets";
this.labelFloorOffsets.Size = new System.Drawing.Size(98, 14);
this.labelFloorOffsets.TabIndex = 0;
this.labelFloorOffsets.Tag = "";
this.labelFloorOffsets.Tag = "xpanningfloor";
this.labelFloorOffsets.Text = "Texture offsets:";
this.labelFloorOffsets.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1196,7 +1231,7 @@
this.labelFloorScale.Name = "labelFloorScale";
this.labelFloorScale.Size = new System.Drawing.Size(98, 14);
this.labelFloorScale.TabIndex = 2;
this.labelFloorScale.Tag = "";
this.labelFloorScale.Tag = "xscalefloor";
this.labelFloorScale.Text = "Texture scale:";
this.labelFloorScale.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1207,20 +1242,21 @@
this.cbUseFloorLineAngles.Name = "cbUseFloorLineAngles";
this.cbUseFloorLineAngles.Size = new System.Drawing.Size(113, 17);
this.cbUseFloorLineAngles.TabIndex = 16;
this.cbUseFloorLineAngles.Tag = "";
this.cbUseFloorLineAngles.Tag = "rotationfloor";
this.cbUseFloorLineAngles.Text = "Use linedef angles";
this.cbUseFloorLineAngles.UseVisualStyleBackColor = true;
this.cbUseFloorLineAngles.CheckedChanged += new System.EventHandler(this.cbUseFloorLineAngles_CheckedChanged);
//
// floorAngleControl
//
this.floorAngleControl.Angle = -1710;
this.floorAngleControl.Angle = -2610;
this.floorAngleControl.AngleOffset = 90;
this.floorAngleControl.DoomAngleClamping = false;
this.floorAngleControl.Location = new System.Drawing.Point(6, 156);
this.floorAngleControl.Name = "floorAngleControl";
this.floorAngleControl.Size = new System.Drawing.Size(44, 44);
this.floorAngleControl.TabIndex = 13;
this.floorAngleControl.Tag = "rotationfloor";
this.floorAngleControl.AngleChanged += new System.EventHandler(this.floorAngleControl_AngleChanged);
//
// labelfloorrenderstyle
@ -1229,7 +1265,7 @@
this.labelfloorrenderstyle.Name = "labelfloorrenderstyle";
this.labelfloorrenderstyle.Size = new System.Drawing.Size(80, 14);
this.labelfloorrenderstyle.TabIndex = 4;
this.labelfloorrenderstyle.Tag = "";
this.labelfloorrenderstyle.Tag = "renderstylefloor";
this.labelfloorrenderstyle.Text = "Render style:";
this.labelfloorrenderstyle.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1239,7 +1275,7 @@
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(80, 14);
this.label11.TabIndex = 14;
this.label11.Tag = "";
this.label11.Tag = "rotationfloor";
this.label11.Text = "Rotation:";
this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1260,7 +1296,7 @@
this.floorRotation.Size = new System.Drawing.Size(62, 24);
this.floorRotation.StepValues = null;
this.floorRotation.TabIndex = 15;
this.floorRotation.Tag = "";
this.floorRotation.Tag = "rotationfloor";
this.floorRotation.WhenTextChanged += new System.EventHandler(this.floorRotation_WhenTextChanged);
//
// floorLightAbsolute
@ -1270,6 +1306,7 @@
this.floorLightAbsolute.Name = "floorLightAbsolute";
this.floorLightAbsolute.Size = new System.Drawing.Size(67, 17);
this.floorLightAbsolute.TabIndex = 11;
this.floorLightAbsolute.Tag = "lightfloorabsolute";
this.floorLightAbsolute.Text = "Absolute";
this.floorLightAbsolute.UseVisualStyleBackColor = true;
this.floorLightAbsolute.CheckedChanged += new System.EventHandler(this.floorLightAbsolute_CheckedChanged);
@ -1280,7 +1317,7 @@
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(80, 14);
this.label12.TabIndex = 9;
this.label12.Tag = "";
this.label12.Tag = "lightfloor";
this.label12.Text = "Brightness:";
this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1312,6 +1349,7 @@
this.floorRenderStyle.Name = "floorRenderStyle";
this.floorRenderStyle.Size = new System.Drawing.Size(130, 21);
this.floorRenderStyle.TabIndex = 5;
this.floorRenderStyle.Tag = "renderstylefloor";
//
// floorScale
//
@ -1330,6 +1368,7 @@
this.floorScale.Name = "floorScale";
this.floorScale.Size = new System.Drawing.Size(186, 26);
this.floorScale.TabIndex = 3;
this.floorScale.Tag = "xscalefloor";
this.floorScale.OnValuesChanged += new System.EventHandler(this.floorScale_OnValuesChanged);
//
// floorOffsets
@ -1349,6 +1388,7 @@
this.floorOffsets.Name = "floorOffsets";
this.floorOffsets.Size = new System.Drawing.Size(186, 26);
this.floorOffsets.TabIndex = 1;
this.floorOffsets.Tag = "xpanningfloor";
this.floorOffsets.OnValuesChanged += new System.EventHandler(this.floorOffsets_OnValuesChanged);
//
// floortex
@ -1400,6 +1440,7 @@
this.reset_ceiling_reflect.Name = "reset_ceiling_reflect";
this.reset_ceiling_reflect.Size = new System.Drawing.Size(23, 23);
this.reset_ceiling_reflect.TabIndex = 19;
this.reset_ceiling_reflect.Tag = "ceiling_reflect";
this.tooltip.SetToolTip(this.reset_ceiling_reflect, "Reset");
this.reset_ceiling_reflect.UseVisualStyleBackColor = true;
this.reset_ceiling_reflect.Click += new System.EventHandler(this.reset_ceiling_reflect_Click);
@ -1410,7 +1451,7 @@
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(80, 14);
this.label20.TabIndex = 17;
this.label20.Tag = "";
this.label20.Tag = "ceiling_reflect";
this.label20.Text = "Reflectivity:";
this.label20.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1431,7 +1472,7 @@
this.ceiling_reflect.Size = new System.Drawing.Size(62, 24);
this.ceiling_reflect.StepValues = null;
this.ceiling_reflect.TabIndex = 18;
this.ceiling_reflect.Tag = "";
this.ceiling_reflect.Tag = "ceiling_reflect";
this.ceiling_reflect.WhenTextChanged += new System.EventHandler(this.ceiling_reflect_WhenTextChanged);
//
// resetceilterrain
@ -1441,6 +1482,7 @@
this.resetceilterrain.Name = "resetceilterrain";
this.resetceilterrain.Size = new System.Drawing.Size(23, 23);
this.resetceilterrain.TabIndex = 8;
this.resetceilterrain.Tag = "ceilingterrain";
this.resetceilterrain.Text = " ";
this.tooltip.SetToolTip(this.resetceilterrain, "Reset");
this.resetceilterrain.UseVisualStyleBackColor = true;
@ -1452,7 +1494,7 @@
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(80, 14);
this.label7.TabIndex = 6;
this.label7.Tag = "";
this.label7.Tag = "ceilingterrain";
this.label7.Text = "Terrain:";
this.label7.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1463,6 +1505,7 @@
this.ceilterrain.Name = "ceilterrain";
this.ceilterrain.Size = new System.Drawing.Size(130, 21);
this.ceilterrain.TabIndex = 7;
this.ceilterrain.Tag = "ceilingterrain";
this.ceilterrain.TextChanged += new System.EventHandler(this.ceilterrain_TextChanged);
this.ceilterrain.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ceilterrain_MouseDown);
//
@ -1473,6 +1516,7 @@
this.resetceillight.Name = "resetceillight";
this.resetceillight.Size = new System.Drawing.Size(23, 23);
this.resetceillight.TabIndex = 12;
this.resetceillight.Tag = "lightceiling";
this.tooltip.SetToolTip(this.resetceillight, "Reset");
this.resetceillight.UseVisualStyleBackColor = true;
this.resetceillight.Click += new System.EventHandler(this.resetceillight_Click);
@ -1483,7 +1527,7 @@
this.labelCeilOffsets.Name = "labelCeilOffsets";
this.labelCeilOffsets.Size = new System.Drawing.Size(98, 14);
this.labelCeilOffsets.TabIndex = 0;
this.labelCeilOffsets.Tag = "";
this.labelCeilOffsets.Tag = "xpanningceiling";
this.labelCeilOffsets.Text = "Texture offsets:";
this.labelCeilOffsets.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1493,7 +1537,7 @@
this.labelCeilScale.Name = "labelCeilScale";
this.labelCeilScale.Size = new System.Drawing.Size(98, 14);
this.labelCeilScale.TabIndex = 2;
this.labelCeilScale.Tag = "";
this.labelCeilScale.Tag = "xscaleceiling";
this.labelCeilScale.Text = "Texture scale:";
this.labelCeilScale.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1504,20 +1548,21 @@
this.cbUseCeilLineAngles.Name = "cbUseCeilLineAngles";
this.cbUseCeilLineAngles.Size = new System.Drawing.Size(113, 17);
this.cbUseCeilLineAngles.TabIndex = 16;
this.cbUseCeilLineAngles.Tag = "";
this.cbUseCeilLineAngles.Tag = "rotationceiling";
this.cbUseCeilLineAngles.Text = "Use linedef angles";
this.cbUseCeilLineAngles.UseVisualStyleBackColor = true;
this.cbUseCeilLineAngles.CheckedChanged += new System.EventHandler(this.cbUseCeilLineAngles_CheckedChanged);
//
// ceilAngleControl
//
this.ceilAngleControl.Angle = -1710;
this.ceilAngleControl.Angle = -2610;
this.ceilAngleControl.AngleOffset = 90;
this.ceilAngleControl.DoomAngleClamping = false;
this.ceilAngleControl.Location = new System.Drawing.Point(6, 156);
this.ceilAngleControl.Name = "ceilAngleControl";
this.ceilAngleControl.Size = new System.Drawing.Size(44, 44);
this.ceilAngleControl.TabIndex = 13;
this.ceilAngleControl.Tag = "rotationceiling";
this.ceilAngleControl.AngleChanged += new System.EventHandler(this.ceilAngleControl_AngleChanged);
//
// labelceilrenderstyle
@ -1526,7 +1571,7 @@
this.labelceilrenderstyle.Name = "labelceilrenderstyle";
this.labelceilrenderstyle.Size = new System.Drawing.Size(80, 14);
this.labelceilrenderstyle.TabIndex = 4;
this.labelceilrenderstyle.Tag = "";
this.labelceilrenderstyle.Tag = "renderstyleceiling";
this.labelceilrenderstyle.Text = "Render style:";
this.labelceilrenderstyle.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1536,7 +1581,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(80, 14);
this.label1.TabIndex = 14;
this.label1.Tag = "";
this.label1.Tag = "rotationceiling";
this.label1.Text = "Rotation:";
this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1557,7 +1602,7 @@
this.ceilRotation.Size = new System.Drawing.Size(62, 24);
this.ceilRotation.StepValues = null;
this.ceilRotation.TabIndex = 15;
this.ceilRotation.Tag = "";
this.ceilRotation.Tag = "rotationceiling";
this.ceilRotation.WhenTextChanged += new System.EventHandler(this.ceilRotation_WhenTextChanged);
//
// ceilLightAbsolute
@ -1567,7 +1612,7 @@
this.ceilLightAbsolute.Name = "ceilLightAbsolute";
this.ceilLightAbsolute.Size = new System.Drawing.Size(67, 17);
this.ceilLightAbsolute.TabIndex = 11;
this.ceilLightAbsolute.Tag = "";
this.ceilLightAbsolute.Tag = "lightceilingabsolute";
this.ceilLightAbsolute.Text = "Absolute";
this.ceilLightAbsolute.UseVisualStyleBackColor = true;
this.ceilLightAbsolute.CheckedChanged += new System.EventHandler(this.ceilLightAbsolute_CheckedChanged);
@ -1578,7 +1623,7 @@
this.labelLightFront.Name = "labelLightFront";
this.labelLightFront.Size = new System.Drawing.Size(80, 14);
this.labelLightFront.TabIndex = 9;
this.labelLightFront.Tag = "";
this.labelLightFront.Tag = "lightceiling";
this.labelLightFront.Text = "Brightness:";
this.labelLightFront.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
@ -1610,6 +1655,7 @@
this.ceilRenderStyle.Name = "ceilRenderStyle";
this.ceilRenderStyle.Size = new System.Drawing.Size(130, 21);
this.ceilRenderStyle.TabIndex = 5;
this.ceilRenderStyle.Tag = "renderstyleceiling";
//
// ceilScale
//
@ -1628,6 +1674,7 @@
this.ceilScale.Name = "ceilScale";
this.ceilScale.Size = new System.Drawing.Size(186, 26);
this.ceilScale.TabIndex = 3;
this.ceilScale.Tag = "xscaleceiling";
this.ceilScale.OnValuesChanged += new System.EventHandler(this.ceilScale_OnValuesChanged);
//
// ceilOffsets
@ -1647,6 +1694,7 @@
this.ceilOffsets.Name = "ceilOffsets";
this.ceilOffsets.Size = new System.Drawing.Size(186, 26);
this.ceilOffsets.TabIndex = 1;
this.ceilOffsets.Tag = "xpanningceiling";
this.ceilOffsets.OnValuesChanged += new System.EventHandler(this.ceilOffsets_OnValuesChanged);
//
// ceilingtex
@ -1663,12 +1711,12 @@
//
this.tabslopes.Controls.Add(this.groupBox7);
this.tabslopes.Controls.Add(this.groupBox6);
this.tabslopes.Controls.Add(this.groupBox5);
this.tabslopes.Controls.Add(this.groupBox4);
this.tabslopes.Controls.Add(this.gbFloorSlope);
this.tabslopes.Controls.Add(this.gbCeilingSLope);
this.tabslopes.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabslopes.Location = new System.Drawing.Point(4, 24);
this.tabslopes.Location = new System.Drawing.Point(4, 22);
this.tabslopes.Name = "tabslopes";
this.tabslopes.Size = new System.Drawing.Size(570, 528);
this.tabslopes.Size = new System.Drawing.Size(570, 526);
this.tabslopes.TabIndex = 3;
this.tabslopes.Text = "Slopes / Portals";
this.tabslopes.UseVisualStyleBackColor = true;
@ -1695,6 +1743,7 @@
this.resetalphafloor.Name = "resetalphafloor";
this.resetalphafloor.Size = new System.Drawing.Size(23, 23);
this.resetalphafloor.TabIndex = 70;
this.resetalphafloor.Tag = "alphafloor";
this.tooltip.SetToolTip(this.resetalphafloor, "Reset");
this.resetalphafloor.UseVisualStyleBackColor = true;
this.resetalphafloor.Click += new System.EventHandler(this.resetalphafloor_Click);
@ -1739,7 +1788,7 @@
this.alphafloor.Size = new System.Drawing.Size(62, 24);
this.alphafloor.StepValues = null;
this.alphafloor.TabIndex = 57;
this.alphafloor.Tag = "";
this.alphafloor.Tag = "alphafloor";
this.alphafloor.WhenTextChanged += new System.EventHandler(this.alphafloor_WhenTextChanged);
//
// floorportalrenderstylelabel
@ -1760,6 +1809,7 @@
this.floorportalrenderstyle.Name = "floorportalrenderstyle";
this.floorportalrenderstyle.Size = new System.Drawing.Size(103, 21);
this.floorportalrenderstyle.TabIndex = 55;
this.floorportalrenderstyle.Tag = "renderstylefloor";
//
// groupBox6
//
@ -1783,6 +1833,7 @@
this.resetalphaceiling.Name = "resetalphaceiling";
this.resetalphaceiling.Size = new System.Drawing.Size(23, 23);
this.resetalphaceiling.TabIndex = 68;
this.resetalphaceiling.Tag = "alphaceiling";
this.tooltip.SetToolTip(this.resetalphaceiling, "Reset");
this.resetalphaceiling.UseVisualStyleBackColor = true;
this.resetalphaceiling.Click += new System.EventHandler(this.resetalphaceiling_Click);
@ -1827,7 +1878,7 @@
this.alphaceiling.Size = new System.Drawing.Size(62, 24);
this.alphaceiling.StepValues = null;
this.alphaceiling.TabIndex = 57;
this.alphaceiling.Tag = "";
this.alphaceiling.Tag = "alphaceiling";
this.alphaceiling.WhenTextChanged += new System.EventHandler(this.alphaceiling_WhenTextChanged);
//
// ceilportalrenderstylelabel
@ -1848,16 +1899,17 @@
this.ceilportalrenderstyle.Name = "ceilportalrenderstyle";
this.ceilportalrenderstyle.Size = new System.Drawing.Size(103, 21);
this.ceilportalrenderstyle.TabIndex = 55;
this.ceilportalrenderstyle.Tag = "renderstyleceiling";
//
// groupBox5
// gbFloorSlope
//
this.groupBox5.Controls.Add(this.floorslopecontrol);
this.groupBox5.Location = new System.Drawing.Point(3, 261);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(298, 266);
this.groupBox5.TabIndex = 1;
this.groupBox5.TabStop = false;
this.groupBox5.Text = " Floor slope ";
this.gbFloorSlope.Controls.Add(this.floorslopecontrol);
this.gbFloorSlope.Location = new System.Drawing.Point(3, 261);
this.gbFloorSlope.Name = "gbFloorSlope";
this.gbFloorSlope.Size = new System.Drawing.Size(298, 266);
this.gbFloorSlope.TabIndex = 1;
this.gbFloorSlope.TabStop = false;
this.gbFloorSlope.Text = " Floor slope ";
//
// floorslopecontrol
//
@ -1871,15 +1923,15 @@
this.floorslopecontrol.OnPivotModeChanged += new System.EventHandler(this.floorslopecontrol_OnPivotModeChanged);
this.floorslopecontrol.OnResetClicked += new System.EventHandler(this.floorslopecontrol_OnResetClicked);
//
// groupBox4
// gbCeilingSLope
//
this.groupBox4.Controls.Add(this.ceilingslopecontrol);
this.groupBox4.Location = new System.Drawing.Point(3, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(298, 252);
this.groupBox4.TabIndex = 0;
this.groupBox4.TabStop = false;
this.groupBox4.Text = " Ceiling slope ";
this.gbCeilingSLope.Controls.Add(this.ceilingslopecontrol);
this.gbCeilingSLope.Location = new System.Drawing.Point(3, 3);
this.gbCeilingSLope.Name = "gbCeilingSLope";
this.gbCeilingSLope.Size = new System.Drawing.Size(298, 252);
this.gbCeilingSLope.TabIndex = 0;
this.gbCeilingSLope.TabStop = false;
this.gbCeilingSLope.Text = " Ceiling slope ";
//
// ceilingslopecontrol
//
@ -1897,9 +1949,9 @@
//
this.tabcomment.Controls.Add(this.commenteditor);
this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.tabcomment.Location = new System.Drawing.Point(4, 24);
this.tabcomment.Location = new System.Drawing.Point(4, 22);
this.tabcomment.Name = "tabcomment";
this.tabcomment.Size = new System.Drawing.Size(570, 528);
this.tabcomment.Size = new System.Drawing.Size(570, 526);
this.tabcomment.TabIndex = 4;
this.tabcomment.Text = "Comment";
this.tabcomment.UseVisualStyleBackColor = true;
@ -1909,17 +1961,17 @@
this.commenteditor.Dock = System.Windows.Forms.DockStyle.Fill;
this.commenteditor.Location = new System.Drawing.Point(0, 0);
this.commenteditor.Name = "commenteditor";
this.commenteditor.Size = new System.Drawing.Size(570, 528);
this.commenteditor.Size = new System.Drawing.Size(570, 526);
this.commenteditor.TabIndex = 0;
//
// tabcustom
//
this.tabcustom.Controls.Add(this.fieldslist);
this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabcustom.Location = new System.Drawing.Point(4, 24);
this.tabcustom.Location = new System.Drawing.Point(4, 22);
this.tabcustom.Name = "tabcustom";
this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
this.tabcustom.Size = new System.Drawing.Size(570, 528);
this.tabcustom.Size = new System.Drawing.Size(570, 526);
this.tabcustom.TabIndex = 1;
this.tabcustom.Text = "Custom";
this.tabcustom.UseVisualStyleBackColor = true;
@ -1937,7 +1989,7 @@
this.fieldslist.PropertyColumnVisible = true;
this.fieldslist.PropertyColumnWidth = 150;
this.fieldslist.ShowFixedFields = true;
this.fieldslist.Size = new System.Drawing.Size(564, 522);
this.fieldslist.Size = new System.Drawing.Size(564, 520);
this.fieldslist.TabIndex = 1;
this.fieldslist.TypeColumnVisible = true;
this.fieldslist.TypeColumnWidth = 100;
@ -2020,8 +2072,8 @@
this.tabslopes.ResumeLayout(false);
this.groupBox7.ResumeLayout(false);
this.groupBox6.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.gbFloorSlope.ResumeLayout(false);
this.gbCeilingSLope.ResumeLayout(false);
this.tabcomment.ResumeLayout(false);
this.tabcustom.ResumeLayout(false);
this.ResumeLayout(false);
@ -2074,8 +2126,8 @@
private System.Windows.Forms.CheckBox cbUseFloorLineAngles;
private System.Windows.Forms.CheckBox cbUseCeilLineAngles;
private System.Windows.Forms.TabPage tabslopes;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox gbFloorSlope;
private System.Windows.Forms.GroupBox gbCeilingSLope;
private CodeImp.DoomBuilder.Controls.SectorSlopeControl floorslopecontrol;
private CodeImp.DoomBuilder.Controls.SectorSlopeControl ceilingslopecontrol;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox heightoffset;

47
Source/Core/Windows/SectorEditFormUDMF.cs
View file

@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Geometry;
@ -187,8 +188,14 @@ namespace CodeImp.DoomBuilder.Windows
{
InitializeComponent();
DoUDMFControls(this);
// Plane equation slopes are handled internally instead through the UDMF fields, so they need special attention
EnableDisableControlAndChildren(gbCeilingSLope, General.Map.Config.PlaneEquationSupport);
EnableDisableControlAndChildren(gbFloorSlope, General.Map.Config.PlaneEquationSupport);
//mxd. Load settings
if(General.Settings.StoreSelectedEditTab)
if (General.Settings.StoreSelectedEditTab)
{
int activetab = General.Settings.ReadSetting("windows." + configname + ".activetab", 0);
tabs.SelectTab(activetab);
@ -220,10 +227,6 @@ namespace CodeImp.DoomBuilder.Windows
{
renderstyles = new List<string>();
}
floorRenderStyle.Enabled = (renderstyles.Count > 0);
labelfloorrenderstyle.Enabled = (renderstyles.Count > 0);
ceilRenderStyle.Enabled = (renderstyles.Count > 0);
labelceilrenderstyle.Enabled = (renderstyles.Count > 0);
// Fill renderstyles
foreach(string name in General.Map.Config.SectorRenderStyles.Values)
@ -243,10 +246,6 @@ namespace CodeImp.DoomBuilder.Windows
{
portalrenderstyles = new List<string>();
}
floorportalrenderstyle.Enabled = (portalrenderstyles.Count > 0);
floorportalrenderstylelabel.Enabled = (portalrenderstyles.Count > 0);
ceilportalrenderstyle.Enabled = (portalrenderstyles.Count > 0);
ceilportalrenderstylelabel.Enabled = (portalrenderstyles.Count > 0);
// Fill portal renderstyles
foreach(string name in General.Map.Config.SectorPortalRenderStyles.Values)
@ -838,6 +837,36 @@ namespace CodeImp.DoomBuilder.Windows
}
}
/// <summary>
/// Enables or disables controls depending on if their tag is one of the UDMF fields set in the game config.
/// </summary>
/// <param name="control">Control to process</param>
private void DoUDMFControls(Control control)
{
if (control.Tag is string name && !string.IsNullOrWhiteSpace(name))
{
EnableDisableControlAndChildren(control, General.Map.Config.SectorFields.Any(f => f.Name == name));
}
else
{
foreach (Control c in control.Controls)
DoUDMFControls(c);
}
}
/// <summary>
/// Enables or disables a control and all its children.
/// </summary>
/// <param name="control">Control the enable or disable</param>
/// <param name="state">If to enable or disable</param>
private void EnableDisableControlAndChildren(Control control, bool state)
{
control.Enabled = state;
foreach (Control c in control.Controls)
EnableDisableControlAndChildren(c, state);
}
#endregion
#region ================== Events

24
Source/Core/Windows/ThingEditFormUDMF.Designer.cs generated
View file

@ -165,6 +165,7 @@
this.cbrandomroll.Name = "cbrandomroll";
this.cbrandomroll.Size = new System.Drawing.Size(66, 17);
this.cbrandomroll.TabIndex = 5;
this.cbrandomroll.Tag = "roll";
this.cbrandomroll.Text = "Random";
this.cbrandomroll.UseVisualStyleBackColor = true;
this.cbrandomroll.CheckedChanged += new System.EventHandler(this.cbrandomroll_CheckedChanged);
@ -176,6 +177,7 @@
this.cbrandompitch.Name = "cbrandompitch";
this.cbrandompitch.Size = new System.Drawing.Size(66, 17);
this.cbrandompitch.TabIndex = 3;
this.cbrandompitch.Tag = "pitch";
this.cbrandompitch.Text = "Random";
this.cbrandompitch.UseVisualStyleBackColor = true;
this.cbrandompitch.CheckedChanged += new System.EventHandler(this.cbrandompitch_CheckedChanged);
@ -208,6 +210,7 @@
this.roll.Size = new System.Drawing.Size(60, 24);
this.roll.StepValues = null;
this.roll.TabIndex = 4;
this.roll.Tag = "roll";
this.roll.WhenTextChanged += new System.EventHandler(this.roll_WhenTextChanged);
//
// labelroll
@ -236,6 +239,7 @@
this.pitch.Size = new System.Drawing.Size(60, 24);
this.pitch.StepValues = null;
this.pitch.TabIndex = 2;
this.pitch.Tag = "pitch";
this.pitch.WhenTextChanged += new System.EventHandler(this.pitch_WhenTextChanged);
//
// labelpitch
@ -295,6 +299,7 @@
this.labelGravity.Name = "labelGravity";
this.labelGravity.Size = new System.Drawing.Size(43, 13);
this.labelGravity.TabIndex = 18;
this.labelGravity.Tag = "gravity";
this.labelGravity.Text = "Gravity:";
this.tooltip.SetToolTip(this.labelGravity, "Positive values are multiplied with the class\'s property.\r\nNegative values are us" +
"ed as their absolute.\r\nDefault is 1.0.");
@ -399,6 +404,7 @@
this.rollControl.Name = "rollControl";
this.rollControl.Size = new System.Drawing.Size(64, 64);
this.rollControl.TabIndex = 20;
this.rollControl.Tag = "roll";
this.rollControl.AngleChanged += new System.EventHandler(this.rollControl_AngleChanged);
//
// grouppitch
@ -420,6 +426,7 @@
this.pitchControl.Name = "pitchControl";
this.pitchControl.Size = new System.Drawing.Size(64, 64);
this.pitchControl.TabIndex = 20;
this.pitchControl.Tag = "pitch";
this.pitchControl.AngleChanged += new System.EventHandler(this.pitchControl_AngleChanged);
//
// groupangle
@ -594,6 +601,7 @@
this.floatbobphase.Size = new System.Drawing.Size(72, 24);
this.floatbobphase.StepValues = null;
this.floatbobphase.TabIndex = 4;
this.floatbobphase.Tag = "floatbobphase";
//
// label1
//
@ -602,6 +610,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(86, 13);
this.label1.TabIndex = 27;
this.label1.Tag = "floatbobphase";
this.label1.Text = "Float bob phase:";
//
// conversationID
@ -621,6 +630,7 @@
this.conversationID.Size = new System.Drawing.Size(72, 24);
this.conversationID.StepValues = null;
this.conversationID.TabIndex = 3;
this.conversationID.Tag = "conversation";
//
// labelID
//
@ -629,6 +639,7 @@
this.labelID.Name = "labelID";
this.labelID.Size = new System.Drawing.Size(86, 13);
this.labelID.TabIndex = 25;
this.labelID.Tag = "conversation";
this.labelID.Text = "Conversation ID:";
//
// health
@ -648,6 +659,7 @@
this.health.Size = new System.Drawing.Size(72, 24);
this.health.StepValues = null;
this.health.TabIndex = 2;
this.health.Tag = "health";
//
// label10
//
@ -658,6 +670,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(41, 13);
this.label10.TabIndex = 22;
this.label10.Tag = "health";
this.label10.Text = "Health:";
this.tooltip.SetToolTip(this.label10, "Positive values are multiplied with the class\'s property.\r\nNegative values are us" +
"ed as their absolute.\r\nDefault is 1.");
@ -679,6 +692,7 @@
this.score.Size = new System.Drawing.Size(72, 24);
this.score.StepValues = null;
this.score.TabIndex = 1;
this.score.Tag = "score";
//
// label9
//
@ -687,6 +701,7 @@
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(38, 13);
this.label9.TabIndex = 20;
this.label9.Tag = "score";
this.label9.Text = "Score:";
//
// gravity
@ -706,6 +721,7 @@
this.gravity.Size = new System.Drawing.Size(72, 24);
this.gravity.StepValues = null;
this.gravity.TabIndex = 0;
this.gravity.Tag = "gravity";
//
// grouprendering
//
@ -731,6 +747,7 @@
this.resetalpha.Name = "resetalpha";
this.resetalpha.Size = new System.Drawing.Size(23, 23);
this.resetalpha.TabIndex = 69;
this.resetalpha.Tag = "alpha";
this.tooltip.SetToolTip(this.resetalpha, "Reset");
this.resetalpha.UseVisualStyleBackColor = true;
this.resetalpha.Click += new System.EventHandler(this.resetalpha_Click);
@ -741,6 +758,7 @@
this.labelScale.Name = "labelScale";
this.labelScale.Size = new System.Drawing.Size(80, 14);
this.labelScale.TabIndex = 32;
this.labelScale.Tag = "scalex";
this.labelScale.Text = "Scale:";
this.labelScale.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
@ -757,6 +775,7 @@
this.scale.Name = "scale";
this.scale.Size = new System.Drawing.Size(186, 26);
this.scale.TabIndex = 0;
this.scale.Tag = "scalex";
this.scale.OnValuesChanged += new System.EventHandler(this.scale_OnValuesChanged);
//
// color
@ -768,6 +787,7 @@
this.color.Name = "color";
this.color.Size = new System.Drawing.Size(207, 31);
this.color.TabIndex = 3;
this.color.Tag = "fillcolor";
//
// alpha
//
@ -786,6 +806,7 @@
this.alpha.Size = new System.Drawing.Size(72, 24);
this.alpha.StepValues = null;
this.alpha.TabIndex = 2;
this.alpha.Tag = "alpha";
this.alpha.WhenTextChanged += new System.EventHandler(this.alpha_WhenTextChanged);
//
// label8
@ -795,6 +816,7 @@
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(37, 13);
this.label8.TabIndex = 25;
this.label8.Tag = "alpha";
this.label8.Text = "Alpha:";
//
// renderStyle
@ -805,6 +827,7 @@
this.renderStyle.Name = "renderStyle";
this.renderStyle.Size = new System.Drawing.Size(156, 21);
this.renderStyle.TabIndex = 1;
this.renderStyle.Tag = "renderstyle";
this.renderStyle.SelectedIndexChanged += new System.EventHandler(this.renderStyle_SelectedIndexChanged);
//
// labelrenderstyle
@ -814,6 +837,7 @@
this.labelrenderstyle.Name = "labelrenderstyle";
this.labelrenderstyle.Size = new System.Drawing.Size(69, 13);
this.labelrenderstyle.TabIndex = 23;
this.labelrenderstyle.Tag = "renderstyle";
this.labelrenderstyle.Text = "Render style:";
//
// actiongroup

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

@ -97,6 +97,8 @@ namespace CodeImp.DoomBuilder.Windows
// Initialize
InitializeComponent();
DoUDMFControls(this);
//mxd. Load settings
useabsoluteheight = General.Settings.ReadSetting("windows." + configname + ".useabsoluteheight", false);
@ -417,6 +419,37 @@ namespace CodeImp.DoomBuilder.Windows
flagsrename = newflagsrename;
}
/// <summary>
/// Enables or disables controls depending on if their tag is one of the UDMF fields set in the game config.
/// </summary>
/// <param name="control">Control to process</param>
private void DoUDMFControls(Control control)
{
if (control.Tag is string name && !string.IsNullOrWhiteSpace(name))
{
//EnableDisableControlAndChildren(control, General.Map.Config.HasUniversalFieldOrFlag<Thing>(name));
EnableDisableControlAndChildren(control, General.Map.Config.ThingFields.Any(f => f.Name == name));
}
else
{
foreach (Control c in control.Controls)
DoUDMFControls(c);
}
}
/// <summary>
/// Enables or disables a control and all its children.
/// </summary>
/// <param name="control">Control the enable or disable</param>
/// <param name="state">If to enable or disable</param>
private void EnableDisableControlAndChildren(Control control, bool state)
{
control.Enabled = state;
foreach (Control c in control.Controls)
EnableDisableControlAndChildren(c, state);
}
#endregion
#region ================== Events