stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Game Configurations, Error Checker: all blocking things are now checked for being stuck in other things.

Browse source 
Thing Type Info: errorcheck is now set to THING_ERROR_INSIDE_STUCK for blocking DECORATE things.
This commit is contained in:
MaxED 2014-08-11 09:39:21 +00:00
parent 450ee02e49
commit 780ccae41a
10 changed files with 72 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Build/Configurations/Includes/Doom2_things.cfg
View file

@ -1,5 +1,5 @@
// Only the new Doom 2 things, use in combination with Doom_thingtypes.cfg
// Only the new Doom 2 things, use in combination with Doom_things.cfg
monsters
@ -160,6 +160,7 @@ obstacles
title = "Obstacles";
sort = 1;
blocking = 1;
error = 2;
70
{
@ -181,6 +182,7 @@ lights
sort = 1;
height = 16;
blocking = 1;
error = 2;
hangs = 0;
85
@ -238,6 +240,7 @@ decoration
height = 88;
hangs = 1;
blocking = 1;
error = 2;
class = "HangNoGuts";
}
@ -248,6 +251,7 @@ decoration
height = 88;
hangs = 1;
blocking = 1;
error = 2;
class = "HangBNoBrain";
}
@ -258,6 +262,7 @@ decoration
height = 64;
hangs = 1;
blocking = 1;
error = 2;
class = "HangTLookingDown";
}
@ -268,6 +273,7 @@ decoration
height = 64;
hangs = 1;
blocking = 1;
error = 2;
class = "HangTSkull";
}
@ -278,6 +284,7 @@ decoration
height = 64;
hangs = 1;
blocking = 1;
error = 2;
class = "HangTLookingUp";
}
@ -288,6 +295,7 @@ decoration
height = 64;
hangs = 1;
blocking = 1;
error = 2;
class = "HangTNoBrain";
}
}

13
Build/Configurations/Includes/Doom_things.cfg
View file

@ -450,6 +450,7 @@ obstacles
height = 20;
hangs = 0;
blocking = 1;
error = 2;
2035
{
@ -544,6 +545,7 @@ lights
height = 16;
hangs = 0;
blocking = 1;
error = 2;
2028
{
@ -557,6 +559,7 @@ lights
sprite = "CANDA0";
width = 20;
blocking = 0;
error = 1;
class = "Candlestick";
}
35
@ -622,6 +625,7 @@ decoration
width = 16;
hangs = 1;
blocking = 1;
error = 2;
class = "BloodyTwitch";
}
@ -643,6 +647,7 @@ decoration
height = 84;
hangs = 1;
blocking = 1;
error = 2;
class = "Meat2";
}
@ -665,6 +670,7 @@ decoration
width = 16;
hangs = 1;
blocking = 1;
error = 2;
class = "Meat4";
}
@ -687,6 +693,7 @@ decoration
width = 16;
hangs = 1;
blocking = 1;
error = 2;
class = "HangingCorpse";
}
@ -709,6 +716,7 @@ decoration
width = 16;
hangs = 1;
blocking = 1;
error = 2;
class = "Meat5";
}
@ -729,6 +737,7 @@ decoration
sprite = "POL1A0";
width = 16;
blocking = 1;
error = 2;
class = "DeadStick";
}
@ -739,6 +748,7 @@ decoration
sprite = "POL6A0";
width = 16;
blocking = 1;
error = 2;
class = "LiveStick";
}
@ -749,6 +759,7 @@ decoration
sprite = "POL4A0";
width = 16;
blocking = 1;
error = 2;
class = "HeadOnAStick";
}
@ -759,6 +770,7 @@ decoration
sprite = "POL2A0";
width = 16;
blocking = 1;
error = 2;
class = "HeadsOnAStick";
}
@ -769,6 +781,7 @@ decoration
sprite = "POL3A0";
width = 16;
blocking = 1;
error = 2;
class = "HeadCandles";
}

4
Build/Configurations/Includes/Heretic_things.cfg
View file

