summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/conf/char_athena.conf2
-rw-r--r--world/map/data/007-2.wlkbin0 -> 3252 bytes
-rw-r--r--world/map/data/resnametable.txt1
-rw-r--r--world/map/db/item_db_trinket.txt2
-rw-r--r--world/map/db/item_db_use.txt2
-rw-r--r--world/map/npc/002-2/stranger.txt1
-rw-r--r--world/map/npc/007-1/_import.txt1
-rw-r--r--world/map/npc/007-1/_warps.txt1
-rw-r--r--world/map/npc/007-2/_import.txt6
-rw-r--r--world/map/npc/007-2/_mobs.txt9
-rw-r--r--world/map/npc/007-2/_warps.txt4
-rw-r--r--world/map/npc/007-2/witch.txt (renamed from world/map/npc/007-1/witch.txt)40
-rw-r--r--world/map/npc/009-7/shops.txt2
-rw-r--r--world/map/npc/013-3/barrier.txt6
-rw-r--r--world/map/npc/020-2/shops.txt2
-rw-r--r--world/map/npc/027-6/general_krukan.txt6
-rw-r--r--world/map/npc/029-2/bankroom.txt2
-rw-r--r--world/map/npc/029-2/morgan.txt2
-rw-r--r--world/map/npc/030-3/orum_homunculus.txt14
-rw-r--r--world/map/npc/051-1/mapflags.txt4
-rw-r--r--world/map/npc/051-3/mapflags.txt4
-rw-r--r--world/map/npc/052-1/mapflags.txt4
-rw-r--r--world/map/npc/052-2/chest.txt2
-rw-r--r--world/map/npc/052-2/mapflags.txt4
-rw-r--r--world/map/npc/_import.txt1
-rw-r--r--world/map/npc/annuals/halloween/munro.txt13
-rw-r--r--world/map/npc/functions/soul_menhir.txt1
-rw-r--r--world/map/npc/items/rubber_bat.txt11
-rw-r--r--world/map/npc/items/warpTowels.txt27
-rw-r--r--world/map/npc/scripts.conf1
30 files changed, 86 insertions, 89 deletions
diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf
index c82ba476..64f8b082 100644
--- a/world/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -29,7 +29,7 @@ char_log_filename: log/char.log
// : is used as a separator in script menus
// I'm not sure why []{} are not included though
//char_name_letters: "#:[]{}
-char_name_letters: $&'()*+,-.
+char_name_letters: $ &'()*+,-.
char_name_letters: 0123456789
char_name_letters: ;<=>?
char_name_letters: ABCDEFGHIJKLMNOPRSTQUVWXYZ
diff --git a/world/map/data/007-2.wlk b/world/map/data/007-2.wlk
new file mode 100644
index 00000000..57ccb981
--- /dev/null
+++ b/world/map/data/007-2.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index 1061431a..c303fb65 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -14,6 +14,7 @@
006-2#006-2.wlk#
006-3#006-3.wlk#
007-1#007-1.wlk#
+007-2#007-2.wlk#
008-1#008-1.wlk#
009-1#009-1.wlk#
009-2#009-2.wlk#
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index ae2a1a1f..0f5c589f 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -9,7 +9,7 @@
832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 4;}
865, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxSP, 30;}
879, HeartOfIsis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;}
-1197, SkeletonCharm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, { callfunc "CheckMunro"; }
+1197, SkeletonCharm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {}
1244, DarkTalisman, 5, 0, 0, 0, 0, 30, 0, 100, 0, 2, 8, 0, 0, 0, {}, {set @minLvl, 1;callfunc "RestrictedItem";}
4008, DiamondRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bVit, 1;}
4009, RubyRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bStr, 1;}
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 4f69c2f5..8015786d 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -85,7 +85,7 @@
1258, Honey, 0, 100, 80, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 45, 0, 1;}, {}
1280, Scissors, 0, 1000, 500, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useScissors";}, {}
1281, ShockSweet, 0, 1000, 500, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useShockSweet";}, {}
-3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {misceffect 403;getitem 3001,1;}, {}
+3001, RubberBat, 0, 200, 100, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "rubberBat";}, {}
3006, TonoriDelight, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 2, 1;}, {}
3007, Marshmallow, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
3009, JellySkull, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
diff --git a/world/map/npc/002-2/stranger.txt b/world/map/npc/002-2/stranger.txt
index c1d4699e..0b47e716 100644
--- a/world/map/npc/002-2/stranger.txt
+++ b/world/map/npc/002-2/stranger.txt
@@ -420,7 +420,6 @@ L_DeletePowder:
L_DyeTowel:
delitem @towelReq$[@towelCheckCount], 1;
- callfunc "MultiWarpTowel";
delitem "BottleOfWater", 1;
getitem @warpTowelName$, 1;
mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
diff --git a/world/map/npc/007-1/_import.txt b/world/map/npc/007-1/_import.txt
index 181fd7ca..eca15081 100644
--- a/world/map/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
@@ -5,4 +5,3 @@ npc: npc/007-1/_mobs.txt
npc: npc/007-1/_warps.txt
npc: npc/007-1/mapflags.txt
npc: npc/007-1/voltain.txt
-npc: npc/007-1/witch.txt
diff --git a/world/map/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index a4e1e697..236737c1 100644
--- a/world/map/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
@@ -4,3 +4,4 @@
007-1,20,54|warp|-1,0,010-1,130,53
007-1,69,21|warp|2,-1,008-1,78,101
007-1,122,20|warp|1,-1,008-1,132,98
+007-1,73,76|warp|-1,-1,007-2,34,34
diff --git a/world/map/npc/007-2/_import.txt b/world/map/npc/007-2/_import.txt
new file mode 100644
index 00000000..bce6eb02
--- /dev/null
+++ b/world/map/npc/007-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 007-2: Illia forsaken inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 007-2
+npc: npc/007-2/_mobs.txt
+npc: npc/007-2/_warps.txt
+npc: npc/007-2/witch.txt
diff --git a/world/map/npc/007-2/_mobs.txt b/world/map/npc/007-2/_mobs.txt
new file mode 100644
index 00000000..ca392cc6
--- /dev/null
+++ b/world/map/npc/007-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Illia forsaken inn mobs
+
+
+
+007-2,0,0,0|script|Mob007-2|32767
+{
+ end;
+}
diff --git a/world/map/npc/007-2/_warps.txt b/world/map/npc/007-2/_warps.txt
new file mode 100644
index 00000000..66c10abd
--- /dev/null
+++ b/world/map/npc/007-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Illia forsaken inn warps
+
+007-2,34,35|warp|-1,-1,007-1,73,77
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-2/witch.txt
index b8cb3850..557b5f62 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-2/witch.txt
@@ -14,7 +14,7 @@
// 254: Quest is being ended and cleaned: the hero logged off.
// 255: Quest is being ended and cleaned: the hero died or he ran out of time
-007-1,77,81,0|script|Valia|370
+007-2,36,23,0|script|Valia|370
{
set @illia_sapphire_powder, 3;
set @illia_amethyst_powder, 1;
@@ -402,22 +402,22 @@ L_AskToTeleport:
// $@ILLIA_HERO$ $@ILLIA_HELPER1$ $@ILLIA_HELPER2$ $@ILLIA_HELPER3$
if (!(attachrid(getcharid(3,$@ILLIA_HELPER1$))))
goto L_NotEveryoneHere;
- if (!(isin("007-1", 66, 73, 92, 88)))
+ if (!(isin("007-2", 0, 0, 57, 55)))
goto L_NotEveryoneHere;
detachrid;
if (!(attachrid(getcharid(3,$@ILLIA_HELPER2$))))
goto L_NotEveryoneHere;
- if (!(isin("007-1", 66, 73, 92, 88)))
+ if (!(isin("007-2", 0, 0, 57, 55)))
goto L_NotEveryoneHere;
detachrid;
if (!(attachrid(getcharid(3,$@ILLIA_HELPER3$))))
goto L_NotEveryoneHere;
- if (!(isin("007-1", 66, 73, 92, 88)))
+ if (!(isin("007-2", 0, 0, 57, 55)))
goto L_NotEveryoneHere;
detachrid;
if (!(attachrid(getcharid(3,$@ILLIA_HERO$))))
goto L_NotEveryoneHere;
- if (!(isin("007-1", 66, 73, 92, 88)))
+ if (!(isin("007-2", 0, 0, 57, 55)))
goto L_NotEveryoneHere;
mes "[Valia]";
mes "\"Everyone seems to be here. Make sure to stay close to me.\"";
@@ -639,10 +639,10 @@ OnTimer34000:
end;
// Trigger 4 areatimers to show the teleport spell
// This is better looking than a basic areawarp
- areatimer "007-1", 66, 73, 92, 88, 3000, "Valia::OnWarpHero";
- areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1";
- areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2";
- areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3";
+ areatimer "007-2", 0, 0, 57, 55, 3000, "Valia::OnWarpHero";
+ areatimer "007-2", 0, 0, 57, 55, 3500, "Valia::OnWarpHelper1";
+ areatimer "007-2", 0, 0, 57, 55, 4000, "Valia::OnWarpHelper2";
+ areatimer "007-2", 0, 0, 57, 55, 4500, "Valia::OnWarpHelper3";
npctalk strnpcinfo(0), "Spiralis Major!";
misceffect FX_BLUE_MAGIC_CAST;
end;
@@ -686,7 +686,7 @@ L_KillHero:
}
-007-1,128,100,0|script|#IlliaDaemon|32767
+007-2,57,55,0|script|#IlliaDaemon|32767
{
end;
@@ -837,7 +837,7 @@ L_DoWarpHelper:
// At this point, the player has been attached
if ($@illia_progress >= 5)
message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
- warp "007-1",85 + rand(0,2),75 + rand(0,2);
+ warp "007-2",31 + rand(0,2),23 + rand(0,2);
detachrid;
goto L_NextHelperToWarp;
@@ -892,7 +892,7 @@ L_WarpHero:
// At this point, the player has been attached
if ($@illia_progress >= 5)
message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
- warp "007-1",85 + rand(0,2),75 + rand(0,2);
+ warp "007-2",31 + rand(0,2),23 + rand(0,2);
detachrid;
end;
@@ -981,42 +981,42 @@ L_Torch1:
return;
}
-007-1,72,88,0|script|#IlliaTorch1|374
+007-2,29,22,0|script|#IlliaTorch1|374
{
end;
}
-007-1,71,85,0|script|#IlliaTorch2|374
+007-2,30,21,0|script|#IlliaTorch2|374
{
end;
}
-007-1,75,70,0|script|#IlliaTorch3|374
+007-2,33,24,0|script|#IlliaTorch3|374
{
end;
}
-007-1,85,71,0|script|#IlliaTorch4|374
+007-2,32,25,0|script|#IlliaTorch4|374
{
end;
}
-007-1,88,69,0|script|#IlliaTorch5|374
+007-2,32,21,0|script|#IlliaTorch5|374
{
end;
}
-007-1,86,68,0|script|#IlliaTorch6|374
+007-2,33,22,0|script|#IlliaTorch6|374
{
end;
}
-007-1,87,68,0|script|#IlliaTorch7|374
+007-2,29,24,0|script|#IlliaTorch7|374
{
end;
}
-007-1,88,67,0|script|#IlliaTorch8|374
+007-2,30,25,0|script|#IlliaTorch8|374
{
end;
}
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index c112d60c..ff33b313 100644
--- a/world/map/npc/009-7/shops.txt
+++ b/world/map/npc/009-7/shops.txt
@@ -1,3 +1,3 @@
-009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1
+009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1
009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt
index 0e00a40c..d7875009 100644
--- a/world/map/npc/013-3/barrier.txt
+++ b/world/map/npc/013-3/barrier.txt
@@ -1,19 +1,19 @@
//
-013-3,71,21,0|script|#DemonMineBarrier1#_M|45,1,1
+013-3,71,21,0|script|#DemonMineBarrier1#_M|32767,1,0
{
set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
if (@state >= 2) goto L_End;
if (@state == 1 && countitem("Soul") >= 1) goto L_Has_Soul;
- message strcharinfo(0), "A barrier around the opening pushes you back as you approach.";
+ message strcharinfo(0), "Barrier : ##3A barrier around the opening pushes you back as you approach.";
warp "013-3", 71, 25;
goto L_End;
L_Has_Soul:
- message strcharinfo(0), "The barrier around the opening allows you passage.";
+ message strcharinfo(0), "Barrier : ##3The barrier around the opening allows you passage.";
set @state, 2;
callsub S_Update_Mask;
delitem "Soul", 1;
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt
index 9975ff3f..847adac0 100644
--- a/world/map/npc/020-2/shops.txt
+++ b/world/map/npc/020-2/shops.txt
@@ -16,7 +16,7 @@
// Weapons shop
020-2,25,65,0|shop|Bracco|135,IronArrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1
// Potions shop
-020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1
+020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*6,MediumManaElixir:*6,LargeManaElixir:*6
// INN
020-2,111,23,0|script|Kane|120
diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt
index 91d8b35f..6b086cee 100644
--- a/world/map/npc/027-6/general_krukan.txt
+++ b/world/map/npc/027-6/general_krukan.txt
@@ -215,8 +215,8 @@ L_End:
OnInit:
setarray $@CRYPT_FIGHT1_MESSAGES$,
- "General Krukan : Haha, Thank you mortal. You have released me from my prison. To show my graditude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
- "General Krukan : Ha, Looks like your tougher then I thought.",
+ "General Krukan : Haha, Thank you mortal. You have released me from my prison. To show my gratitude you can die swiftly at my hands and become part of my undead army. MUhahahahaha! Minions, Dispose of these Adventurers!",
+ "General Krukan : Ha, Looks like you're tougher than I thought.",
"General Krukan : and here I thought I wasn't going to enjoy this.",
"General Krukan : More of them are coming!",
"General Krukan : Minions! Kill them already!",
@@ -226,6 +226,6 @@ OnInit:
"General Krukan : How about you try a different approach and kill them already!",
"General Krukan : Minions! Last chance or it's back to being part of an ossuary for you!",
"General Krukan : Looks like if you want something done right you have to do it yourself.",
- "General Krukan : Charge!.";
+ "General Krukan : Charge!";
end;
}
diff --git a/world/map/npc/029-2/bankroom.txt b/world/map/npc/029-2/bankroom.txt
index dea5a428..44dc3b4d 100644
--- a/world/map/npc/029-2/bankroom.txt
+++ b/world/map/npc/029-2/bankroom.txt
@@ -2,7 +2,7 @@
// He explains how to use the bank.
// Author: Cassy
-029-2,36,122,0|script|#BankRoom|45,1,0
+029-2,35,122,0|script|#BankRoom|32767,0,0
{
message strcharinfo(0), "The door is locked. This must be where Cynric saves the people's money and items.";
end;
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 20000a11..1f8f19f4 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -115,3 +115,5 @@ L_LearningDone:
L_Close:
close;
}
+
+029-2,113,59,0|shop|Zitoni|103,CactusDrink:*1,CactusPotion:*1,TinyManaElixir:*5,SmallManaElixir:*5
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index c31cbf04..aa5d6953 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -1,7 +1,7 @@
// Annual Xmas
// Authors: Wushin, Chayenne
-019-3,79,30,0|script|#OrumTelepathy1|45,3,3
+019-3,79,30,0|script|#OrumTelepathy1|127,3,3
{
callfunc "XmasStates";
@@ -24,7 +24,7 @@ L_End:
end;
}
-019-3,104,67,0|script|#OrumTelepathy2|45,1,1
+019-3,104,67,0|script|#OrumTelepathy2|127,1,1
{
callfunc "XmasStates";
@@ -47,7 +47,7 @@ L_End:
end;
}
-019-3,102,95,0|script|#OrumTelepathy3|45,3,3
+019-3,102,95,0|script|#OrumTelepathy3|127,3,3
{
callfunc "XmasStates";
@@ -70,7 +70,7 @@ L_End:
end;
}
-019-3,81,61,0|script|#OrumTelepathy4|45,3,3
+019-3,81,61,0|script|#OrumTelepathy4|127,3,3
{
callfunc "XmasStates";
@@ -93,7 +93,7 @@ L_End:
end;
}
-030-3,49,53,0|script|#OrumTelepathy5|45,1,1
+030-3,49,53,0|script|#OrumTelepathy5|127,1,1
{
callfunc "XmasStates";
@@ -116,7 +116,7 @@ L_End:
end;
}
-030-3,48,73,0|script|#OrumTelepathy6|45,1,1
+030-3,48,73,0|script|#OrumTelepathy6|127,1,1
{
callfunc "XmasStates";
@@ -139,7 +139,7 @@ L_End:
end;
}
-030-3,95,66,0|script|#OrumTelepathy7|45,1,1
+030-3,95,66,0|script|#OrumTelepathy7|127,1,1
{
callfunc "XmasStates";
diff --git a/world/map/npc/051-1/mapflags.txt b/world/map/npc/051-1/mapflags.txt
index a75ad03b..ddac528a 100644
--- a/world/map/npc/051-1/mapflags.txt
+++ b/world/map/npc/051-1/mapflags.txt
@@ -1,2 +1,2 @@
-051-1|mapflag|nosave|007-1,86,76
-051-1|mapflag|resave|007-1,86,76
+051-1|mapflag|nosave|007-2,36,23
+051-1|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/051-3/mapflags.txt b/world/map/npc/051-3/mapflags.txt
index 19836e59..3615db4b 100644
--- a/world/map/npc/051-3/mapflags.txt
+++ b/world/map/npc/051-3/mapflags.txt
@@ -1,2 +1,2 @@
-051-3|mapflag|nosave|007-1,86,76
-051-3|mapflag|resave|007-1,86,76
+051-3|mapflag|nosave|007-2,36,23
+051-3|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/052-1/mapflags.txt b/world/map/npc/052-1/mapflags.txt
index 1813a7cd..c937dc79 100644
--- a/world/map/npc/052-1/mapflags.txt
+++ b/world/map/npc/052-1/mapflags.txt
@@ -1,2 +1,2 @@
-052-1|mapflag|nosave|007-1,86,76
-052-1|mapflag|resave|007-1,86,76
+052-1|mapflag|nosave|007-2,36,23
+052-1|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 2012e0a8..12752e80 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -164,7 +164,7 @@ OnFx:
end;
OnRing:
- warp "007-1", 85 + rand(0,2), 75 + rand(0,2);
+ warp "007-2",31 + rand(0,2),23 + rand(0,2);
if (strcharinfo(0) == $@ILLIA_HERO$)
goto L_ScheduleEnd;
end;
diff --git a/world/map/npc/052-2/mapflags.txt b/world/map/npc/052-2/mapflags.txt
index efccaddd..3fe6852b 100644
--- a/world/map/npc/052-2/mapflags.txt
+++ b/world/map/npc/052-2/mapflags.txt
@@ -1,2 +1,2 @@
-052-2|mapflag|nosave|007-1,86,76
-052-2|mapflag|resave|007-1,86,76
+052-2|mapflag|nosave|007-2,36,23
+052-2|mapflag|resave|007-2,36,23
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 67f7d664..a0c07173 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -16,6 +16,7 @@ import: npc/006-1/_import.txt
import: npc/006-2/_import.txt
import: npc/006-3/_import.txt
import: npc/007-1/_import.txt
+import: npc/007-2/_import.txt
import: npc/008-1/_import.txt
import: npc/009-1/_import.txt
import: npc/009-2/_import.txt
diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt
index 45abfaa8..feb71aea 100644
--- a/world/map/npc/annuals/halloween/munro.txt
+++ b/world/map/npc/annuals/halloween/munro.txt
@@ -1,4 +1,4 @@
-// Part of Annual halloween
+// Part of Annual halloween
026-1,24,37,0|script|Munro|183
{
callfunc "HalloweenCheckOld";
@@ -47,14 +47,3 @@ L_DisableMunro:
L_Return:
return;
}
-function|script|CheckMunro
-{
- if (($@halloween_time) || ($@xmas_time))
- goto L_Return;
-
- callfunc "UnequipLater";
- goto L_Return;
-
-L_Return:
- return;
-}
diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt
index 6c2c1c17..9d6f04ce 100644
--- a/world/map/npc/functions/soul_menhir.txt
+++ b/world/map/npc/functions/soul_menhir.txt
@@ -11,7 +11,6 @@ function|script|SoulMenhir
L_Towel:
if (TowelLastUsed > (gettimetick(2) - 1800))
goto L_DontPanic;
- callfunc "MultiWarpTowel";
set TowelLastUsed, gettimetick(2);
mes "[Soul Menhir]";
mes "(You touch the mysterious stone. Somehow it feels hard and soft at the same time.)";
diff --git a/world/map/npc/items/rubber_bat.txt b/world/map/npc/items/rubber_bat.txt
new file mode 100644
index 00000000..edf12416
--- /dev/null
+++ b/world/map/npc/items/rubber_bat.txt
@@ -0,0 +1,11 @@
+function|script|rubberBat
+{
+ if (gettimetick(2) - @lastbat < 2) goto L_Return;
+ misceffect 403;
+ set @lastbat, gettimetick(2);
+ goto L_Return;
+
+L_Return:
+ getitem "RubberBat", 1;
+ return;
+}
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 122ac7c0..91c4fccc 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -1,7 +1,7 @@
// See #TravelConfig
function|script|WarpTowel
{
- set @seconds, TowelLastUsed - (gettimetick(2) - 1800);
+ set @seconds, TowelLastUsed - (gettimetick(2) - 1200);
if (@seconds > 0)
goto L_DontPanic;
if (isin("botcheck",25,27,51,47))
@@ -9,8 +9,6 @@ function|script|WarpTowel
if (getmapflag(getmap(), MF_NOSAVE) || getmapflag(getmap(), MF_NOTELEPORT) || getmapflag(getmap(), MF_NOWARP) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2))
goto L_Forbid;
- callfunc "MultiWarpTowel";
-
if (@warpTowelName$ == "HitchhikersTowel")
goto L_Save;
if(@warpTowelName$ == "WhiteHitchhikersTowel")
@@ -154,26 +152,3 @@ L_End:
set @warpTowelName$, "";
return;
}
-
-function|script|MultiWarpTowel
-{
- setarray $@warpTowels$, "HitchhikersTowel", "WhiteHitchhikersTowel", "RedHitchhikersTowel", "GreenHitchhikersTowel", "BlueHitchhikersTowel", "YellowHitchhikersTowel", "PurpleHitchhikersTowel", "OrangeHitchhikersTowel", "PinkHitchhikersTowel", "TealHitchhikersTowel", "LimeHitchhikersTowel";
- set @towel_count, 0;
- set @towel_loop, 0;
- goto L_CountTowelLoop;
-
-L_CountTowelLoop:
- set @towel_count, (@towel_count + countitem($@warpTowels$[@towel_loop]));
- delitem $@warpTowels$[@towel_loop], countitem($@warpTowels$[@towel_loop]);
- goto L_DelLoopAgain;
-
-L_DelLoopAgain:
- if((@towel_loop + 1) == getarraysize($@warpTowels$))
- goto L_Return;
- set @towel_loop, (@towel_loop + 1);
- goto L_CountTowelLoop;
-
-L_Return:
- cleararray $@warpTowels$, "", getarraysize($@warpTowels$);
- return;
-}
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index e2603c8e..f9251214 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -46,6 +46,7 @@ npc: npc/items/unequipcb.txt
npc: npc/items/launcher_ammo.txt
npc: npc/items/check_wand.txt
npc: npc/items/mirror.txt
+npc: npc/items/rubber_bat.txt
import: npc/_import.txt
// GM Events