Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mapping configs clean up #581

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Mapping configs clean up #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions docs/mapping/EdgeC_DBX_Config/EdgeC_Doom2Doom.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,9 @@ engine = "edge-classic";
// Should this configuration be initially available?
enabledbydefault = true;

// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";
nodebuildersave = "";
nodebuildertest = "";

//**************************************
// ***LOBO*** Game_Doom.cfg doesnt exist in db.x so add it's contents here
// Settings common to Doom games
//include("Includes\\Game_Doom.cfg");

// Default lump name for new map
defaultlumpname = "MAP01";
// STANDARD DOOM SETTINGS
// Settings common to all games and all map formats
include("Includes\\EdgeC_common.cfg", "common");

// Skill levels
skills
Expand All @@ -35,24 +25,6 @@ skills
}


//**************************************


// ***LOBO*** Doom_common.cfg doesnt exist in db.x so add it's contents here
// Settings common to Doom games
// STANDARD DOOM SETTINGS
// Settings common to all games and all map formats
include("Includes\\EdgeC_common.cfg", "common");

//**************************************

// Settings common to Doom map format
//include("Includes\\Boom_common.cfg", "mapformat_doom");
//include("Includes\\MBF21_common.cfg", "mapformat_doom");

// 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");

Expand Down
15 changes: 1 addition & 14 deletions docs/mapping/EdgeC_DBX_Config/EdgeC_DoomUDMF.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,12 @@ 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");

// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";
nodebuildersave = "";
nodebuildertest = "";


// Should this configuration be initially available?
enabledbydefault = true;


// Settings common to text map format
include("Includes\\EdgeC_misc.cfg", "mapformat_udmf");

Expand All @@ -53,8 +41,7 @@ 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");

}


9 changes: 7 additions & 2 deletions docs/mapping/EdgeC_DBX_Config/Includes/EdgeC_common.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ common
// Default testing parameters
testparameters = "-iwad \"%WP\" -skill \"%S\" -file \"%AP\" \"%F\" -warp %L1 %L2 %NM";
testshortpaths = true;

// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";
nodebuildersave = "";
nodebuildertest = "";


// Generalized actions
generalizedsectors = true;
Expand Down Expand Up @@ -127,8 +134,6 @@ common
makedoortrack = "DOORTRAK";
makedoordoor = "BIGDOOR2";
makedoorceil = "FLAT20";

// Door making
makedooraction = 1; // See linedeftypes

// DEFAULT SECTOR BRIGHTNESS LEVELS
Expand Down
143 changes: 21 additions & 122 deletions docs/mapping/EdgeC_DBX_Config/Includes/EdgeC_misc.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,81 +95,6 @@ hires



/*
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";
}
}

*/




// ***********************************************************
// * *
// * Doom map format *
Expand All @@ -183,16 +108,13 @@ mapformat_doom
maplumpnames
{
include("Doom_misc.cfg", "doommaplumpnames");
include("Boom_misc.cfg", "doommaplumpnames");
//include("Boom_misc.cfg", "boommaplumpnames");
}


// Enables support for individual offsets of upper/middle/lower sidedef textures
localsidedeftextureoffsets = false;

// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";

// Default flags for first new thing
defaultthingflags
Expand Down Expand Up @@ -281,11 +203,7 @@ mapformat_udmf
distinctsidedefpartbrightness = false;


// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";

engine = "edge-classic"; // override that so that DB2 uses the correct namespace
//engine = "edge-classic"; // override that so that DB2 uses the correct namespace

maplumpnames
{
Expand Down Expand Up @@ -508,44 +426,7 @@ mapformat_udmf
{
type = 2;
default = "";
}

/*
automapstyle
{
type = 11;
default = 0;
enum
{
0 = "Default";
1 = "One-sided wall";
2 = "Two-sided wall";
3 = "Floor levels of front and back sectors are different";
4 = "Ceiling levels of front and back sectors are different";
5 = "3D floor border";
6 = "Wall with special non-door action";
7 = "Secret door";
8 = "Wall not seen yet";
9 = "Locked door";
10 = "Intra-level teleporter";
11 = "Inter-level or game-ending teleporter";
12 = "Unexplored secret wall";
13 = "Portal line";
}
}

alpha
{
type = 1;
default = 1.0;
}

locknumber
{
type = 0;
default = 0;
}
*/
}
}

sidedef
Expand Down Expand Up @@ -738,6 +619,24 @@ mapformat_udmf
default = 0;
}

lightcolor
{
type = 10;
default = 0;
}

rotationfloor
{
type = 1;
default = 0.0f;
}

rotationceiling
{
type = 1;
default = 0.0f;
}

}
}
}
Expand Down
8 changes: 6 additions & 2 deletions docs/mapping/EdgeC_UDB_Config/Includes/EdgeC_common.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ common
//The default script compiler to use
defaultscriptcompiler = "";

// Default nodebuilder configurations
defaultsavecompiler = "";
defaulttestcompiler = "";
nodebuildersave = "";
nodebuildertest = "";

damagetypes = "";
internalsoundnames = "";

Expand Down Expand Up @@ -125,8 +131,6 @@ common
makedoortrack = "DOORTRAK";
makedoordoor = "BIGDOOR2";
makedoorceil = "FLAT20";

// Door making
makedooraction = 1; // See linedeftypes

// DEFAULT SECTOR BRIGHTNESS LEVELS
Expand Down
Loading