.editorconfig

+[*.cs]
+indent_style = tab
\ No newline at end of file

.github/workflows/continuous_integration_other.yml

@@ -10,10 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {
-            name: "macOS",
-            os: macos-latest
-          }
+#        - {
+#            name: "macOS",
+#            os: macos-latest
+#          }
         - {
             name: "Linux",
             os: ubuntu-latest
@@ -28,7 +28,7 @@ jobs:
           make mac
         elif [[ "${{ runner.os }}" == 'Linux' ]]; then
           sudo apt-get update
-          sudo apt install mesa-common-dev
+          sudo apt install mesa-common-dev libxfixes-dev
           make linux
         fi
 
@@ -57,11 +57,6 @@ jobs:
           fi
         done
 
-    - name: Prepare Package
-      run: |
-        # Delete unwanted files
-        rm -r Build/Setup
-
     - name: Upload Package
       uses: actions/upload-artifact@v1
       with:

.gitignore

@@ -32,3 +32,11 @@ bin
 /Build/OpenGLDebug.log
 /Source/Native/*.log
 /Build/builder
+/Build/System.Buffers.dll
+/Build/System.Memory.dll
+/Build/System.Numerics.Vectors.dll
+/Build/System.Runtime.CompilerServices.Unsafe.dll
+/Build/Updater.ini
+/Build.Native
+/builder
+*.csproj.dtbcache.json

.gitlab-ci.yml

+variables:
+  BUILDTYPE: Release
+
+default:
+  image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable
+
+  cache:
+    - key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
+      fallback_keys:
+        - cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
+        - cache-$CI_PROJECT_PATH_SLUG-default
+      paths:
+        - ccache
+        #- ccache_statslog
+
+    - key: apt-$CI_JOB_IMAGE
+      paths:
+        - apt-cache
+      unprotect: true
+
+  before_script:
+    - - |
+         # debconf
+         echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+      - export DEBIAN_FRONTEND="noninteractive"
+      - export DEBIAN_PRIORITY="low"
+      - export DEBCONF_NONINTERACTIVE_SEEN="true"
+      - |
+          # debconf
+          echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
+    - - |
+          # dpkg_aa
+          echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+      - dpkg --add-architecture i386
+      - dpkg --add-architecture amd64
+      - dpkg --add-architecture arm64
+      - |
+          # dpkg_aa
+          echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
+
+    - - |
+          # apt_conf
+          echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+      - export APT_CACHE_DIR=`pwd`/apt-cache
+      - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+      - touch /etc/apt/apt.conf.d/99build
+      - |
+          # apt.conf
+          echo Adding options to apt.conf':'
+      - |
+          # APT::Install-Recommends
+          echo APT::Install-Recommends "false"\;       | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # quit
+          echo quiet "1"\;                             | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # APT::Get::Assume-Yes
+          echo APT::Get::Assume-Yes "true"\;           | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # Dir::Cache::Archives
+          echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+      - |
+          # apt_conf
+          echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
+
+    - - |
+          # apt_update
+          echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+      - apt-get update
+      - |
+          # apt_update
+          echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+
+    - - |
+          # apt_pre
+          echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+      - apt-get install apt-utils
+      - |
+          # apt_pre
+          echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+
+    - - |
+          # apt_upgrade
+          echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+      - apt-get upgrade
+      - |
+          # apt_update
+          echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
+
+    - - |
+          # apt_common
+          echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+      - apt-get install make git ccache
+      - |
+          # apt_common
+          echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+
+    - - |
+          # ccache_config
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
+      - mkdir --parents --verbose ~/.ccache/
+      - touch ~/.ccache/ccache.conf
+      - |
+          # cache.conf
+          echo Adding ccache configution option
+      - |
+          # base_dir
+          echo base_dir = $PWD                  | tee --append ~/.ccache/ccache.conf
+      - |
+          # cache_dir
+          echo cache_dir = $PWD/ccache          | tee --append ~/.ccache/ccache.conf
+      - |
+          # compiler_check
+          echo compiler_check = content         | tee --append ~/.ccache/ccache.conf
+      - |
+          # stats_log
+          echo #stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+      - |
+          # max_size
+          echo max_size = 50M                   | tee --append ~/.ccache/ccache.conf
+      - |
+          # ccache_config
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+
+    - - |
+          # cache_reset
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+      - ccache --zero-stats
+      - ccache --show-stats
+      - |
+          # ccache_reset
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+
+  artifacts:
+    paths:
+      - "Build/"
+    exclude:
+      - "Build/Source/Native/*.d"
+      - "Build/Source.Native/*.o"
+      - "Build/Source.Native/OpenGL/*.d"
+      - "Build/Source.Native/OpenGL/*.o"
+      - "Build/Source.Native/OpenGL/gl_load/*.d"
+      - "Build/Source.Native/OpenGL/gl_load/*.o"
+      - "Build/Source.Native/VPO/*.d"
+      - "Build/Source.Native/VPO/*.o"
+      - "Build/libBuilderNative.so"
+    expose_as: "Base"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  after_script:
+    - - |
+           # apt_clean
+           echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+      - apt-get autoclean
+      - |
+          # apt_clean
+          echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+
+    - - |
+          # ccache_stats
+          echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
+      - ccache --show-stats --verbose || ccache --show-stats
+      - ccache --show-log-stats --verbose || ccache --show-log-stats || true
+      - |
+          # ccahe_stats
+          echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+
+stages:
+  - build
+
+Release:
+  stage: build
+
+  variables:
+    CC: ccache clang
+    CXX: ccache clang
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install clang msbuild
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling UZB"
+     - make --keep-going --silent || make --keep-going
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+i386:
+  stage: build
+
+  variables:
+    CC: ccache i686-linux-gnu-gcc
+    CXX: ccache i686-linux-gnu-g++
+    CPPFLAGS: -msse2
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux i386"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-i686-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:i386
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+amd64:
+  stage: build
+
+  variables:
+    CC: ccache x86_64-linux-gnu-gcc
+    CXX: ccache x86_64-linux-gnu-gcc
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux amd64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-x86-64-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:amd64
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+arm64:
+  stage: build
+
+  variables:
+    CC: ccache aarch64-linux-gnu-gcc
+    CXX: ccache aarch64-linux-gnu-g++
+
+  artifacts:
+    paths:
+      - "Build/libBuilderNative.so"
+    expose_as: "Linux arm64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-aarch64-linux-gnu || apt-get install g++
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # apt_development
+          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+     - apt-get install mesa-common-dev:arm64
+     - |
+          # apt_development
+          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/libBuilderNative.so || make --keep-going Build/libBuilderNative.so
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+win32:
+  stage: build
+
+  variables:
+    CC: ccache i686-w64-mingw32-gcc-posix
+    CXX: ccache i686-w64-mingw32-g++-posix
+
+  artifacts:
+    paths:
+      - "Build/BuilderNative.dll"
+    expose_as: "Windows x86"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-mingw-w64-i686
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/BuilderNative.dll MINGW=1 || make --keep-going Build/BuilderNative.dll MINGW=1
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+win64:
+  stage: build
+
+  variables:
+    CC: ccache x86_64-w64-mingw32-gcc-posix
+    CXX: ccache x86_64-w64-mingw32-g++-posix
+
+  artifacts:
+    paths:
+      - "Build/BuilderNative.dll"
+    expose_as: "Windows amd64"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
+  script:
+   - - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+     - apt-get install g++-mingw-w64-x86-64
+     - |
+          # apt_toolchain
+          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+   - - |
+          # make
+          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling Native"
+     - make --keep-going Build/BuilderNative.dll MINGW=1 || make --keep-going Build/BuilderNative.dll MINGW=1
+     - |
+          # make
+          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+Debug:
+  extends:
+    - Release
+
+  allow_failure: true
+
+  variables:
+    BUILDTYPE: Debug

Build/.gitignore

-Updater.exe
-Updater.ini
-Updater.pdb
-DevIL.dll
-Screenshots
\ No newline at end of file
+Updater.exe
+Updater.ini
+Updater.pdb
+DevIL.dll
+Screenshots
+/Source

Build/Compilers/BCC/bcc.cfg

@@ -7,9 +7,9 @@ compilers
 	// All others are the required files (the setting names do not matter)
 	bcc
 	{
-		interface = "AccCompiler";
+		interface = "BccCompiler";
 		program = "bcc.exe";
-		zcommon = "zcommon.acs";
+		zcommon = "zcommon.bcs";
 		std = "std.acs";
 	}
 }

Build/Compilers/ZDoom/zcommon.acs

-
-//**************************************************************************
-//**
-//** zcommon.acs
-//**
-//**************************************************************************
-
-// If you are not using the -h command line switch and do not want to use
-// WadAuthor's error checker, you can uncomment the following line to shave
-// a few bytes off the size of compiled scripts.
-//#nowadauthor
-
-#include "zspecial.acs"
-#include "zdefs.acs"
-#include "zwvars.acs"
+
+//**************************************************************************
+//**
+//** zcommon.acs
+//**
+//**************************************************************************
+
+// If you are not using the -h command line switch and do not want to use
+// WadAuthor's error checker, you can uncomment the following line to shave
+// a few bytes off the size of compiled scripts.
+//#nowadauthor
+
+#include "zspecial.acs"
+#include "zdefs.acs"
+#include "zwvars.acs"

Build/Compilers/ZDoom/zwvars.acs

-
-//**************************************************************************
-//**
-//** zwvars.acs
-//**
-//**************************************************************************
-
-// include your world-variable declarations here.
+
+//**************************************************************************
+//**
+//** zwvars.acs
+//**
+//**************************************************************************
+
+// include your world-variable declarations here.

Build/Configurations/DSDADoom_DoomUDMF.cfg

+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "DSDADoom: Doom 2 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "dsda";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// Some common settings
+include("Includes\\Common.cfg");
+
+// Default testing parameters
+include("Includes\\Test_params.cfg", "vanilla_mapxx");
+
+// Action special help (mxd)
+actionspecialhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+
+// Thing class help (mxd)
+thingclasshelp = "http://www.zdoom.org/wiki/Classes:%K";
+
+// Default nodebuilder configurations
+defaultsavecompiler = "zdbsp_udmf_normal";
+defaulttestcompiler = "zdbsp_udmf_fast";
+
+// Generalized actions
+generalizedsectors = true;
+generalizedlinedefs = false;
+
+//mxd. Maximum safe map size check (0 means skip check)
+safeboundary = 0;
+
+// Texture loading options
+mixtexturesflats = false;
+defaulttexturescale = 1.0f;
+defaultflatscale = 1.0f;
+scaledtextureoffsets = true;
+
+//mxd. Sidedefs compression
+sidedefcompressionignoresaction = true;
+
+// Texture sources
+textures
+{
+  include("Includes\\Doom_misc.cfg", "textures");
+}
+
+// Patch sources
+patches
+{
+  include("Includes\\Doom_misc.cfg", "patches");
+}
+
+// Sprite sources
+sprites
+{
+  include("Includes\\Doom_misc.cfg", "sprites");
+}
+
+// Flat sources
+flats
+{
+  include("Includes\\Doom_misc.cfg", "flats");
+}
+
+// Colormap sources
+colormaps
+{
+  include("Includes\\Boom_misc.cfg", "colormaps");
+}
+
+// Generalized sector types
+gen_sectortypes
+{
+  include("Includes\\ZDoom_generalized.cfg", "gen_sectortypes");
+}
+
+damagetypes = "";
+internalsoundnames = "";
+
+compatibility
+{
+  fixnegativepatchoffsets = true;
+  fixmaskedpatchoffsets = true;
+}
+
+// The format interface handles the map data format
+formatinterface = "UniversalMapSetIO";
+
+//mxd. The default script compiler to use
+defaultscriptcompiler = "";
+
+// Enables support for individual offsets of upper/middle/lower sidedef textures
+localsidedeftextureoffsets = true;
+
+// Enables setting brightness for floor, ceiling, and walls independently from each other
+distinctfloorandceilingbrightness = true;
+distinctwallbrightness = true;
+
+// Enabled setting brightness for upper, middle, and lower sidedef independently from each other
+distinctsidedefpartbrightness = true;
+
+// Enables multiple tags on sectors
+sectormultitag = true;
+
+// When this is set to true, sectors with the same tag will light up when a line is highlighted
+linetagindicatesectors = false;
+
+// Special linedefs
+singlesidedflag = "blocking";
+doublesidedflag = "twosided";
+impassableflag = "blocking";
+upperunpeggedflag = "dontpegtop";
+lowerunpeggedflag = "dontpegbottom";
+defaultlinedefactivation = "playercross"; //mxd. Used when translating a map to UDMF
+
+// Door making
+makedooraction = 202;	// See linedeftypes
+makedoorflags { playeruse; repeatspecial; }
+makedoorarg0 = 0;
+makedoorarg1 = 16;
+makedoorarg2 = 0;
+makedoorarg3 = 34;
+makedoorarg4 = 0;
+
+// SECTOR FLAGS
+sectorflags
+{
+  silent = "Silent";
+	hidden = "Not shown on textured automap";
+	damagehazard = "Strife damage model";
+	noattack = "Monsters in this sector do not attack";
+}
+
+// SECTOR TYPES
+sectortypes
+{
+  0 = "None";
+	1 = "Light Phased";
+	2 = "Light Sequence Start";
+	3 = "Light Sequence Special 1";
+	4 = "Light Sequence Special 2";
+	26 = "Stairs Special 1";
+	27 = "Stairs Special 2";
+	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";
+	65 = "Light Flicker";
+	66 = "Light Strobe Fast";
+	67 = "Light Strobe Slow";
+	68 = "Light Strobe Hurt -20% health";
+	69 = "Damage Hellslime -10% health";
+	71 = "Damage Nukage -5% health";
+	72 = "Light Glow";
+	74 = "Sector Door Close (30 sec)";
+	75 = "Damage End Level -20% health";
+	76 = "Light StrobeSlowSync";
+	77 = "Light StrobeFastSync";
+	78 = "Sector Door Raise (5 min)";
+	79 = "Low Friction";
+	80 = "Damage Super Hellslime -20% health";
+	81 = "Light Fire Flicker";
+	82 = "Damage -5% health (no protection)";
+	83 = "Damage -8% health (no protection)";
+	84 = "Scroll east + -2 or -5% health (no protection)";
+	85 = "Damage Sludge -4% health";
+  104 = "sLight_Strobe_Hurt";
+	105 = "Delayed damage weak (hazardcount +2/16 per second)";
+	115 = "Instant death";
+	116 = "Delayed damage strong (hazardcount +4/16 per second)";
+	118 = "Carry player by tag";
+	195 = "Hidden Sector (automap)";
+	196 = "Healing Sector";
+	201 = "Scroll North (slow)";
+	202 = "Scroll North (medium)";
+	203 = "Scroll North (fast)";
+	204 = "Scroll East (slow)";
+	205 = "Scroll East (medium)";
+	206 = "Scroll East (fast)";
+	207 = "Scroll South (slow)";
+	208 = "Scroll South (medium)";
+	209 = "Scroll South (fast)";
+	210 = "Scroll West (slow)";
+	211 = "Scroll West (medium)";
+	212 = "Scroll West (fast)";
+	213 = "Scroll NorthWest (slow)";
+	214 = "Scroll NorthWest (medium)";
+	215 = "Scroll NorthWest (fast)";
+	216 = "Scroll NorthEast (slow)";
+	217 = "Scroll NorthEast (medium)";
+	218 = "Scroll NorthEast (fast)";
+	219 = "Scroll SouthEast (slow)";
+	220 = "Scroll SouthEast (medium)";
+	221 = "Scroll SouthEast (fast)";
+	222 = "Scroll SouthWest (slow)";
+	223 = "Scroll SouthWest (medium)";
+	224 = "Scroll SouthWest (fast)";
+	225 = "Carry East Slow";
+	226 = "Carry East Med.Slow";
+	227 = "Carry East Medium";
+	228 = "Carry East Med.Fast";
+	229 = "Carry East Fast";
+	230 = "Carry North Slow";
+	231 = "Carry North Med.Slow";
+	232 = "Carry North Medium";
+	233 = "Carry North Med.Fast";
+	234 = "Carry North Fast";
+	235 = "Carry South Slow";
+	236 = "Carry South Med.Slow";
+	237 = "Carry South Medium";
+	238 = "Carry South Med.Fast";
+	239 = "Carry South Fast";
+	240 = "Carry West Slow";
+	241 = "Carry West Med.Slow";
+	242 = "Carry West Medium";
+	243 = "Carry West Med.Fast";
+	244 = "Carry West Fast";
+}
+
+include("Includes\\DSDADoom_misc.cfg");
+
+// LINEDEF TYPES
+linedeftypes
+{
+  include("Includes\\DSDADoom_linedefs.cfg");
+}
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	include("Includes\\Boom_things.cfg");
+	include("Includes\\DSDADoom_things.cfg");
+}
+
+// Dehacked data
+dehacked
+{
+  include("Includes\\Dehacked_Doom.cfg");
+}

Build/Configurations/EdgeC_Doom2Doom.cfg

+/*************************************************************\
+  Doom Builder 2 Game Configuration for EDGE-Classic
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "EDGE-Classic: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "edge-classic";
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Boom_common.cfg", "mapformat_doom");
+include("Includes\\MBF21_common.cfg", "mapformat_doom");
+
+// Settings common to all games and all map formats
+include("Includes\\EdgeC_common.cfg", "common");
+
+// Settings common to doom map format
+include("Includes\\EdgeC_misc.cfg", "mapformat_doom");
+
+
+// Map name format for Doom 2.
+mapnameformat = "MAPxy";
+
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+  include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+  // Basic game enums
+  include("Includes\\Doom_misc.cfg", "enums");
+}
+
+
+

Build/Configurations/EdgeC_DoomUDMF.cfg

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

Build/Configurations/Eternity_DoomUDMF.cfg

@@ -28,7 +28,7 @@ decorategames = "";
 // (these are not required, just useful for new users)
 thingsfilters
 {
-	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+	include("Includes\\Eternity_misc.cfg", "thingsfilters_udmf");
 }
 
 // THING TYPES

Build/Configurations/GZDoom_DoomDoom.cfg

@@ -20,6 +20,9 @@ engine = "gzdoom";
 // *******************************************************
 
 // STANDARD ZDOOM SETTINGS
+// GZDoom core
+include("Includes\\GZDoom_common.cfg");
+
 // Settings common to all games and all map formats
 include("Includes\\ZDoom_common.cfg", "common");
 

Build/Configurations/GZDoom_DoomHexen.cfg

@@ -23,6 +23,9 @@ enabledbydefault = true;
 // *******************************************************
 
 // STANDARD ZDOOM SETTINGS
+// GZDoom core
+include("Includes\\GZDoom_common.cfg");
+
 // Settings common to all games and all map formats
 include("Includes\\ZDoom_common.cfg", "common");
 

Build/Configurations/GZDoom_DoomUDMF.cfg

@@ -23,6 +23,9 @@ enabledbydefault = true;
 // *******************************************************
 
 // STANDARD ZDOOM SETTINGS
+// GZDoom core
+include("Includes\\GZDoom_common.cfg");
+
 // Settings common to all games and all map formats
 include("Includes\\ZDoom_common.cfg", "common");
 

Build/Configurations/GZDoom_HereticDoom.cfg

@@ -20,6 +20,9 @@ engine = "gzdoom";
 // *******************************************************
 
 // STANDARD ZDOOM SETTINGS
+// GZDoom core
+include("Includes\\GZDoom_common.cfg");
+
 // Settings common to all games and all map formats
 include("Includes\\ZDoom_common.cfg", "common");