summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--world/conf/char_athena.conf2
-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/013-3/barrier.txt6
-rw-r--r--world/map/npc/029-2/bankroom.txt2
-rw-r--r--world/map/npc/030-3/orum_homunculus.txt14
-rw-r--r--world/map/npc/annuals/halloween/munro.txt13
-rw-r--r--world/map/npc/items/rubber_bat.txt11
-rw-r--r--world/map/npc/scripts.conf1
9 files changed, 27 insertions, 26 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/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/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/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/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/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/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/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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 08:12:39 +0000