summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/009-2/trader.txt2
-rw-r--r--world/map/npc/011-6/_warps.txt4
-rw-r--r--world/map/npc/annuals/xmas/core.txt4
3 files changed, 5 insertions, 5 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/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/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;