diff --git a/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg b/Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2Hexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2Hexen.cfg
index f2aa0cdf..e3b67e92 100644
--- a/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg b/Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2UDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2UDMF.cfg
index 643a30d1..edfa2f36 100644
--- a/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/GZDoom_Action2UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Includes/Action2_misc.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Action2_misc.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_misc.cfg
diff --git a/Build/Configurations/Includes/Action2_texturesets.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Action2_texturesets.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_texturesets.cfg
diff --git a/Build/Configurations/Includes/Action2_things.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Action2_things.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/Includes/Action2_things.cfg
diff --git a/Build/Configurations/Configs for other games/ActionDoom2/Includes/Game_Action2.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Includes/Game_Action2.cfg
new file mode 100644
index 00000000..afafc874
--- /dev/null
+++ b/Build/Configurations/Configs for other games/ActionDoom2/Includes/Game_Action2.cfg
@@ -0,0 +1,34 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "action2"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
+
+ // Skill levels
+ skills
+ {
+ include("Action2_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "BLACK";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Action2_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Configs for other games/ZDoom_Action2Hexen.cfg b/Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2Hexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_Action2Hexen.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2Hexen.cfg
index 6f4e78e1..f6134021 100644
--- a/Build/Configurations/Configs for other games/ZDoom_Action2Hexen.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_Action2UDMF.cfg b/Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2UDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_Action2UDMF.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2UDMF.cfg
index abe33a9a..a8caa602 100644
--- a/Build/Configurations/Configs for other games/ZDoom_Action2UDMF.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/ZDoom_Action2UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_Action2Hexen.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2Hexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_Action2Hexen.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2Hexen.cfg
index 6e2ca719..041a64a1 100644
--- a/Build/Configurations/Configs for other games/Zandronum_Action2Hexen.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_Action2UDMF.cfg b/Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2UDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_Action2UDMF.cfg
rename to Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2UDMF.cfg
index 1ed8e44c..a9554728 100644
--- a/Build/Configurations/Configs for other games/Zandronum_Action2UDMF.cfg
+++ b/Build/Configurations/Configs for other games/ActionDoom2/Zandronum_Action2UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Urban Brawl games
-include("Includes\\ZDoom_common.cfg", "game_action2");
+include("Includes\\Game_Action2.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3Hexen.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3Hexen.cfg
index 1c48d7fa..f4a20782 100644
--- a/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3UDMF.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3UDMF.cfg
index af9da163..49544614 100644
--- a/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/GZDoom_Chex3UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Includes/Chex3_texturesets.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex3_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Chex3_texturesets.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex3_texturesets.cfg
diff --git a/Build/Configurations/Includes/Chex3_things.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex3_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Chex3_things.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex3_things.cfg
diff --git a/Build/Configurations/Includes/Chex_misc.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Chex_misc.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/Includes/Chex_misc.cfg
diff --git a/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Game_Chex3.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Game_Chex3.cfg
new file mode 100644
index 00000000..a7a238d3
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/Includes/Game_Chex3.cfg
@@ -0,0 +1,34 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "chex";
+
+ // Skill levels
+ skills
+ {
+ include("Chex_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "COMPSTA1";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Chex3_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Configs for other games/ZDoom_Chex3Hexen.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3Hexen.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/ZDoom_Chex3Hexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3Hexen.cfg
index 57058889..b8d67968 100644
--- a/Build/Configurations/Configs for other games/ZDoom_Chex3Hexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Configs for other games/ZDoom_Chex3UDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3UDMF.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/ZDoom_Chex3UDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3UDMF.cfg
index a445776b..43e37545 100644
--- a/Build/Configurations/Configs for other games/ZDoom_Chex3UDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/ZDoom_Chex3UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Configs for other games/Zandronum_Chex3Hexen.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3Hexen.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/Zandronum_Chex3Hexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3Hexen.cfg
index 87b8466b..de9d4e82 100644
--- a/Build/Configurations/Configs for other games/Zandronum_Chex3Hexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3Hexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Configs for other games/Zandronum_Chex3UDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3UDMF.cfg
similarity index 93%
rename from Build/Configurations/Configs for other games/Zandronum_Chex3UDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3UDMF.cfg
index 0e54a624..ecbdca7a 100644
--- a/Build/Configurations/Configs for other games/Zandronum_Chex3UDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest 3/Zandronum_Chex3UDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest 3 games
-include("Includes\\ZDoom_common.cfg", "game_chex3");
+include("Includes\\Game_Chex3.cfg");
// Default thing filters
// (these are not required, just useful for new users)
@@ -52,7 +52,6 @@ thingtypes
{
// Basic game actors
include("Includes\\Chex3_things.cfg");
- include("Includes\\Harmony_things.cfg");
// Additional ZDoom actors for that game
include("Includes\\ZDoom_things.cfg", "default");
// Standard ZDoom actors
diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexDoom.cfg
index ac08aa9b..fc4f9a24 100644
--- a/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexHexen.cfg
index 4dc50c2d..c6ca1253 100644
--- a/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexUDMF.cfg
index eb070090..2b944fec 100644
--- a/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/GZDoom_ChexUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_misc.cfg b/Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_misc.cfg
new file mode 100644
index 00000000..b4776d6b
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_misc.cfg
@@ -0,0 +1,64 @@
+
+// Basic Doom and Vanilla engine stuff.
+
+include("Doom_Misc.cfg");
+
+// The only difference with Doom
+skills
+{
+ 1 = "Easy does it";
+ 2 = "Not so sticky";
+ 3 = "Gobs of goo";
+ 4 = "Extreme ooze";
+ 5 = "Super slimey!";
+}
+
+/*
+GAME DETECT PATTERN
+Used to guess the game for which a WAD file is made.
+
+1 = One of these lumps must exist
+2 = None of these lumps must exist
+3 = All of these lumps must exist
+*/
+
+gamedetect_chex1
+{
+ EXTENDED = 2;
+ E1M1 = 1; E1M2 = 1; E1M3 = 1; E1M4 = 1; E1M5 = 1; E1M6 = 1; E1M7 = 1; E1M8 = 1; E1M9 = 1;
+ E2M1 = 1; E2M2 = 1; E2M3 = 1; E2M4 = 1; E2M5 = 1; E2M6 = 1; E2M7 = 1; E2M8 = 1; E2M9 = 1;
+ E3M1 = 1; E3M2 = 1; E3M3 = 1; E3M4 = 1; E3M5 = 1; E3M6 = 1; E3M7 = 1; E3M8 = 1; E3M9 = 1;
+ E4M1 = 1; E4M2 = 1; E4M3 = 1; E4M4 = 1; E4M5 = 1; E4M6 = 1; E4M7 = 1; E4M8 = 1; E4M9 = 1;
+ E5M1 = 2; E5M2 = 2; E5M3 = 2; E5M4 = 2; E5M5 = 2; E5M6 = 2; E5M7 = 2; E5M8 = 2; E5M9 = 2;
+ E6M1 = 2; E6M2 = 2; E6M3 = 2;
+ MAP01 = 2; MAP02 = 2; MAP03 = 2; MAP04 = 2; MAP05 = 2; MAP06 = 2; MAP07 = 2; MAP08 = 2; MAP09 = 2; MAP10 = 2;
+ MAP11 = 2; MAP12 = 2; MAP13 = 2; MAP14 = 2; MAP15 = 2; MAP16 = 2; MAP17 = 2; MAP18 = 2; MAP19 = 2; MAP20 = 2;
+ MAP21 = 2; MAP22 = 2; MAP23 = 2; MAP24 = 2; MAP25 = 2; MAP26 = 2; MAP27 = 2; MAP28 = 2; MAP29 = 2; MAP30 = 2;
+ MAP31 = 2; MAP32 = 2; MAP33 = 2; MAP34 = 2; MAP35 = 2; MAP36 = 2; MAP37 = 2; MAP38 = 2; MAP39 = 2; MAP40 = 2;
+ MAP41 = 2;
+}
+
+/*
+GAME DETECT PATTERN
+Used to guess the game for which a WAD file is made.
+
+1 = One of these lumps must exist
+2 = None of these lumps must exist
+3 = All of these lumps must exist
+*/
+
+gamedetect_chex3
+{
+ EXTENDED = 2;
+ E1M1 = 1; E1M2 = 1; E1M3 = 1; E1M4 = 1; E1M5 = 1; E1M6 = 2; E1M7 = 2; E1M8 = 2; E1M9 = 2;
+ E2M1 = 1; E2M2 = 1; E2M3 = 1; E2M4 = 1; E2M5 = 1; E2M6 = 2; E2M7 = 2; E2M8 = 2; E2M9 = 2;
+ E3M1 = 1; E3M2 = 1; E3M3 = 1; E3M4 = 1; E3M5 = 1; E3M6 = 2; E3M7 = 2; E3M8 = 2; E3M9 = 2;
+ E4M1 = 2; E4M2 = 2; E4M3 = 2; E4M4 = 2; E4M5 = 2; E4M6 = 2; E4M7 = 2; E4M8 = 2; E4M9 = 2;
+ E5M1 = 2; E5M2 = 2; E5M3 = 2; E5M4 = 2; E5M5 = 2; E5M6 = 2; E5M7 = 2; E5M8 = 2; E5M9 = 2;
+ E6M1 = 2; E6M2 = 2; E6M3 = 2;
+ MAP01 = 2; MAP02 = 2; MAP03 = 2; MAP04 = 2; MAP05 = 2; MAP06 = 2; MAP07 = 2; MAP08 = 2; MAP09 = 2; MAP10 = 2;
+ MAP11 = 2; MAP12 = 2; MAP13 = 2; MAP14 = 2; MAP15 = 2; MAP16 = 2; MAP17 = 2; MAP18 = 2; MAP19 = 2; MAP20 = 2;
+ MAP21 = 2; MAP22 = 2; MAP23 = 2; MAP24 = 2; MAP25 = 2; MAP26 = 2; MAP27 = 2; MAP28 = 2; MAP29 = 2; MAP30 = 2;
+ MAP31 = 2; MAP32 = 2; MAP33 = 2; MAP34 = 2; MAP35 = 2; MAP36 = 2; MAP37 = 2; MAP38 = 2; MAP39 = 2; MAP40 = 2;
+ MAP41 = 2;
+}
diff --git a/Build/Configurations/Includes/Chex_texturesets.cfg b/Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Chex_texturesets.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_texturesets.cfg
diff --git a/Build/Configurations/Includes/Chex_things.cfg b/Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Chex_things.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/Includes/Chex_things.cfg
diff --git a/Build/Configurations/Configs for other games/Chex Quest/Includes/Game_Chex.cfg b/Build/Configurations/Configs for other games/Chex Quest/Includes/Game_Chex.cfg
new file mode 100644
index 00000000..2cf9ad09
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Chex Quest/Includes/Game_Chex.cfg
@@ -0,0 +1,34 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "chex";
+
+ // Skill levels
+ skills
+ {
+ include("Chex_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "COMPSTA1";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Chex_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Configs for other games/ZDoom_ChexDoom.cfg b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_ChexDoom.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexDoom.cfg
index 6f9de650..21ab1b69 100644
--- a/Build/Configurations/Configs for other games/ZDoom_ChexDoom.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_ChexHexen.cfg b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_ChexHexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexHexen.cfg
index aca1da9e..6aba6c1a 100644
--- a/Build/Configurations/Configs for other games/ZDoom_ChexHexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_ChexUDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_ChexUDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexUDMF.cfg
index a978a324..34dc9c55 100644
--- a/Build/Configurations/Configs for other games/ZDoom_ChexUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/ZDoom_ChexUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_ChexDoom.cfg b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexDoom.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_ChexDoom.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexDoom.cfg
index 79b49699..b6f8f61d 100644
--- a/Build/Configurations/Configs for other games/Zandronum_ChexDoom.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_ChexHexen.cfg b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexHexen.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_ChexHexen.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexHexen.cfg
index 8f109686..0af20442 100644
--- a/Build/Configurations/Configs for other games/Zandronum_ChexHexen.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_ChexUDMF.cfg b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexUDMF.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_ChexUDMF.cfg
rename to Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexUDMF.cfg
index 50d55aca..a67b5b47 100644
--- a/Build/Configurations/Configs for other games/Zandronum_ChexUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Chex Quest/Zandronum_ChexUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Chex Quest games
-include("Includes\\ZDoom_common.cfg", "game_chex");
+include("Includes\\Game_Chex.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg b/Build/Configurations/Configs for other games/Doom/GZDoom_DoomDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg
rename to Build/Configurations/Configs for other games/Doom/GZDoom_DoomDoom.cfg
index 2c55ecc9..8932d6a2 100644
--- a/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg
+++ b/Build/Configurations/Configs for other games/Doom/GZDoom_DoomDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_DoomDoom.cfg b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_DoomDoom.cfg
rename to Build/Configurations/Configs for other games/Doom/ZDoom_DoomDoom.cfg
index 6e9ce8af..c6f5a5e1 100644
--- a/Build/Configurations/Configs for other games/ZDoom_DoomDoom.cfg
+++ b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_DoomHexen.cfg b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_DoomHexen.cfg
rename to Build/Configurations/Configs for other games/Doom/ZDoom_DoomHexen.cfg
index bab96cb7..e4e68e20 100644
--- a/Build/Configurations/Configs for other games/ZDoom_DoomHexen.cfg
+++ b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_DoomUDMF.cfg b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_DoomUDMF.cfg
rename to Build/Configurations/Configs for other games/Doom/ZDoom_DoomUDMF.cfg
index 46677780..4e140ad8 100644
--- a/Build/Configurations/Configs for other games/ZDoom_DoomUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Doom/ZDoom_DoomUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_DoomDoom.cfg b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomDoom.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_DoomDoom.cfg
rename to Build/Configurations/Configs for other games/Doom/Zandronum_DoomDoom.cfg
index 64245153..c2361159 100644
--- a/Build/Configurations/Configs for other games/Zandronum_DoomDoom.cfg
+++ b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_DoomHexen.cfg b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomHexen.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_DoomHexen.cfg
rename to Build/Configurations/Configs for other games/Doom/Zandronum_DoomHexen.cfg
index 127ce08c..39d60a6b 100644
--- a/Build/Configurations/Configs for other games/Zandronum_DoomHexen.cfg
+++ b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_DoomUDMF.cfg b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomUDMF.cfg
similarity index 95%
rename from Build/Configurations/Configs for other games/Zandronum_DoomUDMF.cfg
rename to Build/Configurations/Configs for other games/Doom/Zandronum_DoomUDMF.cfg
index 3f4cae3c..da30fc23 100644
--- a/Build/Configurations/Configs for other games/Zandronum_DoomUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Doom/Zandronum_DoomUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg
rename to Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyDoom.cfg
index c660dbd5..c316fef9 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg
rename to Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyHexen.cfg
index 5402ea84..15654be1 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg
rename to Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyUDMF.cfg
index 20d3e0eb..57628d4c 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/GZDoom_HarmonyUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Harmony/Includes/Game_Harmony.cfg b/Build/Configurations/Configs for other games/Harmony/Includes/Game_Harmony.cfg
new file mode 100644
index 00000000..578eebbd
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Harmony/Includes/Game_Harmony.cfg
@@ -0,0 +1,34 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "harmony"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
+
+ // Skill levels
+ skills
+ {
+ include("Harmony_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "DOORTRAK";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Harmony_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Harmony_misc.cfg b/Build/Configurations/Configs for other games/Harmony/Includes/Harmony_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Harmony_misc.cfg
rename to Build/Configurations/Configs for other games/Harmony/Includes/Harmony_misc.cfg
diff --git a/Build/Configurations/Includes/Harmony_texturesets.cfg b/Build/Configurations/Configs for other games/Harmony/Includes/Harmony_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Harmony_texturesets.cfg
rename to Build/Configurations/Configs for other games/Harmony/Includes/Harmony_texturesets.cfg
diff --git a/Build/Configurations/Includes/Harmony_things.cfg b/Build/Configurations/Configs for other games/Harmony/Includes/Harmony_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Harmony_things.cfg
rename to Build/Configurations/Configs for other games/Harmony/Includes/Harmony_things.cfg
diff --git a/Build/Configurations/Configs for other games/ZDoom_HarmonyDoom.cfg b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HarmonyDoom.cfg
rename to Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyDoom.cfg
index 4420f396..74bcc937 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HarmonyDoom.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_HarmonyHexen.cfg b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HarmonyHexen.cfg
rename to Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyHexen.cfg
index ba14435f..c8dcdf7f 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HarmonyHexen.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_HarmonyUDMF.cfg b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HarmonyUDMF.cfg
rename to Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyUDMF.cfg
index 94f28b9f..f156d583 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HarmonyUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/ZDoom_HarmonyUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HarmonyDoom.cfg b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HarmonyDoom.cfg
rename to Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyDoom.cfg
index 40b7746a..99a0c495 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HarmonyDoom.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HarmonyHexen.cfg b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HarmonyHexen.cfg
rename to Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyHexen.cfg
index 293b5418..3abd60e9 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HarmonyHexen.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HarmonyUDMF.cfg b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HarmonyUDMF.cfg
rename to Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyUDMF.cfg
index 36768742..2f424ac9 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HarmonyUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Harmony/Zandronum_HarmonyUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Harmony games
-include("Includes\\ZDoom_common.cfg", "game_harmony");
+include("Includes\\Game_Harmony.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg
rename to Build/Configurations/Configs for other games/Heretic/GZDoom_HereticDoom.cfg
index 4f3ed617..5449ccc1 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg
rename to Build/Configurations/Configs for other games/Heretic/GZDoom_HereticHexen.cfg
index 18be1870..70f7ccca 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg
rename to Build/Configurations/Configs for other games/Heretic/GZDoom_HereticUDMF.cfg
index af861b8f..fd9b6f45 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/GZDoom_HereticUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Heretic/Includes/Game_Heretic.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Game_Heretic.cfg
new file mode 100644
index 00000000..a099bdb2
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Heretic/Includes/Game_Heretic.cfg
@@ -0,0 +1,35 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+ basegame = 2;
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "heretic raven";
+
+ // Skill levels
+ skills
+ {
+ include("Heretic_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "METL2";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Hexen_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Heretic_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Heretic_linedefs.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Heretic_linedefs.cfg
similarity index 100%
rename from Build/Configurations/Includes/Heretic_linedefs.cfg
rename to Build/Configurations/Configs for other games/Heretic/Includes/Heretic_linedefs.cfg
diff --git a/Build/Configurations/Includes/Heretic_misc.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Heretic_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Heretic_misc.cfg
rename to Build/Configurations/Configs for other games/Heretic/Includes/Heretic_misc.cfg
diff --git a/Build/Configurations/Includes/Heretic_sectors.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Heretic_sectors.cfg
similarity index 100%
rename from Build/Configurations/Includes/Heretic_sectors.cfg
rename to Build/Configurations/Configs for other games/Heretic/Includes/Heretic_sectors.cfg
diff --git a/Build/Configurations/Includes/Heretic_texturesets.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Heretic_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Heretic_texturesets.cfg
rename to Build/Configurations/Configs for other games/Heretic/Includes/Heretic_texturesets.cfg
diff --git a/Build/Configurations/Includes/Heretic_things.cfg b/Build/Configurations/Configs for other games/Heretic/Includes/Heretic_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Heretic_things.cfg
rename to Build/Configurations/Configs for other games/Heretic/Includes/Heretic_things.cfg
diff --git a/Build/Configurations/Configs for other games/ZDoom_HereticDoom.cfg b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HereticDoom.cfg
rename to Build/Configurations/Configs for other games/Heretic/ZDoom_HereticDoom.cfg
index c7cc7b8a..b47de6c7 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HereticDoom.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_HereticHexen.cfg b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HereticHexen.cfg
rename to Build/Configurations/Configs for other games/Heretic/ZDoom_HereticHexen.cfg
index e39cb222..a3052bf3 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HereticHexen.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_HereticUDMF.cfg b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HereticUDMF.cfg
rename to Build/Configurations/Configs for other games/Heretic/ZDoom_HereticUDMF.cfg
index 8585ed64..b9976c52 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HereticUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/ZDoom_HereticUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HereticDoom.cfg b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HereticDoom.cfg
rename to Build/Configurations/Configs for other games/Heretic/Zandronum_HereticDoom.cfg
index fbf7aeaa..98ff7202 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HereticDoom.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HereticHexen.cfg b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HereticHexen.cfg
rename to Build/Configurations/Configs for other games/Heretic/Zandronum_HereticHexen.cfg
index 8a8c5635..32a89c06 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HereticHexen.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HereticUDMF.cfg b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HereticUDMF.cfg
rename to Build/Configurations/Configs for other games/Heretic/Zandronum_HereticUDMF.cfg
index e7f98b8f..aece09d8 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HereticUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Heretic/Zandronum_HereticUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Heretic games
-include("Includes\\ZDoom_common.cfg", "game_heretic");
+include("Includes\\Game_Heretic.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg b/Build/Configurations/Configs for other games/Hexen/GZDoom_HexenHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg
rename to Build/Configurations/Configs for other games/Hexen/GZDoom_HexenHexen.cfg
index 864e8b17..c9c76d98 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/GZDoom_HexenHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg b/Build/Configurations/Configs for other games/Hexen/GZDoom_HexenUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg
rename to Build/Configurations/Configs for other games/Hexen/GZDoom_HexenUDMF.cfg
index f37d4d62..3a0056d2 100644
--- a/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/GZDoom_HexenUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Hexen/Includes/Game_Hexen.cfg b/Build/Configurations/Configs for other games/Hexen/Includes/Game_Hexen.cfg
new file mode 100644
index 00000000..813e21f5
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Hexen/Includes/Game_Hexen.cfg
@@ -0,0 +1,36 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+ skyflatname = "F_SKY";
+ basegame = 3;
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "hexen raven";
+
+ // Skill levels
+ skills
+ {
+ include("Hexen_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "D_END2";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Hexen_misc.cfg", "thingsfilters");
+ } */
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Hexen_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Hexen_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Hexen_sectors.cfg b/Build/Configurations/Configs for other games/Hexen/Includes/Hexen_sectors.cfg
similarity index 100%
rename from Build/Configurations/Includes/Hexen_sectors.cfg
rename to Build/Configurations/Configs for other games/Hexen/Includes/Hexen_sectors.cfg
diff --git a/Build/Configurations/Includes/Hexen_texturesets.cfg b/Build/Configurations/Configs for other games/Hexen/Includes/Hexen_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Hexen_texturesets.cfg
rename to Build/Configurations/Configs for other games/Hexen/Includes/Hexen_texturesets.cfg
diff --git a/Build/Configurations/Includes/Hexen_things.cfg b/Build/Configurations/Configs for other games/Hexen/Includes/Hexen_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Hexen_things.cfg
rename to Build/Configurations/Configs for other games/Hexen/Includes/Hexen_things.cfg
diff --git a/Build/Configurations/Configs for other games/ZDoom_HexenHexen.cfg b/Build/Configurations/Configs for other games/Hexen/ZDoom_HexenHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HexenHexen.cfg
rename to Build/Configurations/Configs for other games/Hexen/ZDoom_HexenHexen.cfg
index bb5ac1af..2fbc0575 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HexenHexen.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/ZDoom_HexenHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_HexenUDMF.cfg b/Build/Configurations/Configs for other games/Hexen/ZDoom_HexenUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_HexenUDMF.cfg
rename to Build/Configurations/Configs for other games/Hexen/ZDoom_HexenUDMF.cfg
index c5ec59b5..8c23babf 100644
--- a/Build/Configurations/Configs for other games/ZDoom_HexenUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/ZDoom_HexenUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HexenHexen.cfg b/Build/Configurations/Configs for other games/Hexen/Zandronum_HexenHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HexenHexen.cfg
rename to Build/Configurations/Configs for other games/Hexen/Zandronum_HexenHexen.cfg
index 2c3c8072..32d89f4c 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HexenHexen.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/Zandronum_HexenHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_HexenUDMF.cfg b/Build/Configurations/Configs for other games/Hexen/Zandronum_HexenUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_HexenUDMF.cfg
rename to Build/Configurations/Configs for other games/Hexen/Zandronum_HexenUDMF.cfg
index 70746298..87573534 100644
--- a/Build/Configurations/Configs for other games/Zandronum_HexenUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Hexen/Zandronum_HexenUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Hexen games
-include("Includes\\ZDoom_common.cfg", "game_hexen");
+include("Includes\\Game_Hexen.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg
rename to Build/Configurations/Configs for other games/Strife/GZDoom_StrifeDoom.cfg
index ff1b679a..fe631787 100644
--- a/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg
+++ b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg
rename to Build/Configurations/Configs for other games/Strife/GZDoom_StrifeHexen.cfg
index 10a9abc7..41d47b71 100644
--- a/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg
+++ b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg
rename to Build/Configurations/Configs for other games/Strife/GZDoom_StrifeUDMF.cfg
index c0734f70..10732166 100644
--- a/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Strife/GZDoom_StrifeUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Strife/Includes/Game_Strife.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Game_Strife.cfg
new file mode 100644
index 00000000..c0d98a6e
--- /dev/null
+++ b/Build/Configurations/Configs for other games/Strife/Includes/Game_Strife.cfg
@@ -0,0 +1,36 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+ skyflatname = "F_SKY001";
+ basegame = 4;
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "strife";
+
+ // Skill levels
+ skills
+ {
+ include("Strife_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "DORTRK01";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Strife_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Strife_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Strife_linedefs.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Strife_linedefs.cfg
similarity index 100%
rename from Build/Configurations/Includes/Strife_linedefs.cfg
rename to Build/Configurations/Configs for other games/Strife/Includes/Strife_linedefs.cfg
diff --git a/Build/Configurations/Includes/Strife_misc.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Strife_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Strife_misc.cfg
rename to Build/Configurations/Configs for other games/Strife/Includes/Strife_misc.cfg
diff --git a/Build/Configurations/Includes/Strife_sectors.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Strife_sectors.cfg
similarity index 100%
rename from Build/Configurations/Includes/Strife_sectors.cfg
rename to Build/Configurations/Configs for other games/Strife/Includes/Strife_sectors.cfg
diff --git a/Build/Configurations/Includes/Strife_texturesets.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Strife_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Strife_texturesets.cfg
rename to Build/Configurations/Configs for other games/Strife/Includes/Strife_texturesets.cfg
diff --git a/Build/Configurations/Includes/Strife_things.cfg b/Build/Configurations/Configs for other games/Strife/Includes/Strife_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Strife_things.cfg
rename to Build/Configurations/Configs for other games/Strife/Includes/Strife_things.cfg
diff --git a/Build/Configurations/Configs for other games/ZDoom_StrifeDoom.cfg b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_StrifeDoom.cfg
rename to Build/Configurations/Configs for other games/Strife/ZDoom_StrifeDoom.cfg
index fee5b785..19330974 100644
--- a/Build/Configurations/Configs for other games/ZDoom_StrifeDoom.cfg
+++ b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_StrifeHexen.cfg b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_StrifeHexen.cfg
rename to Build/Configurations/Configs for other games/Strife/ZDoom_StrifeHexen.cfg
index 2ddfe164..ab3e3a8f 100644
--- a/Build/Configurations/Configs for other games/ZDoom_StrifeHexen.cfg
+++ b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/ZDoom_StrifeUDMF.cfg b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/ZDoom_StrifeUDMF.cfg
rename to Build/Configurations/Configs for other games/Strife/ZDoom_StrifeUDMF.cfg
index 3df5ab95..60243ec9 100644
--- a/Build/Configurations/Configs for other games/ZDoom_StrifeUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Strife/ZDoom_StrifeUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_StrifeDoom.cfg b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeDoom.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_StrifeDoom.cfg
rename to Build/Configurations/Configs for other games/Strife/Zandronum_StrifeDoom.cfg
index 6c06a090..a4939a9e 100644
--- a/Build/Configurations/Configs for other games/Zandronum_StrifeDoom.cfg
+++ b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeDoom.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_doom");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_StrifeHexen.cfg b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeHexen.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_StrifeHexen.cfg
rename to Build/Configurations/Configs for other games/Strife/Zandronum_StrifeHexen.cfg
index 3d08a724..622e0b18 100644
--- a/Build/Configurations/Configs for other games/Zandronum_StrifeHexen.cfg
+++ b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Configs for other games/Zandronum_StrifeUDMF.cfg b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeUDMF.cfg
similarity index 94%
rename from Build/Configurations/Configs for other games/Zandronum_StrifeUDMF.cfg
rename to Build/Configurations/Configs for other games/Strife/Zandronum_StrifeUDMF.cfg
index 1e09dde8..6028cd99 100644
--- a/Build/Configurations/Configs for other games/Zandronum_StrifeUDMF.cfg
+++ b/Build/Configurations/Configs for other games/Strife/Zandronum_StrifeUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Strife games
-include("Includes\\ZDoom_common.cfg", "game_strife");
+include("Includes\\Game_Strife.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Includes/Doomsday_misc.cfg b/Build/Configurations/Configs for other games/Unused Includes/Doomsday_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Doomsday_misc.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Doomsday_misc.cfg
diff --git a/Build/Configurations/Includes/Edge_linedefs.cfg b/Build/Configurations/Configs for other games/Unused Includes/Edge_linedefs.cfg
similarity index 100%
rename from Build/Configurations/Includes/Edge_linedefs.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Edge_linedefs.cfg
diff --git a/Build/Configurations/Includes/Edge_sectors.cfg b/Build/Configurations/Configs for other games/Unused Includes/Edge_sectors.cfg
similarity index 100%
rename from Build/Configurations/Includes/Edge_sectors.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Edge_sectors.cfg
diff --git a/Build/Configurations/Includes/Edge_things.cfg b/Build/Configurations/Configs for other games/Unused Includes/Edge_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Edge_things.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Edge_things.cfg
diff --git a/Build/Configurations/Includes/Eternity_linedefs.cfg b/Build/Configurations/Configs for other games/Unused Includes/Eternity_linedefs.cfg
similarity index 100%
rename from Build/Configurations/Includes/Eternity_linedefs.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Eternity_linedefs.cfg
diff --git a/Build/Configurations/Includes/Eternity_misc.cfg b/Build/Configurations/Configs for other games/Unused Includes/Eternity_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Eternity_misc.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Eternity_misc.cfg
diff --git a/Build/Configurations/Includes/Eternity_things.cfg b/Build/Configurations/Configs for other games/Unused Includes/Eternity_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Eternity_things.cfg
rename to Build/Configurations/Configs for other games/Unused Includes/Eternity_things.cfg
diff --git a/Build/Configurations/Includes/Zandronum_common.cfg b/Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_common.cfg
similarity index 100%
rename from Build/Configurations/Includes/Zandronum_common.cfg
rename to Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_common.cfg
diff --git a/Build/Configurations/Includes/Zandronum_linedefs.cfg b/Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_linedefs.cfg
similarity index 100%
rename from Build/Configurations/Includes/Zandronum_linedefs.cfg
rename to Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_linedefs.cfg
diff --git a/Build/Configurations/Includes/Zandronum_misc.cfg b/Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_misc.cfg
similarity index 100%
rename from Build/Configurations/Includes/Zandronum_misc.cfg
rename to Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_misc.cfg
diff --git a/Build/Configurations/Includes/Zandronum_texturesets.cfg b/Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_texturesets.cfg
similarity index 100%
rename from Build/Configurations/Includes/Zandronum_texturesets.cfg
rename to Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_texturesets.cfg
diff --git a/Build/Configurations/Includes/Zandronum_things.cfg b/Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_things.cfg
similarity index 100%
rename from Build/Configurations/Includes/Zandronum_things.cfg
rename to Build/Configurations/Configs for other games/Zandronum Includes/Zandronum_things.cfg
diff --git a/Build/Configurations/GZDoom_DoomHexen.cfg b/Build/Configurations/GZDoom_DoomHexen.cfg
index e984015c..4faa67f1 100644
--- a/Build/Configurations/GZDoom_DoomHexen.cfg
+++ b/Build/Configurations/GZDoom_DoomHexen.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/GZDoom_DoomUDMF.cfg b/Build/Configurations/GZDoom_DoomUDMF.cfg
index c9852598..51d69677 100644
--- a/Build/Configurations/GZDoom_DoomUDMF.cfg
+++ b/Build/Configurations/GZDoom_DoomUDMF.cfg
@@ -27,7 +27,7 @@ include("Includes\\ZDoom_common.cfg", "common");
include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
// Settings common to Doom games
-include("Includes\\ZDoom_common.cfg", "game_doom");
+include("Includes\\Game_Doom.cfg");
// Default thing filters
// (these are not required, just useful for new users)
diff --git a/Build/Configurations/Includes/Common.cfg b/Build/Configurations/Includes/Common.cfg
index 4f3877cc..1bae0d63 100644
--- a/Build/Configurations/Includes/Common.cfg
+++ b/Build/Configurations/Includes/Common.cfg
@@ -12,9 +12,6 @@ doomlightlevels = true;
start3dmode = 32000;
-// Flat used as sky
-//skyflatname = "F_SKY1"; //mxd: moved to game_xxx sections of ZDoom_common.cfg because different games use different skyflatname
-
// Map boundaries. Map objects can only be placed within these boundaries
// WARNING: changing this may mess your map up, so only change it when you
// know what you are doing
diff --git a/Build/Configurations/Includes/Game_Doom.cfg b/Build/Configurations/Includes/Game_Doom.cfg
new file mode 100644
index 00000000..0f8bd911
--- /dev/null
+++ b/Build/Configurations/Includes/Game_Doom.cfg
@@ -0,0 +1,35 @@
+// Default lump name for new map
+ defaultlumpname = "MAP01";
+ basegame = 1; //mxd: 0 - UNKNOWN, 1 - DOOM, 2 - HERETIC, 3 - HEXEN, 4 - STRIFE,
+
+ // Decorate actors to include depending on actor game property
+ decorategames = "doom";
+
+ // Skill levels
+ skills
+ {
+ include("Doom_misc.cfg", "skills");
+ }
+
+ // Door making
+ makedoortrack = "DOORTRAK";
+
+ // Default thing filters
+ // (these are not required, just useful for new users)
+ /*thingsfilters
+ {
+ include("Doom_misc.cfg", "thingsfilters");
+ }*/
+
+ // How to compare thing flags (for the stuck things error checker)
+ thingflagscompare
+ {
+ include("Doom_misc.cfg", "thingflagscompare");
+ }
+
+ // Default texture sets
+ // (these are not required, but useful for new users)
+ texturesets
+ {
+ include("Doom_texturesets.cfg");
+ }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/UDMF_misc.cfg b/Build/Configurations/Includes/UDMF_misc.cfg
index 1d61bc68..10d49b95 100644
--- a/Build/Configurations/Includes/UDMF_misc.cfg
+++ b/Build/Configurations/Includes/UDMF_misc.cfg
@@ -60,6 +60,14 @@ thingflagscompare
}
}
+sectorflags
+{
+ silent = "Silent";
+ hidden = "Not shown on automap";
+ nofallingdamage = "No falling damage";
+ norespawn = "Players can't respawn in this sector";
+ dropactors = "Actors drop with instantly moving floors";
+}
linedefflags
{
diff --git a/Build/Configurations/Includes/ZDoom_common.cfg b/Build/Configurations/Includes/ZDoom_common.cfg
index a44b6c11..72c1c9e6 100644
--- a/Build/Configurations/Includes/ZDoom_common.cfg
+++ b/Build/Configurations/Includes/ZDoom_common.cfg
@@ -324,6 +324,12 @@ mapformat_udmf
// Generalized actions
generalizedlinedefs = false;
+
+ // SECTOR FLAGS
+ sectorflags
+ {
+ include("UDMF_misc.cfg", "sectorflags");
+ }
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
@@ -397,362 +403,4 @@ mapformat_udmf
include("ZDoom_linedefs.cfg", "udmf");
}
-}
-
-// ***********************************************************
-// * *
-// * Doom: Ultimate Doom, Hell on Earth, Final Doom *
-// * *
-// ***********************************************************
-
-game_doom
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
- basegame = 1; //mxd: 0 - UNKNOWN, 1 - DOOM, 2 - HERETIC, 3 - HEXEN, 4 - STRIFE,
-
- // Decorate actors to include depending on actor game property
- decorategames = "doom";
-
- // Skill levels
- skills
- {
- include("Doom_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "DOORTRAK";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Doom_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Heretic: Shadow of the Serpent Riders *
-// * *
-// ***********************************************************
-
-game_heretic
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
- basegame = 2;
-
- // Decorate actors to include depending on actor game property
- decorategames = "heretic raven";
-
- // Skill levels
- skills
- {
- include("Heretic_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "METL2";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Hexen_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Heretic_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Hexen: Beyond Heretic *
-// * *
-// ***********************************************************
-
-game_hexen
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
- skyflatname = "F_SKY";
- basegame = 3;
-
- // Decorate actors to include depending on actor game property
- decorategames = "hexen raven";
-
- // Skill levels
- skills
- {
- include("Hexen_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "D_END2";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Hexen_misc.cfg", "thingsfilters");
- } */
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Hexen_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Hexen_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Strife: Quest for the Sigil *
-// * *
-// ***********************************************************
-
-game_strife
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
- skyflatname = "F_SKY001";
- basegame = 4;
-
- // Decorate actors to include depending on actor game property
- decorategames = "strife";
-
- // Skill levels
- skills
- {
- include("Strife_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "DORTRK01";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Strife_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Strife_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Chex Quest game *
-// * *
-// ***********************************************************
-
-game_chex
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
-
- // Decorate actors to include depending on actor game property
- decorategames = "chex";
-
- // Skill levels
- skills
- {
- include("Chex_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "COMPSTA1";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Chex_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Chex Quest 3 game *
-// * *
-// ***********************************************************
-
-game_chex3
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
-
- // Decorate actors to include depending on actor game property
- decorategames = "chex";
-
- // Skill levels
- skills
- {
- include("Chex_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "COMPSTA1";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Chex3_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Harmony game *
-// * *
-// ***********************************************************
-
-game_harmony
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
-
- // Decorate actors to include depending on actor game property
- decorategames = "harmony"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
-
- // Skill levels
- skills
- {
- include("Harmony_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "DOORTRAK";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Harmony_texturesets.cfg");
- }
-}
-
-// ***********************************************************
-// * *
-// * Action Doom 2: Urban Brawl game *
-// * *
-// ***********************************************************
-
-game_action2
-{
- // Default lump name for new map
- defaultlumpname = "MAP01";
-
- // Decorate actors to include depending on actor game property
- decorategames = "action2"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
-
- // Skill levels
- skills
- {
- include("Action2_misc.cfg", "skills");
- }
-
- // Door making
- makedoortrack = "BLACK";
-
- // Default thing filters
- // (these are not required, just useful for new users)
- /*thingsfilters
- {
- include("Doom_misc.cfg", "thingsfilters");
- }*/
-
- // How to compare thing flags (for the stuck things error checker)
- thingflagscompare
- {
- include("Doom_misc.cfg", "thingflagscompare");
- }
-
- // Default texture sets
- // (these are not required, but useful for new users)
- texturesets
- {
- include("Action2_texturesets.cfg");
- }
-}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg
index 35d405af..2346b65a 100644
--- a/Build/Configurations/Includes/ZDoom_misc.cfg
+++ b/Build/Configurations/Includes/ZDoom_misc.cfg
@@ -677,41 +677,11 @@ universalfields
default = 0.0f;
}
- silent
- {
- type = 3;
- default = false;
- }
-
- nofallingdamage
- {
- type = 3;
- default = false;
- }
-
- dropactors
- {
- type = 3;
- default = false;
- }
-
- norespawn
- {
- type = 3;
- default = false;
- }
-
soundsequence
{
type = 2;
default = "";
}
-
- hidden
- {
- type = 3;
- default = false;
- }
}
}
diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj
index 41245a24..5b1ede18 100644
--- a/Source/Core/Builder.csproj
+++ b/Source/Core/Builder.csproj
@@ -804,7 +804,6 @@
FlagsForm.cs
-
Form
diff --git a/Source/Core/Config/GameConfiguration.cs b/Source/Core/Config/GameConfiguration.cs
index aa0f12ee..c7aefce0 100644
--- a/Source/Core/Config/GameConfiguration.cs
+++ b/Source/Core/Config/GameConfiguration.cs
@@ -111,6 +111,7 @@ namespace CodeImp.DoomBuilder.Config
private List linedefflagstranslation;
// Sectors
+ private Dictionary sectorflags; //mxd
private Dictionary sectoreffects;
private List sortedsectoreffects;
private List geneffectoptions;
@@ -205,6 +206,7 @@ namespace CodeImp.DoomBuilder.Config
public List LinedefFlagsTranslation { get { return linedefflagstranslation; } }
// Sectors
+ public IDictionary SectorFlags { get { return sectorflags; } }
public IDictionary SectorEffects { get { return sectoreffects; } }
public List SortedSectorEffects { get { return sortedsectoreffects; } }
public List GenEffectOptions { get { return geneffectoptions; } }
@@ -249,6 +251,7 @@ namespace CodeImp.DoomBuilder.Config
this.sortedlinedefactions = new List();
this.linedefactivates = new List();
this.genactioncategories = new List();
+ this.sectorflags = new Dictionary(); //mxd
this.sectoreffects = new Dictionary();
this.sortedsectoreffects = new List();
this.geneffectoptions = new List();
@@ -344,6 +347,7 @@ namespace CodeImp.DoomBuilder.Config
LoadLinedefGeneralizedActions();
// Sectors
+ LoadSectorFlags(); //mxd
LoadBrightnessLevels();
LoadSectorEffects();
LoadSectorGeneralizedEffects();
@@ -613,6 +617,14 @@ namespace CodeImp.DoomBuilder.Config
}
}
+ //mxd. Sector flags
+ private void LoadSectorFlags() {
+ // Get linedef flags
+ IDictionary dic = cfg.ReadSetting("sectorflags", new Hashtable());
+ foreach(DictionaryEntry de in dic)
+ sectorflags.Add(de.Key.ToString(), de.Value.ToString());
+ }
+
// Sector effects
private void LoadSectorEffects()
{
diff --git a/Source/Core/Controls/CheckboxArrayControl.cs b/Source/Core/Controls/CheckboxArrayControl.cs
index ecf02d1a..e8444866 100644
--- a/Source/Core/Controls/CheckboxArrayControl.cs
+++ b/Source/Core/Controls/CheckboxArrayControl.cs
@@ -29,7 +29,8 @@ namespace CodeImp.DoomBuilder.Controls
public partial class CheckboxArrayControl : UserControl
{
// Constants
- private const int SPACING_Y = 1;
+ //private const int SPACING_Y = 1;
+ private int spacingY = 1; //mxd
// Variables
private List checkboxes;
@@ -38,6 +39,7 @@ namespace CodeImp.DoomBuilder.Controls
// Properties
public List Checkboxes { get { return checkboxes; } }
public int Columns { get { return columns; } set { columns = value; } }
+ public int VerticalSpacing { get { return spacingY; } set { spacingY = value; } } //mxd
// Constructor
public CheckboxArrayControl()
@@ -73,7 +75,7 @@ namespace CodeImp.DoomBuilder.Controls
if(columns < 1) return 0;
if(checkboxes.Count < 1) return 0;
int col = (int)Math.Ceiling((float)checkboxes.Count / (float)columns);
- return col * checkboxes[0].Height + (col * SPACING_Y + SPACING_Y);
+ return col * checkboxes[0].Height + (col * spacingY + spacingY);
}
// This positions the checkboxes
@@ -96,7 +98,7 @@ namespace CodeImp.DoomBuilder.Controls
foreach(CheckBox c in checkboxes) if(c.Height > boxheight) boxheight = c.Height;
// Check what the preferred column length is
- columnlength = 1 + (int)Math.Floor((float)(this.ClientSize.Height - boxheight) / (float)(boxheight + SPACING_Y));
+ columnlength = 1 + (int)Math.Floor((float)(this.ClientSize.Height - boxheight) / (float)(boxheight + spacingY));
// When not all items fit with the preferred column length
// we have to extend the column length to make it fit
@@ -110,7 +112,7 @@ namespace CodeImp.DoomBuilder.Controls
foreach(CheckBox c in checkboxes)
{
// Position checkbox
- c.Location = new Point(col * columnwidth, row * boxheight + (row - 1) * SPACING_Y + SPACING_Y);
+ c.Location = new Point(col * columnwidth, row * boxheight + (row - 1) * spacingY + spacingY);
// Next position
if(++row == columnlength)
diff --git a/Source/Core/IO/UniversalStreamReader.cs b/Source/Core/IO/UniversalStreamReader.cs
index f66f8245..d3731d6e 100644
--- a/Source/Core/IO/UniversalStreamReader.cs
+++ b/Source/Core/IO/UniversalStreamReader.cs
@@ -95,6 +95,10 @@ namespace CodeImp.DoomBuilder.IO
config.WriteSetting("managedfields.linedef." + fn, true);
}
+ //mxd. Add sector flags
+ foreach(KeyValuePair flag in General.Map.Config.SectorFlags)
+ config.WriteSetting("managedfields.sector." + flag.Key, true);
+
// Add thing flags
foreach(KeyValuePair flag in General.Map.Config.ThingFlags)
config.WriteSetting("managedfields.thing." + flag.Key, true);
@@ -348,11 +352,16 @@ namespace CodeImp.DoomBuilder.IO
int special = GetCollectionEntry(c, "special", false, 0, where);
int tag = GetCollectionEntry(c, "id", false, 0, where);
+ //mxd. Flags
+ Dictionary stringflags = new Dictionary();
+ foreach(KeyValuePair flag in General.Map.Config.SectorFlags)
+ stringflags[flag.Key] = GetCollectionEntry(c, flag.Key, false, false, where);
+
// Create new item
Sector s = map.CreateSector();
if(s != null)
{
- s.Update(hfloor, hceil, tfloor, tceil, special, tag, bright);
+ s.Update(hfloor, hceil, tfloor, tceil, special, stringflags, tag, bright);
// Custom fields
ReadCustomFields(c, s, "sector");
diff --git a/Source/Core/IO/UniversalStreamWriter.cs b/Source/Core/IO/UniversalStreamWriter.cs
index 901278ff..7ca0f805 100644
--- a/Source/Core/IO/UniversalStreamWriter.cs
+++ b/Source/Core/IO/UniversalStreamWriter.cs
@@ -257,6 +257,10 @@ namespace CodeImp.DoomBuilder.IO
if(s.Tag != 0) coll.Add("id", s.Tag);
coll.Comment = s.Index.ToString();
+ //mxd. Flags
+ foreach(KeyValuePair flag in s.Flags)
+ if(flag.Value) coll.Add(flag.Key, flag.Value);
+
// Add custom fields
AddCustomFields(s, "sector", coll);
diff --git a/Source/Core/Map/Sector.cs b/Source/Core/Map/Sector.cs
index fa2caf06..a9aefc33 100644
--- a/Source/Core/Map/Sector.cs
+++ b/Source/Core/Map/Sector.cs
@@ -57,6 +57,9 @@ namespace CodeImp.DoomBuilder.Map
private int tag;
private int brightness;
+ //mxd. UDMF properties
+ private Dictionary flags;
+
// Cloning
private Sector clone;
private int serializedindex;
@@ -87,6 +90,7 @@ namespace CodeImp.DoomBuilder.Map
public string CeilTexture { get { return ceiltexname; } }
public long LongFloorTexture { get { return longfloortexname; } }
public long LongCeilTexture { get { return longceiltexname; } }
+ internal Dictionary Flags { get { return flags; } } //mxd
public int Effect { get { return effect; } set { BeforePropsChange(); effect = value; } }
public int Tag { get { return tag; } set { BeforePropsChange(); tag = value; if((tag < General.Map.FormatInterface.MinTag) || (tag > General.Map.FormatInterface.MaxTag)) throw new ArgumentOutOfRangeException("Tag", "Invalid tag number"); } }
public int Brightness { get { return brightness; } set { BeforePropsChange(); brightness = value; updateneeded = true; } }
@@ -114,6 +118,7 @@ namespace CodeImp.DoomBuilder.Map
this.ceiltexname = "-";
this.longfloortexname = MapSet.EmptyLongName;
this.longceiltexname = MapSet.EmptyLongName;
+ this.flags = new Dictionary(); //mxd
this.updateneeded = true;
this.triangulationneeded = true;
this.surfaceentries = new SurfaceEntryCollection();
@@ -184,6 +189,25 @@ namespace CodeImp.DoomBuilder.Map
base.ReadWrite(s);
+ //mxd
+ if(s.IsWriting) {
+ s.wInt(flags.Count);
+
+ foreach(KeyValuePair f in flags) {
+ s.wString(f.Key);
+ s.wBool(f.Value);
+ }
+ } else {
+ int c; s.rInt(out c);
+
+ flags = new Dictionary(c);
+ for(int i = 0; i < c; i++) {
+ string t; s.rString(out t);
+ bool b; s.rBool(out b);
+ flags.Add(t, b);
+ }
+ }
+
s.rwInt(ref fixedindex);
s.rwInt(ref floorheight);
s.rwInt(ref ceilheight);
@@ -218,6 +242,7 @@ namespace CodeImp.DoomBuilder.Map
s.longfloortexname = longfloortexname;
s.effect = effect;
s.tag = tag;
+ s.flags = new Dictionary(flags); //mxd
s.brightness = brightness;
s.updateneeded = true;
base.CopyPropertiesTo(s);
@@ -378,6 +403,35 @@ namespace CodeImp.DoomBuilder.Map
#endregion
#region ================== Methods
+
+ // This checks and returns a flag without creating it
+ public bool IsFlagSet(string flagname) {
+ if(flags.ContainsKey(flagname))
+ return flags[flagname];
+ else
+ return false;
+ }
+
+ // This sets a flag
+ public void SetFlag(string flagname, bool value) {
+ if(!flags.ContainsKey(flagname) || (IsFlagSet(flagname) != value)) {
+ BeforePropsChange();
+
+ flags[flagname] = value;
+ }
+ }
+
+ // This returns a copy of the flags dictionary
+ public Dictionary GetFlags() {
+ return new Dictionary(flags);
+ }
+
+ // This clears all flags
+ public void ClearFlags() {
+ BeforePropsChange();
+
+ flags.Clear();
+ }
// This checks if the given point is inside the sector polygon
public bool Intersect(Vector2D p)
@@ -470,8 +524,14 @@ namespace CodeImp.DoomBuilder.Map
#region ================== Changes
- // This updates all properties
- public void Update(int hfloor, int hceil, string tfloor, string tceil, int effect, int tag, int brightness)
+ //mxd. This updates all properties (Doom/Hexen version)
+ public void Update(int hfloor, int hceil, string tfloor, string tceil, int effect, int tag, int brightness)
+ {
+ Update(hfloor, hceil, tfloor, tceil, effect, new Dictionary(), tag, brightness);
+ }
+
+ //mxd. This updates all properties (UDMF version)
+ public void Update(int hfloor, int hceil, string tfloor, string tceil, int effect, Dictionary flags, int tag, int brightness)
{
BeforePropsChange();
@@ -482,6 +542,7 @@ namespace CodeImp.DoomBuilder.Map
SetCeilTexture(tceil);
this.effect = effect;
this.tag = tag;
+ this.flags = new Dictionary(flags); //mxd
this.brightness = brightness;
updateneeded = true;
}
diff --git a/Source/Core/VisualModes/VisualMode.cs b/Source/Core/VisualModes/VisualMode.cs
index 1cc83ef2..ba7dcccf 100644
--- a/Source/Core/VisualModes/VisualMode.cs
+++ b/Source/Core/VisualModes/VisualMode.cs
@@ -64,7 +64,6 @@ namespace CodeImp.DoomBuilder.VisualModes
//mxd
private List selectedVisualThings;
private List selectedVisualSectors;
- //protected List vertices;
protected Dictionary vertices;
//used in "Play From Here" Action
private Thing playerStart;
diff --git a/Source/Core/Windows/ISectorEditForm.cs b/Source/Core/Windows/ISectorEditForm.cs
deleted file mode 100644
index 07c7e7e7..00000000
--- a/Source/Core/Windows/ISectorEditForm.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CodeImp.DoomBuilder.Map;
-
-namespace CodeImp.DoomBuilder.Windows
-{
- public interface ISectorEditForm
- {
- event EventHandler OnValuesChanged;
- ICollection Selection { get; }
- }
-}
diff --git a/Source/Core/Windows/SectorEditForm.cs b/Source/Core/Windows/SectorEditForm.cs
index 5f5a89c5..f74f39d1 100644
--- a/Source/Core/Windows/SectorEditForm.cs
+++ b/Source/Core/Windows/SectorEditForm.cs
@@ -26,7 +26,7 @@ using CodeImp.DoomBuilder.Types;
namespace CodeImp.DoomBuilder.Windows
{
- public partial class SectorEditForm : DelayedForm, ISectorEditForm
+ internal partial class SectorEditForm : DelayedForm
{
#region ================== Events
@@ -59,12 +59,6 @@ namespace CodeImp.DoomBuilder.Windows
#endregion
- #region ================== Properties
-
- public ICollection Selection { get { return sectors; } } //mxd
-
- #endregion
-
#region ================== Constructor
// Constructor
diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
index c0733a31..c21bc174 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
@@ -51,11 +51,7 @@
this.tabs = new System.Windows.Forms.TabControl();
this.tabproperties = new System.Windows.Forms.TabPage();
this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.cbDropactors = new System.Windows.Forms.CheckBox();
- this.cbNorespawn = new System.Windows.Forms.CheckBox();
- this.cbNofallingdamage = new System.Windows.Forms.CheckBox();
- this.cbHidden = new System.Windows.Forms.CheckBox();
- this.cbSilent = new System.Windows.Forms.CheckBox();
+ this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.tabSurfaces = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.floorAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
@@ -180,6 +176,7 @@
this.brightness.AllowNegative = false;
this.brightness.AllowRelative = true;
this.brightness.ButtonStep = 8;
+ this.brightness.ButtonStepFloat = 1F;
this.brightness.Location = new System.Drawing.Point(125, 84);
this.brightness.Name = "brightness";
this.brightness.Size = new System.Drawing.Size(81, 24);
@@ -191,6 +188,7 @@
this.desaturation.AllowDecimal = true;
this.desaturation.AllowNegative = false;
this.desaturation.AllowRelative = false;
+ this.desaturation.ButtonStep = 1;
this.desaturation.ButtonStepFloat = 0.1F;
this.desaturation.Location = new System.Drawing.Point(125, 142);
this.desaturation.Name = "desaturation";
@@ -237,6 +235,7 @@
this.gravity.AllowDecimal = true;
this.gravity.AllowNegative = true;
this.gravity.AllowRelative = true;
+ this.gravity.ButtonStep = 1;
this.gravity.ButtonStepFloat = 0.1F;
this.gravity.Location = new System.Drawing.Point(125, 112);
this.gravity.Name = "gravity";
@@ -310,6 +309,7 @@
this.ceilingheight.AllowNegative = true;
this.ceilingheight.AllowRelative = true;
this.ceilingheight.ButtonStep = 8;
+ this.ceilingheight.ButtonStepFloat = 1F;
this.ceilingheight.Location = new System.Drawing.Point(89, 19);
this.ceilingheight.Name = "ceilingheight";
this.ceilingheight.Size = new System.Drawing.Size(88, 24);
@@ -359,6 +359,7 @@
this.floorheight.AllowNegative = true;
this.floorheight.AllowRelative = true;
this.floorheight.ButtonStep = 8;
+ this.floorheight.ButtonStepFloat = 1F;
this.floorheight.Location = new System.Drawing.Point(89, 49);
this.floorheight.Name = "floorheight";
this.floorheight.Size = new System.Drawing.Size(88, 24);
@@ -400,11 +401,7 @@
//
// groupBox3
//
- this.groupBox3.Controls.Add(this.cbDropactors);
- this.groupBox3.Controls.Add(this.cbNorespawn);
- this.groupBox3.Controls.Add(this.cbNofallingdamage);
- this.groupBox3.Controls.Add(this.cbHidden);
- this.groupBox3.Controls.Add(this.cbSilent);
+ this.groupBox3.Controls.Add(this.flags);
this.groupBox3.Location = new System.Drawing.Point(201, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(242, 148);
@@ -412,60 +409,15 @@
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Flags:";
//
- // cbDropactors
+ // flags
//
- this.cbDropactors.AutoSize = true;
- this.cbDropactors.Location = new System.Drawing.Point(14, 119);
- this.cbDropactors.Name = "cbDropactors";
- this.cbDropactors.Size = new System.Drawing.Size(219, 18);
- this.cbDropactors.TabIndex = 4;
- this.cbDropactors.Tag = "dropactors";
- this.cbDropactors.Text = "Actors drop with instantly moving floors";
- this.cbDropactors.UseVisualStyleBackColor = true;
- //
- // cbNorespawn
- //
- this.cbNorespawn.AutoSize = true;
- this.cbNorespawn.Location = new System.Drawing.Point(14, 95);
- this.cbNorespawn.Name = "cbNorespawn";
- this.cbNorespawn.Size = new System.Drawing.Size(135, 18);
- this.cbNorespawn.TabIndex = 3;
- this.cbNorespawn.Tag = "norespawn";
- this.cbNorespawn.Text = "Players can\'t respawn";
- this.cbNorespawn.UseVisualStyleBackColor = true;
- //
- // cbNofallingdamage
- //
- this.cbNofallingdamage.AutoSize = true;
- this.cbNofallingdamage.Location = new System.Drawing.Point(14, 71);
- this.cbNofallingdamage.Name = "cbNofallingdamage";
- this.cbNofallingdamage.Size = new System.Drawing.Size(111, 18);
- this.cbNofallingdamage.TabIndex = 2;
- this.cbNofallingdamage.Tag = "nofallingdamage";
- this.cbNofallingdamage.Text = "No falling damage";
- this.cbNofallingdamage.UseVisualStyleBackColor = true;
- //
- // cbHidden
- //
- this.cbHidden.AutoSize = true;
- this.cbHidden.Location = new System.Drawing.Point(14, 47);
- this.cbHidden.Name = "cbHidden";
- this.cbHidden.Size = new System.Drawing.Size(138, 18);
- this.cbHidden.TabIndex = 1;
- this.cbHidden.Tag = "hidden";
- this.cbHidden.Text = "Not shown on automap";
- this.cbHidden.UseVisualStyleBackColor = true;
- //
- // cbSilent
- //
- this.cbSilent.AutoSize = true;
- this.cbSilent.Location = new System.Drawing.Point(14, 23);
- this.cbSilent.Name = "cbSilent";
- this.cbSilent.Size = new System.Drawing.Size(52, 18);
- this.cbSilent.TabIndex = 0;
- this.cbSilent.Tag = "silent";
- this.cbSilent.Text = "Silent";
- this.cbSilent.UseVisualStyleBackColor = true;
+ this.flags.AutoScroll = true;
+ this.flags.Columns = 1;
+ this.flags.Location = new System.Drawing.Point(15, 21);
+ this.flags.Name = "flags";
+ this.flags.Size = new System.Drawing.Size(222, 121);
+ this.flags.TabIndex = 5;
+ this.flags.VerticalSpacing = 6;
//
// tabSurfaces
//
@@ -537,6 +489,7 @@
this.floorAlpha.AllowDecimal = true;
this.floorAlpha.AllowNegative = false;
this.floorAlpha.AllowRelative = false;
+ this.floorAlpha.ButtonStep = 1;
this.floorAlpha.ButtonStepFloat = 0.1F;
this.floorAlpha.Location = new System.Drawing.Point(118, 145);
this.floorAlpha.Name = "floorAlpha";
@@ -561,6 +514,7 @@
this.floorRotation.AllowNegative = true;
this.floorRotation.AllowRelative = true;
this.floorRotation.ButtonStep = 5;
+ this.floorRotation.ButtonStepFloat = 1F;
this.floorRotation.Location = new System.Drawing.Point(118, 115);
this.floorRotation.Name = "floorRotation";
this.floorRotation.Size = new System.Drawing.Size(62, 24);
@@ -596,6 +550,7 @@
this.floorBrightness.AllowNegative = true;
this.floorBrightness.AllowRelative = true;
this.floorBrightness.ButtonStep = 16;
+ this.floorBrightness.ButtonStepFloat = 1F;
this.floorBrightness.Location = new System.Drawing.Point(118, 85);
this.floorBrightness.Name = "floorBrightness";
this.floorBrightness.Size = new System.Drawing.Size(62, 24);
@@ -618,6 +573,7 @@
// floorScale
//
this.floorScale.AllowDecimal = true;
+ this.floorScale.ButtonStep = 1;
this.floorScale.ButtonStepFloat = 0.1F;
this.floorScale.DefaultValue = 1F;
this.floorScale.Field1 = "xscalefloor";
@@ -631,6 +587,7 @@
// floorOffsets
//
this.floorOffsets.AllowDecimal = true;
+ this.floorOffsets.ButtonStep = 1;
this.floorOffsets.ButtonStepFloat = 16F;
this.floorOffsets.DefaultValue = 0F;
this.floorOffsets.Field1 = "xpanningfloor";
@@ -707,6 +664,7 @@
this.ceilAlpha.AllowDecimal = true;
this.ceilAlpha.AllowNegative = false;
this.ceilAlpha.AllowRelative = false;
+ this.ceilAlpha.ButtonStep = 1;
this.ceilAlpha.ButtonStepFloat = 0.1F;
this.ceilAlpha.Location = new System.Drawing.Point(118, 145);
this.ceilAlpha.Name = "ceilAlpha";
@@ -731,6 +689,7 @@
this.ceilRotation.AllowNegative = true;
this.ceilRotation.AllowRelative = true;
this.ceilRotation.ButtonStep = 5;
+ this.ceilRotation.ButtonStepFloat = 1F;
this.ceilRotation.Location = new System.Drawing.Point(118, 115);
this.ceilRotation.Name = "ceilRotation";
this.ceilRotation.Size = new System.Drawing.Size(62, 24);
@@ -766,6 +725,7 @@
this.ceilBrightness.AllowNegative = true;
this.ceilBrightness.AllowRelative = true;
this.ceilBrightness.ButtonStep = 16;
+ this.ceilBrightness.ButtonStepFloat = 1F;
this.ceilBrightness.Location = new System.Drawing.Point(118, 85);
this.ceilBrightness.Name = "ceilBrightness";
this.ceilBrightness.Size = new System.Drawing.Size(62, 24);
@@ -788,6 +748,7 @@
// ceilScale
//
this.ceilScale.AllowDecimal = true;
+ this.ceilScale.ButtonStep = 1;
this.ceilScale.ButtonStepFloat = 0.1F;
this.ceilScale.DefaultValue = 1F;
this.ceilScale.Field1 = "xscaleceiling";
@@ -801,6 +762,7 @@
// ceilOffsets
//
this.ceilOffsets.AllowDecimal = true;
+ this.ceilOffsets.ButtonStep = 1;
this.ceilOffsets.ButtonStepFloat = 16F;
this.ceilOffsets.DefaultValue = 0F;
this.ceilOffsets.Field1 = "xpanningceiling";
@@ -904,7 +866,6 @@
this.tabs.ResumeLayout(false);
this.tabproperties.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
this.tabSurfaces.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
@@ -964,12 +925,8 @@
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gravity;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox desaturation;
private System.Windows.Forms.TextBox soundSequence;
- private System.Windows.Forms.CheckBox cbDropactors;
- private System.Windows.Forms.CheckBox cbNorespawn;
- private System.Windows.Forms.CheckBox cbNofallingdamage;
- private System.Windows.Forms.CheckBox cbHidden;
- private System.Windows.Forms.CheckBox cbSilent;
private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl fadeColor;
private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl lightColor;
+ private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
}
}
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs
index 962679e4..38c91e8b 100644
--- a/Source/Core/Windows/SectorEditFormUDMF.cs
+++ b/Source/Core/Windows/SectorEditFormUDMF.cs
@@ -8,7 +8,7 @@ using CodeImp.DoomBuilder.GZBuilder.Tools;
namespace CodeImp.DoomBuilder.Windows
{
- public partial class SectorEditFormUDMF : DelayedForm, ISectorEditForm
+ internal partial class SectorEditFormUDMF : DelayedForm
{
#region ================== Events
@@ -19,13 +19,6 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Variables
private ICollection sectors;
- private List flags;
-
- #endregion
-
- #region ================== Properties
-
- public ICollection Selection { get { return sectors; } } //mxd
#endregion
@@ -34,6 +27,10 @@ namespace CodeImp.DoomBuilder.Windows
public SectorEditFormUDMF() {
InitializeComponent();
+ // Fill flags list
+ foreach(KeyValuePair lf in General.Map.Config.SectorFlags)
+ flags.Add(lf.Value, lf.Key);
+
// Fill effects list
effect.AddInfo(General.Map.Config.SortedSectorEffects.ToArray());
@@ -51,8 +48,6 @@ namespace CodeImp.DoomBuilder.Windows
if(!General.Map.FormatInterface.HasCustomFields)
tabs.TabPages.Remove(tabcustom);
- flags = new List() { cbDropactors, cbHidden, cbNofallingdamage, cbNorespawn, cbSilent, ceilLightAbsolute, floorLightAbsolute };
-
// Initialize custom fields editor
fieldslist.Setup("sector");
}
@@ -76,6 +71,10 @@ namespace CodeImp.DoomBuilder.Windows
// Get first sector
sc = General.GetByIndex(sectors, 0);
+ // Flags
+ foreach(CheckBox c in flags.Checkboxes)
+ if(sc.Flags.ContainsKey(c.Tag.ToString())) c.Checked = sc.Flags[c.Tag.ToString()];
+
// Effects
effect.Value = sc.Effect;
brightness.Text = sc.Brightness.ToString();
@@ -126,13 +125,6 @@ namespace CodeImp.DoomBuilder.Windows
fadeColor.SetValueFrom(sc.Fields);
lightColor.SetValueFrom(sc.Fields);
- //Sector flags
- foreach(CheckBox cb in flags) {
- string key = cb.Tag.ToString();
- if(sc.Fields != null)
- cb.CheckState = (sc.Fields.GetValue(key, false) ? CheckState.Checked : CheckState.Unchecked);
- }
-
// Action
tagSelector.Setup(); //mxd
tagSelector.SetTag(sc.Tag);//mxd
@@ -146,6 +138,16 @@ namespace CodeImp.DoomBuilder.Windows
// Go for all sectors
foreach(Sector s in sectors) {
+ // Flags
+ foreach(CheckBox c in flags.Checkboxes) {
+ if(s.Flags.ContainsKey(c.Tag.ToString())) {
+ if(s.Flags[c.Tag.ToString()] != c.Checked) {
+ c.ThreeState = true;
+ c.CheckState = CheckState.Indeterminate;
+ }
+ }
+ }
+
// Effects
if(s.Effect != effect.Value) effect.Empty = true;
if(s.Brightness.ToString() != brightness.Text) brightness.Text = "";
@@ -196,20 +198,6 @@ namespace CodeImp.DoomBuilder.Windows
fadeColor.SetValueFrom(s.Fields);
lightColor.SetValueFrom(s.Fields);
- //Sector flags
- foreach(CheckBox cb in flags) {
- if(cb.CheckState == CheckState.Indeterminate) continue;
-
- string key = cb.Tag.ToString();
- if(s.Fields != null) {
- CheckState state = (s.Fields.GetValue(key, false) ? CheckState.Checked : CheckState.Unchecked);
- if(cb.CheckState != state) {
- cb.ThreeState = true;
- cb.CheckState = CheckState.Indeterminate;
- }
- }
- }
-
// Action
if(s.Tag != sc.Tag) tagSelector.ClearTag(); //mxd
@@ -283,6 +271,12 @@ namespace CodeImp.DoomBuilder.Windows
// Go for all sectors
foreach(Sector s in sectors) {
+ // Apply all flags
+ foreach(CheckBox c in flags.Checkboxes) {
+ if(c.CheckState == CheckState.Checked) s.SetFlag(c.Tag.ToString(), true);
+ else if(c.CheckState == CheckState.Unchecked) s.SetFlag(c.Tag.ToString(), false);
+ }
+
// Effects
if(!effect.Empty) s.Effect = effect.Value;
s.Brightness = General.Clamp(brightness.GetResult(s.Brightness), General.Map.FormatInterface.MinBrightness, General.Map.FormatInterface.MaxBrightness);
@@ -367,19 +361,6 @@ namespace CodeImp.DoomBuilder.Windows
float val = General.Clamp(desaturation.GetResultFloat(0f), 0f, 1f);
UDMFTools.SetFloat(s.Fields, "desaturation", val, 0f, false);
}
-
- //flags
- foreach(CheckBox cb in flags) {
- if(cb.CheckState == CheckState.Indeterminate) continue;
- string key = cb.Tag.ToString();
- bool oldValue = s.Fields.GetValue(key, false);
-
- if(cb.CheckState == CheckState.Checked) {
- if(!oldValue) s.Fields[key] = new UniValue(UniversalType.Boolean, true);
- } else if(s.Fields.ContainsKey(key)) {
- s.Fields.Remove(key);
- }
- }
}
// Update the used textures
diff --git a/Source/Core/Windows/ThingEditForm.cs b/Source/Core/Windows/ThingEditForm.cs
index a1ae7000..9704b59c 100644
--- a/Source/Core/Windows/ThingEditForm.cs
+++ b/Source/Core/Windows/ThingEditForm.cs
@@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.Windows
///
/// Dialog window that allows viewing and editing of Thing properties.
///
- public partial class ThingEditForm : DelayedForm
+ internal partial class ThingEditForm : DelayedForm
{
#region ================== Variables
diff --git a/Source/Core/Windows/VertexEditForm.cs b/Source/Core/Windows/VertexEditForm.cs
index d12a0b0c..1cb44d25 100644
--- a/Source/Core/Windows/VertexEditForm.cs
+++ b/Source/Core/Windows/VertexEditForm.cs
@@ -27,7 +27,7 @@ using CodeImp.DoomBuilder.GZBuilder.Tools;
namespace CodeImp.DoomBuilder.Windows
{
- public partial class VertexEditForm : DelayedForm
+ internal partial class VertexEditForm : DelayedForm
{
#region ================== Constants
@@ -65,12 +65,6 @@ namespace CodeImp.DoomBuilder.Windows
#endregion
- #region ================== mxd. Properties
-
- public ICollection Selection { get { return vertices; } }
-
- #endregion
-
#region ================== Constructor
// Constructor
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
index d815fd43..059e3ce3 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
@@ -68,7 +68,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
private int prevoffsetx; // We have to provide delta offsets, but I don't
private int prevoffsety; // want to calculate with delta offsets to prevent
// inaccuracy in the dragging.
-
+
+ private static List updateList; //mxd
+
#endregion
#region ================== Properties
@@ -639,23 +641,26 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
//mxd
List sectors = mode.GetSelectedSectors();
+ updateList = new List();
+
+ foreach(Sector s in sectors) {
+ if(mode.VisualSectorExists(s)) {
+ updateList.Add((BaseVisualSector)mode.GetVisualSector(s));
+ }
+ }
+
General.Interface.OnEditFormValuesChanged += new System.EventHandler(Interface_OnEditFormValuesChanged);
General.Interface.ShowEditSectors(sectors);
+
+ updateList.Clear();
+ updateList = null;
}
}
//mxd
private void Interface_OnEditFormValuesChanged(object sender, System.EventArgs e) {
- ISectorEditForm form = sender as ISectorEditForm;
- if(form == null) return;
-
- // Update what must be updated
- foreach(Sector s in form.Selection) {
- if(mode.VisualSectorExists(s)) {
- BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s);
- vs.UpdateSectorGeometry(true);
- }
- }
+ foreach(BaseVisualSector vs in updateList)
+ vs.UpdateSectorGeometry(true);
}
// Sector height change
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs
index 16bcf963..5a964b07 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs
@@ -19,6 +19,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Undo/redo
private int undoticket;
+ //updating
+ private static Dictionary updateList;
+
#endregion
// Constructor
@@ -289,19 +292,30 @@ namespace CodeImp.DoomBuilder.BuilderModes
public virtual void OnEditEnd() {
if(General.Interface.IsActiveWindow) {
List verts = mode.GetSelectedVertices();
+ updateList = new Dictionary();
+
+ foreach(Vertex v in verts){
+ VertexData vd = mode.GetVertexData(v);
+ foreach(KeyValuePair s in vd.UpdateAlso) {
+ if(mode.VisualSectorExists(s.Key)) {
+ BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+ updateList.Add(vs, s.Value);
+ }
+ }
+ }
+
General.Interface.OnEditFormValuesChanged += new System.EventHandler(Interface_OnEditFormValuesChanged);
General.Interface.ShowEditVertices(verts, false);
+
+ updateList.Clear();
+ updateList = null;
}
}
//mxd
private void Interface_OnEditFormValuesChanged(object sender, System.EventArgs e) {
- VertexEditForm form = sender as VertexEditForm;
- if(form == null) return;
-
- // Update what must be updated
- foreach(Vertex v in form.Selection)
- updateGeometry(v);
+ foreach(KeyValuePair group in updateList)
+ group.Key.UpdateSectorGeometry(group.Value);
changed = true;
Update();