summaryrefslogtreecommitdiff
path: root/world/map/npc/009-8
diff options
context:
space:
mode:
authorJesusaves <jesusalva@themanaworld.org>2020-04-06 23:23:22 -0300
committerGitHub <noreply@github.com>2020-04-07 02:23:22 +0000
commit9ddcd23a2964afba0ec7e83d1ce458c77f4666bc (patch)
treef85ed24a326d0b08f33677e83a287af4c8b02d28 /world/map/npc/009-8
parent8423eebd492280369d3e0dd7d0b94b06514ae589 (diff)
downloadserverdata-9ddcd23a2964afba0ec7e83d1ce458c77f4666bc.tar.gz
serverdata-9ddcd23a2964afba0ec7e83d1ce458c77f4666bc.tar.bz2
serverdata-9ddcd23a2964afba0ec7e83d1ce458c77f4666bc.tar.xz
serverdata-9ddcd23a2964afba0ec7e83d1ce458c77f4666bc.zip
Doomsday Framework (#551)
Contains code for Act 3 and Act 4. Also provides assets for Act 5, but they are not yet ready. Act 5 assets are provided for cases of extreme need only.
Diffstat (limited to 'world/map/npc/009-8')
-rw-r--r--world/map/npc/009-8/celestia.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/009-8/celestia.txt b/world/map/npc/009-8/celestia.txt
index 67aa9366..4fbe6609 100644
--- a/world/map/npc/009-8/celestia.txt
+++ b/world/map/npc/009-8/celestia.txt
@@ -311,10 +311,10 @@ function|script|CelestiaState
}
009-8,40,125,0|script|Celestia Basement|32767,0,0
{
- if (countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)||
+ if ($DOOMSDAY == 2||countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)||
strcharinfo(1) == "Celestia's Tea Party")
warp "009-8", 82, 126;
- if (strcharinfo(1) != "Celestia's Tea Party")
+ if (strcharinfo(1) != "Celestia's Tea Party" && $DOOMSDAY != 2)
sendcollision "009-8", 1, 62, 105, 77, 123;
end;
@@ -325,7 +325,7 @@ OnPCLoginEvent:
}
009-8,68,123,0|script|Celestia Interceptor|32767,1,0
{
- if (strcharinfo(1) != "Celestia's Tea Party")
+ if (strcharinfo(1) != "Celestia's Tea Party" && $DOOMSDAY != 2)
goto L_Stomp;
mapmask 1 | 8;
end;