diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-1_Tulimshar/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/001-2_Tulimshar/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/_import.txt | 4 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/dedication.txt | 9 | ||||
| -rw-r--r-- | npc/001-4_Omars_house/omar.txt (renamed from npc/001-2_Tulimshar/omar.txt) | 4 | ||||
| -rw-r--r-- | npc/021-1_Tulimshar/bakery.txt | 2 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
8 files changed, 21 insertions, 5 deletions
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 751b0df8..ec36a41b 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,71,72 diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt index 99123cba..6b8f78b6 100644 --- a/npc/001-2_Tulimshar/_import.txt +++ b/npc/001-2_Tulimshar/_import.txt @@ -2,7 +2,6 @@ map: 001-2.gat npc: npc/001-2_Tulimshar/_mobs.txt npc: npc/001-2_Tulimshar/_warps.txt npc: npc/001-2_Tulimshar/casino.txt -npc: npc/001-2_Tulimshar/omar.txt npc: npc/001-2_Tulimshar/phaet.txt npc: npc/001-2_Tulimshar/shops.txt npc: npc/001-2_Tulimshar/troupe_leader.txt diff --git a/npc/001-4_Omars_house/_import.txt b/npc/001-4_Omars_house/_import.txt new file mode 100644 index 00000000..2a2d618c --- /dev/null +++ b/npc/001-4_Omars_house/_import.txt @@ -0,0 +1,4 @@ +map: 001-4.gat +npc: npc/001-4_Omars_house/_warps.txt +npc: npc/001-4_Omars_house/omar.txt +npc: npc/001-4_Omars_house/dedication.txt diff --git a/npc/001-4_Omars_house/_warps.txt b/npc/001-4_Omars_house/_warps.txt new file mode 100644 index 00000000..2f29349e --- /dev/null +++ b/npc/001-4_Omars_house/_warps.txt @@ -0,0 +1,3 @@ +// 001-4 Omar's house warps + +001-4.gat,71,73 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 new file mode 100644 index 00000000..edb0e388 --- /dev/null +++ b/npc/001-4_Omars_house/dedication.txt @@ -0,0 +1,9 @@ +// Dedication to Irene Christina + +001-4.gat,76,68,0 script #IreneDedication 127,{ + mes "~ Irene Christina ~"; + mes "The song in this house is dedicated to Irene."; + mes ""; + mes "She had seen only twenty hours of this world when she died in her father's arms."; + close; +}; diff --git a/npc/001-2_Tulimshar/omar.txt b/npc/001-4_Omars_house/omar.txt index 4f75574e..a6ac2277 100644 --- a/npc/001-2_Tulimshar/omar.txt +++ b/npc/001-4_Omars_house/omar.txt @@ -23,7 +23,7 @@ function script KadiyaSubquestConsts { } -001-2.gat,70,60,0 script Omar 162,{ +001-4.gat,70,60,0 script Omar 162,{ callfunc "ElanoreFix"; callfunc "KadiyaSubquestConsts"; @@ -184,7 +184,7 @@ S_update_var: } -001-2.gat,76,59,0 script _______Kadiya 174,{ +001-4.gat,76,59,0 script _______Kadiya 174,{ callfunc "ElanoreFix"; set @Q_MASK, NIBBLE_3_MASK; set @Q_SHIFT, NIBBLE_3_SHIFT; diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt index 0cdb83ee..d7ca399f 100644 --- a/npc/021-1_Tulimshar/bakery.txt +++ b/npc/021-1_Tulimshar/bakery.txt @@ -7,7 +7,7 @@ mes "\"This bakery is the best!\""; close; -OnTimer60000: +OnTimer300000: npctalk "Come to the bakery!"; setnpctimer 0; end; diff --git a/npc/_import.txt b/npc/_import.txt index 403fb447..624cac46 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,6 +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_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 |