From cbc3c50aeb12013ae1e4553390b156ea39cb0897 Mon Sep 17 00:00:00 2001 From: Saulc Date: Fri, 26 Jan 2018 02:14:38 +0100 Subject: change stats points. and add new foods items --- npc/003-2-1/_warps.txt | 2 +- npc/004-0/_import.txt | 3 - npc/004-0/_warps.txt | 3 - npc/004-1-1-1/_import.txt | 2 - npc/004-1-1/_import.txt | 3 - npc/004-1-1/_warps.txt | 4 - npc/004-1/_import.txt | 3 - npc/004-1/_warps.txt | 4 - npc/005-1/_import.txt | 1 - npc/005-1/_mobs.txt | 10 -- npc/005-1/_warps.txt | 4 +- npc/005-1/zegas.txt | 32 ------- npc/005-6/_import.txt | 5 + npc/005-6/_warps.txt | 3 + npc/005-6/morgan.txt | 6 ++ npc/005-6/zitoni.txt | 226 ++++++++++++++++++++++++++++++++++++++++++++++ npc/_import.txt | 4 +- 17 files changed, 245 insertions(+), 70 deletions(-) delete mode 100644 npc/004-0/_import.txt delete mode 100644 npc/004-0/_warps.txt delete mode 100644 npc/004-1-1-1/_import.txt delete mode 100644 npc/004-1-1/_import.txt delete mode 100644 npc/004-1-1/_warps.txt delete mode 100644 npc/004-1/_import.txt delete mode 100644 npc/004-1/_warps.txt delete mode 100644 npc/005-1/zegas.txt create mode 100644 npc/005-6/_import.txt create mode 100644 npc/005-6/_warps.txt create mode 100644 npc/005-6/morgan.txt create mode 100644 npc/005-6/zitoni.txt (limited to 'npc') diff --git a/npc/003-2-1/_warps.txt b/npc/003-2-1/_warps.txt index b3d603825..01b8d9348 100644 --- a/npc/003-2-1/_warps.txt +++ b/npc/003-2-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 003-2-1: First Deck warps -003-2-1,19,28,0 warp #003-2-1_19_28 0,0,004-1,193,109 +003-2-1,19,28,0 warp #003-2-1_19_28 0,0,005-1,193,109 003-2-1,33,28,0 warp #003-2-1_33_28 0,0,003-2-0,20,27 003-2-1,31,25,0 warp #003-2-1_31_25 0,0,003-2-2,72,29 diff --git a/npc/004-0/_import.txt b/npc/004-0/_import.txt deleted file mode 100644 index e7a3c06d7..000000000 --- a/npc/004-0/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Map 004-0: Oceania -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/004-0/_warps.txt", diff --git a/npc/004-0/_warps.txt b/npc/004-0/_warps.txt deleted file mode 100644 index a92576de9..000000000 --- a/npc/004-0/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 004-0: Oceania warps -004-0,6,3,0 warp #004-0_6_3 0,0,004-1-1,55,72 diff --git a/npc/004-1-1-1/_import.txt b/npc/004-1-1-1/_import.txt deleted file mode 100644 index 496cbbb5a..000000000 --- a/npc/004-1-1-1/_import.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Map 004-1-1-1: Candor Island -// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/004-1-1/_import.txt b/npc/004-1-1/_import.txt deleted file mode 100644 index 991283715..000000000 --- a/npc/004-1-1/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Map 004-1-1: Light Armor Shop -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/004-1-1/_warps.txt", diff --git a/npc/004-1-1/_warps.txt b/npc/004-1-1/_warps.txt deleted file mode 100644 index 4c67ee852..000000000 --- a/npc/004-1-1/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 004-1-1: Light Armor Shop warps -004-1-1,30,35,0 warp #004-1-1_30_35 0,0,001-1,51,66 -004-1-1,37,46,0 warp #004-1-1_37_46 0,0,004-1,55,72 diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt deleted file mode 100644 index 31c31230f..000000000 --- a/npc/004-1/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Map 004-1: candor -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/004-1/_warps.txt", diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt deleted file mode 100644 index e7794ef46..000000000 --- a/npc/004-1/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 004-1: candor warps -004-1,6,3,0 warp #004-1_6_3 0,0,004-1-1,37,45 -004-1,30,17,0 warp #004-1_30_17 0,0,003-2-1,20,28 diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt index 1a1a15781..08601d0bf 100644 --- a/npc/005-1/_import.txt +++ b/npc/005-1/_import.txt @@ -2,4 +2,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/005-1/_mobs.txt", "npc/005-1/_warps.txt", -"npc/005-1/zegas.txt", diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt index 5f89c4fbb..242d35034 100644 --- a/npc/005-1/_mobs.txt +++ b/npc/005-1/_mobs.txt @@ -7,21 +7,11 @@ 005-1,37,44,11,5 monster Tortuga 1004,2,35000,120000 005-1,42,19,9,16 monster Tortuga 1004,2,35000,120000 005-1,87,15,12,11 monster Tortuga 1004,3,35000,120000 -005-1,44,53,2,1 monster Little Blub 1007,2,25000,120000 005-1,61,42,7,10 monster Little Blub 1007,2,25000,120000 005-1,62,3,10,4 monster Little Blub 1007,2,25000,120000 005-1,87,47,4,3 monster Blub 1008,1,60000,120000 -005-1,85,11,2,3 monster Little Blub 1007,1,25000,120000 005-1,85,36,14,9 monster Little Blub 1007,2,35000,120000 -005-1,48,39,9,6 monster Little Blub 1007,1,35000,120000 -005-1,28,26,3,5 monster Little Blub 1007,1,35000,120000 -005-1,35,28,0,1 monster Plushroom Field 1011,1,35000,150000 -005-1,54,93,0,1 monster Plushroom Field 1011,1,35000,150000 -005-1,63,58,4,2 monster Plushroom Field 1011,1,35000,150000 005-1,54,42,0,2 monster Plushroom Field 1011,1,35000,150000 -005-1,78,36,4,5 monster Plushroom Field 1011,2,35000,150000 -005-1,71,40,1,1 monster Plushroom Field 1011,1,35000,150000 -005-1,41,83,8,9 monster Croc 1006,2,35000,300000 005-1,63,9,10,3 monster Croc 1006,1,35000,300000 005-1,76,46,1,1 monster Croc 1006,1,35000,300000 005-1,52,70,4,17 monster Croc 1006,1,35000,300000 diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt index 6c1f5599a..30a459eba 100644 --- a/npc/005-1/_warps.txt +++ b/npc/005-1/_warps.txt @@ -1,7 +1,9 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-1: Drasil Island warps -005-1,38,96,0 warp #005-1_38_96 0,0,000-2-0,21,28 +005-1,43,107,0 warp #005-1_43_107 0,0,000-2-0,21,28 005-1,31,80,0 warp #005-1_31_80 0,0,005-2,33,42 005-1,34,74,0 warp #005-1_34_74 0,0,005-3,25,42 005-1,48,70,0 warp #005-1_48_70 0,0,005-4,25,42 005-1,39,68,0 warp #005-1_39_68 0,0,005-5,25,41 +005-1,22,91,0 warp #005-1_22_91 0,0,005-5,24,41 +005-1,43,75,0 warp #005-1_43_75 0,0,005-6,33,42 diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt deleted file mode 100644 index cbeb83294..000000000 --- a/npc/005-1/zegas.txt +++ /dev/null @@ -1,32 +0,0 @@ -// Evol scripts. -// Authors: -// gumi -// Reid -// Description: -// Lloyd the banker NPC. -// Variables: -// 0 ArtisQuests_Lloyd -// 1 ArtisQuests_Fexil -// 2 ArtisQuests_Enora -// Quest states: -// 00 -- Never talked -// 01 -- Registred on the Guild -// 10 -- not started -// 11 -- Lloyd warned about the quest -// 20 -- Default. -// 21 -- BlackSmith quest delivered. -// 22 -- Chelios Quest given. -// 23 -- Chelios Quest done. - -005-1,35,75,0 script Zegas NPC_LLOYD,{ - - - -OnPCLoginEvent: - if (#MerchantBank) - { - BankVault += max(0, #MerchantBank); - #MerchantBank = 0; - } - end; -} diff --git a/npc/005-6/_import.txt b/npc/005-6/_import.txt new file mode 100644 index 000000000..365d443e9 --- /dev/null +++ b/npc/005-6/_import.txt @@ -0,0 +1,5 @@ +// Map 005-6: Candor Magic House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/005-6/_warps.txt", +"npc/005-6/morgan.txt", +"npc/005-6/zitoni.txt", diff --git a/npc/005-6/_warps.txt b/npc/005-6/_warps.txt new file mode 100644 index 000000000..2ac22ab7d --- /dev/null +++ b/npc/005-6/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 005-6: Candor Magic House warps +005-6,33,43,0 warp #005-6_33_43 0,0,005-1,43,76 diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt new file mode 100644 index 000000000..5f9fe1c3b --- /dev/null +++ b/npc/005-6/morgan.txt @@ -0,0 +1,6 @@ +005-6,30,37,0 script Morgan NPC_RUMLY,{ + +OnInit: + .sex = G_MALE; + end; +} diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt new file mode 100644 index 000000000..ad5086de4 --- /dev/null +++ b/npc/005-6/zitoni.txt @@ -0,0 +1,226 @@ +// Evol scripts. +// Author: +// Vasily_Makarov +// Description: +// Stat resetter. +// Variables: +// General_Rumly +// Values: +// 0 Player hasn't met Zitomi +// 1 Last time player has told that he will never come back +// 2 Last time player has told that he will come back later +// 3 Player has already reset his stat +// Others: +// .@visited - Zitomi actual variable +// .@wasSP - free status points before reset + +005-6,43,39,0 script Zitoni NPC_RUMLY,{ + + setnpcdir "Rumly#001-1", 2; + stopnpctimer; + initnpctimer; + + speech S_LAST_NEXT, + l("Hey you, do you have any @@s?", getitemlink(Plushroom)); + +L_Menu: + .@visited = getq(General_Rumly); + .@plush_count = lognbaselvl(1, 10); + + select + l("Plushrooms you say?"), + l("Who are you?"), + rif(.@visited > 0, l("Can you reset my stats please?")), + lg("You are weird, I have to go sorry."); + + switch (@menu) + { + case 1: + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Wind and grass is nice and cool, so juicy sweet..."), + l("Our only wish to eat a plush, so juicy sweet..."); + goto L_Menu; + case 2: + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + lg("Why are you asking? And who are you too? I've never seen you around before..."), + lg("Wait, are you one of those from the Legion of Gasaron? I didn't do anything wrong, I promise!"), + l("I... I just like to eat the purple and delightful... And natural, and..."); + + switch (select(l("Chill out I won't say anything."), + l("Yes I am and you are going to face justice!"))) + { + case 1: break; + case 2: + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("No! No, no, my precious plushrooms! Don’t take me to them, they wants my precious."); + goto L_Quit; + } + + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("I won't forget it, I swear on my precious plushrooms!"), + l("There is an unknown side effect to these plushrooms, they can free you from your past mistakes."), + l("You can use it to clear your stats, to start freshly if you see what I mean..."), + l("Bring me some of these plushrooms and I will show you how it works!"), + l("Although the more powerful you are, the more plushrooms you will need."); + + select + l("Sounds good!"), + rif(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")), + l("We will talk about it later."), + l("My stats are too good, I won't need it."); + + switch (@menu) + { + case 1: + if (.@visited < 2) + { + setq General_Rumly, 2; + } + + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Great! Can't wait for some tasty mushrooms!"); + + goto L_Menu; + case 2: + goto L_ResetStats; + case 3: + goto L_Later; + case 4: + goto L_Never; + } + + case 3: + goto L_ResetStats; + case 4: + if (.@visited < 2) goto L_Quit; + + .@rand = rand(2); + + if (.@rand) + { + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("See you! And come back with the plushrooms!"); + } + else + { + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Oh noes!"), + l("A rabbit!"), + l("He has a guns!"), + l("*Bang bang*"); + narrator S_LAST_NEXT, + l("Rumly is hiding behind the tree."); + } + + goto L_Quit; + } + +L_ResetStats: + if (.@visited == 1) + { + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + lg("Changed your mind, uh?"), + l("Very good."), + l("Status point reset can't be undone. Do you really want this?"), + lg("Are you sure about this?"); + } + else + { + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + lg("Are you sure about this?"); + } + +L_ConfirmReset: + switch (select(lg("Yes, I am sure."), + lg("I need to think about it..."), + lg("I won't need it, thank you."))) + { + case 1: + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom)); + + select + rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")), + rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")), + rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")), + lg("I have to go, sorry."); + + if (@menu > 1) + { + goto L_Later; + } + + delitem Plushroom, .@plush_count; + + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Thank you."), + l("Now stand still... It should not take much time..."); + + .@wasSP = StatusPoint; + resetstatus; + if (.@visited < 3) + { + setq General_Rumly, 3; + } + if (StatusPoint == .@wasSP) + { + speech S_LAST_NEXT, + l("It seems that you have no status points to reset!"), + lg("But the plushroom you brought was really awesome you know."), + lg("Come back when you will really need me. And bring more plushrooms with you!"); + } + else + { + speech S_LAST_NEXT, + l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP), + l("Spend it wisely this time."), + lg("But you are welcome to reset your stats again if you bring me some more plushrooms!"); + } + goto L_Quit; + + case 2: + goto L_Later; + case 3: + goto L_Never; + } + +L_Later: + if (.@visited < 2) + { + setq General_Rumly, 2; + } + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + l("Come back soon, and bring @@s!", getitemlink(Plushroom)); + + goto L_Quit; + +L_Never: + if (.@visited < 2) + { + setq General_Rumly, 1; + } + + speech S_FIRST_BLANK_LINE | S_LAST_NEXT, + lg("I am sure that you will change your mind."); + + goto L_Quit; + +L_Quit: + setnpcdir "Rumly#001-1", 4; + stopnpctimer; + initnpctimer; + + goodbye; + +OnTimer1800: + stopnpctimer; + + if (getnpcdir("Rumly#001-1") == 2) setnpcdir "Rumly#001-1", 6; + if (getnpcdir("Rumly#001-1") == 4) setnpcdir "Rumly#001-1", 8; + + end; + +OnInit: + .sex = G_MALE; + end; +} diff --git a/npc/_import.txt b/npc/_import.txt index 90ebfc55f..fbebc881b 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -64,14 +64,12 @@ @include "npc/003-2-0/_import.txt" @include "npc/003-2-1/_import.txt" @include "npc/003-2-2/_import.txt" -@include "npc/004-1-1-1/_import.txt" -@include "npc/004-1-1/_import.txt" -@include "npc/004-1/_import.txt" @include "npc/005-1/_import.txt" @include "npc/005-2/_import.txt" @include "npc/005-3/_import.txt" @include "npc/005-4/_import.txt" @include "npc/005-5/_import.txt" +@include "npc/005-6/_import.txt" @include "npc/008-1/_import.txt" @include "npc/008-2-0/_import.txt" @include "npc/008-2-1/_import.txt" -- cgit v1.2.3-70-g09d2