diff options
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/009-2/trader.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/009-7/rouge.txt | 7 | ||||
| -rw-r--r-- | world/map/npc/011-6/_warps.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/030-2/_import.txt | 4 | ||||
| -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.txt | 5 | ||||
| -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.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/barriers.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/config.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/core.txt | 4 |
11 files changed, 15 insertions, 17 deletions
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/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/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; |