@ -221,6 +221,7 @@ hazards
title = "Hazards";
width = 20;
blocking = 2;
error = 2;
sort = 0;
87
@ -491,6 +492,7 @@ obstacles
title = "Obstacles";
width = 20;
blocking = 2;
error = 2;
sort = 0;
37
@ -547,6 +549,7 @@ decoration
width = 16;
sort = 0;
blocking = 2;
error = 2;
96
{
@ -626,6 +629,7 @@ lights
width = 16;
sort = 0;
blocking = 2;
error = 2;
50
{

14
Build/Configurations/Includes/Hexen_things.cfg
View file

@ -63,7 +63,6 @@ teleports
title = "Teleports";
width = 16;
sort = 1;
error = 1;
blocking = 0;
14
@ -636,6 +635,7 @@ obstacles
width = 20;
sort = 1;
blocking = 2;
error = 2;
8064
{
@ -1021,6 +1021,7 @@ lights
title = "Light sources";
width = 20;
blocking = 2;
error = 2;
sort = 1;
17
@ -1209,6 +1210,7 @@ decoration
hangs = 1;
height = 72;
blocking = 2;
error = 2;
}
6
{
@ -1297,6 +1299,7 @@ decoration
sprite = "SHB1A0";
width = 8;
blocking = 2;
error = 2;
}
8102
{
@ -1304,6 +1307,7 @@ decoration
sprite = "SHB2A0";
width = 16;
blocking = 2;
error = 2;
}
111
{
@ -1318,6 +1322,7 @@ decoration
hangs = 1;
height = 75;
blocking = 2;
error = 2;
}
61
{
@ -1326,6 +1331,7 @@ decoration
width = 10;
height = 92;
blocking = 2;
error = 2;
}
108
{
@ -1335,6 +1341,7 @@ decoration
hangs = 1;
height = 95;
blocking = 2;
error = 2;
}
109
{
@ -1344,6 +1351,7 @@ decoration
hangs = 1;
height = 95;
blocking = 2;
error = 2;
}
110
{
@ -1352,6 +1360,7 @@ decoration
width = 15;
height = 35;
blocking = 2;
error = 2;
}
62
{
@ -1399,6 +1408,7 @@ decoration
sprite = "POT1A0";
width = 10;
blocking = 2;
error = 2;
arg0
{
title = "Contained Item";
@ -1412,6 +1422,7 @@ decoration
sprite = "POT2A0";
width = 10;
blocking = 2;
error = 2;
arg0
{
title = "Contained Item";
@ -1425,6 +1436,7 @@ decoration
sprite = "POT3A0";
width = 15;
blocking = 2;
error = 2;
arg0
{
title = "Contained Item";

10
Build/Configurations/Includes/Skulltag_things.cfg
View file

@ -11,7 +11,6 @@ skulltag
height = 1;
hangs = 0;
blocking = 0;
error = 1;
1337
{
@ -47,6 +46,7 @@ skulltag
height = 20;
hangs = 0;
blocking = 2;
error = 2;
5009
{
@ -142,6 +142,7 @@ doomheretichexen
height = 20;
hangs = 0;
blocking = 2;
error = 2;
5120
{
@ -266,7 +267,7 @@ doomheretichexen
5320
{
title = "Impaling Spike (doomguy head)";
sprite = "POLAA0";
sprite = "POLAA0";
width = 16;
height = 56;
}
@ -339,6 +340,7 @@ doomheretichexen
height = 16;
hangs = 0;
blocking = 1;
error = 2;
5150
{
@ -404,6 +406,7 @@ doomheretichexen
height = 20;
hangs = 0;
blocking = 2;
error = 2;
5020
{
@ -720,6 +723,7 @@ doom
height = 20;
hangs = 0;
blocking = 2;
error = 2;
5057
{
@ -2234,10 +2238,10 @@ raven
height = 20;
hangs = 0;
blocking = 2;
error = 2;
5050 // Stalagmite
{
blocking = 2;
title = "Stalagmite";
sprite = "SMT2A0";
width = 16;

5
Build/Configurations/Other Games/Action Doom/Includes/Action2_things.cfg
View file

@ -695,6 +695,7 @@ keys
height = 20;
hangs = 0;
blocking = 2;
error = 2;
13370
{
@ -775,6 +776,7 @@ npcs
height = 56;
hangs = 0;
blocking = 1;
error = 2;
13381
{
@ -844,6 +846,7 @@ specialeffects
height = 20;
hangs = 0;
blocking = 1;
error = 2;
10102
{
@ -872,6 +875,7 @@ obstacles
height = 48;
hangs = 0;
blocking = 1;
error = 2;
13375
{
@ -990,6 +994,7 @@ lights
height = 16;
hangs = 0;
blocking = 1;
error = 2;
13389
{

3
Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_things.cfg
View file

@ -406,6 +406,7 @@ obstacles
height = 20;
hangs = 0;
blocking = 1;
error = 2;
47
{
@ -614,6 +615,7 @@ lights
height = 16;
hangs = 0;
blocking = 1;
error = 2;
2028
{
@ -737,6 +739,7 @@ civilians
height = 16;
hangs = 0;
blocking = 1;
error = 2;
70
{

3
Build/Configurations/Other Games/Chex Quest/Includes/Chex_things.cfg
View file

@ -341,6 +341,7 @@ obstacles
height = 20;
hangs = 0;
blocking = 1;
error = 2;
47
{
@ -439,6 +440,7 @@ lights
height = 16;
hangs = 0;
blocking = 1;
error = 2;
2028
{
@ -482,6 +484,7 @@ civilians
height = 16;
hangs = 0;
blocking = 1;
error = 2;
45
{

14
Build/Configurations/Other Games/Harmony/Includes/Harmony_things.cfg
View file

@ -332,12 +332,14 @@ specialeffects
height = 20;
hangs = 0;
blocking = 1;
error = 2;
47
{
title = "Chair seat";
sprite = "SMITA0";
blocking = 0;
error = 0;
}
3006
{
@ -357,13 +359,13 @@ specialeffects
{
title = "Breaking grid";
blocking = 0;
error = 0;
sprite = "HEADL0";
}
26
{
title = "Crate target";
sprite = "POL6A0";
blocking = 1;
}
79
{
@ -375,7 +377,6 @@ specialeffects
title = "Attack blocker (invisible)";
sprite = "GOR3A0";
height = 84;
blocking = 1;
}
}
@ -389,6 +390,7 @@ obstacles
height = 20;
hangs = 0;
blocking = 1;
error = 2;
2035
{
@ -450,6 +452,7 @@ lights
height = 16;
hangs = 0;
blocking = 1;
error = 2;
48
{
@ -466,6 +469,7 @@ lights
title = "Candle";
sprite = "CANDA0";
blocking = 0;
error = 0;
}
55
{
@ -521,6 +525,7 @@ decoration
title = "Missile (ready)";
sprite = "SMT2A0";
blocking = 1;
error = 2;
}
@ -529,6 +534,7 @@ decoration
title = "Vine tentacle";
sprite = "POL2A0";
blocking = 1;
error = 2;
}
@ -537,6 +543,7 @@ decoration
title = "Missile (launched)";
sprite = "POL3A0";
blocking = 1;
error = 2;
}
15
@ -566,6 +573,7 @@ decoration
height = 88;
hangs = 1;
blocking = 1;
error = 2;
}
74
@ -574,6 +582,7 @@ decoration
sprite = "HDB2A0";
height = 88;
blocking = 1;
error = 2;
}
75
@ -582,5 +591,6 @@ decoration
sprite = "HDB3A0";
height = 64;
blocking = 1;
error = 2;
}
}

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

@ -325,6 +325,9 @@ namespace CodeImp.DoomBuilder.Config
hangs = actor.GetFlagValue("spawnceiling", hangs);
int blockvalue = (blocking > 0) ? blocking : 2;
blocking = actor.GetFlagValue("solid", (blocking != 0)) ? blockvalue : 0;
//mxd
if(blocking > THING_BLOCKING_NONE) errorcheck = THING_ERROR_INSIDE_STUCK;
}
// This is used for sorting