diff options
| -rw-r--r-- | data/001-4.wlk | bin | 16004 -> 2919 bytes | |||
| -rw-r--r-- | npc/001-1_Tulimshar/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/_import.txt | 3 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/_warps.txt | 4 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/dedication.txt | 2 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/omar.txt | 4 | ||||
| -rw-r--r-- | npc/_import.txt | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/data/001-4.wlk b/data/001-4.wlk Binary files differindex 0a762e12..e1311a6f 100644 --- a/data/001-4.wlk +++ b/data/001-4.wlk diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 751b0df8..e3778fff 100644 --- a/npc/001-1_Tulimshar/_warps.txt +++ b/npc/001-1_Tulimshar/_warps.txt @@ -4,4 +4,4 @@ 001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 -001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72 +001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33 diff --git a/npc/001-4_Omars_house/_import.txt b/npc/001-4_Omars_house/_import.txt index 2a2d618c..6810c05c 100644 --- a/npc/001-4_Omars_house/_import.txt +++ b/npc/001-4_Omars_house/_import.txt @@ -1,4 +1,5 @@ map: 001-4.gat +npc: npc/001-4_Omars_house/_mobs.txt npc: npc/001-4_Omars_house/_warps.txt -npc: npc/001-4_Omars_house/omar.txt npc: npc/001-4_Omars_house/dedication.txt +npc: npc/001-4_Omars_house/omar.txt diff --git a/npc/001-4_Omars_house/_warps.txt b/npc/001-4_Omars_house/_warps.txt index 2f29349e..0e3b0f9b 100644 --- a/npc/001-4_Omars_house/_warps.txt +++ b/npc/001-4_Omars_house/_warps.txt @@ -1,3 +1,3 @@ -// 001-4 Omar's house warps +// 001-4 Omars house warps -001-4.gat,71,73 warp ToOutdoor -1,-1,001-1.gat,75,42 +001-4.gat,26,34 warp toOutdoor -1,-1,001-1.gat,75,42 diff --git a/npc/001-4_Omars_house/dedication.txt b/npc/001-4_Omars_house/dedication.txt index edb0e388..4b240b11 100644 --- a/npc/001-4_Omars_house/dedication.txt +++ b/npc/001-4_Omars_house/dedication.txt @@ -1,6 +1,6 @@ // Dedication to Irene Christina -001-4.gat,76,68,0 script #IreneDedication 127,{ +001-4.gat,31,29,0 script #IreneDedication 127,{ mes "~ Irene Christina ~"; mes "The song in this house is dedicated to Irene."; mes ""; diff --git a/npc/001-4_Omars_house/omar.txt b/npc/001-4_Omars_house/omar.txt index a6ac2277..aedf1806 100644 --- a/npc/001-4_Omars_house/omar.txt +++ b/npc/001-4_Omars_house/omar.txt @@ -23,7 +23,7 @@ function script KadiyaSubquestConsts { } -001-4.gat,70,60,0 script Omar 162,{ +001-4.gat,25,21,0 script Omar 162,{ callfunc "ElanoreFix"; callfunc "KadiyaSubquestConsts"; @@ -184,7 +184,7 @@ S_update_var: } -001-4.gat,76,59,0 script _______Kadiya 174,{ +001-4.gat,31,20,0 script _______Kadiya 174,{ callfunc "ElanoreFix"; set @Q_MASK, NIBBLE_3_MASK; set @Q_SHIFT, NIBBLE_3_SHIFT; diff --git a/npc/_import.txt b/npc/_import.txt index aa41757f..245517e6 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,7 +1,7 @@ import: npc/001-1_Tulimshar/_import.txt import: npc/001-2_Tulimshar/_import.txt import: npc/001-3_Tulimshar_arena/_import.txt -import: npc/001-4_Tulimshar/_import.txt +import: npc/001-4_Omars_house/_import.txt import: npc/002-1_Sandstorm/_import.txt import: npc/002-3_Desert_mines/_import.txt import: npc/002-4_Desert_mines/_import.txt |