mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-22 11:51:25 +00:00
Added multiple engine support for any game configuration.
Floor and ceiling textures are now moved more predictably by arrow keys in GZDoom Visual mode. Walls texture coordinates are always rounded when moved by arrow keys in Visual modes. Linedef info panel: relative UDMF light values are now shown like this: 16 (128), which means "UDMF light value" ("total surface brightness (UDMF light value + sector brightness)") Player is now spawned at camera height when testing from current location in Visual modes. Focus is now properly restored after testing from current location in Visual modes. Updated Heretic_sectors.cfg and Heretic_things.cfg as described here: http://www.doombuilder.com/forums/viewtopic.php?f=11&t=357 Changed sprites of artifacts in Hexen_things.cfg to proper ones. Renamed Skulltag configs to Zandronum
This commit is contained in:
parent
dd0ecf1b96
commit
6b62b4f3d2
122 changed files with 3556 additions and 4692 deletions
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -103,11 +103,11 @@ thingtypes
|
|||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\GZDoom_things.cfg", "gzdoom");
|
||||
include("Includes\\Skulltag_things.cfg", "doom");
|
||||
include("Includes\\Skulltag_things.cfg", "heretic");
|
||||
include("Includes\\Skulltag_things.cfg", "hexen");
|
||||
include("Includes\\Skulltag_things.cfg", "strife");
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "doom");
|
||||
include("Includes\\Zandronum_things.cfg", "heretic");
|
||||
include("Includes\\Zandronum_things.cfg", "hexen");
|
||||
include("Includes\\Zandronum_things.cfg", "strife");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -128,6 +128,6 @@ enums
|
|||
include("Includes\\ZDoom_misc.cfg", "enums_chex3");
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_harmony");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_doom");
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_doom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "zdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "GZDoom: Urban Brawl (Hexen format)";
|
||||
game = "Zandronum: Urban Brawl (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "zdoom";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_action2");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "GZDoom: Urban Brawl (UDMF)";
|
||||
game = "Zandronum: Urban Brawl (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "zdoom";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_action2");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Chex Quest 3 (Hexen format)";
|
||||
game = "Zandronum: Chex Quest 3 (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -51,7 +51,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -66,5 +66,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_chex3");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Chex Quest 3 (UDMF)";
|
||||
game = "Zandronum: Chex Quest 3 (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -51,7 +51,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -66,5 +66,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_chex3");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Chex Quest 1 (Doom format)";
|
||||
game = "Zandronum: Chex Quest 1 (Doom format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_chex");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Chex Quest 1 (Hexen format)";
|
||||
game = "Zandronum: Chex Quest 1 (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_chex");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Chex Quest 1 (UDMF)";
|
||||
game = "Zandronum: Chex Quest 1 (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_chex");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Doom (Doom format)";
|
||||
game = "Zandronum: Doom (Doom format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -51,7 +51,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "doom");
|
||||
include("Includes\\Zandronum_things.cfg", "doom");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -66,5 +66,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_doom");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_doom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_doom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Doom (Hexen format)";
|
||||
game = "Zandronum: Doom (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -51,7 +51,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "doom");
|
||||
include("Includes\\Zandronum_things.cfg", "doom");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -66,5 +66,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_doom");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_doom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_doom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Doom (UDMF)";
|
||||
game = "Zandronum: Doom (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -51,7 +51,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "doom");
|
||||
include("Includes\\Zandronum_things.cfg", "doom");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -66,5 +66,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_doom");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_doom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_doom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Harmony (Doom format)";
|
||||
game = "Zandronum: Harmony (Doom format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_harmony");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Harmony (Hexen format)";
|
||||
game = "Zandronum: Harmony (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_harmony");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Harmony (UDMF)";
|
||||
game = "Zandronum: Harmony (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "default");
|
||||
include("Includes\\Zandronum_things.cfg", "default");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_harmony");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Heretic (Doom format)";
|
||||
game = "Zandronum: Heretic (Doom format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "heretic");
|
||||
include("Includes\\Zandronum_things.cfg", "heretic");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_heretic");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Heretic (Hexen format)";
|
||||
game = "Zandronum: Heretic (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "heretic");
|
||||
include("Includes\\Zandronum_things.cfg", "heretic");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_heretic");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Heretic (UDMF)";
|
||||
game = "Zandronum: Heretic (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "heretic");
|
||||
include("Includes\\Zandronum_things.cfg", "heretic");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_heretic");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Hexen (Hexen format)";
|
||||
game = "Zandronum: Hexen (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "hexen");
|
||||
include("Includes\\Zandronum_things.cfg", "hexen");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_hexen");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Hexen (UDMF)";
|
||||
game = "Zandronum: Hexen (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "hexen");
|
||||
include("Includes\\Zandronum_things.cfg", "hexen");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_hexen");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Strife (Doom format)";
|
||||
game = "Zandronum: Strife (Doom format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "strife");
|
||||
include("Includes\\Zandronum_things.cfg", "strife");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_strife");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Strife (Hexen format)";
|
||||
game = "Zandronum: Strife (Hexen format)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "strife");
|
||||
include("Includes\\Zandronum_things.cfg", "strife");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_strife");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -6,16 +6,16 @@
|
|||
type = "Doom Builder 2 Game Configuration";
|
||||
|
||||
// This is the title to show for this game
|
||||
game = "Skulltag: Strife (UDMF)";
|
||||
game = "Zandronum: Strife (UDMF)";
|
||||
|
||||
// This is the simplified game engine/sourceport name
|
||||
engine = "skulltag";
|
||||
engine = "zandronum";
|
||||
|
||||
// *******************************************************
|
||||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
@ -50,7 +50,7 @@ thingtypes
|
|||
// Standard ZDoom actors
|
||||
include("Includes\\ZDoom_things.cfg", "zdoom");
|
||||
// Additional actors from the engine
|
||||
include("Includes\\Skulltag_things.cfg", "strife");
|
||||
include("Includes\\Zandronum_things.cfg", "strife");
|
||||
}
|
||||
|
||||
// ENUMERATIONS
|
||||
|
@ -65,5 +65,5 @@ enums
|
|||
// Additional ZDoom enums for that game
|
||||
include("Includes\\ZDoom_misc.cfg", "enums_strife");
|
||||
// Additional enums from the engine
|
||||
include("Includes\\Skulltag_misc.cfg", "enums_notdoom");
|
||||
include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
|
||||
}
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ engine = "gzdoom";
|
|||
// * *
|
||||
// * Note: all the elements that could be factorized *
|
||||
// * because they were common to ZDoom, GZDoom and *
|
||||
// * Skulltag have been moved to ZDoom_common.cfg. *
|
||||
// * Zandronum have been moved to ZDoom_common.cfg. *
|
||||
// * *
|
||||
// *******************************************************
|
||||
|
||||
|
|
|
@ -1,41 +1,49 @@
|
|||
|
||||
0 = "Normal";
|
||||
1 = "Light Blinks (randomly)";
|
||||
2 = "Light Blinks (2 Hz)";
|
||||
3 = "Light Blinks (1 Hz)";
|
||||
4 = "Damage -10 or 20% health and Light Blinks (2 Hz)";
|
||||
5 = "Damage -5 or 10% health";
|
||||
7 = "Damage -2 or 5% health";
|
||||
8 = "Light Glows (1+ sec)";
|
||||
1 = "Light Blinks (Randomly)";
|
||||
2 = "Light Blinks (0.5s)";
|
||||
3 = "Light Blinks (1.0s)";
|
||||
4 = "Damage (5 Points, Fast, Fire), Light Blinks (0.5s), Scroll East (Fast)";
|
||||
5 = "Damage (5 Points, Fast, Fire)";
|
||||
7 = "Damage (4 Points, Slow, Normal)";
|
||||
8 = "Light Glows (1.0s)";
|
||||
9 = "Secret";
|
||||
10 = "Door Close Stay (after 30 sec)";
|
||||
12 = "Light Blinks (1 Hz synchronized)";
|
||||
13 = "Light Blinks (2 Hz synchronized)";
|
||||
14 = "Door Open Close (opens after 5 min)";
|
||||
10 = "Door Close Stay (After 30s)";
|
||||
12 = "Light Blinks (0.5s Synchronized)";
|
||||
13 = "Light Blinks (1.0s Synchronized)";
|
||||
14 = "Door Open Stay (After 300s)";
|
||||
15 = "Friction";
|
||||
16 = "Damage -10 or 20% health";
|
||||
21 = "Scroll East (slow)";
|
||||
22 = "Scroll East (medium)";
|
||||
23 = "Scroll East (fast)";
|
||||
26 = "Scroll North (slow)";
|
||||
27 = "Scroll North (medium)";
|
||||
28 = "Scroll North (fast)";
|
||||
31 = "Scroll South (slow)";
|
||||
32 = "Scroll South (medium)";
|
||||
33 = "Scroll South (fast)";
|
||||
36 = "Scroll West (slow)";
|
||||
37 = "Scroll West (medium)";
|
||||
38 = "Scroll West (fast)";
|
||||
40 = "Wind East (weak)";
|
||||
41 = "Wind East (medium)";
|
||||
42 = "Wind East (strong)";
|
||||
43 = "Wind North (weak)";
|
||||
44 = "Wind North (medium)";
|
||||
45 = "Wind North (strong)";
|
||||
46 = "Wind South (weak)";
|
||||
47 = "Wind South (medium)";
|
||||
48 = "Wind South (strong)";
|
||||
49 = "Wind West (weak)";
|
||||
50 = "Wind West (medium)";
|
||||
51 = "Wind West (strong)";
|
||||
16 = "Damage (8 Points, Fast, Fire)";
|
||||
20 = "Scroll East (Slowest)";
|
||||
21 = "Scroll East (Slow)";
|
||||
22 = "Scroll East (Medium)";
|
||||
23 = "Scroll East (Fast)";
|
||||
24 = "Scroll East (Fastest)";
|
||||
25 = "Scroll North (Slowest)";
|
||||
26 = "Scroll North (Slow)";
|
||||
27 = "Scroll North (Medium)";
|
||||
28 = "Scroll North (Fast)";
|
||||
29 = "Scroll North (Fastest)";
|
||||
30 = "Scroll South (Slowest)";
|
||||
31 = "Scroll South (Slow)";
|
||||
32 = "Scroll South (Medium)";
|
||||
33 = "Scroll South (Fast)";
|
||||
34 = "Scroll South (Fastest)";
|
||||
35 = "Scroll West (Slowest)";
|
||||
36 = "Scroll West (Slow)";
|
||||
37 = "Scroll West (Medium)";
|
||||
38 = "Scroll West (Fast)";
|
||||
39 = "Scroll West (Fastest)";
|
||||
40 = "Wind East (Weak)";
|
||||
41 = "Wind East (Medium)";
|
||||
42 = "Wind East (Strong)";
|
||||
43 = "Wind North (Weak)";
|
||||
44 = "Wind North (Medium)";
|
||||
45 = "Wind North (Strong)";
|
||||
46 = "Wind South (Weak)";
|
||||
47 = "Wind South (Medium)";
|
||||
48 = "Wind South (Strong)";
|
||||
49 = "Wind West (Weak)";
|
||||
50 = "Wind West (Medium)";
|
||||
51 = "Wind West (Strong)";
|
||||
|
||||
|
|
|
@ -8,31 +8,31 @@ players
|
|||
height = 56;
|
||||
blocking = 2;
|
||||
error = 2;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
|
||||
1
|
||||
{
|
||||
title = "Player 1 start";
|
||||
title = "Player 1 Start";
|
||||
sprite = "PLAYA1";
|
||||
}
|
||||
2
|
||||
{
|
||||
title = "Player 2 start";
|
||||
title = "Player 2 Start";
|
||||
sprite = "PLAYA1";
|
||||
}
|
||||
3
|
||||
{
|
||||
title = "Player 3 start";
|
||||
title = "Player 3 Start";
|
||||
sprite = "PLAYA1";
|
||||
}
|
||||
4
|
||||
{
|
||||
title = "Player 4 start";
|
||||
title = "Player 4 Start";
|
||||
sprite = "PLAYA1";
|
||||
}
|
||||
11
|
||||
{
|
||||
title = "Player Deathmatch start";
|
||||
title = "Player Deathmatch Start";
|
||||
sprite = "PLAYQ0";
|
||||
}
|
||||
}
|
||||
|
@ -46,47 +46,58 @@ teleports
|
|||
height = 56;
|
||||
blocking = 0;
|
||||
error = 0;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
|
||||
14
|
||||
{
|
||||
title = "Teleport Landing";
|
||||
sprite = "TELEA0";
|
||||
}
|
||||
56
|
||||
{
|
||||
title = "D'Sparil Teleport Location";
|
||||
sprite = "SOR2I0";
|
||||
}
|
||||
52
|
||||
{
|
||||
title = "Teleport Glitter (Exit)";
|
||||
title = "Teleport Glitter (Exit/Blue)";
|
||||
sprite = "TGLTF0";
|
||||
}
|
||||
74
|
||||
{
|
||||
title = "Teleport Glitter";
|
||||
title = "Teleport Glitter (Normal/Red)";
|
||||
sprite = "TGLTA0";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sounds
|
||||
{
|
||||
color = 5; // Purple
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Sounds";
|
||||
width = 0;
|
||||
height = 0;
|
||||
width = 20;
|
||||
height = 16;
|
||||
blocking = 0;
|
||||
sort = 1;
|
||||
error = 0;
|
||||
sort = 0;
|
||||
|
||||
41 = "Waterfall";
|
||||
42 = "Wind";
|
||||
1200 = "Scream";
|
||||
1201 = "Squish";
|
||||
1202 = "Drops";
|
||||
1203 = "Slow Footsteps";
|
||||
1204 = "Heartbeat";
|
||||
1205 = "Bells";
|
||||
1206 = "Growl";
|
||||
1207 = "Magic";
|
||||
1208 = "Laughter";
|
||||
1209 = "Fast Footsteps";
|
||||
41 = "Looping Sound: Waterfall";
|
||||
42 = "Looping Sound: Wind";
|
||||
|
||||
1203 = "Sequence: Slow Footsteps";
|
||||
1209 = "Sequence: Fast Footsteps";
|
||||
|
||||
1200 = "Sequence: Scream";
|
||||
1206 = "Sequence: Growl";
|
||||
1208 = "Sequence: Laughter";
|
||||
|
||||
1204 = "Sequence: Heartbeat";
|
||||
1201 = "Sequence: Squish";
|
||||
|
||||
1202 = "Sequence: Water Drops";
|
||||
1205 = "Sequence: Bells";
|
||||
1207 = "Sequence: Magic";
|
||||
}
|
||||
|
||||
monsters
|
||||
|
@ -95,7 +106,7 @@ monsters
|
|||
arrow = 1;
|
||||
title = "Monsters";
|
||||
width = 16;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
error = 2;
|
||||
blocking = 2;
|
||||
|
||||
|
@ -125,7 +136,7 @@ monsters
|
|||
width = 22;
|
||||
height = 62;
|
||||
}
|
||||
45
|
||||
45
|
||||
{
|
||||
title = "Nitrogolem";
|
||||
sprite = "MUMMY1";
|
||||
|
@ -139,6 +150,41 @@ monsters
|
|||
width = 22;
|
||||
height = 62;
|
||||
}
|
||||
90
|
||||
{
|
||||
title = "Sabreclaw";
|
||||
sprite = "CLNKA1";
|
||||
width = 20;
|
||||
height = 64;
|
||||
}
|
||||
64
|
||||
{
|
||||
title = "Undead Warrior";
|
||||
sprite = "KNIGA1";
|
||||
width = 24;
|
||||
height = 78;
|
||||
}
|
||||
65
|
||||
{
|
||||
title = "Undead Warrior Ghost";
|
||||
sprite = "KNIGA1";
|
||||
width = 24;
|
||||
height = 78;
|
||||
}
|
||||
70
|
||||
{
|
||||
title = "Weredragon";
|
||||
sprite = "BEASA1";
|
||||
width = 32;
|
||||
height = 74;
|
||||
}
|
||||
92
|
||||
{
|
||||
title = "Ophidian";
|
||||
sprite = "SNKEA1";
|
||||
width = 22;
|
||||
height = 70;
|
||||
}
|
||||
15
|
||||
{
|
||||
title = "Disciple Of D'Sparil";
|
||||
|
@ -152,6 +198,13 @@ monsters
|
|||
width = 40;
|
||||
height = 72;
|
||||
}
|
||||
9
|
||||
{
|
||||
title = "Maulotaur";
|
||||
sprite = "MNTRA1";
|
||||
width = 28;
|
||||
height = 100;
|
||||
}
|
||||
7
|
||||
{
|
||||
title = "D'Sparil";
|
||||
|
@ -159,79 +212,61 @@ monsters
|
|||
width = 28;
|
||||
height = 100;
|
||||
}
|
||||
56
|
||||
}
|
||||
|
||||
hazards
|
||||
{
|
||||
color = 4; // Red
|
||||
arrow = 1;
|
||||
title = "Hazards";
|
||||
width = 20;
|
||||
blocking = 2;
|
||||
sort = 0;
|
||||
|
||||
87
|
||||
{
|
||||
title = "D'Sparil Teleport Location";
|
||||
sprite = "SOR2I0";
|
||||
title = "Volcano";
|
||||
sprite = "VLCOE0";
|
||||
height = 20;
|
||||
}
|
||||
9
|
||||
2035
|
||||
{
|
||||
title = "Maulotaur";
|
||||
sprite = "MNTRA1";
|
||||
width = 28;
|
||||
height = 100;
|
||||
title = "Gasbag";
|
||||
sprite = "PPODA0";
|
||||
height = 54;
|
||||
}
|
||||
64
|
||||
43
|
||||
{
|
||||
title = "Undead Warrior";
|
||||
sprite = "KNIGA1";
|
||||
width = 24;
|
||||
height = 48;
|
||||
}
|
||||
65
|
||||
{
|
||||
title = "Undead Warrior Ghost";
|
||||
sprite = "KNIGA1";
|
||||
width = 24;
|
||||
height = 78;
|
||||
}
|
||||
70
|
||||
{
|
||||
title = "Weredragon";
|
||||
sprite = "BEASA1";
|
||||
width = 32;
|
||||
height = 74;
|
||||
}
|
||||
90
|
||||
{
|
||||
title = "Sabreclaw";
|
||||
sprite = "CLNKA1";
|
||||
width = 20;
|
||||
height = 64;
|
||||
}
|
||||
92
|
||||
{
|
||||
title = "Ophidian";
|
||||
sprite = "SNKEA1";
|
||||
width = 22;
|
||||
height = 70;
|
||||
title = "Gasbag Generator";
|
||||
sprite = "PPODA0";
|
||||
height = 16;
|
||||
}
|
||||
}
|
||||
|
||||
weapons
|
||||
{
|
||||
color = 14; // Yellow
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Weapons";
|
||||
width = 20;
|
||||
height = 16;
|
||||
blocking = 0;
|
||||
sort = 1;
|
||||
|
||||
53
|
||||
sort = 0;
|
||||
|
||||
2005
|
||||
{
|
||||
title = "Dragon Claw";
|
||||
sprite = "WBLSA0";
|
||||
title = "Gauntlets Of The Necromancer";
|
||||
sprite = "WGNTA0";
|
||||
}
|
||||
2001
|
||||
{
|
||||
title = "Ethereal Crossbow";
|
||||
sprite = "WBOWA0";
|
||||
}
|
||||
2002
|
||||
53
|
||||
{
|
||||
title = "Firemace";
|
||||
sprite = "WMCEA0";
|
||||
title = "Dragon Claw";
|
||||
sprite = "WBLSA0";
|
||||
}
|
||||
2003
|
||||
{
|
||||
|
@ -243,20 +278,20 @@ weapons
|
|||
title = "Hellstaff";
|
||||
sprite = "WSKLA0";
|
||||
}
|
||||
2005
|
||||
2002
|
||||
{
|
||||
title = "Gauntlets Of The Necromancer";
|
||||
sprite = "WGNTA0";
|
||||
title = "Firemace";
|
||||
sprite = "WMCEA0";
|
||||
}
|
||||
}
|
||||
|
||||
ammunition
|
||||
{
|
||||
color = 6; // Brown
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Ammunition";
|
||||
width = 20;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
height = 16;
|
||||
blocking = 0;
|
||||
|
||||
|
@ -270,16 +305,6 @@ ammunition
|
|||
title = "Crystal Geode";
|
||||
sprite = "AMG2A0";
|
||||
}
|
||||
13
|
||||
{
|
||||
title = "Mace Spheres";
|
||||
sprite = "AMM1A0";
|
||||
}
|
||||
16
|
||||
{
|
||||
title = "Pile Of Mace Spheres";
|
||||
sprite = "AMM2A0";
|
||||
}
|
||||
18
|
||||
{
|
||||
title = "Ethereal Arrows";
|
||||
|
@ -290,26 +315,6 @@ ammunition
|
|||
title = "Quiver Of Ethereal Arrows";
|
||||
sprite = "AMC2A0";
|
||||
}
|
||||
20
|
||||
{
|
||||
title = "Lesser Runes";
|
||||
sprite = "AMS1A0";
|
||||
}
|
||||
21
|
||||
{
|
||||
title = "Greater Runes";
|
||||
sprite = "AMS2A0";
|
||||
}
|
||||
22
|
||||
{
|
||||
title = "Flame Orb";
|
||||
sprite = "AMP1A0";
|
||||
}
|
||||
23
|
||||
{
|
||||
title = "Inferno Orb";
|
||||
sprite = "AMP2A0";
|
||||
}
|
||||
54
|
||||
{
|
||||
title = "Claw Orb";
|
||||
|
@ -320,28 +325,78 @@ ammunition
|
|||
title = "Energy Orb";
|
||||
sprite = "AMB2A0";
|
||||
}
|
||||
22
|
||||
{
|
||||
title = "Flame Orb";
|
||||
sprite = "AMP1A0";
|
||||
}
|
||||
23
|
||||
{
|
||||
title = "Inferno Orb";
|
||||
sprite = "AMP2A0";
|
||||
}
|
||||
20
|
||||
{
|
||||
title = "Lesser Runes";
|
||||
sprite = "AMS1A0";
|
||||
}
|
||||
21
|
||||
{
|
||||
title = "Greater Runes";
|
||||
sprite = "AMS2A0";
|
||||
}
|
||||
13
|
||||
{
|
||||
title = "Mace Spheres";
|
||||
sprite = "AMM1A0";
|
||||
}
|
||||
16
|
||||
{
|
||||
title = "Pile Of Mace Spheres";
|
||||
sprite = "AMM2A0";
|
||||
}
|
||||
8
|
||||
{
|
||||
title = "Bag Of Holding";
|
||||
sprite = "BAGHA0";
|
||||
}
|
||||
34
|
||||
{
|
||||
title = "Time Bomb Of The Ancients";
|
||||
sprite = "FBMBA0";
|
||||
}
|
||||
30
|
||||
{
|
||||
title = "Morph Ovum";
|
||||
sprite = "EGGCA0";
|
||||
}
|
||||
}
|
||||
|
||||
health
|
||||
{
|
||||
color = 1; // Blue
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Health and Armor";
|
||||
width = 20;
|
||||
height = 16;
|
||||
blocking = 0;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
|
||||
81
|
||||
{
|
||||
title = "Crystal Vial";
|
||||
sprite = "PTN1A0";
|
||||
}
|
||||
82
|
||||
{
|
||||
title = "Quartz Flask";
|
||||
sprite = "PTN2A0";
|
||||
}
|
||||
32
|
||||
{
|
||||
title = "Mystic Urn";
|
||||
sprite = "SPHLA0";
|
||||
}
|
||||
85
|
||||
{
|
||||
title = "Silver Shield";
|
||||
|
@ -357,80 +412,65 @@ health
|
|||
powerups
|
||||
{
|
||||
color = 9; // Light Blue
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Artifacts";
|
||||
width = 20;
|
||||
height = 20;
|
||||
blocking = 0;
|
||||
sort = 1;
|
||||
|
||||
30
|
||||
{
|
||||
title = "Morph Ovum";
|
||||
sprite = "ARTIEGGC";
|
||||
}
|
||||
32
|
||||
{
|
||||
title = "Mystic Urn";
|
||||
sprite = "ARTISPHL";
|
||||
}
|
||||
33
|
||||
{
|
||||
title = "Torch";
|
||||
sprite = "ARTITRCH";
|
||||
}
|
||||
34
|
||||
{
|
||||
title = "Time Bomb Of The Ancients";
|
||||
sprite = "ARTIFBMB";
|
||||
}
|
||||
sort = 0;
|
||||
|
||||
35
|
||||
{
|
||||
title = "Map Scroll";
|
||||
sprite = "SPMPA0";
|
||||
}
|
||||
33
|
||||
{
|
||||
title = "Torch";
|
||||
sprite = "TRCHA0";
|
||||
}
|
||||
36
|
||||
{
|
||||
title = "Chaos Device";
|
||||
sprite = "ARTIATLP";
|
||||
sprite = "ATLPA0";
|
||||
}
|
||||
75
|
||||
{
|
||||
title = "Shadowsphere";
|
||||
sprite = "ARTIINVS";
|
||||
}
|
||||
82
|
||||
{
|
||||
title = "Quartz Flask";
|
||||
sprite = "ARTIPTN2";
|
||||
}
|
||||
83
|
||||
{
|
||||
title = "Wings Of Wrath";
|
||||
sprite = "ARTISOAR";
|
||||
sprite = "INVSA0";
|
||||
}
|
||||
84
|
||||
{
|
||||
title = "Ring of Invulnerability";
|
||||
sprite = "ARTIINVU";
|
||||
sprite = "INVUA0";
|
||||
}
|
||||
86
|
||||
{
|
||||
title = "Tome of Power";
|
||||
sprite = "ARTIPWBK";
|
||||
sprite = "PWBKA0";
|
||||
}
|
||||
83
|
||||
{
|
||||
title = "Wings Of Wrath";
|
||||
sprite = "SOARA0";
|
||||
}
|
||||
}
|
||||
|
||||
keys
|
||||
{
|
||||
color = 13; // Light Magenta
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Keys";
|
||||
width = 20;
|
||||
height = 16;
|
||||
blocking = 0;
|
||||
sort = 1;
|
||||
|
||||
sort = 0;
|
||||
|
||||
80
|
||||
{
|
||||
title = "Yellow Key";
|
||||
sprite = "CKYYA0";
|
||||
}
|
||||
73
|
||||
{
|
||||
title = "Green Key";
|
||||
|
@ -441,28 +481,18 @@ keys
|
|||
title = "Blue Key";
|
||||
sprite = "BKYYA0";
|
||||
}
|
||||
80
|
||||
{
|
||||
title = "Yellow Key";
|
||||
sprite = "CKYYA0";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
obstacles
|
||||
{
|
||||
color = 3; // Cyan
|
||||
arrow = 0;
|
||||
arrow = 1;
|
||||
title = "Obstacles";
|
||||
width = 20;
|
||||
blocking = 2;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
|
||||
29
|
||||
{
|
||||
title = "Small Pillar";
|
||||
sprite = "SMPLA0";
|
||||
height = 34;
|
||||
}
|
||||
37
|
||||
{
|
||||
title = "Stalagmite (Small)";
|
||||
|
@ -495,108 +525,58 @@ obstacles
|
|||
sprite = "BARLA0";
|
||||
height = 32;
|
||||
}
|
||||
29
|
||||
{
|
||||
title = "Small Pillar";
|
||||
sprite = "SMPLA0";
|
||||
height = 34;
|
||||
}
|
||||
47
|
||||
{
|
||||
title = "Brown Pillar";
|
||||
sprite = "BRPLA0";
|
||||
height = 128;
|
||||
}
|
||||
87
|
||||
{
|
||||
title = "Volcano";
|
||||
sprite = "VLCOE0";
|
||||
height = 20;
|
||||
}
|
||||
2035
|
||||
{
|
||||
title = "Gasbag";
|
||||
sprite = "PPODA0";
|
||||
height = 54;
|
||||
}
|
||||
43
|
||||
{
|
||||
title = "Gasbag Generator";
|
||||
sprite = "PPODA0";
|
||||
height = 16;
|
||||
}
|
||||
}
|
||||
|
||||
lights
|
||||
{
|
||||
color = 11; // Light Cyan
|
||||
arrow = 0;
|
||||
title = "Light sources";
|
||||
width = 16;
|
||||
sort = 1;
|
||||
blocking = 2;
|
||||
|
||||
27
|
||||
{
|
||||
title = "Serpent Torch";
|
||||
sprite = "SRTCA0";
|
||||
height = 54;
|
||||
}
|
||||
28
|
||||
{
|
||||
title = "Chandelier";
|
||||
sprite = "CHDLA0";
|
||||
hangs = 1;
|
||||
height = 62;
|
||||
}
|
||||
50
|
||||
{
|
||||
title = "Wall Torch";
|
||||
sprite = "WTRHA0";
|
||||
height = 64;
|
||||
}
|
||||
76
|
||||
{
|
||||
title = "Fire Brazier";
|
||||
sprite = "KFR1A0";
|
||||
height = 44;
|
||||
}
|
||||
}
|
||||
|
||||
decoration
|
||||
{
|
||||
color = 4; // Red
|
||||
arrow = 0;
|
||||
color = 11; // Light Cyan
|
||||
arrow = 1;
|
||||
title = "Decoration";
|
||||
width = 16;
|
||||
sort = 1;
|
||||
sort = 0;
|
||||
blocking = 2;
|
||||
|
||||
94
|
||||
96
|
||||
{
|
||||
title = "Blue Key Marker";
|
||||
sprite = "KGZBA0";
|
||||
title = "Yellow Key Marker";
|
||||
sprite = "KGZYA0";
|
||||
height = 50;
|
||||
blocking = 2;
|
||||
}
|
||||
95
|
||||
{
|
||||
title = "Green Key Marker";
|
||||
sprite = "KGZGA0";
|
||||
height = 50;
|
||||
blocking = 2;
|
||||
}
|
||||
96
|
||||
94
|
||||
{
|
||||
title = "Yellow Key Marker";
|
||||
sprite = "KGZYA0";
|
||||
title = "Blue Key Marker";
|
||||
sprite = "KGZBA0";
|
||||
height = 50;
|
||||
blocking = 2;
|
||||
}
|
||||
|
||||
51
|
||||
{
|
||||
title = "Hanging Corpse";
|
||||
sprite = "HCORA0";
|
||||
hangs = 1;
|
||||
height = 104;
|
||||
blocking = 2;
|
||||
}
|
||||
17
|
||||
{
|
||||
title = "Hanging Skull";
|
||||
title = "Hanging Skull 1";
|
||||
sprite = "SKH1A0";
|
||||
hangs = 1;
|
||||
height = 70;
|
||||
|
@ -624,14 +604,52 @@ decoration
|
|||
}
|
||||
48
|
||||
{
|
||||
title = "Moss";
|
||||
title = "Moss 1";
|
||||
sprite = "MOS1A0";
|
||||
height = 23;
|
||||
hangs = 1;
|
||||
}
|
||||
49
|
||||
{
|
||||
title = "Moss 2";
|
||||
sprite = "MOS2A0";
|
||||
height = 27;
|
||||
hangs = 1;
|
||||
}
|
||||
}
|
||||
|
||||
lights
|
||||
{
|
||||
color = 7; // Light Grey
|
||||
arrow = 1;
|
||||
title = "Light Sources";
|
||||
width = 16;
|
||||
sort = 0;
|
||||
blocking = 2;
|
||||
|
||||
50
|
||||
{
|
||||
title = "Wall Torch";
|
||||
sprite = "WTRHA0";
|
||||
height = 64;
|
||||
}
|
||||
27
|
||||
{
|
||||
title = "Serpent Torch";
|
||||
sprite = "SRTCA0";
|
||||
height = 54;
|
||||
}
|
||||
76
|
||||
{
|
||||
title = "Fire Brazier";
|
||||
sprite = "KFR1A0";
|
||||
height = 44;
|
||||
}
|
||||
28
|
||||
{
|
||||
title = "Chandelier";
|
||||
sprite = "CHDLA0";
|
||||
hangs = 1;
|
||||
height = 62;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -378,77 +378,77 @@ powerups
|
|||
30
|
||||
{
|
||||
title = "Porkalator";
|
||||
sprite = "ARTIPORK";
|
||||
sprite = "PORKB0";
|
||||
}
|
||||
32
|
||||
{
|
||||
title = "Mystic Urn";
|
||||
sprite = "ARTISPHL";
|
||||
sprite = "SPHLA0";
|
||||
}
|
||||
33
|
||||
{
|
||||
title = "Torch";
|
||||
sprite = "ARTITRCH";
|
||||
sprite = "TRCHA0";
|
||||
}
|
||||
36
|
||||
{
|
||||
title = "Chaos Device";
|
||||
sprite = "ARTIATLP";
|
||||
sprite = "ATLPA0";
|
||||
}
|
||||
82
|
||||
{
|
||||
title = "Quartz Flask";
|
||||
sprite = "ARTIPTN2";
|
||||
sprite = "PTN2A0";
|
||||
}
|
||||
83
|
||||
{
|
||||
title = "Wings Of Wrath";
|
||||
sprite = "ARTISOAR";
|
||||
sprite = "SOARA0";
|
||||
}
|
||||
84
|
||||
{
|
||||
title = "Icon Of The Defender";
|
||||
sprite = "ARTIINVU";
|
||||
sprite = "INVUA0";
|
||||
}
|
||||
86
|
||||
{
|
||||
title = "Dark Servant";
|
||||
sprite = "ARTISUMN";
|
||||
sprite = "SUMNA0";
|
||||
}
|
||||
10110
|
||||
{
|
||||
title = "Disc Of Repulsion";
|
||||
sprite = "ARTIBLST";
|
||||
sprite = "BLSTB0";
|
||||
}
|
||||
10120
|
||||
{
|
||||
title = "Mystic Ambit Incant";
|
||||
sprite = "ARTIHRAD";
|
||||
sprite = "HRADB0";
|
||||
}
|
||||
10040
|
||||
{
|
||||
title = "Banishment Device";
|
||||
sprite = "ARTITELO";
|
||||
sprite = "TELOA0";
|
||||
}
|
||||
8000
|
||||
{
|
||||
title = "Flechette";
|
||||
sprite = "ARTIPSBG";
|
||||
sprite = "PSBGA0";
|
||||
}
|
||||
8002
|
||||
{
|
||||
title = "Boots Of Speed";
|
||||
sprite = "ARTISPED";
|
||||
sprite = "SPEDB0";
|
||||
}
|
||||
8003
|
||||
{
|
||||
title = "Krater Of Might";
|
||||
sprite = "ARTIBMAN";
|
||||
sprite = "BMANA0";
|
||||
}
|
||||
8041
|
||||
{
|
||||
title = "Dragonskin Bracers";
|
||||
sprite = "ARTIBRAC";
|
||||
sprite = "BRACC0";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
// Skulltag things that aren't found in ZDoom.
|
||||
// Simple interface file to access the listing easily.
|
||||
// The things themselves are actually listed in Skulltag_common.cfg.
|
||||
|
||||
doom
|
||||
{
|
||||
include("Skulltag_common.cfg", "skulltag")
|
||||
include("Skulltag_common.cfg", "doomheretichexenstrife")
|
||||
include("Skulltag_common.cfg", "doomheretichexen")
|
||||
include("Skulltag_common.cfg", "doom")
|
||||
}
|
||||
|
||||
heretic
|
||||
{
|
||||
include("Skulltag_common.cfg", "skulltag")
|
||||
include("Skulltag_common.cfg", "doomheretichexenstrife")
|
||||
include("Skulltag_common.cfg", "doomheretichexen")
|
||||
include("Skulltag_common.cfg", "raven")
|
||||
include("Skulltag_common.cfg", "heretic")
|
||||
}
|
||||
|
||||
hexen
|
||||
{
|
||||
include("Skulltag_common.cfg", "skulltag")
|
||||
include("Skulltag_common.cfg", "doomheretichexenstrife")
|
||||
include("Skulltag_common.cfg", "doomheretichexen")
|
||||
include("Skulltag_common.cfg", "raven")
|
||||
include("Skulltag_common.cfg", "hexen")
|
||||
}
|
||||
|
||||
strife
|
||||
{
|
||||
include("Skulltag_common.cfg", "skulltag")
|
||||
include("Skulltag_common.cfg", "doomheretichexenstrife")
|
||||
include("Skulltag_common.cfg", "strife")
|
||||
}
|
||||
|
||||
default
|
||||
{
|
||||
include("Skulltag_common.cfg", "skulltag")
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
// ***********************************************************
|
||||
// * *
|
||||
// * These values are the same for Doom format, Hexen format *
|
||||
// * and UDMF; as well as for ZDoom, GZDoom and Skulltag *
|
||||
// * and UDMF; as well as for ZDoom, GZDoom and Zandronum *
|
||||
// * *
|
||||
// ***********************************************************
|
||||
|
||||
|
|
|
@ -3422,7 +3422,7 @@ zdoom
|
|||
|
||||
145
|
||||
{
|
||||
title = "Player Set Team (Skulltag only)";
|
||||
title = "Player Set Team (Zandronum only)";
|
||||
arg0
|
||||
{
|
||||
title = "Team";
|
||||
|
@ -3455,7 +3455,7 @@ zdoom
|
|||
|
||||
152
|
||||
{
|
||||
title = "Team Player Score (Skulltag only)";
|
||||
title = "Team Player Score (Zandronum only)";
|
||||
arg0
|
||||
{
|
||||
title = "Points";
|
||||
|
@ -3463,7 +3463,7 @@ zdoom
|
|||
}
|
||||
153
|
||||
{
|
||||
title = "Team Give Points (Skulltag only)";
|
||||
title = "Team Give Points (Zandronum only)";
|
||||
arg0
|
||||
{
|
||||
title = "Team";
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -13,7 +13,7 @@ hexen
|
|||
|
||||
152
|
||||
{
|
||||
title = "Team Score (Skulltag)";
|
||||
title = "Team Score (Zandronum)";
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
// Miscellaneous Skulltag settings.
|
||||
// Miscellaneous Zandronum settings.
|
||||
// Only contains ST-exclusive stuff, imports the rest from ZDoom configuration.
|
||||
|
||||
enums_doom
|
|
@ -1,4 +1,4 @@
|
|||
// Default texture sets for Skulltag
|
||||
// Default texture sets for Zandronum
|
||||
// (these are not required, but useful for new users)
|
||||
texturesets
|
||||
{
|
42
Build/Configurations/Includes/Zandronum_things.cfg
Normal file
42
Build/Configurations/Includes/Zandronum_things.cfg
Normal file
|
@ -0,0 +1,42 @@
|
|||
// Zandronum things that aren't found in ZDoom.
|
||||
// Simple interface file to access the listing easily.
|
||||
// The things themselves are actually listed in Zandronum_common.cfg.
|
||||
|
||||
doom
|
||||
{
|
||||
include("Zandronum_common.cfg", "zandronum")
|
||||
include("Zandronum_common.cfg", "doomheretichexenstrife")
|
||||
include("Zandronum_common.cfg", "doomheretichexen")
|
||||
include("Zandronum_common.cfg", "doom")
|
||||
}
|
||||
|
||||
heretic
|
||||
{
|
||||
include("Zandronum_common.cfg", "zandronum")
|
||||
include("Zandronum_common.cfg", "doomheretichexenstrife")
|
||||
include("Zandronum_common.cfg", "doomheretichexen")
|
||||
include("Zandronum_common.cfg", "raven")
|
||||
include("Zandronum_common.cfg", "heretic")
|
||||
}
|
||||
|
||||
hexen
|
||||
{
|
||||
include("Zandronum_common.cfg", "zandronum")
|
||||
include("Zandronum_common.cfg", "doomheretichexenstrife")
|
||||
include("Zandronum_common.cfg", "doomheretichexen")
|
||||
include("Zandronum_common.cfg", "raven")
|
||||
include("Zandronum_common.cfg", "hexen")
|
||||
}
|
||||
|
||||
strife
|
||||
{
|
||||
include("Zandronum_common.cfg", "zandronum")
|
||||
include("Zandronum_common.cfg", "doomheretichexenstrife")
|
||||
include("Zandronum_common.cfg", "strife")
|
||||
}
|
||||
|
||||
default
|
||||
{
|
||||
include("Zandronum_common.cfg", "zandronum")
|
||||
}
|
||||
|
Binary file not shown.
|
@ -703,6 +703,7 @@
|
|||
<DependentUpon>ConsoleDocker.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="GZBuilder\Data\BoundingBox.cs" />
|
||||
<Compile Include="GZBuilder\Data\EngineInfo.cs" />
|
||||
<Compile Include="GZBuilder\Data\GameType.cs" />
|
||||
<Compile Include="GZBuilder\Data\GZDoomLight.cs" />
|
||||
<Compile Include="GZBuilder\Data\LinksCollector.cs" />
|
||||
|
@ -807,6 +808,7 @@
|
|||
<None Include="Resources\Builder16.png" />
|
||||
<None Include="Resources\CLogo.png" />
|
||||
<None Include="Resources\Angle.png" />
|
||||
<None Include="Resources\Add.png" />
|
||||
<Content Include="Resources\DB2.ico" />
|
||||
<None Include="Resources\GZDB2.ico" />
|
||||
<None Include="Resources\fog.png" />
|
||||
|
@ -819,6 +821,7 @@
|
|||
<Content Include="Resources\Light.png" />
|
||||
<Content Include="Resources\Light_animate.png" />
|
||||
<None Include="Resources\MLogo.png" />
|
||||
<None Include="Resources\Marine.png" />
|
||||
<Content Include="Resources\Model.png" />
|
||||
<Content Include="Resources\Model_selected.png" />
|
||||
<None Include="Resources\SearchClear.png" />
|
||||
|
|
|
@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UDMFControls", "..\Plugins\
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagExplorer", "..\Plugins\TagExplorer\TagExplorer.csproj", "{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PropertiesDock", "..\Plugins\PropertiesDock\PropertiesDock.csproj", "{507E4F00-9929-436F-8E29-70C3C43DC7A3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
@ -85,16 +83,6 @@ Global
|
|||
{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.ActiveCfg = Release|x86
|
||||
{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.Build.0 = Release|x86
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{507E4F00-9929-436F-8E29-70C3C43DC7A3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -26,6 +26,7 @@ using CodeImp.DoomBuilder.Data;
|
|||
using System.IO;
|
||||
using CodeImp.DoomBuilder.Editing;
|
||||
using System.Collections.Specialized;
|
||||
using CodeImp.DoomBuilder.GZBuilder.Data;
|
||||
|
||||
#endregion
|
||||
|
||||
|
@ -52,11 +53,14 @@ namespace CodeImp.DoomBuilder.Config
|
|||
private string nodebuildersave;
|
||||
private string nodebuildertest;
|
||||
private DataLocationList resources;
|
||||
private string testprogram;
|
||||
private string testparameters;
|
||||
private bool testshortpaths;
|
||||
private bool customparameters;
|
||||
private int testskill;
|
||||
//private string testprogram; //mxd
|
||||
//private string testparameters;
|
||||
//private bool testshortpaths;
|
||||
//private bool customparameters;
|
||||
//private int testskill;
|
||||
private List<EngineInfo> testEngines;
|
||||
private int currentEngineIndex;
|
||||
|
||||
private List<ThingsFilter> thingsfilters;
|
||||
private List<DefinedTextureSet> texturesets;
|
||||
private Dictionary<string, bool> editmodes;
|
||||
|
@ -72,11 +76,23 @@ namespace CodeImp.DoomBuilder.Config
|
|||
public string NodebuilderSave { get { return nodebuildersave; } internal set { nodebuildersave = value; } }
|
||||
public string NodebuilderTest { get { return nodebuildertest; } internal set { nodebuildertest = value; } }
|
||||
internal DataLocationList Resources { get { return resources; } }
|
||||
public string TestProgram { get { return testprogram; } internal set { testprogram = value; } }
|
||||
public string TestParameters { get { return testparameters; } internal set { testparameters = value; } }
|
||||
public bool TestShortPaths { get { return testshortpaths; } internal set { testshortpaths = value; } }
|
||||
public int TestSkill { get { return testskill; } internal set { testskill = value; } }
|
||||
public bool CustomParameters { get { return customparameters; } internal set { customparameters = value; } }
|
||||
|
||||
//mxd
|
||||
public string TestProgramName { get { return testEngines[currentEngineIndex].TestProgramName; } internal set { testEngines[currentEngineIndex].TestProgramName = value; } }
|
||||
public string TestProgram { get { return testEngines[currentEngineIndex].TestProgram; } internal set { testEngines[currentEngineIndex].TestProgram = value; } }
|
||||
public string TestParameters { get { return testEngines[currentEngineIndex].TestParameters; } internal set { testEngines[currentEngineIndex].TestParameters = value; } }
|
||||
public bool TestShortPaths { get { return testEngines[currentEngineIndex].TestShortPaths; } internal set { testEngines[currentEngineIndex].TestShortPaths = value; } }
|
||||
public int TestSkill { get { return testEngines[currentEngineIndex].TestSkill; } internal set { testEngines[currentEngineIndex].TestSkill = value; } }
|
||||
public bool CustomParameters { get { return testEngines[currentEngineIndex].CustomParameters; } internal set { testEngines[currentEngineIndex].CustomParameters = value; } }
|
||||
//public string TestProgram { get { return testprogram; } internal set { testprogram = value; } }
|
||||
//public string TestParameters { get { return testparameters; } internal set { testparameters = value; } }
|
||||
//public bool TestShortPaths { get { return testshortpaths; } internal set { testshortpaths = value; } }
|
||||
//public int TestSkill { get { return testskill; } internal set { testskill = value; } }
|
||||
//public bool CustomParameters { get { return customparameters; } internal set { customparameters = value; } }
|
||||
public List<EngineInfo> TestEngines { get { return testEngines; } internal set { testEngines = value; } }
|
||||
//public EngineInfo CurrentTestEngine { get { return testEngines[currentEngineIndex]; } }
|
||||
public int CurrentEngineIndex { get { return currentEngineIndex; } internal set { currentEngineIndex = value; } }
|
||||
|
||||
internal ICollection<ThingsFilter> ThingsFilters { get { return thingsfilters; } }
|
||||
internal List<DefinedTextureSet> TextureSets { get { return texturesets; } }
|
||||
internal Dictionary<string, bool> EditModes { get { return editmodes; } }
|
||||
|
@ -100,14 +116,48 @@ namespace CodeImp.DoomBuilder.Config
|
|||
// Load settings from program configuration
|
||||
this.nodebuildersave = General.Settings.ReadSetting("configurations." + settingskey + ".nodebuildersave", MISSING_NODEBUILDER);
|
||||
this.nodebuildertest = General.Settings.ReadSetting("configurations." + settingskey + ".nodebuildertest", MISSING_NODEBUILDER);
|
||||
this.testprogram = General.Settings.ReadSetting("configurations." + settingskey + ".testprogram", "");
|
||||
this.testparameters = General.Settings.ReadSetting("configurations." + settingskey + ".testparameters", "");
|
||||
this.testshortpaths = General.Settings.ReadSetting("configurations." + settingskey + ".testshortpaths", false);
|
||||
this.customparameters = General.Settings.ReadSetting("configurations." + settingskey + ".customparameters", false);
|
||||
this.testskill = General.Settings.ReadSetting("configurations." + settingskey + ".testskill", 3);
|
||||
//mxd
|
||||
//this.testprogram = General.Settings.ReadSetting("configurations." + settingskey + ".testprogram", "");
|
||||
//this.testparameters = General.Settings.ReadSetting("configurations." + settingskey + ".testparameters", "");
|
||||
//this.testshortpaths = General.Settings.ReadSetting("configurations." + settingskey + ".testshortpaths", false);
|
||||
//this.customparameters = General.Settings.ReadSetting("configurations." + settingskey + ".customparameters", false);
|
||||
//this.testskill = General.Settings.ReadSetting("configurations." + settingskey + ".testskill", 3);
|
||||
this.resources = new DataLocationList(General.Settings.Config, "configurations." + settingskey + ".resources");
|
||||
this.startmode = General.Settings.ReadSetting("configurations." + settingskey + ".startmode", "VerticesMode");
|
||||
|
||||
//mxd. read test engines
|
||||
testEngines = new List<EngineInfo>();
|
||||
IDictionary list = General.Settings.ReadSetting("configurations." + settingskey + ".engines", new ListDictionary());
|
||||
currentEngineIndex = General.Settings.ReadSetting("configurations." + settingskey + ".currentengineindex", 0);
|
||||
|
||||
//no engine list found? use old engine properties
|
||||
if (list.Count == 0) {
|
||||
EngineInfo info = new EngineInfo();
|
||||
info.TestProgram = General.Settings.ReadSetting("configurations." + settingskey + ".testprogram", "");
|
||||
info.TestProgramName = General.Settings.ReadSetting("configurations." + settingskey + ".testprogramname", EngineInfo.DEFAULT_ENGINE_NAME);
|
||||
info.CheckProgramName(false);
|
||||
info.TestParameters = General.Settings.ReadSetting("configurations." + settingskey + ".testparameters", "");
|
||||
info.TestShortPaths = General.Settings.ReadSetting("configurations." + settingskey + ".testshortpaths", false);
|
||||
info.CustomParameters = General.Settings.ReadSetting("configurations." + settingskey + ".customparameters", false);
|
||||
info.TestSkill = General.Settings.ReadSetting("configurations." + settingskey + ".testskill", 3);
|
||||
testEngines.Add(info);
|
||||
currentEngineIndex = 0;
|
||||
} else {
|
||||
//read engines settings from config
|
||||
foreach (DictionaryEntry de in list) {
|
||||
string path = "configurations." + settingskey + ".engines." + de.Key;
|
||||
EngineInfo info = new EngineInfo();
|
||||
info.TestProgram = General.Settings.ReadSetting(path + ".testprogram", "");
|
||||
info.TestProgramName = General.Settings.ReadSetting(path + ".testprogramname", EngineInfo.DEFAULT_ENGINE_NAME);
|
||||
info.CheckProgramName(false);
|
||||
info.TestParameters = General.Settings.ReadSetting(path + ".testparameters", "");
|
||||
info.TestShortPaths = General.Settings.ReadSetting(path + ".testshortpaths", false);
|
||||
info.CustomParameters = General.Settings.ReadSetting(path + ".customparameters", false);
|
||||
info.TestSkill = General.Settings.ReadSetting(path + ".testskill", 3);
|
||||
testEngines.Add(info);
|
||||
}
|
||||
}
|
||||
|
||||
// Make list of things filters
|
||||
thingsfilters = new List<ThingsFilter>();
|
||||
IDictionary cfgfilters = General.Settings.ReadSetting("configurations." + settingskey + ".thingsfilters", new Hashtable());
|
||||
|
@ -166,11 +216,23 @@ namespace CodeImp.DoomBuilder.Config
|
|||
// Write to configuration
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".nodebuildersave", nodebuildersave);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".nodebuildertest", nodebuildertest);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".testprogram", testprogram);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".testparameters", testparameters);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".testshortpaths", testshortpaths);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".customparameters", customparameters);
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".testskill", testskill);
|
||||
//General.Settings.WriteSetting("configurations." + settingskey + ".testprogram", testprogram);
|
||||
//General.Settings.WriteSetting("configurations." + settingskey + ".testparameters", testparameters);
|
||||
//General.Settings.WriteSetting("configurations." + settingskey + ".testshortpaths", testshortpaths);
|
||||
//General.Settings.WriteSetting("configurations." + settingskey + ".customparameters", customparameters);
|
||||
//General.Settings.WriteSetting("configurations." + settingskey + ".testskill", testskill);
|
||||
//mxd
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".currentengineindex", currentEngineIndex);
|
||||
for (int i = 0; i < testEngines.Count; i++ ) {
|
||||
string path = "configurations." + settingskey + ".engines.engine" + i.ToString(CultureInfo.InvariantCulture);
|
||||
General.Settings.WriteSetting(path + ".testprogramname", testEngines[i].TestProgramName);
|
||||
General.Settings.WriteSetting(path + ".testprogram", testEngines[i].TestProgram);
|
||||
General.Settings.WriteSetting(path + ".testparameters", testEngines[i].TestParameters);
|
||||
General.Settings.WriteSetting(path + ".testshortpaths", testEngines[i].TestShortPaths);
|
||||
General.Settings.WriteSetting(path + ".customparameters", testEngines[i].CustomParameters);
|
||||
General.Settings.WriteSetting(path + ".testskill", testEngines[i].TestSkill);
|
||||
}
|
||||
|
||||
General.Settings.WriteSetting("configurations." + settingskey + ".startmode", startmode);
|
||||
resources.WriteToConfig(General.Settings.Config, "configurations." + settingskey + ".resources");
|
||||
|
||||
|
@ -221,11 +283,15 @@ namespace CodeImp.DoomBuilder.Config
|
|||
ci.nodebuildertest = this.nodebuildertest;
|
||||
ci.resources = new DataLocationList();
|
||||
ci.resources.AddRange(this.resources);
|
||||
ci.testprogram = this.testprogram;
|
||||
//mxd
|
||||
/*ci.testprogram = this.testprogram;
|
||||
ci.testparameters = this.testparameters;
|
||||
ci.testshortpaths = this.testshortpaths;
|
||||
ci.customparameters = this.customparameters;
|
||||
ci.testskill = this.testskill;
|
||||
ci.testskill = this.testskill;*/
|
||||
ci.TestEngines = new List<EngineInfo>();
|
||||
foreach (EngineInfo info in testEngines) ci.TestEngines.Add(new EngineInfo(info));
|
||||
|
||||
ci.startmode = this.startmode;
|
||||
ci.texturesets = new List<DefinedTextureSet>();
|
||||
foreach(DefinedTextureSet s in this.texturesets) ci.texturesets.Add(s.Copy());
|
||||
|
@ -245,11 +311,15 @@ namespace CodeImp.DoomBuilder.Config
|
|||
this.nodebuildertest = ci.nodebuildertest;
|
||||
this.resources = new DataLocationList();
|
||||
this.resources.AddRange(ci.resources);
|
||||
this.testprogram = ci.testprogram;
|
||||
//mxd
|
||||
/*this.testprogram = ci.testprogram;
|
||||
this.testparameters = ci.testparameters;
|
||||
this.testshortpaths = ci.testshortpaths;
|
||||
this.customparameters = ci.customparameters;
|
||||
this.testskill = ci.testskill;
|
||||
this.testskill = ci.testskill;*/
|
||||
this.testEngines = new List<EngineInfo>();
|
||||
foreach (EngineInfo info in ci.TestEngines) testEngines.Add(new EngineInfo(info));
|
||||
|
||||
this.startmode = ci.startmode;
|
||||
this.texturesets = new List<DefinedTextureSet>();
|
||||
foreach(DefinedTextureSet s in ci.texturesets) this.texturesets.Add(s.Copy());
|
||||
|
|
|
@ -247,7 +247,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
if(typeindex != fieldtype.Index)
|
||||
{
|
||||
// Change field type!
|
||||
TypeHandlerAttribute attrib = General.Types.GetAttribute(typeindex);
|
||||
//TypeHandlerAttribute attrib = General.Types.GetAttribute(typeindex); //mxd
|
||||
fieldtype = General.Types.GetFieldHandler(typeindex, this.Cells[2].Value);
|
||||
this.Cells[1].Value = fieldtype.GetDisplayType();
|
||||
}
|
||||
|
|
|
@ -170,7 +170,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
if(General.Map.UDMF) {
|
||||
//light
|
||||
frontoffsetlabel.Text = "Front light:";
|
||||
setUDMFLight(l.Front.Fields, frontoffsetlabel, frontoffset);
|
||||
setUDMFLight(l.Front, frontoffsetlabel, frontoffset);
|
||||
|
||||
bool hasTopFields = false;
|
||||
bool hasMiddleFields = false;
|
||||
|
@ -268,7 +268,7 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
if(General.Map.UDMF) {
|
||||
//light
|
||||
backoffsetlabel.Text = "Back light:";
|
||||
setUDMFLight(l.Back.Fields, backoffsetlabel, backoffset);
|
||||
setUDMFLight(l.Back, backoffsetlabel, backoffset);
|
||||
|
||||
bool hasTopFields = false;
|
||||
bool hasMiddleFields = false;
|
||||
|
@ -382,12 +382,14 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
}
|
||||
|
||||
//mxd
|
||||
private void setUDMFLight(UniFields fields, Label label, Label value) {
|
||||
if(fields.ContainsKey("light")) {
|
||||
value.Text = fields["light"].Value.ToString();
|
||||
|
||||
if(fields.ContainsKey("lightabsolute") && Boolean.Parse(fields["lightabsolute"].Value.ToString()))
|
||||
value.Text += " (abs)";
|
||||
private void setUDMFLight(Sidedef sd, Label label, Label value) {
|
||||
if(sd.Fields.ContainsKey("light")) {
|
||||
int light = (int)sd.Fields["light"].Value;
|
||||
|
||||
if (sd.Fields.ContainsKey("lightabsolute") && Boolean.Parse(sd.Fields["lightabsolute"].Value.ToString()))
|
||||
value.Text = light + " (abs.)";
|
||||
else
|
||||
value.Text = light + " (" + Math.Min(255, Math.Max(0, (light + sd.Sector.Brightness))) + ")";
|
||||
|
||||
value.Enabled = true;
|
||||
label.Enabled = true;
|
||||
|
|
|
@ -81,10 +81,13 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
ceilingLight.Enabled = true;
|
||||
ceilingLightLabel.Enabled = true;
|
||||
|
||||
ceilingLight.Text = s.Fields["lightceiling"].Value.ToString();
|
||||
int cl = (int)s.Fields["lightceiling"].Value;
|
||||
|
||||
if(s.Fields.ContainsKey("lightceilingabsolute") && Boolean.Parse(s.Fields["lightceilingabsolute"].Value.ToString()))
|
||||
ceilingLight.Text += " (abs.)";
|
||||
ceilingLight.Text = cl + " (abs.)";
|
||||
else
|
||||
ceilingLight.Text = cl + " (" + Math.Min(255, Math.Max(0, (cl + s.Brightness))) + ")";
|
||||
|
||||
} else {
|
||||
ceilingLight.Text = "--";
|
||||
ceilingLight.Enabled = false;
|
||||
|
@ -96,10 +99,13 @@ namespace CodeImp.DoomBuilder.Controls
|
|||
floorLight.Enabled = true;
|
||||
floorLightLabel.Enabled = true;
|
||||
|
||||
floorLight.Text = s.Fields["lightfloor"].Value.ToString();
|
||||
int fl = (int)s.Fields["lightfloor"].Value;
|
||||
|
||||
if(s.Fields.ContainsKey("lightfloorabsolute") && Boolean.Parse(s.Fields["lightfloorabsolute"].Value.ToString()))
|
||||
floorLight.Text += " (abs.)";
|
||||
floorLight.Text = fl + " (abs.)";
|
||||
else
|
||||
floorLight.Text = fl + " (" + Math.Min(255, Math.Max(0, (fl + s.Brightness))) + ")";
|
||||
|
||||
} else {
|
||||
floorLight.Text = "--";
|
||||
floorLight.Enabled = false;
|
||||
|
|
39
Source/Core/GZBuilder/Data/EngineInfo.cs
Normal file
39
Source/Core/GZBuilder/Data/EngineInfo.cs
Normal file
|
@ -0,0 +1,39 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.IO;
|
||||
|
||||
namespace CodeImp.DoomBuilder.GZBuilder.Data {
|
||||
public class EngineInfo {
|
||||
public const string DEFAULT_ENGINE_NAME = "Engine with no name";
|
||||
|
||||
public string TestProgramName;
|
||||
public string TestProgram;
|
||||
public string TestParameters;
|
||||
public bool CustomParameters;
|
||||
public int TestSkill;
|
||||
public bool TestShortPaths;
|
||||
|
||||
public EngineInfo() {
|
||||
TestProgramName = DEFAULT_ENGINE_NAME;
|
||||
}
|
||||
|
||||
public EngineInfo(EngineInfo other) {
|
||||
TestProgramName = other.TestProgramName;
|
||||
TestProgram = other.TestProgram;
|
||||
TestParameters = other.TestParameters;
|
||||
CustomParameters = other.CustomParameters;
|
||||
TestSkill = other.TestSkill;
|
||||
TestShortPaths = other.TestShortPaths;
|
||||
}
|
||||
|
||||
public void CheckProgramName(bool forced) {
|
||||
if ((forced || TestProgramName == DEFAULT_ENGINE_NAME) && !String.IsNullOrEmpty(TestProgram)) {
|
||||
//get engine name from folder name
|
||||
string n = Path.GetDirectoryName(TestProgram);
|
||||
int pos = n.LastIndexOf(Path.DirectorySeparatorChar);
|
||||
TestProgramName = n.Substring(pos + 1, n.Length - pos - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.GZBuilder
|
|||
|
||||
//version
|
||||
public const float Version = 1.13f;
|
||||
public const char Revision = ' ';
|
||||
public const char Revision = 'a';
|
||||
|
||||
//debug console
|
||||
#if DEBUG
|
||||
|
|
|
@ -240,7 +240,6 @@ namespace CodeImp.DoomBuilder
|
|||
TestAtSkill(General.Map.ConfigSettings.TestSkill);
|
||||
|
||||
General.Editing.Mode.OnMapTestEnd(); //mxd
|
||||
//General.Plugins.OnMapTestEnd(); //mxd
|
||||
}
|
||||
|
||||
//mxd
|
||||
|
@ -254,10 +253,10 @@ namespace CodeImp.DoomBuilder
|
|||
|
||||
General.MainWindow.StopProcessing();
|
||||
TestAtSkill(General.Map.ConfigSettings.TestSkill);
|
||||
General.MainWindow.EnableProcessing();
|
||||
|
||||
|
||||
General.Editing.Mode.OnMapTestEnd();
|
||||
General.MainWindow.RedrawDisplay();
|
||||
General.MainWindow.EnableProcessing();
|
||||
General.MainWindow.FocusDisplay();
|
||||
}
|
||||
|
||||
// This saves the map to a temporary file and launches a test wit hthe given skill
|
||||
|
|
|
@ -15,7 +15,7 @@ using CodeImp.DoomBuilder.Data;
|
|||
using CodeImp.DoomBuilder.Map;
|
||||
using CodeImp.DoomBuilder.Windows;
|
||||
using CodeImp.DoomBuilder.Config;
|
||||
using CodeImp.DoomBuilder.Types;
|
||||
//using CodeImp.DoomBuilder.Types;
|
||||
|
||||
#endregion
|
||||
|
||||
|
@ -53,10 +53,10 @@ namespace CodeImp.DoomBuilder.Plugins
|
|||
|
||||
|
||||
//mxd
|
||||
public static TypeHandlerAttribute[] GetCustomUseAttributes() {
|
||||
/*public static TypeHandlerAttribute[] GetCustomUseAttributes() {
|
||||
//TypeHandlerAttribute[] attrs = General.Types.GetCustomUseAttributes();
|
||||
return General.Types.GetCustomUseAttributes();
|
||||
}
|
||||
}*/
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
16
Source/Core/Properties/Resources.Designer.cs
generated
16
Source/Core/Properties/Resources.Designer.cs
generated
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Этот код создан программой.
|
||||
// Исполняемая версия:2.0.50727.5420
|
||||
// Исполняемая версия:2.0.50727.4927
|
||||
//
|
||||
// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
|
||||
// повторной генерации кода.
|
||||
|
@ -60,6 +60,13 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Add {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Add", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Angle {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Angle", resourceCulture);
|
||||
|
@ -242,6 +249,13 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Marine {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Marine", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap mergegeometry {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("mergegeometry", resourceCulture);
|
||||
|
|
|
@ -148,6 +148,9 @@
|
|||
<data name="ScriptError" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptError.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="ViewTextureCeiling" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -160,11 +163,8 @@
|
|||
<data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Script2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Script2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptPalette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
@ -190,8 +190,8 @@
|
|||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
@ -211,8 +211,8 @@
|
|||
<data name="ScriptConstant" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptConstant.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="ViewTextureCeiling" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="fx" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\fx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
@ -226,9 +226,6 @@
|
|||
<data name="List" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Question" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -259,6 +256,9 @@
|
|||
<data name="fog" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="InfoLine" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\InfoLine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MissingTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -271,6 +271,9 @@
|
|||
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model_selected" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -283,6 +286,9 @@
|
|||
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Script2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Script2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -301,9 +307,6 @@
|
|||
<data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
@ -352,7 +355,10 @@
|
|||
<data name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="InfoLine" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\InfoLine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Marine" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Marine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 491 B |
BIN
Source/Core/Resources/Marine.png
Normal file
BIN
Source/Core/Resources/Marine.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 501 B |
|
@ -297,13 +297,19 @@ namespace CodeImp.DoomBuilder.VisualModes
|
|||
return false;
|
||||
}
|
||||
|
||||
//check camera Z
|
||||
float pz = camPos.z - s.FloorHeight;
|
||||
int ceilRel = s.CeilHeight - s.FloorHeight - 41; //relative ceiling height
|
||||
if(pz > ceilRel) pz = ceilRel; //above ceiling?
|
||||
else if(pz < 0) pz = 0; //below floor?
|
||||
|
||||
//store initial position
|
||||
playerStart = start;
|
||||
playerStartPosition = start.Position;
|
||||
playerStartAngle = start.Angle;
|
||||
|
||||
//everything should be valid, let's move player start here
|
||||
start.Move(new Vector3D(camPos.x, camPos.y, s.FloorHeight));
|
||||
start.Move(new Vector3D(camPos.x, camPos.y, pz));
|
||||
start.Rotate(General.Map.VisualCamera.AngleXY - (float)Math.PI);
|
||||
}
|
||||
return true;
|
||||
|
|
1375
Source/Core/Windows/ConfigForm.Designer.cs
generated
1375
Source/Core/Windows/ConfigForm.Designer.cs
generated
File diff suppressed because it is too large
Load diff
|
@ -30,6 +30,7 @@ using CodeImp.DoomBuilder.Config;
|
|||
using System.IO;
|
||||
using CodeImp.DoomBuilder.Controls;
|
||||
using CodeImp.DoomBuilder.Editing;
|
||||
using CodeImp.DoomBuilder.GZBuilder.Data;
|
||||
|
||||
#endregion
|
||||
|
||||
|
@ -112,6 +113,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
tabs.Enabled = true;
|
||||
|
||||
preventchanges = true;
|
||||
|
||||
//mxd. Store current engine name
|
||||
if(configinfo != null && !String.IsNullOrEmpty(cbEngineSelector.Text) && cbEngineSelector.Text != configinfo.TestProgramName)
|
||||
configinfo.TestProgramName = cbEngineSelector.Text;
|
||||
|
||||
// Get config info of selected item
|
||||
configinfo = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
|
||||
|
@ -160,9 +165,17 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// Fill skills list
|
||||
skill.ClearInfo();
|
||||
skill.AddInfo(gameconfig.Skills.ToArray());
|
||||
|
||||
//mxd
|
||||
cbEngineSelector.Items.Clear();
|
||||
foreach(EngineInfo info in configinfo.TestEngines)
|
||||
cbEngineSelector.Items.Add(info.TestProgramName);
|
||||
|
||||
cbEngineSelector.SelectedIndex = configinfo.CurrentEngineIndex;
|
||||
btnRemoveEngine.Enabled = configinfo.TestEngines.Count > 1;
|
||||
|
||||
// Set test application and parameters
|
||||
if(!configinfo.CustomParameters)
|
||||
/*if(!configinfo.CustomParameters)
|
||||
{
|
||||
configinfo.TestParameters = gameconfig.TestParameters;
|
||||
configinfo.TestShortPaths = gameconfig.TestShortPaths;
|
||||
|
@ -173,7 +186,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
int skilllevel = configinfo.TestSkill;
|
||||
skill.Value = skilllevel - 1;
|
||||
skill.Value = skilllevel;
|
||||
customparameters.Checked = configinfo.CustomParameters;
|
||||
customparameters.Checked = configinfo.CustomParameters;*/
|
||||
|
||||
// Fill texture sets list
|
||||
listtextures.Items.Clear();
|
||||
|
@ -263,6 +276,14 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(nodebuildertest.SelectedItem != null)
|
||||
configinfo.NodebuilderTest = (nodebuildertest.SelectedItem as NodebuilderInfo).Name;
|
||||
}
|
||||
|
||||
//mxd. Engine name changed
|
||||
/*private void tbEngineName_TextChanged(object sender, EventArgs e) {
|
||||
if (configinfo == null) return;
|
||||
|
||||
configinfo.TestProgramName = tbEngineName.Text;
|
||||
cbEngineSelector.SelectedItem = configinfo.TestEngines[configinfo.CurrentEngineIndex];
|
||||
}*/
|
||||
|
||||
// Test application changed
|
||||
private void testapplication_TextChanged(object sender, EventArgs e)
|
||||
|
@ -271,7 +292,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(configinfo == null) return;
|
||||
|
||||
// Apply to selected configuration
|
||||
configinfo.TestProgram = testapplication.Text;
|
||||
configinfo.TestProgram = testapplication.Text;
|
||||
|
||||
//mxd. Update engine name if needed
|
||||
configinfo.TestEngines[configinfo.CurrentEngineIndex].CheckProgramName(false);
|
||||
cbEngineSelector.Text = configinfo.TestProgramName;
|
||||
}
|
||||
|
||||
// Test parameters changed
|
||||
|
@ -282,7 +307,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
|
||||
// Apply to selected configuration
|
||||
configinfo = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
|
||||
configinfo.TestParameters = testparameters.Text;
|
||||
configinfo.TestParameters = testparameters.Text;
|
||||
|
||||
// Show example result
|
||||
CreateParametersExample();
|
||||
|
@ -346,6 +371,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
{
|
||||
// Apply
|
||||
testapplication.Text = testprogramdialog.FileName;
|
||||
|
||||
//mxd. Update engine name
|
||||
configinfo.TestEngines[configinfo.CurrentEngineIndex].CheckProgramName(true);
|
||||
cbEngineSelector.Text = configinfo.TestProgramName;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -592,5 +621,78 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
configinfo.StartMode = emi.Type.Name;
|
||||
}
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void btnNewEngine_Click(object sender, EventArgs e) {
|
||||
EngineInfo newInfo = new EngineInfo();
|
||||
newInfo.TestSkill = (int)Math.Ceiling(gameconfig.Skills.Count / 2f); //set Medium skill level
|
||||
configinfo.TestEngines.Add(newInfo);
|
||||
|
||||
//store current engine name
|
||||
if(!String.IsNullOrEmpty(cbEngineSelector.Text))
|
||||
configinfo.TestProgramName = cbEngineSelector.Text;
|
||||
|
||||
//refresh engines list
|
||||
cbEngineSelector.Items.Clear();
|
||||
foreach(EngineInfo info in configinfo.TestEngines)
|
||||
cbEngineSelector.Items.Add(info.TestProgramName);
|
||||
|
||||
cbEngineSelector.SelectedIndex = configinfo.TestEngines.Count - 1;
|
||||
|
||||
btnRemoveEngine.Enabled = true;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void btnRemoveEngine_Click(object sender, EventArgs e) {
|
||||
//remove params
|
||||
int index = cbEngineSelector.SelectedIndex;
|
||||
configinfo.TestEngines.RemoveAt(index);
|
||||
|
||||
//refresh engines list
|
||||
cbEngineSelector.Items.Clear();
|
||||
foreach(EngineInfo info in configinfo.TestEngines)
|
||||
cbEngineSelector.Items.Add(info.TestProgramName);
|
||||
|
||||
if (index >= configinfo.TestEngines.Count)
|
||||
index = configinfo.TestEngines.Count - 1;
|
||||
|
||||
cbEngineSelector.SelectedIndex = index;
|
||||
|
||||
if (configinfo.TestEngines.Count < 2)
|
||||
btnRemoveEngine.Enabled = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void cbEngineSelector_SelectedIndexChanged(object sender, EventArgs e) {
|
||||
//set new values
|
||||
configinfo.CurrentEngineIndex = cbEngineSelector.SelectedIndex;
|
||||
cbEngineSelector.Tag = cbEngineSelector.SelectedIndex; //store for later use
|
||||
|
||||
// Set test application and parameters
|
||||
if (!configinfo.CustomParameters)
|
||||
{
|
||||
configinfo.TestParameters = gameconfig.TestParameters;
|
||||
configinfo.TestShortPaths = gameconfig.TestShortPaths;
|
||||
}
|
||||
|
||||
configinfo.TestProgramName = cbEngineSelector.Text;
|
||||
testapplication.Text = configinfo.TestProgram;
|
||||
testparameters.Text = configinfo.TestParameters;
|
||||
shortpaths.Checked = configinfo.TestShortPaths;
|
||||
int skilllevel = configinfo.TestSkill;
|
||||
skill.Value = skilllevel - 1; //mxd. WHY???
|
||||
skill.Value = skilllevel;
|
||||
customparameters.Checked = configinfo.CustomParameters;
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void cbEngineSelector_DropDown(object sender, EventArgs e) {
|
||||
int index = (int)cbEngineSelector.Tag;
|
||||
|
||||
if(index != -1 && cbEngineSelector.Text != cbEngineSelector.Items[index].ToString()) {
|
||||
cbEngineSelector.Items[index] = cbEngineSelector.Text;
|
||||
configinfo.TestProgramName = cbEngineSelector.Text;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -150,21 +150,12 @@
|
|||
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label9.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
|
@ -183,9 +174,6 @@
|
|||
<data name="label10.Text" xml:space="preserve">
|
||||
<value>Here you can select the editing modes that you wish to use in this configuration. This is useful in case there are plugins with additional editing modes that can be used as a replacement for the original editing modes.</value>
|
||||
</data>
|
||||
<metadata name="labelparameters.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
@ -213,33 +201,6 @@
|
|||
<metadata name="tabtesting.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="shortpaths.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="customparameters.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="skill.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="browsetestprogram.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="noresultlabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="testresult.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="labelresult.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="testparameters.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="testapplication.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="tabtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
@ -254,7 +215,7 @@
|
|||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA4
|
||||
CAAAAk1TRnQBSQFMAwEBAAEMAQABDAEAARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
|
||||
CAAAAk1TRnQBSQFMAwEBAAFEAQABRAEAARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
|
||||
AUwDAAEQAwABAQEAAQgFAAHAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
|
|
3260
Source/Core/Windows/MainForm.Designer.cs
generated
3260
Source/Core/Windows/MainForm.Designer.cs
generated
File diff suppressed because it is too large
Load diff
|
@ -1364,13 +1364,29 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
if(General.Map != null)
|
||||
{
|
||||
// Make the new skills list
|
||||
skills = new ToolStripItem[(General.Map.Config.Skills.Count * 2) + 1];
|
||||
int addindex = 0;
|
||||
//mxd
|
||||
skills = new ToolStripItem[(General.Map.Config.Skills.Count * 2) + 3];
|
||||
|
||||
//mxd. Add engine selector
|
||||
ToolStripMenuItem menuitem = new ToolStripMenuItem("Engine:", Properties.Resources.Marine);
|
||||
for (int i = 0; i < General.Map.ConfigSettings.TestEngines.Count; i++) {
|
||||
ToolStripMenuItem engineItem = new ToolStripMenuItem(General.Map.ConfigSettings.TestEngines[i].TestProgramName);
|
||||
engineItem.Tag = i;
|
||||
engineItem.Checked = (i == General.Map.ConfigSettings.CurrentEngineIndex);
|
||||
engineItem.Click += new EventHandler(engineItem_Click);
|
||||
menuitem.DropDownItems.Add(engineItem);
|
||||
}
|
||||
skills[0] = menuitem;
|
||||
|
||||
//mxd. Add seperator
|
||||
skills[1] = new ToolStripSeparator();
|
||||
skills[1].Padding = new Padding(0, 3, 0, 3);
|
||||
int addindex = 2;
|
||||
|
||||
// Positive skills are with monsters
|
||||
for(int i = 0; i < General.Map.Config.Skills.Count; i++)
|
||||
{
|
||||
ToolStripMenuItem menuitem = new ToolStripMenuItem(General.Map.Config.Skills[i].ToString());
|
||||
menuitem = new ToolStripMenuItem(General.Map.Config.Skills[i].ToString());
|
||||
menuitem.Image = Properties.Resources.Monster2;
|
||||
menuitem.Click += new EventHandler(TestSkill_Click);
|
||||
menuitem.Tag = General.Map.Config.Skills[i].Index;
|
||||
|
@ -1386,7 +1402,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// Negative skills are without monsters
|
||||
for(int i = 0; i < General.Map.Config.Skills.Count; i++)
|
||||
{
|
||||
ToolStripMenuItem menuitem = new ToolStripMenuItem(General.Map.Config.Skills[i].ToString());
|
||||
menuitem = new ToolStripMenuItem(General.Map.Config.Skills[i].ToString());
|
||||
menuitem.Image = Properties.Resources.Monster3;
|
||||
menuitem.Click += new EventHandler(TestSkill_Click);
|
||||
menuitem.Tag = -General.Map.Config.Skills[i].Index;
|
||||
|
@ -1398,6 +1414,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
buttontest.DropDownItems.AddRange(skills);
|
||||
}
|
||||
}
|
||||
|
||||
//mxd
|
||||
private void engineItem_Click(object sender, EventArgs e) {
|
||||
General.Map.ConfigSettings.CurrentEngineIndex = (int)(((ToolStripMenuItem)sender).Tag);
|
||||
}
|
||||
|
||||
// Event handler for testing at a specific skill
|
||||
private void TestSkill_Click(object sender, EventArgs e)
|
||||
|
|
|
@ -198,6 +198,30 @@
|
|||
<metadata name="sectorinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="heightpanel1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="vertexinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="labelcollapsedinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="buttontoggleinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="modename.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="linedefinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="thinginfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="sectorinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="redrawtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>433, 17</value>
|
||||
</metadata>
|
||||
|
|
|
@ -157,6 +157,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
//mxd. Still better than nothing :)
|
||||
if (config.SelectedIndex == -1 && General.Configs.Count > 0) config.SelectedIndex = 0;
|
||||
|
||||
// Done
|
||||
Cursor.Current = Cursors.Default;
|
||||
|
|
|
@ -157,6 +157,27 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
|
|||
public override Sector GetControlSector() {
|
||||
return level.sector;
|
||||
}
|
||||
|
||||
//mxd. Modify texture offsets based on camera angle (so "movetextureleft" action always moves texture more or less "left" etc.)
|
||||
protected Point getTranslatedTextureOffset(Point p) {
|
||||
Point tp = new Point();
|
||||
int camAngle = (int)(General.Map.VisualCamera.AngleXY * 180f / (float)Math.PI);
|
||||
|
||||
if (camAngle > 315 || camAngle < 46) {
|
||||
tp = p;
|
||||
} else if (camAngle > 225) {
|
||||
tp.Y = p.X;
|
||||
tp.X = -p.Y;
|
||||
} else if (camAngle > 135) {
|
||||
tp.X = -p.X;
|
||||
tp.Y = -p.Y;
|
||||
}else{
|
||||
tp.Y = -p.X;
|
||||
tp.X = p.Y;
|
||||
}
|
||||
|
||||
return tp;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -367,10 +367,10 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
|
|||
}
|
||||
|
||||
//mxd
|
||||
protected float getRoundedTextureOffset(float offset, float scale) {
|
||||
if (offset == 0f) return 0f;
|
||||
float result = (float)Math.Round(offset * scale);
|
||||
if (result == 0) result = 1f * (offset < 0 ? -1 : 1);
|
||||
protected float getRoundedTextureOffset(float oldValue, float offset, float scale) {
|
||||
if(offset == 0f) return oldValue;
|
||||
float result = (float)Math.Round(oldValue + (offset * scale));
|
||||
if (result == oldValue) result += 1f * (offset < 0 ? -1 : 1);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue