From 2f52cdd29c61f3d075a847c637d53ec6f806c7b1 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 7 Apr 2018 14:31:14 -0300 Subject: Blame gumi, moving 011 to 011-1 due bad parser --- conf/map/maps.conf | 2 +- db/map_index.txt | 2 +- maps/re/009-1.mcache | Bin 810 -> 810 bytes maps/re/011.mcache | Bin 3021 -> 0 bytes npc/009-1/_import.txt | 1 + npc/009-1/_warps.txt | 2 +- npc/009-1/lynnthetraveler.txt | 92 ++++++++++++++++++++++++++++++++++++++++++ npc/011-1/_import.txt | 5 +++ npc/011-1/_mobs.txt | 6 +++ npc/011-1/_warps.txt | 3 ++ npc/011-1/manastone.txt | 92 ++++++++++++++++++++++++++++++++++++++++++ npc/011/_import.txt | 5 --- npc/011/_mobs.txt | 6 --- npc/011/_warps.txt | 3 -- npc/011/manastone.txt | 92 ------------------------------------------ npc/_import.txt | 2 +- 16 files changed, 203 insertions(+), 110 deletions(-) delete mode 100644 maps/re/011.mcache create mode 100644 npc/009-1/lynnthetraveler.txt create mode 100644 npc/011-1/_import.txt create mode 100644 npc/011-1/_mobs.txt create mode 100644 npc/011-1/_warps.txt create mode 100644 npc/011-1/manastone.txt delete mode 100644 npc/011/_import.txt delete mode 100644 npc/011/_mobs.txt delete mode 100644 npc/011/_warps.txt delete mode 100644 npc/011/manastone.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 6d9502457..76cc2f14b 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -40,7 +40,7 @@ map_list: ( "010-1-1", "010-1", "010-2", - "011", + "011-1", "boss", "botcheck", "sec_pri", diff --git a/db/map_index.txt b/db/map_index.txt index 26fd220e4..ea1931869 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -37,7 +37,7 @@ 010-1-1 37 010-1 38 010-2 39 -011 40 +011-1 40 boss 41 botcheck 42 sec_pri 43 diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache index e70ceccce..11b3be6e4 100644 Binary files a/maps/re/009-1.mcache and b/maps/re/009-1.mcache differ diff --git a/maps/re/011.mcache b/maps/re/011.mcache deleted file mode 100644 index c47677811..000000000 Binary files a/maps/re/011.mcache and /dev/null differ diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt index ef571ea53..0ea0f7252 100644 --- a/npc/009-1/_import.txt +++ b/npc/009-1/_import.txt @@ -2,4 +2,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/009-1/_mobs.txt", "npc/009-1/_warps.txt", +"npc/009-1/lynnthetraveler.txt", "npc/009-1/soul-menhir.txt", diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt index 975964cd1..c8b9057ef 100644 --- a/npc/009-1/_warps.txt +++ b/npc/009-1/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 009-1: Halinarzo warps 009-1,56,107,0 warp #009-1_56_107 2,0,010-2,171,20 -009-1,119,40,0 warp #009-1_119_40 0,0,11,177,177 +009-1,119,40,0 warp #009-1_119_40 0,0,011-1,177,177 diff --git a/npc/009-1/lynnthetraveler.txt b/npc/009-1/lynnthetraveler.txt new file mode 100644 index 000000000..91cd3758f --- /dev/null +++ b/npc/009-1/lynnthetraveler.txt @@ -0,0 +1,92 @@ +// TMW2 Script +// Author: +// Jesusalva +// Description: +// The Travelers travel around the world telling stories. + +009-1,30,26,0 script Lynn The Traveler NPC_F_COINKEEPER,{ + + mesn; + if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Wow! Are you @@? Everyone, in every city, talks about you!", $MOST_HEROIC$); + if (strcharinfo(0) == $MOST_HEROIC$) next; + + mesq l("Hello. I am @@, and I am from a family of travellers. We travel though the whole world, looking for exotic goods.", .name$); + next; + mesq l("You can buy rare items with me, or I can tell you about different cities in our world."); + +L_Menu: + mes ""; + menu + l("I want to trade with you."), L_Trade, + l("Tell me about Halinarzo."), L_Halin, + l("Tell me about Tulimshar."), L_Tulim, + l("Tell me about Hurnscald."), L_Hurns, + l("Sorry, I'll pass."), L_Close; + +L_Tulim: + mes ""; + mesn; + mesq l("Tulimshar is the oldest human city, and its foundation is the year zero of our calendar."); + next; + mesq l("The city only flourished because Janett Platinum had the idea to build city walls surrounding this city."); + next; + mesq l("The desert climate means you'll find mostly maggots and scorpions. Their drops include cactus drinks, cake, knifes, black pearls, gold, and other common things."); + next; + mesq l("You can find for a good price desert equipment and some kind of dyes. You find all sort of crafters, artisans and warriors here."); + next; + goto L_Menu; + +L_Hurns: + mes ""; + mesn; + mesq l("Hurnscald was founded after Tulimshar, in more fertile lands. Their walls are not so sturdy as the ones of Tulimshar."); + next; + mesq l("Under the leadership of King Wusher, they were the first to accept immigrants from other races. You will find humans and non-humans there."); + next; + mesq l("The fertile climate is ideal for mushrooms. You can also find lots of wood."); + next; + mesq l("Their economy provide many edible items and potions."); + next; + goto L_Menu; + +L_Halin: + mes ""; + mesn; + mesq l("Halinarzo was founded to explore Mana Stones."); + next; + mesq l("You can find both huge swamps, as huge desertic areas near and on it."); + next; + mesq l("Lizards are the main monster found, and they steal gold from innocent bypassers."); + next; + mesq l("Without any mana stone left, and because the walls were not very strong, most of the city was destroyed."); + next; + mesq l("Unlike many other cities, if you want people in eternal need of items, there is a good place to look."); + next; + goto L_Menu; + + +L_Trade: + mesn; + mesq l("Use your @@ as currency!", getitemlink(StrangeCoin)); + next; + openshop "Aeros Trader"; + closedialog; + +L_Close: + close; + +OnInit: + .@npcId = getnpcid(0, .name$); + setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); + setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater); + setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); + setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots + setunitdata(.@npcId, UDT_HAIRSTYLE, 18); + setunitdata(.@npcId, UDT_HAIRCOLOR, 8); + npcsit; + + .sex = G_FEMALE; + .distance = 5; + end; +} + diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt new file mode 100644 index 000000000..2545a2de2 --- /dev/null +++ b/npc/011-1/_import.txt @@ -0,0 +1,5 @@ +// Map 011-1: Depleted Mana Stones Mine +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/011-1/_mobs.txt", +"npc/011-1/_warps.txt", +"npc/011-1/manastone.txt", diff --git a/npc/011-1/_mobs.txt b/npc/011-1/_mobs.txt new file mode 100644 index 000000000..8988adbb5 --- /dev/null +++ b/npc/011-1/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 011-1: Depleted Mana Stones Mine mobs +011-1,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 +011-1,98,101,79,79 monster Fire Goblin 1067,100,60000,60000 +011-1,100,99,79,79 monster Lava Slime 1097,75,60000,60000 +011-1,101,98,79,79 monster Red Slime 1092,120,60000,60000 diff --git a/npc/011-1/_warps.txt b/npc/011-1/_warps.txt new file mode 100644 index 000000000..bba2aa0f6 --- /dev/null +++ b/npc/011-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 011-1: Depleted Mana Stones Mine warps +011-1,177,178,0 warp #011-1_177_178 0,0,009-1,119,41 diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt new file mode 100644 index 000000000..0ca8e09fa --- /dev/null +++ b/npc/011-1/manastone.txt @@ -0,0 +1,92 @@ +// TMW2 Script +// Author: +// Jesusalva +// Description: +// The last Mana Stone in the whole world, which is not owned by the Magic Council +// or the Monster King. + +011-1,0,0,0 script Mana Stone NPC_MANA_STONE,{ + + if (BaseLevel < 40) goto L_NotWorthy; + mesn; + mes l("The mighty Mana Stone does not reacts against you."); + mes l("If you fell ready, perhaps you should touch it?"); + mes ""; + menu + l("Touch it!"), L_Level, + l("Take it!"), L_NotWorthy2, + l("Break it!"), L_NotWorthy2, + l("Leave it alone!"), -; + close; + + +L_NotWorthy: + percentheal -70+BaseLevel, -100+BaseLevel; + npctalk3 l("You are not worthy!"); + end; + +L_Level: + if (MAGIC_LVL == 0 && readparam(bInt) >= 30 && BaseLevel >= 40 && JobLevel >= 10 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + + // Everything below this line is garbage + if (MAGIC_LVL == 1 && readparam(bInt) >= 60 && BaseLevel >= 60 && JobLevel >= 30 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL == 2 && readparam(bInt) >= 90 && BaseLevel >= 80 && JobLevel >= 50 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL == 3 && readparam(bInt) >= 120 && BaseLevel >= 100 && JobLevel >= 70 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL == 4 && readparam(bInt) >= 150 && BaseLevel >= 120 && JobLevel >= 90 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL == 5 && readparam(bInt) >= 180 && BaseLevel >= 140 && JobLevel >= 110 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL == 6 && readparam(bInt) >= 210 && BaseLevel >= 160 && JobLevel >= 120 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; + if (MAGIC_LVL >= 7) npctalk3 l("You already got all power I could grant you!"); + if (is_gm()) percentheal -20, -50; + if (MAGIC_LVL >= 7 || is_gm()) close; + +L_NotWorthy2: + if (is_gm()) movenpc(.name$, rand(200), rand(200)); + if (is_gm()) close; + percentheal -20, -50; + npctalk3 l("You are not worthy!"); + end; + +L_LevelUp: + mes ""; + mes l("A great rush of mana flows though you."); + if (!MAGIC_LVL) mes l("Magic Power is granted to you, but you die from it."); + if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it."); + MAGIC_LVL = MAGIC_LVL+1; + percentheal -100, -100; + close; + +OnInit: + movenpc .name$, rand(200), rand(200); + .sex = G_OTHER; + .distance = 5; + end; + +OnClock0030: +OnClock0120: +OnClock0210: +OnClock0300: +OnClock0450: +OnClock0540: +OnClock0630: +OnClock0720: +OnClock0810: +OnClock0900: +OnClock1050: +OnClock1140: +OnClock1230: +OnClock1320: +OnClock1410: +OnClock1500: +OnClock1650: +OnClock1740: +OnClock1830: +OnClock1920: +OnClock2010: +OnClock2100: +OnClock2250: +OnClock2340: + npctalk "Those who are worthy, may get my magic. For the others, death awaits!"; + movenpc .name$, rand(200), rand(200); + end; + +} diff --git a/npc/011/_import.txt b/npc/011/_import.txt deleted file mode 100644 index fa75f66af..000000000 --- a/npc/011/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 011: Depleted Mana Stones Mine -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/011/_mobs.txt", -"npc/011/_warps.txt", -"npc/011/manastone.txt", diff --git a/npc/011/_mobs.txt b/npc/011/_mobs.txt deleted file mode 100644 index cdfb14c71..000000000 --- a/npc/011/_mobs.txt +++ /dev/null @@ -1,6 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 011: Depleted Mana Stones Mine mobs -011,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 -011,98,101,79,79 monster Fire Goblin 1067,100,60000,60000 -011,100,99,79,79 monster Lava Slime 1097,75,60000,60000 -011,101,98,79,79 monster Red Slime 1092,120,60000,60000 diff --git a/npc/011/_warps.txt b/npc/011/_warps.txt deleted file mode 100644 index 72d6d408c..000000000 --- a/npc/011/_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 011: Depleted Mana Stones Mine warps -011,177,178,0 warp #011_177_178 0,0,009-1,119,41 diff --git a/npc/011/manastone.txt b/npc/011/manastone.txt deleted file mode 100644 index cf2ccbe8a..000000000 --- a/npc/011/manastone.txt +++ /dev/null @@ -1,92 +0,0 @@ -// TMW2 Script -// Author: -// Jesusalva -// Description: -// The last Mana Stone in the whole world, which is not owned by the Magic Council -// or the Monster King. - -011,0,0,0 script Mana Stone NPC_MANA_STONE,{ - - if (BaseLevel < 40) goto L_NotWorthy; - mesn; - mes l("The mighty Mana Stone does not reacts against you."); - mes l("If you fell ready, perhaps you should touch it?"); - mes ""; - menu - l("Touch it!"), L_Level, - l("Take it!"), L_NotWorthy2, - l("Break it!"), L_NotWorthy2, - l("Leave it alone!"), -; - close; - - -L_NotWorthy: - percentheal -70+BaseLevel, -100+BaseLevel; - npctalk3 l("You are not worthy!"); - end; - -L_Level: - if (MAGIC_LVL == 0 && readparam(bInt) >= 30 && BaseLevel >= 40 && JobLevel >= 10 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - - // Everything below this line is garbage - if (MAGIC_LVL == 1 && readparam(bInt) >= 60 && BaseLevel >= 60 && JobLevel >= 30 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL == 2 && readparam(bInt) >= 90 && BaseLevel >= 80 && JobLevel >= 50 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL == 3 && readparam(bInt) >= 120 && BaseLevel >= 100 && JobLevel >= 70 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL == 4 && readparam(bInt) >= 150 && BaseLevel >= 120 && JobLevel >= 90 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL == 5 && readparam(bInt) >= 180 && BaseLevel >= 140 && JobLevel >= 110 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL == 6 && readparam(bInt) >= 210 && BaseLevel >= 160 && JobLevel >= 120 && readparam(Sp) == readparam(MaxSp)) goto L_LevelUp; - if (MAGIC_LVL >= 7) npctalk3 l("You already got all power I could grant you!"); - if (is_gm()) percentheal -20, -50; - if (MAGIC_LVL >= 7 || is_gm()) close; - -L_NotWorthy2: - if (is_gm()) movenpc(.name$, rand(200), rand(200)); - if (is_gm()) close; - percentheal -20, -50; - npctalk3 l("You are not worthy!"); - end; - -L_LevelUp: - mes ""; - mes l("A great rush of mana flows though you."); - if (!MAGIC_LVL) mes l("Magic Power is granted to you, but you die from it."); - if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it."); - MAGIC_LVL = MAGIC_LVL+1; - percentheal -100, -100; - close; - -OnInit: - movenpc .name$, rand(200), rand(200); - .sex = G_OTHER; - .distance = 5; - end; - -OnClock0030: -OnClock0120: -OnClock0210: -OnClock0300: -OnClock0450: -OnClock0540: -OnClock0630: -OnClock0720: -OnClock0810: -OnClock0900: -OnClock1050: -OnClock1140: -OnClock1230: -OnClock1320: -OnClock1410: -OnClock1500: -OnClock1650: -OnClock1740: -OnClock1830: -OnClock1920: -OnClock2010: -OnClock2100: -OnClock2250: -OnClock2340: - npctalk "Those who are worthy, may get my magic. For the others, death awaits!"; - movenpc .name$, rand(200), rand(200); - end; - -} diff --git a/npc/_import.txt b/npc/_import.txt index 55cb20f9a..08b0ffe4e 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -39,7 +39,7 @@ @include "npc/010-1-1/_import.txt" @include "npc/010-1/_import.txt" @include "npc/010-2/_import.txt" -@include "npc/011/_import.txt" +@include "npc/011-1/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/sec_pri/_import.txt" -- cgit v1.2.3-70-g09d2