summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/002-2/casino.txt3
-rw-r--r--world/map/npc/009-2/trader.txt2
-rw-r--r--world/map/npc/009-7/rouge.txt7
-rw-r--r--world/map/npc/010-2/loratay.txt56
-rw-r--r--world/map/npc/011-6/_warps.txt4
-rw-r--r--world/map/npc/020-2/furquest.txt58
-rw-r--r--world/map/npc/030-2/_import.txt4
-rw-r--r--world/map/npc/030-2/guards.txt (renamed from world/map/npc/030-2/gaurds.txt)0
-rw-r--r--world/map/npc/030-2/present_helper.txt5
-rw-r--r--world/map/npc/030-2/roasted_acorns_helper.txt (renamed from world/map/npc/030-2/roasted_acrons_helper.txt)0
-rw-r--r--world/map/npc/030-3/orum_homunculus.txt2
-rw-r--r--world/map/npc/annuals/xmas/barriers.txt2
-rw-r--r--world/map/npc/annuals/xmas/config.txt2
-rw-r--r--world/map/npc/annuals/xmas/core.txt4
14 files changed, 117 insertions, 32 deletions
diff --git a/world/map/npc/002-2/casino.txt b/world/map/npc/002-2/casino.txt
index 4733bb63..f4995662 100644
--- a/world/map/npc/002-2/casino.txt
+++ b/world/map/npc/002-2/casino.txt
@@ -153,7 +153,6 @@ L_b100:
L_Check:
if(countitem("CasinoCoins") < @bet) goto L_NoCoin;
- delitem "CasinoCoins", @bet;
menu
"Choose a color", L_PickColor,
"Choose a number", L_Number;
@@ -164,6 +163,7 @@ L_PickColor:
"Red", L_Color;
L_Color:
+ delitem "CasinoCoins", @bet;
set @color,rand(2);
if(@color == 1) goto L_Lost;
mes "You won!";
@@ -178,6 +178,7 @@ L_Number:
"29", L_Menuitems, "30", L_Menuitems, "31", L_Menuitems, "32", L_Menuitems, "33", L_Menuitems, "34", L_Menuitems, "35", L_Menuitems, "36", L_Menuitems;
L_Menuitems:
+ delitem "CasinoCoins", @bet;
if (@menu == 1) set @number, 0;
if (@menu == 2) set @number, 37;
if (@menu >= 3) set @number, @menu - 2;
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index 572cad1b..c386b05a 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -3,7 +3,7 @@
// Updated by: TheKandiman
// Reviewed by: Wombat
-009-2.gat,39,93,0|script|Trader|115
+009-2.gat,29,98,0|script|Trader|115
{
set @Ironprice, 1000;
set @Sulphurprice, 1200;
diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt
index 78491431..dd86679c 100644
--- a/world/map/npc/009-7/rouge.txt
+++ b/world/map/npc/009-7/rouge.txt
@@ -1,14 +1,13 @@
009-7.gat,32,45,0|script|Rouge#Duels|181
{
-if (getgmlevel() >= 40 && getequipid(equip_head) == 647) goto L_CallDebug;
-if (!debug && (strcharinfo(0) == "meko") && (getequipid(equip_head) < 1)) goto L_CallDebug; // allow meko to debug (has no dev cap)
+if (getgmlevel() >= 40 && (getequipid(equip_head) == 647 || getequipid(equip_head) == 725)) goto L_CallDebug;
goto L_Main;
L_CallDebug:
mes "You are wearing a dev cap: calling debug menu...";
- mes "For the documentation, @@https://wiki.themanaworld.org/index.php/User:Meko/FightClub/debug|click here@@##0";
+ mes "For the documentation, @@https://wiki.themanaworld.org/index.php/FightClub|click here@@##0";
callfunc "fightclub_Debug";
- goto L_Main;
+ goto L_End;
L_Main:
set @requests, 0;
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index f10395a2..b8a00c28 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -1,3 +1,39 @@
+010-2.gat,83,85,0|script|Lora Tay Debug|151
+{
+ mes "[Lora Tay Debug]";
+ mes "What do you want to do?";
+ menu
+ "Show Quest State", L_ShowState,
+ "Set Quest State", L_SetState,
+ "Reset", L_Reset,
+ "Nothing.", L_Close;
+
+L_ShowState:
+ set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
+ mes "Current State is " + @wg_state;
+ goto L_Close;
+
+L_SetState:
+ mes "What state do you want?";
+ input @wg_state;
+ callfunc "setWGState";
+ mes "Set to " + @wg_state;
+ goto L_Close;
+
+L_Reset:
+ set @wg_state, 0;
+ callfunc "setWGState";
+ mes "Reset!";
+ goto L_Close;
+
+L_Close:
+ close;
+
+OnInit:
+ if (!debug)
+ disablenpc "Lora Tay Debug";
+ end;
+}
010-2.gat,85,85,0|script|Lora Tay|151
{
set @ROBE_COCOONS_NR, 150; // must be multiple of ten
@@ -111,7 +147,7 @@ L_agostine_1:
L_Next13:
set @wg_state, 10;
- callsub S_Update;
+ callfunc "setWGState";
goto L_Close;
L_agostine_menu:
@@ -215,7 +251,7 @@ L_give_water:
goto L_no_water;
delitem "BottleOfWater", 1;
set @wg_state, 11;
- callsub S_Update;
+ callfunc "setWGState";
set @xpval, 50000;
@@ -302,7 +338,7 @@ L_Next2:
mes "Go see Agostine, ask him what he's planning and I will think about it.\"";
set @wg_state, 13;
- callsub S_Update;
+ callfunc "setWGState";
goto L_Close;
L_proposal_intro:
@@ -353,7 +389,7 @@ L_proposal_search_items:
L_Next5:
set @wg_state, 15;
- callsub S_Update;
+ callfunc "setWGState";
goto L_Close;
L_proposal_not_enough_items:
@@ -366,7 +402,7 @@ L_proposal_give_items:
goto L_proposal_not_enough_items;
delitem "SilkCocoon", @FINEDRESS_COCOONS;
set @wg_state, 16;
- callsub S_Update;
+ callfunc "setWGState";
mes "[Lora Tay the Seamstress]";
mes "\"Great, now I can spin the silk threading and fix this mess made of these fine materials.";
@@ -396,7 +432,7 @@ L_Next6:
mes "I am done with the threading but I will now need to sew these materials together into the design.\"";
next;
set @wg_state, 18;
- callsub S_Update;
+ callfunc "setWGState";
goto L_proposal_wait_dress_finished;
L_proposal_wait_dress_finished:
@@ -412,7 +448,7 @@ L_proposal_wait_dress_finished:
L_proposal_dress_finished:
set @wg_state, 19;
- callsub S_Update;
+ callfunc "setWGState";
mes "[Lora Tay the Seamstress]";
mes "\"Well it was difficult seaming with such fragile materials.";
mes "But I have done it. The design is finished except for one part of it.\"";
@@ -436,7 +472,7 @@ L_Next7:
L_Next8:
set @wg_state, 20;
- callsub S_Update;
+ callfunc "setWGState";
goto L_Close;
L_proposal_deliver_dress:
@@ -1141,10 +1177,6 @@ L_CleanSorcererRobe:
set @cotton_cloth_id, 0;
goto L_Close;
-S_Update:
- set QUEST_WG_state, (QUEST_WG_state & ~(BYTE_0_MASK) | (@wg_state << BYTE_0_SHIFT));
- return;
-
L_Close:
set @wg_state, 0;
close;
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index f4a1c05f..8465b47d 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -5,12 +5,12 @@
011-6.gat,61,71|warp|To Small Bandit Cave|-1,-1,011-6.gat,270,124
011-6.gat,270,125|warp|To Bandit Cave|-1,-1,011-6.gat,61,72
011-6.gat,260,128|warp|To Bandit Cave|-1,-1,011-6.gat,51,76
-011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,48,119
+011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,47,119
011-6.gat,196,26|warp|To Small Bandit Cave|-1,-1,011-6.gat,261,46
011-6.gat,261,47|warp|To Second Bandit Cave|-1,-1,011-6.gat,196,27
011-6.gat,271,52|warp|To Bandit Cave|-1,-1,011-6.gat,98,31
011-6.gat,98,30|warp|To Small Bandit Cave|-1,-1,011-6.gat,271,51
-011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,146,117
+011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,145,117
011-6.gat,49,101|warp|To Woodland|-1,-1,011-1.gat,38,37
011-6.gat,24,206|warp|To Lake Cave|-1,-1,011-4.gat,16,58
011-6.gat,47,185|warp|To Lake Cave|-1,-1,011-4.gat,39,36
diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 9e45b87e..d20e00c7 100644
--- a/world/map/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
@@ -2,7 +2,42 @@
// Script by Shaili and QOAL
//#################################################################################
-// Tulimshar Crafting Workshop - Agostine, The Legendary Tailor
+020-2.gat,24,26,0|script|Agostine Debug|137
+{
+ mes "[Agostine Debug]";
+ mes "What do you want to do?";
+ menu
+ "Show Quest State", L_ShowState,
+ "Set Quest State", L_SetState,
+ "Reset", L_Reset,
+ "Nothing.", L_Close;
+
+L_ShowState:
+ set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
+ mes "Current State is " + @wg_state;
+ goto L_Close;
+
+L_SetState:
+ mes "What state do you want?";
+ input @wg_state;
+ callfunc "setWGState";
+ mes "Set to " + @wg_state;
+ goto L_Close;
+
+L_Reset:
+ set @wg_state, 0;
+ callfunc "setWGState";
+ mes "Reset!";
+ goto L_Close;
+
+L_Close:
+ close;
+
+OnInit:
+ if (!debug)
+ disablenpc "Agostine Debug";
+ end;
+}
020-2.gat,27,26,0|script|Agostine|137
{
set @CUTFUR_EXP, 10;
@@ -69,6 +104,7 @@ L_State_Accept:
mes "[Agostine, The Legendary Tailor]";
mes "\"Thanks so much.\"";
set @wg_state, 1;
+ callfunc "setWGState";
goto L_Close;
L_State_0_3:
@@ -134,6 +170,7 @@ L_State_0_9:
mes "[Agostine, The Legendary Tailor]";
mes "\"This is a little reward for your help. Take 500 GP, my friend!\"";
set @wg_state, 2;
+ callfunc "setWGState";
goto L_Close;
L_State_neg:
@@ -163,6 +200,7 @@ L_State_2:
mes "Only the best furs can be used for these gloves!";
mes "But, as you see, I am a tailor, not a hunter! So, why don't you bring me the best fluffy's fur you can find?\"";
set @wg_state, 3;
+ callfunc "setWGState";
next;
menu
"You are crazy! I won't kill any animal for this!", L_Close,
@@ -172,6 +210,7 @@ L_State_3:
mes "[Agostine, The Legendary Tailor]";
mes "\"Remember, I want the best of fur!\"";
set @wg_state, 4;
+ callfunc "setWGState";
goto L_Close;
L_State_4:
@@ -210,6 +249,7 @@ L_State_4_success:
mes "\"It's perfect! Perfect! Good job, my friend! I will prepare your gloves right now!\"";
next;
set @wg_state, 5;
+ callfunc "setWGState";
goto L_State_5;
L_State_5:
@@ -227,6 +267,7 @@ L_State_5_pay:
set Zeny, Zeny - 15000;
getitem "WinterGloves", 1;
set @wg_state, 6;
+ callfunc "setWGState";
mes "[Agostine, The Legendary Tailor]";
mes "\"Here they are. You will have the most fashionable hands in the world!\"";
goto L_Close;
@@ -254,6 +295,7 @@ L_State_10:
mes "and a pair of Boots, like those you can find in the mines.";
mes "They will make you lovely, my friend!\"";
set @wg_state, 7;
+ callfunc "setWGState";
goto L_Close;
L_State_11:
@@ -292,6 +334,7 @@ L_State_11_success:
mes "[Agostine, The Legendary Tailor]";
mes "\"This one is good enough, my friend. Good job.\"";
set @wg_state, 8;
+ callfunc "setWGState";
goto L_State_12;
L_State_12:
@@ -311,6 +354,7 @@ L_State_12_pay:
delitem "Boots", 1;
getitem "FurBoots", 1;
set @wg_state, 9;
+ callfunc "setWGState";
mes "[Agostine, The Legendary Tailor]";
mes "\"Enjoy your new boots, my friend!\"";
goto L_Close;
@@ -381,6 +425,7 @@ L_Next2:
L_State_14_Accept:
set @wg_state, 12;
+ callfunc "setWGState";
goto L_Close;
L_State_14_AlreadyAccepted:
@@ -421,6 +466,7 @@ L_Next4:
mes "\"Hurry back my friend!\"";
set @wg_state, 14;
+ callfunc "setWGState";
goto L_Close;
@@ -463,6 +509,7 @@ L_Next6:
L_Next7:
set @wg_state, 17;
+ callfunc "setWGState";
message strcharinfo(0), "Agostine gives you a folio containing his designs, that you put in a hidden compartment in your backpack.";
mes "Agostine gives you a folio containing his designs, that you put in a hidden compartment in your backpack.";
@@ -504,6 +551,7 @@ L_State_17_AskItems:
L_Next9:
set @wg_state, 21;
+ callfunc "setWGState";
goto L_Close;
L_State_17_NotEnoughItems:
@@ -517,6 +565,7 @@ L_State_17_GiveItems:
goto L_State_17_NotEnoughItems;
delitem "CottonCloth", @FINEDRESS_COTTON_CLOTHS;
set @wg_state, 22;
+ callfunc "setWGState";
mes "[Agostine, The Legendary Tailor]";
mes "\"Great now just a little cloth here........\"";
@@ -574,6 +623,7 @@ L_Next11:
set Zeny, Zeny - @FINEDRESS_GP;
getitem "FineDress", 1;
set @wg_state, 23;
+ callfunc "setWGState";
goto L_Close;
L_State_17_NoMoney:
@@ -595,7 +645,11 @@ L_State_18:
goto L_Close;
L_Close:
- set QUEST_WG_state, (QUEST_WG_state & ~(BYTE_0_MASK) | (@wg_state << BYTE_0_SHIFT));
set @wg_state, 0;
close;
}
+function|script|setWGState
+{
+ set QUEST_WG_state, (QUEST_WG_state & ~(BYTE_0_MASK) | (@wg_state << BYTE_0_SHIFT));
+ return;
+}
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt
index c2c641aa..c3867abf 100644
--- a/world/map/npc/030-2/_import.txt
+++ b/world/map/npc/030-2/_import.txt
@@ -9,11 +9,11 @@ npc: npc/030-2/bedding_helper.txt
npc: npc/030-2/chief_helper.txt
npc: npc/030-2/eljas.txt
npc: npc/030-2/empty_boxes_helper.txt
-npc: npc/030-2/gaurds.txt
npc: npc/030-2/glitter_helper.txt
+npc: npc/030-2/guards.txt
npc: npc/030-2/mapflags.txt
npc: npc/030-2/present_helper.txt
-npc: npc/030-2/roasted_acrons_helper.txt
+npc: npc/030-2/roasted_acorns_helper.txt
npc: npc/030-2/shipping_helper.txt
npc: npc/030-2/storage_helper.txt
npc: npc/030-2/wrapping_paper_helper.txt
diff --git a/world/map/npc/030-2/gaurds.txt b/world/map/npc/030-2/guards.txt
index 3fdc1ffa..3fdc1ffa 100644
--- a/world/map/npc/030-2/gaurds.txt
+++ b/world/map/npc/030-2/guards.txt
diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt
index 248c296a..0a027ca0 100644
--- a/world/map/npc/030-2/present_helper.txt
+++ b/world/map/npc/030-2/present_helper.txt
@@ -1,8 +1,8 @@
// Annual Xmas
// Author: wushin
-// Present Reclaimation
+// Present Reclamation
-030-2.gat,47,82,0|script|Jonanthan|328
+030-2.gat,47,82,0|script|Jonathan|328
{
callfunc "XmasStates";
@@ -84,4 +84,3 @@ L_Close:
set @present_name$, "";
close;
}
-
diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acorns_helper.txt
index f942c118..f942c118 100644
--- a/world/map/npc/030-2/roasted_acrons_helper.txt
+++ b/world/map/npc/030-2/roasted_acorns_helper.txt
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index 16cb1433..4da1c618 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -312,7 +312,7 @@ L_FakeList:
mes "\"So far my basement portal has remained undetected:";
mes "Head to the west in this cave to find it.\"";
mes "\"Once there smash your fist into the small crack and you will be teleported into the basement of the inn.\"";
- mes "\"Let me fake the mark Chief Warrick uses to identify his helpers. Don't get to close to the gaurds they might spot you.\"";
+ mes "\"Let me fake the mark Chief Warrick uses to identify his helpers. Don't get to close to the guards they might spot you.\"";
mes "\"Now, prove yourself, gather the required items and go back to the Inn to sabotage Santa's Helpers.\"";
callfunc "XmasSetSide";
set XMASTIME, XMASTIME | $@xmas_helper_bit;
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 80097356..4c7837af 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -17,7 +17,7 @@ L_Hint:
message strcharinfo(0), "I said get out! We've got no time for your kind here.";
mes "[Orum's Homunculus]";
mes "\"What are you doing? Come, see me in the caves below!\"";
- mes "\"I said go north till you reach the snoman. Then head into the cave to the east.\"";
+ mes "\"I said go north till you reach the snowman. Then head into the cave to the east.\"";
warp "020-1.gat",33,94;
close;
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index 8f7c9139..33ddcf97 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -144,7 +144,7 @@ L_Main:
setarray $@xmas_uncommon_reward$, "NutcrackerHat", "AmberChristmasSweater", "RedStockings", "PinkChristmasSweater", "BlueChristmasSweater";
// Quest Side 0 Settings
setarray $@xmas_zero_reagents$, "ShockSweet", "EmptyBottle", "EmeraldPowder";
- setarray $@xmas_zero_reagents_names$, "ShockSweet", "Empty Bottles", "Emerald Powders";
+ setarray $@xmas_zero_reagents_names$, "Shock Sweet", "Empty Bottles", "Emerald Powders";
setarray $@xmas_zero_reagents_amounts, 1, 4, 10;
if(getarraysize($@xmas_zero_reagents_amounts) != getarraysize($@xmas_zero_reagents$))
goto L_XmasError;
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 30562e13..d064efca 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -209,9 +209,9 @@ L_FinalGift:
set @xmas_reward_item2$, $@xmas_uncommon_reward$[@xmas_uncommon_slot2];
if(checkweight("Iten", 1) == 0)
goto L_FullInv;
- if(@xmas_reward >= 80)
+ if(@xmas_reward >= $@xmas_reward_tally_rare)
getitem @xmas_reward_item$, 1;
- if(@xmas_reward >= 40)
+ if(@xmas_reward >= $@xmas_reward_tally_common)
getitem @xmas_reward_item1$, 1;
getitem @xmas_reward_item2$, 1;
set @xmas_uncommon_slot1, 0;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 06:14:56 +0000