From e27b59c8e6f95ee9e7078627d52c09822b8c54b4 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sat, 21 Jun 2014 18:46:47 -0400 Subject: Fix map layers in Hurnscald Game staff room closes #122 --- world/map/data/009-1.wlk | Bin 8779 -> 8779 bytes world/map/data/009-2.wlk | Bin 24004 -> 24004 bytes world/map/npc/009-1/_warps.txt | 1 + world/map/npc/009-2/_warps.txt | 1 + world/map/npc/017-2/_warps.txt | 8 ++++---- world/map/npc/017-9/_import.txt | 1 + world/map/npc/017-9/_warps.txt | 12 ++++++------ world/map/npc/017-9/secret.txt | 39 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 world/map/npc/017-9/secret.txt diff --git a/world/map/data/009-1.wlk b/world/map/data/009-1.wlk index e2839bfc..e39df062 100644 Binary files a/world/map/data/009-1.wlk and b/world/map/data/009-1.wlk differ diff --git a/world/map/data/009-2.wlk b/world/map/data/009-2.wlk index 0967fe34..c6cd8d70 100644 Binary files a/world/map/data/009-2.wlk and b/world/map/data/009-2.wlk differ diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt index 7808445d..0e867bd7 100644 --- a/world/map/npc/009-1/_warps.txt +++ b/world/map/npc/009-1/_warps.txt @@ -12,3 +12,4 @@ 009-1.gat,91,46|warp|To Hurnscald Forge|0,-1,009-2.gat,182,66 009-1.gat,24,36|warp|To Hurnscald West Exit|-1,1,008-1.gat,53,61 009-1.gat,49,24|warp|To Hurnscald North Exit|2,-1,008-1.gat,78,48 +009-1.gat,60,41|warp|To Bedroom|-1,-1,009-2.gat,32,91 diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt index e2035b60..0b8abbf3 100644 --- a/world/map/npc/009-2/_warps.txt +++ b/world/map/npc/009-2/_warps.txt @@ -21,3 +21,4 @@ 009-2.gat,27,107|warp|To Outside|-1,-1,009-1.gat,58,47 009-2.gat,46,50|warp|To Inn Private Room|-1,-1,009-2.gat,76,78 009-2.gat,77,78|warp|To Hurnscald Inn|-1,-1,009-2.gat,47,50 +009-2.gat,31,91|warp|To Outside|-1,-1,009-1.gat,59,41 diff --git a/world/map/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt index 0e2b50de..78ec53a4 100644 --- a/world/map/npc/017-2/_warps.txt +++ b/world/map/npc/017-2/_warps.txt @@ -1,9 +1,9 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Theater warps -017-2.gat,30,20|warp|To Right Door Backstage|-1,-1,017-9.gat,29,21 +//017-2.gat,30,20|warp|To Right Door Backstage|-1,-1,017-9.gat,29,21 017-2.gat,26,31|warp|To Outside|-1,-1,017-1.gat,43,33 -017-2.gat,22,20|warp|To Left Door Backstage|-1,-1,017-9.gat,23,21 -017-2.gat,24,25|warp|To Left Trapdoor Backstage|-1,-1,017-9.gat,21,26 +//017-2.gat,22,20|warp|To Left Door Backstage|-1,-1,017-9.gat,23,21 +//017-2.gat,24,25|warp|To Left Trapdoor Backstage|-1,-1,017-9.gat,21,26 017-2.gat,26,21|warp|To Center Trapdoor Backstage|-1,-1,017-9.gat,26,27 -017-2.gat,28,25|warp|To Right Trapdoor Backstage|-1,-1,017-9.gat,31,26 +//017-2.gat,28,25|warp|To Right Trapdoor Backstage|-1,-1,017-9.gat,31,26 diff --git a/world/map/npc/017-9/_import.txt b/world/map/npc/017-9/_import.txt index 4e650df8..b423c6ff 100644 --- a/world/map/npc/017-9/_import.txt +++ b/world/map/npc/017-9/_import.txt @@ -5,3 +5,4 @@ npc: npc/017-9/_mobs.txt npc: npc/017-9/_warps.txt npc: npc/017-9/announcements.txt npc: npc/017-9/mapflags.txt +npc: npc/017-9/secret.txt diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt index 57d73676..22de71a5 100644 --- a/world/map/npc/017-9/_warps.txt +++ b/world/map/npc/017-9/_warps.txt @@ -1,9 +1,9 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Backstage warps -017-9.gat,22,20|warp|To Left Door Onstage|-1,-1,017-2.gat,23,21 -017-9.gat,26,21|warp|To Outside|-1,-1,017-1.gat,43,34 -017-9.gat,30,20|warp|To Right Door Onstage|-1,-1,017-2.gat,29,21 -017-9.gat,21,28|warp|To Left Trapdoor Onstage|-1,-1,017-2.gat,25,25 -017-9.gat,26,28|warp|To Centre Trapdoor Onstage|-1,-1,017-2.gat,26,23 -017-9.gat,31,28|warp|To Right Trapdoor Onstage|-1,-1,017-2.gat,27,25 +017-9.gat,22,20|warp|To Nivalis|-1,-1,020-1.gat,60,75 +017-9.gat,26,21|warp|To Hurnscald|-1,-1,009-1.gat,42,45 +017-9.gat,30,20|warp|To Tumlishar|-1,-1,001-1.gat,33,65 +//017-9.gat,21,28|warp|To Left Trapdoor Onstage|-1,-1,017-2.gat,25,25 +017-9.gat,26,28|warp|To second warpzone|-1,-1,017-2.gat,26,23 +017-9.gat,31,28|warp|To Crypt|-1,-1,027-2.gat,118,109 diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt new file mode 100644 index 00000000..43e485c7 --- /dev/null +++ b/world/map/npc/017-9/secret.txt @@ -0,0 +1,39 @@ +009-1.gat,42,43,0|script|#SecretDoor|127,0,0, +{ + if (getgmlevel() < 40 && !debug) goto L_close; + warp "017-9.gat", 26, 25; + goto L_close; + +L_close: + close; +} + +020-1.gat,60,76,0|script|#SecretDoor2|127,0,0, +{ + if (getgmlevel() < 40 && !debug) goto L_close; + warp "017-9.gat", 22, 22; + goto L_close; + +L_close: + close; +} + +001-1.gat,32,65,0|script|#SecretDoor3|127,0,0, +{ + if (getgmlevel() < 40 && !debug) goto L_close; + warp "017-9.gat", 30, 22; + goto L_close; + +L_close: + close; +} + +027-2.gat,118,111,0|script|#SecretDoor4|127,0,0, +{ + if (getgmlevel() < 40 && !debug) goto L_close; + warp "017-9.gat", 30, 29; + goto L_close; + +L_close: + close; +} -- cgit v1.2.3-70-g09d2