From f0aeb577ac2d611b543281374d62cf10b50774f3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 7 Mar 2009 11:47:13 -0700 Subject: Fix a bug in Jack's script --- npc/009-1_Hurnscald/jack.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt index 2231df49..02381aa7 100644 --- a/npc/009-1_Hurnscald/jack.txt +++ b/npc/009-1_Hurnscald/jack.txt @@ -37,8 +37,8 @@ mes "[Jack Lumber]"; mes "\"Hello there, my name is Jack Lumber, the enemy of all trees. If you need some firewood just let me know.\""; - next; if (Inspector == 1) callsub S_NohMask_Ask; + next; if (@Q_Forestbow < 1) close; menu @@ -242,6 +242,7 @@ L_Shield_state_3: close; S_NohMask_Ask: + next; menu "I'll keep that in mind.", -, "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer; -- cgit v1.2.3-70-g09d2 From ccb6634a79c52021c4a918f7a63a3b9c2b02fafa Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 7 Mar 2009 11:47:45 -0700 Subject: Add some new maps Includes some indoors for Central Tulimshar, Tulimshar Canyon, and an indoor for Tulimshar Canyon. --- data/008-1.wlk | Bin 18484 -> 18484 bytes data/010-1.wlk | Bin 18004 -> 18004 bytes data/018-1.wlk | Bin 24004 -> 24004 bytes data/021-1.wlk | Bin 29908 -> 29908 bytes data/021-2.wlk | Bin 0 -> 40004 bytes data/021-8.wlk | Bin 0 -> 11290 bytes data/023-1.wlk | Bin 0 -> 30004 bytes data/024-1.wlk | Bin 0 -> 14522 bytes data/024-2.wlk | Bin 0 -> 40004 bytes data/resnametable.txt | 5 ++++ npc/021-1_Tulimshar/_import.txt | 2 +- npc/021-1_Tulimshar/_mobs.txt | 1 - npc/021-1_Tulimshar/_warps.txt | 5 ++++ npc/021-1_Tulimshar/magic_school.txt | 19 -------------- npc/021-1_Tulimshar/weellos.txt | 15 +++++++++++ npc/021-2/_import.txt | 3 --- npc/021-2/_mobs.txt | 7 ----- npc/021-2/_warps.txt | 5 ---- npc/021-2_Tulimshar/_import.txt | 3 +++ npc/021-2_Tulimshar/_warps.txt | 11 ++++++++ npc/021-2_Tulimshar/bakery.txt | 38 +++++++++++++++++++++++++++ npc/021-2_Tulimshar/government_building.txt | 29 ++++++++++++++++++++ npc/021-2_Tulimshar/workshop.txt | 11 ++++++++ npc/022-1_Beach_Cliffs/_import.txt | 3 --- npc/022-1_Beach_Cliffs/_mobs.txt | 7 ----- npc/022-1_Beach_Cliffs/_warps.txt | 4 --- npc/023-1_Beach_Cliffs/_warps.txt | 2 -- npc/024-1_Tulimshar_Canyon/_import.txt | 7 +++++ npc/024-1_Tulimshar_Canyon/_mobs.txt | 34 ++++++++++++++++++++++++ npc/024-1_Tulimshar_Canyon/_warps.txt | 5 ++++ npc/024-1_Tulimshar_Canyon/ched.txt | 28 ++++++++++++++++++++ npc/024-1_Tulimshar_Canyon/eomie.txt | 7 +++++ npc/024-1_Tulimshar_Canyon/tinris.txt | 7 +++++ npc/024-1_Tulimshar_Canyon/tondar.txt | 7 +++++ npc/024-2_Tulimshar_Magic_School/_import.txt | 5 ++++ npc/024-2_Tulimshar_Magic_School/_mobs.txt | 7 +++++ npc/024-2_Tulimshar_Magic_School/_warps.txt | 4 +++ npc/024-2_Tulimshar_Magic_School/barrier.txt | 12 +++++++++ npc/024-2_Tulimshar_Magic_School/tyer.txt | 23 ++++++++++++++++ npc/_import.txt | 7 ++--- 40 files changed, 268 insertions(+), 55 deletions(-) create mode 100644 data/021-2.wlk create mode 100644 data/021-8.wlk create mode 100644 data/023-1.wlk create mode 100644 data/024-1.wlk create mode 100644 data/024-2.wlk delete mode 100644 npc/021-1_Tulimshar/magic_school.txt create mode 100644 npc/021-1_Tulimshar/weellos.txt delete mode 100644 npc/021-2/_import.txt delete mode 100644 npc/021-2/_mobs.txt delete mode 100644 npc/021-2/_warps.txt create mode 100644 npc/021-2_Tulimshar/bakery.txt create mode 100644 npc/021-2_Tulimshar/government_building.txt create mode 100644 npc/021-2_Tulimshar/workshop.txt delete mode 100644 npc/022-1_Beach_Cliffs/_import.txt delete mode 100644 npc/022-1_Beach_Cliffs/_mobs.txt delete mode 100644 npc/022-1_Beach_Cliffs/_warps.txt create mode 100644 npc/024-1_Tulimshar_Canyon/_import.txt create mode 100644 npc/024-1_Tulimshar_Canyon/_mobs.txt create mode 100644 npc/024-1_Tulimshar_Canyon/_warps.txt create mode 100644 npc/024-1_Tulimshar_Canyon/ched.txt create mode 100644 npc/024-1_Tulimshar_Canyon/eomie.txt create mode 100644 npc/024-1_Tulimshar_Canyon/tinris.txt create mode 100644 npc/024-1_Tulimshar_Canyon/tondar.txt create mode 100644 npc/024-2_Tulimshar_Magic_School/_import.txt create mode 100644 npc/024-2_Tulimshar_Magic_School/_mobs.txt create mode 100644 npc/024-2_Tulimshar_Magic_School/_warps.txt create mode 100644 npc/024-2_Tulimshar_Magic_School/barrier.txt create mode 100644 npc/024-2_Tulimshar_Magic_School/tyer.txt diff --git a/data/008-1.wlk b/data/008-1.wlk index a513fdc2..e051c2e1 100644 Binary files a/data/008-1.wlk and b/data/008-1.wlk differ diff --git a/data/010-1.wlk b/data/010-1.wlk index 33a7505f..8ae55525 100644 Binary files a/data/010-1.wlk and b/data/010-1.wlk differ diff --git a/data/018-1.wlk b/data/018-1.wlk index 38c24166..66649741 100644 Binary files a/data/018-1.wlk and b/data/018-1.wlk differ diff --git a/data/021-1.wlk b/data/021-1.wlk index 37ced2aa..51df0dfd 100644 Binary files a/data/021-1.wlk and b/data/021-1.wlk differ diff --git a/data/021-2.wlk b/data/021-2.wlk new file mode 100644 index 00000000..3fe682ff Binary files /dev/null and b/data/021-2.wlk differ diff --git a/data/021-8.wlk b/data/021-8.wlk new file mode 100644 index 00000000..8ddde1fd Binary files /dev/null and b/data/021-8.wlk differ diff --git a/data/023-1.wlk b/data/023-1.wlk new file mode 100644 index 00000000..31f88b7b Binary files /dev/null and b/data/023-1.wlk differ diff --git a/data/024-1.wlk b/data/024-1.wlk new file mode 100644 index 00000000..0948e9a9 Binary files /dev/null and b/data/024-1.wlk differ diff --git a/data/024-2.wlk b/data/024-2.wlk new file mode 100644 index 00000000..74704a5f Binary files /dev/null and b/data/024-2.wlk differ diff --git a/data/resnametable.txt b/data/resnametable.txt index 02c33d6d..e74aac31 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -43,4 +43,9 @@ 020-4.gat#020-4.wlk# 021-1.gat#021-1.wlk# 021-2.gat#021-2.wlk# +021-8.gat#021-8.wlk# 022-1.gat#022-1.wlk# +023-1.gat#023-1.wlk# +024-1.gat#024-1.wlk# +024-2.gat#024-2.wlk# +botcheck.gat#botcheck.wlk# diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt index e6939894..c64daf4b 100644 --- a/npc/021-1_Tulimshar/_import.txt +++ b/npc/021-1_Tulimshar/_import.txt @@ -5,7 +5,7 @@ npc: npc/021-1_Tulimshar/bakery.txt npc: npc/021-1_Tulimshar/eurni.txt npc: npc/021-1_Tulimshar/gate_guards.txt npc: npc/021-1_Tulimshar/inac.txt -npc: npc/021-1_Tulimshar/magic_school.txt npc: npc/021-1_Tulimshar/north_shops.txt npc: npc/021-1_Tulimshar/royal_guards.txt +npc: npc/021-1_Tulimshar/weellos.txt npc: npc/021-1_Tulimshar/workers.txt diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt index 4a7227f6..b9f4b10d 100644 --- a/npc/021-1_Tulimshar/_mobs.txt +++ b/npc/021-1_Tulimshar/_mobs.txt @@ -4,7 +4,6 @@ 021-1.gat,90,65,3,2 monster Maggot 1002,2,0,0,Mob021-1::On1002 021-1.gat,95,124,3,2 monster Maggot 1002,2,0,0,Mob021-1::On1002 021-1.gat,103,53,6,2 monster Maggot 1002,5,0,0,Mob021-1::On1002 -021-1.gat,44,54,6,8 monster Maggot 1002,7,0,0,Mob021-1::On1002 021-1.gat,98,24,2,2 monster Sea Slime 1033,1,150000,100000,Mob021-1::On1033 diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt index ccd01723..160955ec 100644 --- a/npc/021-1_Tulimshar/_warps.txt +++ b/npc/021-1_Tulimshar/_warps.txt @@ -5,3 +5,8 @@ 021-1.gat,53,134 warp toBuilding -1,-1,021-2.gat,27,29 021-1.gat,55,134 warp toBuilding -1,-1,021-2.gat,33,29 021-1.gat,57,134 warp toBuilding -1,-1,021-2.gat,39,29 +021-1.gat,103,100 warp toBakery -1,-1,021-2.gat,91,27 +021-1.gat,103,96 warp toBakery -1,-1,021-2.gat,122,23 +021-1.gat,49,63 warp toMagicSchool 3,-1,024-1.gat,86,72 +021-1.gat,53,99 warp toTaylor -1,-1,021-2.gat,25,66 +021-1.gat,52,95 warp toTaylor -1,-1,021-2.gat,23,98 diff --git a/npc/021-1_Tulimshar/magic_school.txt b/npc/021-1_Tulimshar/magic_school.txt deleted file mode 100644 index 1bbf0734..00000000 --- a/npc/021-1_Tulimshar/magic_school.txt +++ /dev/null @@ -1,19 +0,0 @@ -// Tulimshar's magic academy - -021-1.gat,45,54,0 script Tinris 160,{ - mes "[Tinris]"; - mes "\"This is a magic school.\""; - close; -} - -021-1.gat,46,41,0 script Tondar 168,{ - mes "[Tondar]"; - mes "\"We're not accepting any new students right now.\""; - close; -} - -021-1.gat,32,46,0 script Ched 113,{ - mes "[Ched]"; - mes "\"I'm a student here.\""; - close; -} diff --git a/npc/021-1_Tulimshar/weellos.txt b/npc/021-1_Tulimshar/weellos.txt new file mode 100644 index 00000000..06bb8f17 --- /dev/null +++ b/npc/021-1_Tulimshar/weellos.txt @@ -0,0 +1,15 @@ +// A historian + +021-1.gat,130,125,0 script Weellos 103,{ + if isin("021-1.gat", 130, 120, 140, 125) goto L_In; + + mes "[Weellos]"; + mes "\"This is a very historic building. One of the oldest in the area.\""; + close; + +// If the player is inside the fence with Weellos +L_In: + mes "[Weellos]"; + mes "\"What did you think of the historic building?\""; + close; +} diff --git a/npc/021-2/_import.txt b/npc/021-2/_import.txt deleted file mode 100644 index f00477be..00000000 --- a/npc/021-2/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -map: 021-2.gat -npc: npc/021-2/_mobs.txt -npc: npc/021-2/_warps.txt diff --git a/npc/021-2/_mobs.txt b/npc/021-2/_mobs.txt deleted file mode 100644 index e192181c..00000000 --- a/npc/021-2/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// 021-2 mobs - - - -021-2.gat,0,0,0 script Mob021-2 -1,{ - end; -} diff --git a/npc/021-2/_warps.txt b/npc/021-2/_warps.txt deleted file mode 100644 index 947ede8e..00000000 --- a/npc/021-2/_warps.txt +++ /dev/null @@ -1,5 +0,0 @@ -// 021-2 warps - -021-2.gat,27,30 warp toOutside -1,-1,021-1.gat,53,135 -021-2.gat,33,30 warp toOutside -1,-1,021-1.gat,55,135 -021-2.gat,39,30 warp toOutside -1,-1,021-1.gat,57,135 diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt index b098b11d..0cd9f7ea 100644 --- a/npc/021-2_Tulimshar/_import.txt +++ b/npc/021-2_Tulimshar/_import.txt @@ -1,3 +1,6 @@ map: 021-2.gat npc: npc/021-2_Tulimshar/_mobs.txt npc: npc/021-2_Tulimshar/_warps.txt +npc: npc/021-2_Tulimshar/bakery.txt +npc: npc/021-2_Tulimshar/government_building.txt +npc: npc/021-2_Tulimshar/workshop.txt diff --git a/npc/021-2_Tulimshar/_warps.txt b/npc/021-2_Tulimshar/_warps.txt index 982c026b..ef12e855 100644 --- a/npc/021-2_Tulimshar/_warps.txt +++ b/npc/021-2_Tulimshar/_warps.txt @@ -1,2 +1,13 @@ // 021-2 Tulimshar warps +021-2.gat,27,30 warp toOutside -1,-1,021-1.gat,53,135 +021-2.gat,33,30 warp toOutside -1,-1,021-1.gat,55,135 +021-2.gat,39,30 warp toOutside -1,-1,021-1.gat,57,135 +021-2.gat,91,28 warp toOutside -1,-1,021-1.gat,103,101 +021-2.gat,122,24 warp toOutside -1,-1,021-1.gat,103,97 +021-2.gat,118,24 warp to1stFloor 0,-1,021-2.gat,79,22 +021-2.gat,80,22 warp to2ndFloor 0,-1,021-2.gat,118,23 +021-2.gat,23,99 warp toOutside -1,-1,021-1.gat,52,96 +021-2.gat,25,67 warp toOutside -1,-1,021-1.gat,53,100 +021-2.gat,46,97 warp to1stFloor 0,-1,021-2.gat,45,58 +021-2.gat,46,57 warp to2ndFloor 0,-1,021-2.gat,46,96 diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt new file mode 100644 index 00000000..fd7a47d0 --- /dev/null +++ b/npc/021-2_Tulimshar/bakery.txt @@ -0,0 +1,38 @@ +// The bakery + +// The chef +021-2.gat,95,21,0 script Riskim 148,{ + mes "[Riskim]"; + mes "\"Welcome to our bakery!\""; + close; +} + +// Server? +021-2.gat,82,23,0 script Sara 108,{ + mes "[Sara]"; + mes "\"Hello!\""; + close; +} + +// The cashier +021-2.gat,89,21,0 shop Drabur 112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1 + +// Stockroom boy +021-2.gat,133,21,0 script Iormo 160,{ + mes "[Iormo]"; + mes "\"This stock room can get messy.\""; + close; +} + +// An old couple eating at the bakery +021-2.gat,71,22,0 script Rynoh 159,{ + mes "[Rynoh]"; + mes "\"It may be expensive, but it sure is good.\""; + close; +} + +021-2.gat,73,22,0 script Ontas 154,{ + mes "[Ontas]"; + mes "\"We come here every week. They have some of the best bread I've ever eaten.\""; + close; +} diff --git a/npc/021-2_Tulimshar/government_building.txt b/npc/021-2_Tulimshar/government_building.txt new file mode 100644 index 00000000..48a7db7a --- /dev/null +++ b/npc/021-2_Tulimshar/government_building.txt @@ -0,0 +1,29 @@ +// The government builing in the south west + +// A clerk +021-2.gat,27,17,0 script Estard 107,{ + mes "[Estard]"; + mes "\"Hello what Can I do for you?\""; + next; + menu + "Nothing, I guess.", -; + close; +} + +// A clerk +021-2.gat,36,17,0 script Tathin 107,{ + mes "[Tathin]"; + mes "\"Hello what Can I do for you?\""; + next; + menu + "Nothing, I guess.", -; + close; +} + +// Guard + +021-2.gat,20,19,0 script Guard 123,1,1,{ + mes "[Guard]"; + mes "\"You can't come back here.\""; + close; +} diff --git a/npc/021-2_Tulimshar/workshop.txt b/npc/021-2_Tulimshar/workshop.txt new file mode 100644 index 00000000..ffe732b4 --- /dev/null +++ b/npc/021-2_Tulimshar/workshop.txt @@ -0,0 +1,11 @@ +// Tulimshar's main workshop + +// The receptionist +021-2.gat,22,63,0 script Sonir 118,{ + mes "[Sonir]"; + mes "\"This is Tulimshar's main workshop. Much crafting happens here.\""; + next; + mes "[Sonir]"; + mes "\"We also have limited housing on the second floor.\""; + close; +} diff --git a/npc/022-1_Beach_Cliffs/_import.txt b/npc/022-1_Beach_Cliffs/_import.txt deleted file mode 100644 index 6dab9d52..00000000 --- a/npc/022-1_Beach_Cliffs/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -map: 022-1.gat -npc: npc/022-1_Beach_Cliffs/_mobs.txt -npc: npc/022-1_Beach_Cliffs/_warps.txt diff --git a/npc/022-1_Beach_Cliffs/_mobs.txt b/npc/022-1_Beach_Cliffs/_mobs.txt deleted file mode 100644 index 7dfedcec..00000000 --- a/npc/022-1_Beach_Cliffs/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// 022-1 Beach Cliffs mobs - - - -022-1.gat,0,0,0 script Mob022-1 -1,{ - end; -} diff --git a/npc/022-1_Beach_Cliffs/_warps.txt b/npc/022-1_Beach_Cliffs/_warps.txt deleted file mode 100644 index c856a583..00000000 --- a/npc/022-1_Beach_Cliffs/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// 022-1 Beach Cliffs warps - -022-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15 -022-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 diff --git a/npc/023-1_Beach_Cliffs/_warps.txt b/npc/023-1_Beach_Cliffs/_warps.txt index 8c3827bd..0090bda5 100644 --- a/npc/023-1_Beach_Cliffs/_warps.txt +++ b/npc/023-1_Beach_Cliffs/_warps.txt @@ -1,4 +1,2 @@ // 023-1 Beach Cliffs warps -023-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15 -023-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 diff --git a/npc/024-1_Tulimshar_Canyon/_import.txt b/npc/024-1_Tulimshar_Canyon/_import.txt new file mode 100644 index 00000000..dc06405f --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/_import.txt @@ -0,0 +1,7 @@ +map: 024-1.gat +npc: npc/024-1_Tulimshar_Canyon/_mobs.txt +npc: npc/024-1_Tulimshar_Canyon/_warps.txt +npc: npc/024-1_Tulimshar_Canyon/ched.txt +npc: npc/024-1_Tulimshar_Canyon/eomie.txt +npc: npc/024-1_Tulimshar_Canyon/tinris.txt +npc: npc/024-1_Tulimshar_Canyon/tondar.txt diff --git a/npc/024-1_Tulimshar_Canyon/_mobs.txt b/npc/024-1_Tulimshar_Canyon/_mobs.txt new file mode 100644 index 00000000..140fe4f2 --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/_mobs.txt @@ -0,0 +1,34 @@ +// 024-1 Tulimshar Canyon mobs + +024-1.gat,89,52,3,2 monster Maggot 1002,2,0,0,Mob024-1::On1002 +024-1.gat,40,45,3,2 monster Maggot 1002,2,0,0,Mob024-1::On1002 +024-1.gat,90,37,10,7 monster Maggot 1002,4,0,0,Mob024-1::On1002 +024-1.gat,96,25,3,10 monster Sea Sime 1033,1,0,0,Mob024-1::On1033 +024-1.gat,33,45,24,20 monster Black Scorpion 1009,3,0,0,Mob024-1::On1009 +024-1.gat,93,35,5,6 monster Gian Maggot 1006,1,0,0,Mob024-1::On1006 +024-1.gat,63,54,3,6 monster Maggot 1002,1,0,0,Mob024-1::On1002 + + +024-1.gat,0,0,0 script Mob024-1 -1,{ +On1002: + set @mobID, 1002; + callfunc "MobPoints"; + break; + +On1006: + set @mobID, 1006; + callfunc "MobPoints"; + break; + +On1009: + set @mobID, 1009; + callfunc "MobPoints"; + break; + +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + break; + + end; +} diff --git a/npc/024-1_Tulimshar_Canyon/_warps.txt b/npc/024-1_Tulimshar_Canyon/_warps.txt new file mode 100644 index 00000000..cd52451e --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/_warps.txt @@ -0,0 +1,5 @@ +// 024-1 Tulimshar Canyon warps + +024-1.gat,86,73 warp toCentralTulimshar 3,-1,021-1.gat,49,64 +024-1.gat,80,48 warp toBuilding 0,-1,024-2.gat,26,26 +024-1.gat,86,48 warp toBuilding -1,-1,024-2.gat,42,27 diff --git a/npc/024-1_Tulimshar_Canyon/ched.txt b/npc/024-1_Tulimshar_Canyon/ched.txt new file mode 100644 index 00000000..2f935364 --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/ched.txt @@ -0,0 +1,28 @@ +// Student at Tulimshar's magic academy + +024-1.gat,69,56,0 script Ched 113,{ + if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden; + if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon; + + mes "[Ched]"; + mes "\"I'm a student here.\""; + close; + +L_Garden: + if (BaseLevel < 40) goto L_Warp; + mes "[Ched]"; + mes "\"Be careful of those plants. They can be dangerous,\""; + close; + +L_Canyon: + if (BaseLevel < 40) goto L_Warp; + mes "[Ched]"; + mes "\"I'm not allowed back there.\""; + close; + +L_Warp: + warp "024-1.gat", 71, 56; + mes "[Ched]"; + mes "\"You can't be back there.\""; + close; +} diff --git a/npc/024-1_Tulimshar_Canyon/eomie.txt b/npc/024-1_Tulimshar_Canyon/eomie.txt new file mode 100644 index 00000000..0bf187df --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/eomie.txt @@ -0,0 +1,7 @@ +// A professor at Tulimshar's magic academy + +024-1.gat,72,94,0 script Eomie 164,{ + mes "[Eomie]"; + mes "\"I maintain this little spot of grass in the desert.\""; + close; +} diff --git a/npc/024-1_Tulimshar_Canyon/tinris.txt b/npc/024-1_Tulimshar_Canyon/tinris.txt new file mode 100644 index 00000000..29381f57 --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/tinris.txt @@ -0,0 +1,7 @@ +// A gardener at Tulimshar's magic academy + +024-1.gat,82,64,0 script Tinris 160,{ + mes "[Tinris]"; + mes "\"This is a magic school.\""; + close; +} diff --git a/npc/024-1_Tulimshar_Canyon/tondar.txt b/npc/024-1_Tulimshar_Canyon/tondar.txt new file mode 100644 index 00000000..ba97d2ee --- /dev/null +++ b/npc/024-1_Tulimshar_Canyon/tondar.txt @@ -0,0 +1,7 @@ +// A professor at Tulimshar's magic academy + +024-1.gat,83,51,0 script Tondar 168,{ + mes "[Tondar]"; + mes "\"We're not accepting any new students right now.\""; + close; +} diff --git a/npc/024-2_Tulimshar_Magic_School/_import.txt b/npc/024-2_Tulimshar_Magic_School/_import.txt new file mode 100644 index 00000000..be56cb29 --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/_import.txt @@ -0,0 +1,5 @@ +map: 024-2.gat +npc: npc/024-2_Tulimshar_Magic_School/_mobs.txt +npc: npc/024-2_Tulimshar_Magic_School/_warps.txt +npc: npc/024-2_Tulimshar_Magic_School/barrier.txt +npc: npc/024-2_Tulimshar_Magic_School/tyer.txt diff --git a/npc/024-2_Tulimshar_Magic_School/_mobs.txt b/npc/024-2_Tulimshar_Magic_School/_mobs.txt new file mode 100644 index 00000000..98573823 --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/_mobs.txt @@ -0,0 +1,7 @@ +// 024-2 Tulimshar Magic School mobs + + + +024-2.gat,0,0,0 script Mob024-2 -1,{ + end; +} diff --git a/npc/024-2_Tulimshar_Magic_School/_warps.txt b/npc/024-2_Tulimshar_Magic_School/_warps.txt new file mode 100644 index 00000000..c58304b1 --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/_warps.txt @@ -0,0 +1,4 @@ +// 024-2 Tulimshar Magic School warps + +024-2.gat,26,27 warp toOutside 0,-1,024-1.gat,79,49 +024-2.gat,42,28 warp toOutside -1,-1,024-1.gat,86,49 diff --git a/npc/024-2_Tulimshar_Magic_School/barrier.txt b/npc/024-2_Tulimshar_Magic_School/barrier.txt new file mode 100644 index 00000000..eda8e173 --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/barrier.txt @@ -0,0 +1,12 @@ +// A barrier in the magic school to keep less experienced players out of the canyon + +024-2.gat,31,24,0 script #MagicSchoolBarrier1#M 127,1,1,{ + if (BaseLevel < 40) goto L_PushBack; + close; + +L_PushBack: + warp "024-2.gat", 34, 24; + mes "[Tyer]"; + mes "\"You're still too young to go in there.\""; + close; +} diff --git a/npc/024-2_Tulimshar_Magic_School/tyer.txt b/npc/024-2_Tulimshar_Magic_School/tyer.txt new file mode 100644 index 00000000..6594cc76 --- /dev/null +++ b/npc/024-2_Tulimshar_Magic_School/tyer.txt @@ -0,0 +1,23 @@ +// A man in the magic school + +024-2.gat,36,21,0 script Tyer 157,{ + mes "[Tyer]"; + mes "\"Hello.\""; + + if (BaseLevel >= 40) close; + next; + + menu + "Hello", -, + "What do you mean I'm too young to go in there?", L_Explain; + close; + +L_Explain: + mes "[Tyer]"; + mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\""; + next; + + mes "[Tyer]"; + mes "\"That barrier was made to keep those that are too young out.\""; + close; +} diff --git a/npc/_import.txt b/npc/_import.txt index 416fff95..9b3acaf8 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -41,7 +41,8 @@ import: npc/020-2_Nivalis/_import.txt import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt import: npc/021-1_Tulimshar/_import.txt -//import: npc/021-2/_import.txt -//import: npc/021-8_Meeting_Rooms/_import.txt -//import: npc/023-1_Beach_Cliffs/_import.txt +import: npc/021-2_Tulimshar/_import.txt +import: npc/023-1_Beach_Cliffs/_import.txt +import: npc/024-1_Tulimshar_Canyon/_import.txt +import: npc/024-2_Tulimshar_Magic_School/_import.txt import: npc/botcheck/_import.txt -- cgit v1.2.3-70-g09d2 From a9322f124050f01101bb5c43886a666016fd73a2 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 7 Mar 2009 11:58:37 -0700 Subject: Adjust Tulimshar's bakery a bit --- npc/021-1_Tulimshar/bakery.txt | 10 ++++++++-- npc/021-2_Tulimshar/bakery.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt index aff3cc5e..6d831bf2 100644 --- a/npc/021-1_Tulimshar/bakery.txt +++ b/npc/021-1_Tulimshar/bakery.txt @@ -5,7 +5,13 @@ 021-1.gat,108,102,0 script Itka 114,{ mes "[Itka]"; mes "\"This bakery is the best!\""; - mes ""; - mes "\"Too bad they haven't fully opened yet.\""; close; + +OnTimer10000: + npctalk "Come to the bakery!"; + setnpctimer 0; + end; + +OnInit: + initnpctimer; } diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt index fd7a47d0..7116503f 100644 --- a/npc/021-2_Tulimshar/bakery.txt +++ b/npc/021-2_Tulimshar/bakery.txt @@ -15,7 +15,7 @@ } // The cashier -021-2.gat,89,21,0 shop Drabur 112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1 +021-2.gat,89,21,0 shop Drabur 112,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,Cake :-1,CherryCake :-1,OrangeCupcake :-3,Milk :-5,XmasCake :-1 // Stockroom boy 021-2.gat,133,21,0 script Iormo 160,{ -- cgit v1.2.3-70-g09d2 From 29ba73d418f5b8a800fd1f7aae3457fe67cd1f22 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 7 Mar 2009 22:41:49 -0700 Subject: Adjust the barrier int he magic school THe explaination is now handled better --- npc/024-2_Tulimshar_Magic_School/barrier.txt | 3 +-- npc/024-2_Tulimshar_Magic_School/tyer.txt | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/npc/024-2_Tulimshar_Magic_School/barrier.txt b/npc/024-2_Tulimshar_Magic_School/barrier.txt index eda8e173..6450d5ad 100644 --- a/npc/024-2_Tulimshar_Magic_School/barrier.txt +++ b/npc/024-2_Tulimshar_Magic_School/barrier.txt @@ -5,8 +5,7 @@ close; L_PushBack: + doevent "Tyer::OnBarrier"; warp "024-2.gat", 34, 24; - mes "[Tyer]"; - mes "\"You're still too young to go in there.\""; close; } diff --git a/npc/024-2_Tulimshar_Magic_School/tyer.txt b/npc/024-2_Tulimshar_Magic_School/tyer.txt index 6594cc76..f46190f2 100644 --- a/npc/024-2_Tulimshar_Magic_School/tyer.txt +++ b/npc/024-2_Tulimshar_Magic_School/tyer.txt @@ -3,13 +3,16 @@ 024-2.gat,36,21,0 script Tyer 157,{ mes "[Tyer]"; mes "\"Hello.\""; + close; - if (BaseLevel >= 40) close; +OnBarrier: + mes "[Tyer]"; + mes "\"You're still too young to go in there.\""; next; menu - "Hello", -, - "What do you mean I'm too young to go in there?", L_Explain; + "What do you mean I'm too young to go in there?", L_Explain, + "Ah, right.", -; close; L_Explain: -- cgit v1.2.3-70-g09d2 From b073a508fb4c61ed3cb4f4cc62fc3d892480a6b8 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 7 Mar 2009 22:42:22 -0700 Subject: Move bank storage to be account level --- npc/functions/banker.txt | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/npc/functions/banker.txt b/npc/functions/banker.txt index 79a57738..4967263a 100644 --- a/npc/functions/banker.txt +++ b/npc/functions/banker.txt @@ -1,6 +1,7 @@ // function script Banker { + if (BankAccount > 0) callsub S_MoveAccount; mes "[" + @npcName$ + "]"; mes "\"Welcome to the bank!"; mes "How can I help you?\""; @@ -71,7 +72,7 @@ D_All: L_Deposit: if (zeny < @Amount) goto L_NoMoney; set zeny, zeny - @Amount; - set BankAccount, BankAccount + @Amount; + set #BankAccount, #BankAccount + @Amount; goto L_Balance; L_With: @@ -92,64 +93,64 @@ L_With: "I've changed my mind", L_Nev; W_1: - if (BankAccount < 1000) goto L_NoMoney; + if (#BankAccount < 1000) goto L_NoMoney; set @Amount, 1000; goto L_Withdraw; W_5: - if (BankAccount < 5000) goto L_NoMoney; + if (#BankAccount < 5000) goto L_NoMoney; set @Amount, 5000; goto L_Withdraw; W_10: - if (BankAccount < 10000) goto L_NoMoney; + if (#BankAccount < 10000) goto L_NoMoney; set @Amount, 10000; goto L_Withdraw; W_25: - if (BankAccount < 25000) goto L_NoMoney; + if (#BankAccount < 25000) goto L_NoMoney; set @Amount, 25000; goto L_Withdraw; W_50: - if (BankAccount < 50000) goto L_NoMoney; + if (#BankAccount < 50000) goto L_NoMoney; set @Amount, 50000; goto L_Withdraw; W_100: - if (BankAccount < 100000) goto L_NoMoney; + if (#BankAccount < 100000) goto L_NoMoney; set @Amount, 100000; goto L_Withdraw; W_250: - if (BankAccount < 250000) goto L_NoMoney; + if (#BankAccount < 250000) goto L_NoMoney; set @Amount, 250000; goto L_Withdraw; W_500: - if (BankAccount < 500000) goto L_NoMoney; + if (#BankAccount < 500000) goto L_NoMoney; set @Amount, 500000; goto L_Withdraw; W_1000: - if (BankAccount < 1000000) goto L_NoMoney; + if (#BankAccount < 1000000) goto L_NoMoney; set @Amount, 1000000; goto L_Withdraw; W_All: - if (BankAccount < 1) goto L_NoMoney; - set @Amount, BankAccount; + if (#BankAccount < 1) goto L_NoMoney; + set @Amount, #BankAccount; goto L_Withdraw; L_Withdraw: set zeny, zeny + @Amount; - set BankAccount, BankAccount - @Amount; + set #BankAccount, #BankAccount - @Amount; goto L_Balance; L_Balance: mes "[" + @npcName$ + "]"; mes "\"Your current bank balance is:"; - mes BankAccount + " GP\""; + mes #BankAccount + " GP\""; return; L_Nev: @@ -161,4 +162,9 @@ L_NoMoney: mes "[" + @npcName$ + "]"; mes "\"Oh dear, it seems that you don't have enough money.\""; return; + +S_MoveAccount: + set #BankAccount, #BankAccount + BankAccount; + set BankAccount, 0; + return; } -- cgit v1.2.3-70-g09d2