From 69eb7e9f03ab4b9846585bfe01c7b4d16e9438c9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 11 Apr 2006 18:02:51 +0000 Subject: [PATCH] SVN r28 (trunk) --- default.cbd | 2 +- src/g_strife/a_acolyte.cpp | 1 - src/p_floor.cpp | 6 +- wadsrc/in_epi1.txt | 89 ++++++ wadsrc/in_epi2.txt | 46 +++ wadsrc/in_epi3.txt | 60 ++++ wadsrc/in_htc1.txt | 17 ++ wadsrc/in_htc2.txt | 17 ++ wadsrc/in_htc3.txt | 17 ++ wadsrc/lockdefs.txt | 560 +++++++++++++++++++++++++++++++++++++ 10 files changed, 810 insertions(+), 5 deletions(-) create mode 100644 wadsrc/in_epi1.txt create mode 100644 wadsrc/in_epi2.txt create mode 100644 wadsrc/in_epi3.txt create mode 100644 wadsrc/in_htc1.txt create mode 100644 wadsrc/in_htc2.txt create mode 100644 wadsrc/in_htc3.txt create mode 100644 wadsrc/lockdefs.txt diff --git a/default.cbd b/default.cbd index 2dc0df585..32328def1 100644 --- a/default.cbd +++ b/default.cbd @@ -143,7 +143,7 @@ ${COMPILE} "autostart.cpp a.nas blocks.nas misc.nas tmap.nas tmap2.nas tmap3.nas cmdlib.cpp colormatcher.cpp configfile.cpp ct_chat.cpp d_dehacked.cpp d_main.cpp \ d_net.cpp d_netinfo.cpp d_protocol.cpp decallib.cpp decorations.cpp dobject.cpp \ doomdef.cpp doomstat.cpp dsectoreffect.cpp dthinker.cpp empty.cpp f_finale.cpp \ - f_wipe.cpp farchive.cpp files.cpp g_game.cpp g_level.cpp gameconfigfile.cpp \ + f_wipe.cpp farchive.cpp files.cpp g_game.cpp g_hub.cpp g_level.cpp gameconfigfile.cpp \ gi.cpp hu_scores.cpp info.cpp infodefaults.cpp lumpconfigfile.cpp m_alloc.cpp \ m_argv.cpp m_bbox.cpp m_cheat.cpp m_fixed.cpp m_menu.cpp m_misc.cpp m_options.cpp \ m_png.cpp m_random.cpp mus2midi.cpp nodebuild.cpp nodebuild_events.cpp \ diff --git a/src/g_strife/a_acolyte.cpp b/src/g_strife/a_acolyte.cpp index 0d0420f10..82533342d 100644 --- a/src/g_strife/a_acolyte.cpp +++ b/src/g_strife/a_acolyte.cpp @@ -316,7 +316,6 @@ IMPLEMENT_ACTOR (AAcolyteToBe, Strife, 201, 0) PROP_RadiusFixed (20) PROP_HeightFixed (56) PROP_StrifeType (29) - PROP_Tag ("PEASANT") PROP_DeathSound ("becoming/death") END_DEFAULTS diff --git a/src/p_floor.cpp b/src/p_floor.cpp index 846d68927..866172354 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -697,6 +697,9 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line, persteptime = FixedDiv (stairsize, speed) >> FRACBITS; + int (* FindSector) (int tag, int start) = + (compatflags & COMPATF_STAIRINDEX)? P_FindSectorFromTagLinear : P_FindSectorFromTag; + // check if a manual trigger, if so do just the sector on the backside if (tag == 0) { @@ -710,9 +713,6 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line, // The compatibility mode doesn't work with a hashing algorithm. // It needs the original linear search method. This was broken in Boom. - int (* FindSector) (int tag, int start) = - (compatflags & COMPATF_STAIRINDEX)? P_FindSectorFromTagLinear : P_FindSectorFromTag; - secnum = -1; while ((secnum = FindSector (tag, secnum)) >= 0) { diff --git a/wadsrc/in_epi1.txt b/wadsrc/in_epi1.txt new file mode 100644 index 000000000..213e80cd4 --- /dev/null +++ b/wadsrc/in_epi1.txt @@ -0,0 +1,89 @@ +Background wimap0 +Splat wisplat +Pointer wiurh0 wiurh1 + +Animation 224 104 11 +{ + WIA00000 + WIA00001 + WIA00002 +} + +Animation 184 160 11 +{ + WIA00100 + WIA00101 + WIA00102 +} + +Animation 112 136 11 +{ + WIA00200 + WIA00201 + WIA00202 +} + +Animation 72 112 11 +{ + WIA00300 + WIA00301 + WIA00302 +} + +Animation 88 96 11 +{ + WIA00400 + WIA00401 + WIA00402 +} + +Animation 64 48 11 +{ + WIA00500 + WIA00501 + WIA00502 +} + +Animation 192 40 11 +{ + WIA00600 + WIA00601 + WIA00602 +} + +Animation 136 16 11 +{ + WIA00700 + WIA00701 + WIA00702 +} + +Animation 80 16 11 +{ + WIA00800 + WIA00801 + WIA00802 +} + + +Animation 64 24 11 +{ + WIA00900 + WIA00901 + WIA00902 +} + + +Spots +{ + E1M1 185 164 + E1M2 148 143 + E1M3 69 122 + E1M4 209 102 + E1M5 116 89 + E1M6 166 55 + E1M7 71 56 + E1M8 135 29 + E1M9 71 24 +} + \ No newline at end of file diff --git a/wadsrc/in_epi2.txt b/wadsrc/in_epi2.txt new file mode 100644 index 000000000..4570b943e --- /dev/null +++ b/wadsrc/in_epi2.txt @@ -0,0 +1,46 @@ +Background wimap1 +Splat wisplat +Pointer wiurh0 wiurh1 + +// IfEntering and IfLeaving are mutually exclusive so these have to be defined twice! + +IfLeaving E2M1 Pic 128 136 WIA10000 +IfLeaving E2M2 Pic 128 136 WIA10100 +IfLeaving E2M3 Pic 128 136 WIA10200 +IfLeaving E2M4 Pic 128 136 WIA10300 +IfLeaving E2M5 Pic 128 136 WIA10400 +IfLeaving E2M6 Pic 128 136 WIA10500 +IfLeaving E2M7 Pic 128 136 WIA10600 +IfLeaving E2M9 Pic 128 136 WIA10400 + +IfEntering E2M2 Pic 128 136 WIA10000 +IfEntering E2M3 Pic 128 136 WIA10100 +IfEntering E2M4 Pic 128 136 WIA10200 +IfEntering E2M5 Pic 128 136 WIA10300 +IfEntering E2M6 Pic 128 136 WIA10400 +IfEntering E2M7 Pic 128 136 WIA10500 +IfEntering E2M8 Pic 128 136 WIA10600 +IfEntering E2M9 Pic 128 136 WIA10400 + +IfVisited E2M9 Pic 192 144 WIA10702 + +IfEntering E2M9 Animation 192 144 11 ONCE +{ + WIA10700 + WIA10701 + WIA10702 +} + + +Spots +{ + E2M1 254 25 + E2M2 97 50 + E2M3 188 64 + E2M4 128 78 + E2M5 214 92 + E2M6 133 130 + E2M7 208 136 + E2M8 148 140 + E2M9 235 158 +} diff --git a/wadsrc/in_epi3.txt b/wadsrc/in_epi3.txt new file mode 100644 index 000000000..de009e437 --- /dev/null +++ b/wadsrc/in_epi3.txt @@ -0,0 +1,60 @@ +Background wimap2 +Splat wisplat +Pointer wiurh0 wiurh1 + + +Animation 104 168 11 +{ + WIA20000 + WIA20001 + WIA20002 +} + +Animation 40 136 11 +{ + WIA20100 + WIA20101 + WIA20102 +} + +Animation 160 96 11 +{ + WIA20200 + WIA20201 + WIA20202 +} + +Animation 104 80 11 +{ + WIA30300 + WIA30301 + WIA30302 +} + +Animation 120 32 11 +{ + WIA40400 + WIA40401 + WIA40402 +} + +Animation 40 0 8 +{ + WIA50500 + WIA50501 + WIA50502 +} + + +Spots +{ + E3M1 156 168 + E3M2 48 154 + E3M3 174 95 + E3M4 265 75 + E3M5 130 48 + E3M6 279 23 + E3M7 198 48 + E3M8 140 25 + E3M9 281 136 +} diff --git a/wadsrc/in_htc1.txt b/wadsrc/in_htc1.txt new file mode 100644 index 000000000..808e66590 --- /dev/null +++ b/wadsrc/in_htc1.txt @@ -0,0 +1,17 @@ +Background mape1 +Splat in_x +Pointer in_yah + +Spots +{ + E1M1 172 78 + E1M2 86 90 + E1M3 73 66 + E1M4 159 95 + E1M5 148 126 + E1M6 132 54 + E1M7 131 74 + E1M8 208 138 + E1M9 52 101 +} + diff --git a/wadsrc/in_htc2.txt b/wadsrc/in_htc2.txt new file mode 100644 index 000000000..d44a91b65 --- /dev/null +++ b/wadsrc/in_htc2.txt @@ -0,0 +1,17 @@ +Background mape2 +Splat in_x +Pointer in_yah + +Spots +{ + E2M1 218 57 + E2M2 137 81 + E2M3 155 124 + E2M4 171 68 + E2M5 250 86 + E2M6 136 98 + E2M7 203 90 + E2M8 220 140 + E2M9 279 106 +} + diff --git a/wadsrc/in_htc3.txt b/wadsrc/in_htc3.txt new file mode 100644 index 000000000..7e85977be --- /dev/null +++ b/wadsrc/in_htc3.txt @@ -0,0 +1,17 @@ +Background mape3 +Splat in_x +Pointer in_yah + +Spots +{ + E3M1 86 99 + E3M2 124 103 + E3M3 154 79 + E3M4 202 83 + E3M5 178 59 + E3M6 142 58 + E3M7 219 66 + E3M8 247 57 + E3M9 107 80 +} + diff --git a/wadsrc/lockdefs.txt b/wadsrc/lockdefs.txt new file mode 100644 index 000000000..8ca368de8 --- /dev/null +++ b/wadsrc/lockdefs.txt @@ -0,0 +1,560 @@ +// +// Doom Locks - they include Heretic's keys because somebody mentioned that he already used them +// +ClearLocks + +Lock 1 Doom +{ + RedCard + Message "$PD_REDC" + RemoteMessage "You need a red card to activate this object" + Mapcolor 255 0 0 +} + + +Lock 2 Doom +{ + BlueCard + Message "$PD_BLUEC" + RemoteMessage "You need a blue card to activate this object" + Mapcolor 0 0 255 +} + + +Lock 3 Doom +{ + YellowCard + Message "$PD_YELLOWC" + RemoteMessage "You need a yellow card to activate this object" + Mapcolor 255 255 0 +} + + +Lock 4 Doom +{ + RedSkull + Message "$PD_REDS" + RemoteMessage "You need a red skull to activate this object" + Mapcolor 255 0 0 +} + + +Lock 5 Doom +{ + BlueSkull + Message "$PD_BLUES" + RemoteMessage "You need a blue skull to activate this object" + Mapcolor 0 0 255 +} + + +Lock 6 Doom +{ + YellowSkull + Message "$PD_YELLOWS" + RemoteMessage "You need a yellow skull to activate this object" + Mapcolor 255 255 0 +} + + +Lock 129 Doom +{ + Any { RedCard RedSkull KeyGreen } + Message "$PD_REDK" + RemoteMessage "$PD_REDO" + Mapcolor 255 0 0 +} + + +Lock 130 Doom +{ + Any { BlueCard BlueSkull KeyBlue } + Message "$PD_BLUEK" + RemoteMessage "$PD_BLUEO" + Mapcolor 0 0 255 +} + + +Lock 131 Doom +{ + Any { YellowCard YellowSkull KeyYellow } + Message "$PD_YELLOWK" + RemoteMessage "$PD_YELLOWO" + Mapcolor 255 255 0 +} + + +Lock 132 Doom +{ + Any { RedCard RedSkull } + Message "$PD_REDK" + RemoteMessage "$PD_REDO" + Mapcolor 255 0 0 +} + + +Lock 133 Doom +{ + Any { BlueCard BlueSkull } + Message "$PD_BLUEK" + RemoteMessage "$PD_BLUEO" + Mapcolor 0 0 255 +} + + +Lock 134 Doom +{ + Any { YellowCard YellowSkull } + Message "$PD_YELLOWK" + RemoteMessage "$PD_YELLOWO" + Mapcolor 255 255 0 +} + +Lock 100 +{ + Message "Any key will open this door" + RemoteMessage "Any key will activate this object" + Mapcolor 128 128 255 +} + +Lock 228 +{ + Message "Any key will open this door" + RemoteMessage "Any key will activate this object" + Mapcolor 128 128 255 +} + +Lock 229 Doom +{ + Any { BlueCard BlueSkull KeyBlue} + Any { YellowCard YellowSkull KeyYellow} + Any { RedCard RedSkull KeyGreen} + Message "$PD_ALL3" + RemoteMessage "You need all three keys to activate this object" +} + +Lock 101 Doom +{ + BlueCard + BlueSkull + YellowCard + YellowSkull + RedCard + RedSkull + Message "$PD_ALL6" + RemoteMessage "You need all six keys to activate this object" +} + +// +// Heretic KeyDefs +// + +Lock 1 Heretic +{ + KeyGreen + Message "$TXT_NEEDGREENKEY" + Mapcolor 0 255 0 +} + + +Lock 2 Heretic +{ + KeyBlue + Message "$TXT_NEEDBLUEKEY" + Mapcolor 0 0 255 +} + + +Lock 3 Heretic +{ + KeyYellow + Message "$TXT_NEEDYELLOWKEY" + Mapcolor 255 255 0 +} + + +Lock 129 Heretic +{ + KeyGreen + Message "$TXT_NEEDGREENKEY" + Mapcolor 0 255 0 +} + + +Lock 130 Heretic +{ + KeyBlue + Message "$TXT_NEEDBLUEKEY" + Mapcolor 0 0 255 +} + + +Lock 131 Heretic +{ + KeyYellow + Message "$TXT_NEEDYELLOWKEY" + Mapcolor 255 255 0 +} + + +Lock 229 Heretic +{ + KeyGreen + KeyYellow + KeyBlue + Message "$PD_ALL3" + RemoteMessage "You need all three keys to activate this object" +} + +Lock 101 Heretic +{ + KeyGreen + KeyYellow + KeyBlue + Message "$PD_ALL3" + RemoteMessage "You need all three keys to activate this object" +} + + +// +// Hexen KeyDefs +// + +Lock 1 Hexen +{ + KeySteel + Message "You need the $TXT_KEY_STEEL" + Mapcolor 150 150 150 +} + + +Lock 2 Hexen +{ + KeyCave + Message "You need the $TXT_KEY_CAVE" + Mapcolor 255 218 0 +} + + +Lock 3 Hexen +{ + KeyAxe + Message "You need the $TXT_KEY_AXE" + Mapcolor 64 64 255 +} + + +Lock 4 Hexen +{ + KeyFire + Message "You need the $TXT_KEY_FIRE" + Mapcolor 255 128 0 +} + + +Lock 5 Hexen +{ + KeyEmerald + Message "You need the $TXT_KEY_EMERALD" + Mapcolor 0 255 0 +} + + +Lock 6 Hexen +{ + KeyDungeon + Message "You need the $TXT_KEY_DUNGEON" + Mapcolor 47 151 255 +} + + +Lock 7 Hexen +{ + KeySilver + Message "You need the $TXT_KEY_SILVER" + Mapcolor 154 152 188 +} + + +Lock 8 Hexen +{ + KeyRusted + Message "You need the $TXT_KEY_RUSTED" + Mapcolor 156 76 0 +} + + +Lock 9 Hexen +{ + KeyHorn + Message "You need the $TXT_KEY_HORN" + Mapcolor 255 218 0 +} + + +Lock 10 Hexen +{ + KeySwamp + Message "You need the $TXT_KEY_SWAMP" + Mapcolor 64 255 64 +} + + +Lock 11 Hexen +{ + KeyCastle + Message "You need the $TXT_KEY_CASTLE" + Mapcolor 255 64 64 +} + + +Lock 101 Hexen +{ + KeySteel + KeyCave + KeyAxe + KeyFire + KeyEmerald + KeyDungeon + KeySilver + KeyRusted + KeyHorn + KeySwamp + KeyCastle + Message "You need all the keys" +} + +Lock 229 Hexen +{ + KeySteel + KeyCave + KeyAxe + KeyFire + KeyEmerald + KeyDungeon + KeySilver + KeyRusted + KeyHorn + KeySwamp + KeyCastle + Message "You need all the keys" +} + + +// Strife KeyDefs + +Lock 1 Strife +{ + BaseKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + + +Lock 2 Strife +{ + GovsKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + + +Lock 3 Strife +{ + Passcard + RemoteMessage "You need a passcard" + Message "You need a pass card key to open this door" + Mapcolor 128 266 150 +} + + +Lock 4 Strife +{ + IDBadge + Message "You need an ID card" + Mapcolor 255 128 0 +} + + +Lock 5 Strife +{ + PrisonKey + Message "You don't have the key to the prison" + Mapcolor 0 255 0 +} + + +Lock 6 Strife +{ + SeveredHand + Message "Hand print not on file" + Mapcolor 255 151 100 +} + + +Lock 7 Strife +{ + Power1Key + Message "You don't have the key" + Mapcolor 150 150 150 +} + + +Lock 8 Strife +{ + Power2Key + Message "You don't have the key" + Mapcolor 150 150 150 +} + + +Lock 9 Strife +{ + Power3Key + Message "You don't have the key" + Mapcolor 150 150 150 +} + + +Lock 10 Strife +{ + GoldKey + Message "You need the Gold Key" + Mapcolor 255 200 0 +} + + +Lock 11 Strife +{ + IDCard + RemoteMessage "You need an ID badge" + Message "You need an ID badge to open this door" + Mapcolor 200 0 0 +} + +Lock 12 Strife +{ + SilverKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 13 Strife +{ + OracleKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 14 Strife +{ + MilitaryID + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 15 Strife +{ + OrderKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 16 Strife +{ + WarehouseKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 17 Strife +{ + BrassKey + Message "You need a brass key" + Mapcolor 150 75 0 +} + +Lock 18 Strife +{ + RedCrystalKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 19 Strife +{ + BlueCrystalKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 20 Strife +{ + ChapelKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 21 Strife +{ + CatacombKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 22 Strife +{ + SecurityKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 23 Strife +{ + CoreKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 24 Strife +{ + MaulerKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 25 Strife +{ + FactoryKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 26 Strife +{ + MineKey + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 27 Strife +{ + NewKey5 + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 50 Strife +{ + PrisonPass + Message "You don't have the key" + Mapcolor 150 150 150 +} + +Lock 51 Strife +{ + OraclePass + Message "You don't have the key" + Mapcolor 150 150 150 +} +