From 7994363113d46f5eb3970282fbca6a165d555b40 Mon Sep 17 00:00:00 2001 From: seeds Date: Sat, 24 Jul 2021 20:40:26 +0000 Subject: Piou isles fixes patch --- npc/006-2-1/_import.txt | 4 ++-- npc/006-2-1/camilot.txt | 54 ------------------------------------------------ npc/006-2-1/chirp.txt | 2 +- npc/006-2-1/jenny.txt | 41 ------------------------------------ npc/006-2-1/lune.txt | 14 +++---------- npc/006-2-1/miltaco.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ npc/006-2-1/plum.txt | 7 ------- npc/006-2-1/server.txt | 41 ++++++++++++++++++++++++++++++++++++ 8 files changed, 102 insertions(+), 116 deletions(-) delete mode 100644 npc/006-2-1/camilot.txt delete mode 100644 npc/006-2-1/jenny.txt create mode 100644 npc/006-2-1/miltaco.txt create mode 100644 npc/006-2-1/server.txt (limited to 'npc/006-2-1') diff --git a/npc/006-2-1/_import.txt b/npc/006-2-1/_import.txt index 87ae69a2f..7a60f1202 100644 --- a/npc/006-2-1/_import.txt +++ b/npc/006-2-1/_import.txt @@ -2,8 +2,8 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-2-1/_mobs.txt", "npc/006-2-1/_warps.txt", -"npc/006-2-1/camilot.txt", "npc/006-2-1/chirp.txt", -"npc/006-2-1/jenny.txt", +"npc/006-2-1/server.txt", "npc/006-2-1/lune.txt", +"npc/006-2-1/miltaco.txt", "npc/006-2-1/plum.txt", diff --git a/npc/006-2-1/camilot.txt b/npc/006-2-1/camilot.txt deleted file mode 100644 index 8cd6b3c07..000000000 --- a/npc/006-2-1/camilot.txt +++ /dev/null @@ -1,54 +0,0 @@ -// TMW2 scripts. -// Authors: -// Saulc -// Jesusalva -// Reid -// Travolta -// +Seeds -// Description: -// Camilot is the barber. - -006-2-1,85,67,0 script Camilot NPC_PIOU_BARBER,{ - mesn; - mesq l("Hi! I'm Camilot, a piou specialist in humanoid hairstyles. Do you want a hair cut?"); - - do - { - select - l("What is my current hairstyle and hair color?"), - l("I'd like to get a different style."), - l("Can you do something with my color?"), - l("I'm allergic to piou, goodbye."); - - switch (@menu) - { - case 1: - BarberSayStyle 2; - break; - case 2: - BarberChangeStyle; - speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("Enjoy your new style."); - l("Anything else?"); - break; - case 3: - BarberChangeColor; - speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("I hope you like this color."); - l("Anything else?"); - break; - case 4: - speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("Come and visit again!"); - - goodbye; - } - } while (1); - close; - - -OnInit: - .sex = G_OTHER; - .distance = 5; - end; -} diff --git a/npc/006-2-1/chirp.txt b/npc/006-2-1/chirp.txt index 3b0f146da..05de00c8b 100644 --- a/npc/006-2-1/chirp.txt +++ b/npc/006-2-1/chirp.txt @@ -8,7 +8,7 @@ close; OnInit: - .sex = OTHER; + .sex = G_OTHER; .distance = 4; end; } diff --git a/npc/006-2-1/jenny.txt b/npc/006-2-1/jenny.txt deleted file mode 100644 index 72525f8a3..000000000 --- a/npc/006-2-1/jenny.txt +++ /dev/null @@ -1,41 +0,0 @@ -// TMW2 Script. -// Author: -// Jesusalva -// Modified by: -// +seeds - -006-2-1,41,74,0 script Jenny NPC_PIOU_SERVER,{ - - mesn; - mesq l("Hello! Would you like to try some piou delicacies?"); - next; - closedialog; - npcshopattach(.name$); - shop .name$; - close; - -OnInit: - - .sex = G_OTHER; - .distance = 5; - - tradertype(NST_MARKET); - sellitem Piberries, 20, 20; - sellitem Aquada, 120, 5; - sellitem LettuceLeaf, 30, 15; - sellitem Bread, 46, 10; - sellitem Cheese, 55, 15; - - end; - -OnClock0556: -OnClock1201: -OnClock1759: -OnClock0003: - restoreshopitem Piberries, 20, 20; - restoreshopitem Aquada, 120, 5; - restoreshopitem LettuceLeaf, 30, 15; - restoreshopitem Bread, 46, 10; - restoreshopitem Cheese, 55, 15; - end; -} diff --git a/npc/006-2-1/lune.txt b/npc/006-2-1/lune.txt index 8a63fc86d..486ac01dc 100644 --- a/npc/006-2-1/lune.txt +++ b/npc/006-2-1/lune.txt @@ -76,7 +76,7 @@ L_AgiPotionA: .@price=POL_AdjustPrice(1000); mes ""; mesn; - mesq l("To make an %s I need a %s, an %s, and %s GP for commission.", getitemlink(AgiPotionA), getitemlink(TopazPowder), getitemlink(HerbalTea) fnum(.@price)); + mesq l("To make an %s I need a %s, an %s, and %s GP for commission.", getitemlink(AgiPotionA), getitemlink(TopazPowder), getitemlink(HerbalTea), fnum(.@price)); next; select l("I have the ingredients here."), @@ -115,7 +115,7 @@ L_AgiPotionB: .@price=POL_AdjustPrice(1250); mes ""; mesn; - mesq l("To make an %s I need a %s, two %s, and %s GP for commission.", getitemlink(AgiPotionB), getitemlink(Topaz), getitemlink(HerbalTea) fnum(.@price)); + mesq l("To make an %s I need a %s, two %s, and %s GP for commission.", getitemlink(AgiPotionB), getitemlink(Topaz), getitemlink(HerbalTea), fnum(.@price)); next; select l("I have the ingredients here."), @@ -154,7 +154,7 @@ L_AgiPotionC: .@price=POL_AdjustPrice(1500); mes ""; mesn; - mesq l("To make an %s I need a %s, three %s, and %s GP for commission.", getitemlink(AgiPotionC), getitemlink(PolishedTopaz), getitemlink(HerbalTea) fnum(.@price)); + mesq l("To make an %s I need a %s, three %s, and %s GP for commission.", getitemlink(AgiPotionC), getitemlink(PolishedTopaz), getitemlink(HerbalTea), fnum(.@price)); next; select l("I have the ingredients here."), @@ -195,14 +195,6 @@ L_Quit: close; OnInit: - .@npcId = getnpcid(.name$); - setunitdata(.@npcId, UDT_HEADTOP, FancyHat); - setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); - setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); - setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots - setunitdata(.@npcId, UDT_HAIRSTYLE, 7); - setunitdata(.@npcId, UDT_HAIRCOLOR, 17); - .sex = G_OTHER; .distance = 4; end; diff --git a/npc/006-2-1/miltaco.txt b/npc/006-2-1/miltaco.txt new file mode 100644 index 000000000..427b9a47a --- /dev/null +++ b/npc/006-2-1/miltaco.txt @@ -0,0 +1,55 @@ +// TMW2 scripts. +// Authors: +// Saulc +// Jesusalva +// Reid +// Travolta +// Modified by: +// +seeds +// Description: +// Miltaco is the barber. + +006-2-1,85,67,0 script Miltaco NPC_PIOU_BARBER,{ + mesn; + mesq l("Hi! I'm Miltaco, a piou specialist in humanoid hairstyles. Do you want a hair cut?"); + + do + { + select + l("What is my current hairstyle and hair color?"), + l("I'd like to get a different style."), + l("Can you do something with my color?"), + l("I'm allergic to pious, goodbye."); + + switch (@menu) + { + case 1: + BarberSayStyle 2; + break; + case 2: + BarberChangeStyle; + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Enjoy your new style."); + l("Anything else?"); + break; + case 3: + BarberChangeColor; + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("I hope you like this color."); + l("Anything else?"); + break; + case 4: + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Come and visit again!"); + + goodbye; + } + } while (1); + close; + + +OnInit: + .sex = G_OTHER; + .distance = 5; + end; +} diff --git a/npc/006-2-1/plum.txt b/npc/006-2-1/plum.txt index 12c6c9043..cc987b46f 100644 --- a/npc/006-2-1/plum.txt +++ b/npc/006-2-1/plum.txt @@ -10,13 +10,6 @@ close; OnInit: - .@npcId = getnpcid(.name$); - setunitdata(.@npcId, UDT_HEADBOTTOM, CottonSkirt); - setunitdata(.@npcId, UDT_HEADMIDDLE, TneckSweater); - setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); - setunitdata(.@npcId, UDT_HAIRSTYLE, 12); - setunitdata(.@npcId, UDT_HAIRCOLOR, 14); - .sex = G_OTHER; .distance = 5; end; diff --git a/npc/006-2-1/server.txt b/npc/006-2-1/server.txt new file mode 100644 index 000000000..8b14c143f --- /dev/null +++ b/npc/006-2-1/server.txt @@ -0,0 +1,41 @@ +// TMW2 Script. +// Author: +// Jesusalva +// Modified by: +// +seeds + +006-2-1,41,74,0 script Server NPC_PIOU_SERVER,{ + + mesn; + mesq l("Hello! Would you like to try some piou delicacies?"); + next; + closedialog; + npcshopattach(.name$); + shop .name$; + close; + +OnInit: + + .sex = G_OTHER; + .distance = 5; + + tradertype(NST_MARKET); + sellitem Piberries, 20, 20; + sellitem Aquada, 120, 5; + sellitem LettuceLeaf, 30, 15; + sellitem Bread, 46, 10; + sellitem Cheese, 55, 15; + + end; + +OnClock0556: +OnClock1201: +OnClock1759: +OnClock0003: + restoreshopitem Piberries, 20, 20; + restoreshopitem Aquada, 120, 5; + restoreshopitem LettuceLeaf, 30, 15; + restoreshopitem Bread, 46, 10; + restoreshopitem Cheese, 55, 15; + +} -- cgit v1.2.3-60-g2f50