Moving Tutorial from Tulimshar to Candor

9 files changed, 0 insertions, 423 deletions

diff --git a/world/map/npc/022-1/_import.txt b/world/map/npc/022-1/_import.txt
deleted file mode 100644
index 543a85c0..00000000
--- a/world/map/npc/022-1/_import.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Map 022-1: Tulimshar Port
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 022-1.gat
-npc: npc/022-1/_mobs.txt
-npc: npc/022-1/_warps.txt
-npc: npc/022-1/adrian.txt
-npc: npc/022-1/anwar.txt
-npc: npc/022-1/dock.txt
-npc: npc/022-1/ferry_master.txt
-npc: npc/022-1/mapflags.txt
-npc: npc/022-1/npcs.txt
diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt
deleted file mode 100644
index 51ade3ee..00000000
--- a/world/map/npc/022-1/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Port mobs
-
-
-
-022-1.gat,0,0,0|script|Mob022-1|-1
-{
-    end;
-}
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
deleted file mode 100644
index f5f26146..00000000
--- a/world/map/npc/022-1/_warps.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Port warps
-
-022-1.gat,19,38|warp|To Tulismhar Suburbs|-1,2,042-1.gat,96,40
-022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
-022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
-022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
-022-1.gat,40,82|warp|To Tulimshar Suburbs|-1,-1,042-1.gat,116,85
diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt
deleted file mode 100644
index 7d76cf9d..00000000
--- a/world/map/npc/022-1/adrian.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-// part of quest given by 021-2/kylian.txt
-// Author: Jenalya
-
-// state 1: player has the task to get the luggage from the harbor
-// state 2: Adrian gave the luggage to the player
-// state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license
-
-022-1.gat,58,54,0|script|Adrian|213
-{
-    set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
-
-    mes "[Adrian]";
-    mes "\"Hello. Are you here to get the luggage for some of our passengers?\"";
-    if (@state == 1)
-        menu
-            "Yes, Kylian sent me to get his luggage.",L_Get,
-            "No.",L_No;
-    menu
-        "No.",L_No;
-L_No:
-    mes "[Adrian]";
-    mes "\"Too bad. I want to go and drink a beer, but I have to wait here until all the luggage is picked up.\"";
-    mes "He sighs.";
-    goto L_Close;
-
-L_Get:
-    mes "[Adrian]";
-    mes "\"Wonderful! Show me the ticket.\"";
-    mes "He checks the paper Kylian gave you and then takes a critical look at you.";
-    next;
-    getinventorylist;
-    if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventorylist_count == 100))
-        goto L_Inventory;
-    mes "[Adrian]";
-    mes "\"Alright, here it is.\"";
-    mes "Adrain hands you a very heavy suitcase.";
-    getitem "LeatherSuitcase", 1;
-    set @state, 2;
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT);
-    goto L_Close;
-
-L_Inventory:
-    mes "[Adrian]";
-    mes "\"The suitcase is rather heavy. You doesn't look as if you can handle that.";
-    mes "Maybe if you get rid of some of the other stuff you're carrying.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @inventorylist_count, 0;
-    close;
-}
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt
deleted file mode 100644
index 5de4532e..00000000
--- a/world/map/npc/022-1/anwar.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-// Anwar needs a magic fertilizer for his field
-// Quest uses Nibble 3 of QUEST_NorthTulimshar
-// Author: Jenalya
-// state 1: Anwar sent to Tinris for help to get a magic fertilizer
-// state 2: Tinris asked for chocolate cake as present for his girlfriend
-// state 3: Tinris asked for ingredients for the fertilizer
-// state 4: Tinris gave you the fertilizer
-// state 5: Anwar tried it out and it doesn't work well, sent you back to Tinris
-// state 6: Tinris asked for more ingredients for a new try
-// state 7: Tinris says it's really hard, gives you the fertilizer and tells you to ask Eomie to cast a spell on it
-// state 8: Eomie sends you to get some stuff so she can interrupt her spell on the spot of grass
-// state 9: Eomie casted a spell on the fertilizer
-// state 10: Anwar used it and it worked. he asks you to help him preparing a thank-you-gift for each Tinris and Eomis
-// state 11: Anwar asked to bring present to Tinris
-// state 12: gave present to Tinris
-// state 13: Anwar asked to bring present to Eomie
-// state 14: gave present to Eomie
-// state 15: reported back to Anwar and done
-022-1.gat,41,46,0|script|Anwar|156
-{
-    set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
-    set @cloth_amount, 3;
-    set @silk_amount, 30;
-
-    set @firstTry_exp, 400;
-    set @secondTry_exp, 700;
-    set @material_exp, 1000;
-    set @final_exp, 2000;
-
-    if (@state >= 15) goto L_Done;
-    if (@state >= 13) goto L_GiveEomie;
-    if (@state >= 11) goto L_GiveTinris;
-    if (@state == 10) goto L_GiftMaterial;
-    if (@state >= 5) goto L_SecondTry;
-    if (@state >= 1) goto L_FirstTry;
-
-    mes "[Anwar]";
-    mes "\"Hello. You look like one of those young people who come here to go on an adventure.";
-    mes "Would you be interested in doing some small errand for me?\"";
-    menu
-        "Sure!",L_Sure,
-        "I'm busy, sorry.",L_Close;
-
-L_Sure:
-    mes "[Anwar]";
-    mes "\"That's the spirit! Ok, I'm tired of spending most of my time working on this field. I heard the magicians at the magic school are researching ways to enhance the growth of plants with magic.\"";
-    next;
-    mes "\"I can't go there myself, since this area of the city is full of sneaky ragtags and they will rob my field if I leave here. Could you go to the magic school and ask for some magic enhancement for my field?\"";
-    next;
-    mes "\"To find the school just follow the street south and then go west.\"";
-    set @state, 1;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_FirstTry: // @state >= 1 but below 5
-    mes "[Anwar]";
-    mes "\"I hope the wizards at the magic school can help me with the field. I'd really like to have more free time. I want to make clothing, but I'm not experienced enough to make a living out of that.\"";
-    if (@state != 4)
-        goto L_Close;
-    menu
-        "Tinris gave me a magic fertilizer for your field, but he isn't sure if it works.",L_Next;
-
-L_Next:
-    mes "[Anwar]";
-    mes "\"Really? Well, let's try it out!\"";
-    mes "He takes the fertilizer and starts to bespatter the field.";
-    next;
-    mes "But it doesn't seem to be good for the plants, they start to shrivel and get brown.";
-    mes "[Anwar]";
-    mes "\"Oh no! What is this? It's damaging my plants! Go back to Tinris and tell him it doesn't work!\"";
-    getexp @firstTry_exp, 0;
-    set @state, 5;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_SecondTry: // @state >= 5 but below 10
-    mes "[Anwar]";
-    mes "\"I hope Tinris can come up with a better fertilizer. My plants are suffering from the first try.\"";
-    if (@state != 9)
-        goto L_Close;
-    menu
-        "Here is another one. Eomie cast a spell on it.",L_Continue;
-
-L_Continue:
-    mes "[Anwar]";
-    mes "\"Eomie? I heard she's amazingly skilled with nature magic. I'll try if this works better.\"";
-    mes "He takes the fertilizer and puts it on only a few plants, then waits a moment to see the result.";
-    next;
-    mes "The plants recover a bit and become green again.";
-    mes "[Anwar]";
-    mes "\"Ah, this one is better. I'll put it on the entire field.\"";
-    getexp @secondTry_exp, 0;
-    set @state, 10;
-    callsub S_Update_Mask;
-    next;
-    goto L_GiftMaterial;
-
-L_GiftMaterial: // @state == 10
-    mes "[Anwar]";
-    mes "\"I want to show my gratitude to Tinris and Eomie. Can you help me once again? I would like to make some clothes for them and need " + @cloth_amount + " pieces of Cotton Cloth and " + @silk_amount + " Silk Cocoons.\"";
-    menu
-        "I have it.",L_GiveGiftStuff,
-        "Where can I get that?",L_Hint,
-        "I'll see what I can do.",L_Close;
-
-L_GiveGiftStuff:
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_Full_Inv;
-    if ((countitem("CottonCloth") < @cloth_amount) || (countitem("SilkCocoon") < @silk_amount))
-        goto L_NoItem;
-    delitem "CottonCloth", @cloth_amount;
-    delitem "SilkCocoon", @silk_amount;
-    getexp @material_exp, 0;
-
-    getitem "GreenVNeckSweater", 1;
-    set @state, 11;
-    callsub S_Update_Mask;
-    mes "[Anwar]";
-    mes "\"Great! I'll start right away with the present for Tinris. That shouldn't take long.\"";
-    mes "After a short while of cutting and sewing he holds a V-Neck Sweater in his hands. Then he dyes it green.";
-    next;
-    mes "[Anwar]";
-    mes "\"Wonderful! Could you please bring this to Tinris to show him my gratitude?\"";
-    goto L_Close;
-
-L_Hint:
-    mes "[Anwar]";
-    mes "\"As far as I know Cotton Cloth is given out as reward for hunting monsters. You should talk to Aidan on the bazaar.\"";
-    next;
-    mes "\"And silk cocoons come from Silkworms. They live in the woodland area around Hurnscald. You can get there by taking the ferry.\"";
-    goto L_Close;
-
-L_GiveTinris: // @state >= 11 but below 13
-    mes "[Anwar]";
-    mes "\"Did you already bring the Green V-Neck Sweater to Tinris?\"";
-    if (@state != 12)
-        menu
-            "Not yet.",L_Close;
-    menu
-        "Yes, he was very happy.",L_Happy;
-
-L_Happy:
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_Full_Inv;
-    mes "[Anwar]";
-    mes "\"Wonderful! I also finished the present for Eomie. Can you bring it to her?\"";
-    getitem "SilkHeadband", 1;
-    set @state, 13;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_GiveEomie: // @state >= 13 but below 15
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_Full_Inv;
-    mes "[Anwar]";
-    mes "\"Did you give the Silk Headband to Eomie?\"";
-    if (@state != 14)
-        menu
-            "Not yet.",L_Close;
-    menu
-        "Yes. She asked me to thank you.",L_ThankYou;
-
-L_ThankYou:
-    mes "Anwar smiles.";
-    mes "[Anwar]";
-    mes "\"I'm so happy. Thank you so much for your help. I made this for you while you went to see Eomie.\"";
-    getexp @final_exp, 0;
-    getitem "DarkGreenCottonTrousers", 1;
-    set @state, 15;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_Done: // @state == 15
-    mes "[Anwar]";
-    mes "\"Thank you so much for your help. The plants are growing much better now. I don't have to spend all my time working in the field any more.";
-    mes "Finally I can do what I'm really interested in and work on getting better at sewing clothes.\"";
-    goto L_Close;
-
-L_NoItem:
-    mes "[Anwar]";
-    mes "\"You don't have it!\"";
-    goto L_Close;
-
-L_Full_Inv:
-    mes "[Anwar]";
-    mes "\"You carry a lot of stuff. Come back when you have more room.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @cloth_amount, 0;
-    set @silk_amount, 0;
-    set @inventorylist_count, 0;
-    close;
-
-S_Update_Mask:
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_3_MASK)) | (@state << NIBBLE_3_SHIFT);
-    return;
-}
diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
deleted file mode 100644
index 8da5b8aa..00000000
--- a/world/map/npc/022-1/dock.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-// The ferry dock
-// Author: Wushin
-
-// Ferry Sign
-022-1.gat,62,36,0|script|Ferry Schedule#2|396
-{
-    callfunc "FerryManifest";
-    end;
-}
-
-022-1.gat,65,71,0|script|Ferry Schedule#3|396
-{
-    callfunc "FerryManifest";
-    end;
-}
-
-022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2
-{
-    callfunc "BoardFerry";
-    close;
-}
-
-022-1.gat,80,62,0|script|#Tulimshar SouthDock|127
-{
-    end;
-OnCommandArrive:
-    enablenpc "Tulimshar South Koga";
-    end;
-
-OnCommandWarp:
-    disablenpc "Tulimshar South Koga";
-    end;
-}
-
-022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4
-{
-    callfunc "BoardCandorFerry";
-    close;
-}
-
-022-1.gat,65,25,0|script|#Tulimshar NorthDock|127
-{
-    end;
-OnCommandArrive:
-    enablenpc "Tulimshar North Koga";
-    end;
-
-OnCommandWarp:
-    disablenpc "Tulimshar North Koga";
-    end;
-}
diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
deleted file mode 100644
index d9594bcd..00000000
--- a/world/map/npc/022-1/ferry_master.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-
-022-1.gat,71,71,0|script|Ferry Master|138
-{
-    mes "[Ferry Master]";
-    mes "\"Hello! Do you need something?\"";
-    goto L_Main;
-
-L_Main:
-    menu
-        "How do I use the ferry?", L_Explain,
-        "Nothing I guess", L_Close;
-
-L_Explain:
-    mes "[Ferry Master]";
-    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
-    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
-    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
-    next;
-    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
-    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald, Nivalis and the Tulimshar South Dock.\"";
-    mes "\"The Candor Ferry only travels betwen Candor and the Tulimshar North Dock.\"";
-    next;
-    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
-    mes "\"We also have some slot machines in case you get bored.\"";
-    goto L_Main;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
deleted file mode 100644
index 1977e88c..00000000
--- a/world/map/npc/022-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-022-1.gat|mapflag|town
-022-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/022-1/npcs.txt b/world/map/npc/022-1/npcs.txt
deleted file mode 100644
index b94f790e..00000000
--- a/world/map/npc/022-1/npcs.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-022-1.gat,35,36,0|script|Marikel|211
-{
-    set @npcname$, "Marikel";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Working on the docks can be hard nowadays.\"";
-    next;
-    mes "\"At least it pays well.\"";
-    menu
-        "Why does it pay well?",L_Marikel_1,
-        "Pfft! Working on the docks is for the birds.",L_Marikel_2;
-
-L_Marikel_1:
-    mes "[" + @npcname$ + "]";
-    mes "\"Tulimshar is the wealthiest and most powerful city in the world!\"";
-    close;
-
-L_Marikel_2:
-    mes "[" + @npcname$ + "]";
-    mes "\"Yeah, killing monsters may pay well, but I'd need more hazard pay than a tower mason to hunt monsters.\"";
-    next;
-    mes "\"I'll just play safe and stick to putting our stock away. Be careful, the monsters outside the city can be dangerous.\"";
-    next;
-    mes "\"The Sandstorm mine, just South of Tulimshar, is blocked from most but miners, soldiers and seasoned monster slayers.\"";
-    close;
-}
-
-022-1.gat,65,46,0|script|Joelin|212
-{
-    set @npcname$, "Joelin";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My ship's to set sail soon. We'll tour around the Acean Isles, then back around to Argaes, then here in Tonori.\"";
-    next;
-    mes "\"Tulimshar's Fleets also are sending exploration teams to build a dock in Nivalis on Kaizei, which I'm not really hoping for. It's cold up there!\"";
-    close;
-}
-
-022-1.gat,67,46,0|script|Harper|213
-{
-    set @npcname$, "Harper";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My captain knows an awlful lot about the world's continents.\"";
-    close;
-}
-
-022-1.gat,75,99,0|script|Swezanne|206
-{
-    set @npcname$, "Swezanne";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Just through those gates is Northern Tulimshar. In Southern Tulimshar I go to the Bazaar and talk with Aidan about monster points.\"";
-    close;
-}