From 47f790759ea3ea56d31e000bc3f3b7f142ee802d Mon Sep 17 00:00:00 2001 From: wushin Date: Fri, 11 Apr 2014 14:32:22 -0500 Subject: Npcs remaining script fixes Npcs changed for travel Npcs changed for new maps Npcs changed for basic crypts --- world/map/npc/021-2/bakery.txt | 21 ++- world/map/npc/021-2/bank.txt | 8 -- world/map/npc/021-2/forge_shops.txt | 4 + world/map/npc/021-2/government_building.txt | 11 +- world/map/npc/021-2/hotel_receptionist.txt | 12 -- world/map/npc/021-2/inya.txt | 200 ---------------------------- world/map/npc/021-2/kylian.txt | 2 +- world/map/npc/021-2/manakins.txt | 47 +++++++ world/map/npc/021-2/rebecca.txt | 11 ++ 9 files changed, 77 insertions(+), 239 deletions(-) delete mode 100644 world/map/npc/021-2/bank.txt create mode 100644 world/map/npc/021-2/forge_shops.txt delete mode 100644 world/map/npc/021-2/hotel_receptionist.txt delete mode 100644 world/map/npc/021-2/inya.txt create mode 100644 world/map/npc/021-2/manakins.txt create mode 100644 world/map/npc/021-2/rebecca.txt (limited to 'world/map/npc/021-2') diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 6415b498..a063811e 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -3,9 +3,6 @@ // The chef 021-2.gat,95,21,0|script|Riskim|148, { - goto L_Begin; - -L_Begin: mes "[Riskim]"; mes ""; mes "\"Welcome to our bakery!\""; @@ -42,9 +39,9 @@ L_Begin: L_lace_chococake: next; menu - "Thanks! Let me have a look around...", L_end, + "Thanks! Let me have a look around...", L_End, "Can you put this potion into a Chocolate Cake?", L_Next, - "Goodbye!", L_end; + "Goodbye!", L_End; L_Next: mes "[Riskim]"; @@ -60,9 +57,9 @@ L_Next: mes "\"We'll need extra chocolate for that one. If you can give me ten pieces of chocolate and that potion, plus 400 GP, I will bake you a special Chocolate Cake that hides the taste.\""; next; menu - "I will get them for you.", L_end, + "I will get them for you.", L_End, "Here you are!", L_Continue, - "Maybe later.", L_end; + "Maybe later.", L_End; L_Continue: if (countitem("ChocolateBar") < 10) @@ -103,9 +100,9 @@ L_lacking_ingredients: L_lace_cupcake: next; menu - "Thanks! Let me have a look around...", L_end, + "Thanks! Let me have a look around...", L_End, "Can you put this potion into an Orange Cupcake?", L_More, - "Goodbye!", L_end; + "Goodbye!", L_End; L_More: mes "[Riskim]"; @@ -116,13 +113,13 @@ L_More: mes ""; mes "\"Perhaps the Chef at Dimond's Cove can help you? We get all our cupcakes from him.\""; next; - goto L_end; + goto L_End; -L_end: +L_End: close; } -// Server? +// Server 021-2.gat,82,23,0|script|Sara|108, { mes "[Sara]"; diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt deleted file mode 100644 index a1fbd3c1..00000000 --- a/world/map/npc/021-2/bank.txt +++ /dev/null @@ -1,8 +0,0 @@ -// Another banker -021-2.gat,69,135,0|script|Hydusun|149, -{ - set @npcname$, "Hydusun"; - callfunc "Banker"; - close; -} - diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt new file mode 100644 index 00000000..2ffa556b --- /dev/null +++ b/world/map/npc/021-2/forge_shops.txt @@ -0,0 +1,4 @@ +// Forge Shops + +021-2.gat,77,134,0|shop|Gungnir|311,SlingShot :-1,SlingBullet :-1,ShortBow :-1,Arrow :1,IronArrow :3 +021-2.gat,71,133,0|shop|Mjolnir|377,Knife :-1,SharpKnife :-1,Dagger :-1,LeatherShirt :-2,LeatherShield :-2 diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt index e0a8796b..abf01ccb 100644 --- a/world/map/npc/021-2/government_building.txt +++ b/world/map/npc/021-2/government_building.txt @@ -6,9 +6,6 @@ mes "[Estard]"; mes "\"Hello what can I do for you?\""; next; - goto L_main; - -L_main: if (getpartnerid2()) goto L_main_married; @@ -61,9 +58,11 @@ L_get_rings: if (Zeny < WEDDING_FEE) menu "Thanks anyways. I don't have enough with me.", L_Close; - menu - "I'll buy a pair.", L_get_rings_pay, - "Thanks anyways.", L_Close; + if (Zeny >= WEDDING_FEE) + menu + "I'll buy a pair.", L_get_rings_pay, + "Thanks anyways.", L_Close; + goto L_get_rings_pay; L_get_rings_pay: callsub S_give_rings; diff --git a/world/map/npc/021-2/hotel_receptionist.txt b/world/map/npc/021-2/hotel_receptionist.txt deleted file mode 100644 index dac560c6..00000000 --- a/world/map/npc/021-2/hotel_receptionist.txt +++ /dev/null @@ -1,12 +0,0 @@ -// Tulimshar's main workshop - -// The receptionist -021-2.gat,22,63,0|script|Sonir|118, -{ - mes "[Sonir]"; - mes "\"Welcome to The Wizards's Rest!\""; - next; - mes "[Sonir]"; - mes "\"We have limited housing on the second floor.\""; - close; -} diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt deleted file mode 100644 index c448681d..00000000 --- a/world/map/npc/021-2/inya.txt +++ /dev/null @@ -1,200 +0,0 @@ -//Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple) -//The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic? - -021-2.gat,80,134,0|script|Inya|106, -{ - mes "[Inya]"; - mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\""; - next; - mes "\"Also, if you have a ring with gems on it, I can remove the gems and return the Simple Ring to you for 500,000 gold pieces.\""; - next; - mes "\"So, how can I help you?\""; - menu - "I have a wedding ring, will that do?", L_Inya_Wedding_Ring, - "I'd like to remove a gem (500000 GP).", L_Inya_Remove_RingGem, - "I'd like to add a gem (1000000 GP).", L_Inya_Add_RingGem, - "Not interested.", L_Inya_NotInterested; - -L_Inya_Wedding_Ring: - mes "[Inya]"; - mes "\"No, sorry. I do not alter wedding rings at this time.\""; - close; - -L_Inya_Remove_RingGem: - mes "[Inya]"; - mes "\"What kind of gem would you like to have removed?\""; - menu - "Diamond.", L_Inya_Remove_Diamond, - "Ruby.", L_Inya_Remove_Ruby, - "Emerald.", L_Inya_Remove_Emerald, - "Sapphire.", L_Inya_Remove_Sapphire, - "Topaz.", L_Inya_Remove_Topaz, - "Amethyst.", L_Inya_Remove_Amethyst, - "I've changed my mind.", L_Inya_NotInterested; - -L_Inya_Add_RingGem: - mes "[Inya]"; - mes "\"What kind of gem would you like to add?\""; - menu - "Diamond.", L_Inya_Add_Diamond, - "Ruby.", L_Inya_Add_Ruby, - "Emerald.", L_Inya_Add_Emerald, - "Sapphire.", L_Inya_Add_Sapphire, - "Topaz.", L_Inya_Add_Topaz, - "Amethyst.", L_Inya_Add_Amethyst, - "I've changed my mind.", L_Inya_NotInterested; - -L_Inya_Remove_Diamond: - if ( (Zeny < 500000) - | (countitem ("DiamondRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "DiamondRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Remove_Ruby: - if ( (Zeny < 500000) - | (countitem ("RubyRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "RubyRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Remove_Emerald: - if ( (Zeny < 500000) - | (countitem ("EmeraldRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "EmeraldRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Remove_Sapphire: - if ( (Zeny < 500000) - | (countitem ("SapphireRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "SapphireRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Remove_Topaz: - if ( (Zeny < 500000) - | (countitem ("TopazRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "TopazRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Remove_Amethyst: - if ( (Zeny < 500000) - | (countitem ("AmethystRing") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 500000; - delitem "AmethystRing", 1; - getitem "SimpleRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Diamond: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Diamond") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Diamond", 1; - getitem "DiamondRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Ruby: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Ruby") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Ruby", 1; - getitem "RubyRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Emerald: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Emerald") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Emerald", 1; - getitem "EmeraldRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Sapphire: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Sapphire") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Sapphire", 1; - getitem "SapphireRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Topaz: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Topaz") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Topaz", 1; - getitem "TopazRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_Add_Amethyst: - if ( (Zeny < 1000000) - | (countitem ("SimpleRing") < 1) - | (countitem ("Amethyst") < 1) ) - goto L_Inya_Not_Enough; - set Zeny, Zeny - 1000000; - delitem "SimpleRing", 1; - delitem "Amethyst", 1; - getitem "AmethystRing", 1; - mes "[Inya]"; - mes "\"Here you go.\""; - close; - -L_Inya_NotInterested: - mes "[Inya]"; - mes "\"Come back later and I will try to be of assistance.\""; - close; - -L_Inya_Not_Enough: - mes "[Inya]"; - mes "\"I am sorry, you simply do not seem to have the necessary items for me to help you. Please come back when you do, and I would be more than happy to help you out.\""; - close; -} diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt index 15f0d36b..71dcb896 100644 --- a/world/map/npc/021-2/kylian.txt +++ b/world/map/npc/021-2/kylian.txt @@ -56,7 +56,7 @@ OnInit: end; } -021-2.gat,32,92,0|script|Kylian|193, +021-2.gat,89,55,0|script|Kylian|193, { set @state, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT); diff --git a/world/map/npc/021-2/manakins.txt b/world/map/npc/021-2/manakins.txt new file mode 100644 index 00000000..a17603b7 --- /dev/null +++ b/world/map/npc/021-2/manakins.txt @@ -0,0 +1,47 @@ +// Display Manakins. + +// Forge +021-2.gat,76,131,0|script|Terranite Armor#Female|401, +{ + mes "Terranite Armor Complete Set, made to order, inquire with Heathin"; + close; +} + +021-2.gat,81,131,0|script|Terranite Armor#Male|402, +{ + mes "Terranite Armor Complete Set, made to order, inquire with Heathin"; + close; +} + +021-2.gat,81,136,0|script|Terranite|403, +{ + mes "Ahhh! A Terranite! Wait it appears to just be a display model."; + close; +} + +// Muesuem + +021-2.gat,71,161,0|script|Taplapian#Female|404, +{ + mes "A Female Talapian."; + close; +} + +021-2.gat,77,161,0|script|Taplapian#Male|405, +{ + mes "A Male Talapian."; + close; +} + +021-2.gat,83,161,0|script|Gispian#Female|406, +{ + mes "A Female Gispian."; + close; +} + +021-2.gat,89,161,0|script|Gispian#Male|407, +{ + mes "A Male Gispian."; + close; +} + diff --git a/world/map/npc/021-2/rebecca.txt b/world/map/npc/021-2/rebecca.txt new file mode 100644 index 00000000..90ad16e9 --- /dev/null +++ b/world/map/npc/021-2/rebecca.txt @@ -0,0 +1,11 @@ +// + +021-2.gat,26,54,0|script|Rebecca|118, +{ + set @npcname$, "Rebecca the Inn Keeper"; + set @cost, 100; + callfunc "Inn"; + set @npcname$, ""; + set @cost, 0; + close; +} -- cgit v1.2.3-70-g09d2