summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/012-3/beheader.txt2
-rw-r--r--world/map/npc/018-1/mike.txt5
-rw-r--r--world/map/npc/018-2/receptionist.txt7
-rw-r--r--world/map/npc/030-2/eljas.txt2
-rw-r--r--world/map/npc/030-3/orum_homunculus.txt40
-rw-r--r--world/map/npc/030-4/mana_battery.txt30
-rw-r--r--world/map/npc/099-7/boss.txt4
-rw-r--r--world/map/npc/annuals/fathertime.txt36
-rw-r--r--world/map/npc/annuals/xmas/barriers.txt2
-rw-r--r--world/map/npc/functions/global_event_handler.txt4
-rw-r--r--world/map/npc/functions/vault.txt76
-rw-r--r--world/map/npc/magic/event-summon-managuardian.txt2
-rw-r--r--world/map/npc/magic/level2-barrier.txt4
-rw-r--r--world/map/npc/magic/level2-magic-knuckles.txt2
14 files changed, 158 insertions, 58 deletions
diff --git a/world/map/npc/012-3/beheader.txt b/world/map/npc/012-3/beheader.txt
index 89fa51ce..17abc129 100644
--- a/world/map/npc/012-3/beheader.txt
+++ b/world/map/npc/012-3/beheader.txt
@@ -176,7 +176,7 @@ L_Finish:
goto L_Nope;
getitem "Beheader", 1;
- getexp 750000, 0;
+ getexp 1000000, 0;
set FLAGS, FLAGS | FLAG_GOT_BEHEADER_SWORD;
set TERRAC, 0;
diff --git a/world/map/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt
index 38fce03d..4e819e86 100644
--- a/world/map/npc/018-1/mike.txt
+++ b/world/map/npc/018-1/mike.txt
@@ -1,7 +1,10 @@
018-1,77,60,0|script|Mike|113
{
mes "[Mike]";
- mes "\"I need black stingers to make some medicine to cure my sister.\"";
+ mes "\"Be careful with the mines over there, during digging they broke in a monster nest and dangerous monsters inhabit it now. All mining operations have been suspended, but unfortunately, not everyone managed to get out in time or unharmed.\"";
+ next;
+ mes "[Mike]";
+ mes "\"So, I need black stingers to make some medicine to cure my sister.\"";
next;
set @dq_level, 40;
diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index efac07d9..2efd73c7 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -6,6 +6,7 @@
mes "[Receptionist]";
mes "\"Welcome to the mining camp!";
+ mes "Mining operations are currently suspended.";
mes "Do you need anything?\"";
next;
goto L_Menu;
@@ -28,6 +29,12 @@ L_Mine:
mes "[Receptionist]";
mes "\"Minerals have been easy to find in this area historically. The mine entrance we're using collapsed from the mountain side when the volcano errupted. Plenty of minerals were exposed then.\"";
next;
+ mes "[Receptionist]";
+ mes "\"Unfortunately, some miners dug into a monster nest and not everyone made back unharmed. Since then, operations have been officially suspended, which increases the ore price as Tulimshar's mines becomes the only viable source of minerals.\"";
+ next;
+ mes "[Receptionist]";
+ mes "\"Well, with the increased ore prices, there are still some people who go inside trying to get rich quick. The insurance company however will not cover for accidents with monsters.\"";
+ next;
goto L_Question_End;
L_Enter:
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 09e549e7..9437c3d5 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -186,7 +186,7 @@ L_Research:
L_NotWelcome:
mes "... You hear a voice calling your name ... ";
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Come See me in the caves below.\"";
mes "\"go south till you reach the snowman. Then head into the cave to the east.\"";
warp "020-1",33,94;
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index aa5d6953..503374ff 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -15,7 +15,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Not that way!\"";
mes "\"Use the southernmost exit.\"";
close;
@@ -38,7 +38,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"That is the long way!\"";
mes "\"Just go south from here to the southernmost exit.\"";
close;
@@ -61,7 +61,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Ok. You are getting closer, I can feel it!\"";
mes "\"You are heading in the right direction - to the southern most exit.\"";
close;
@@ -84,7 +84,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Ok, you are getting closer, I can feel it.!\"";
mes "\"Go take the south west path towards the brazier.\"";
close;
@@ -107,7 +107,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Wrong way!\"";
mes "\"I am in the northeastern corner.\"";
close;
@@ -130,7 +130,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Wrong Way!\"";
mes "\"I am in the northeastern corner.\"";
close;
@@ -153,7 +153,7 @@ L_XmasMain:
goto L_End;
L_Telepathy:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Wrong Way!\"";
mes "\"I am in the northeastern corner.\"";
close;
@@ -162,7 +162,7 @@ L_End:
end;
}
-030-3,100,49,0|script|Orum's Homunculus|385
+030-3,100,49,0|script|Balthasar|385
{
callfunc "XmasStates";
@@ -171,7 +171,7 @@ L_End:
goto L_OffSeason;
L_OffSeason:
- mes "Orums Homunculus looks up, inspects you briefly, and looks away again.";
+ mes "Balthasar looks up, inspects you briefly, and looks away again.";
end;
L_XmasMain:
@@ -200,7 +200,7 @@ L_SetPath:
goto L_XmasMain;
L_QuestStart1:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Greetings traveler, Do you have any time to help me out?\"";
menu
"No. I really have to go.", L_Close,
@@ -218,7 +218,7 @@ L_Next:
goto L_Close;
L_QuestStart2:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Greetings traveler, Do you have any time to help me out?\"";
menu
"No. I really have to go.", L_Close,
@@ -236,7 +236,7 @@ L_KeepGoing:
goto L_Close;
L_HaveList2:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Have you got the missing lists?\"";
menu
"What were those names again?", L_ListNames,
@@ -267,7 +267,7 @@ L_Foo:
goto L_Close;
L_ListReturn:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"This had better be important, I've got enough to worry about.\"";
menu
"Sorry for interrupting, but I've come down here because I delivered the fake list", L_FakeList;
@@ -322,7 +322,7 @@ L_FakeList:
goto L_Close;
L_HelperQuest:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Welcome back!\"";
mes "\"How is the sabotage coming along?\"";
menu
@@ -386,7 +386,7 @@ L_IngredientList:
goto L_Close;
L_PowerReagents:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Have you gotten the reagents?\"";
menu
"Yes.", L_CheckReagents,
@@ -407,7 +407,7 @@ L_CheckReagents:
mes "He positions the four potions in a stand so all the openings are mostly facing each other.";
mes "He begins to chant.";
next;
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "O";
next;
mes "wat";
@@ -419,7 +419,7 @@ L_CheckReagents:
mes "The potions begin to pulse with mana.";
mes "He continues to chant";
next;
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "Aye";
next;
mes "Am";
@@ -441,13 +441,13 @@ L_CheckReagents:
goto L_Close;
L_Quick:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"What are you still doing here?\"";
mes "\"Quickly, to the warehouse.\"";
goto L_Close;
L_Reward:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Revenge is a dish best served cold..\"";
if (@xmas_reward2_done_state)
set @xmas_state, $@xmas_reward_done;
@@ -459,7 +459,7 @@ L_Reward:
goto L_Close;
L_Thanks:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Please feel free to continue to sabotage whats left of the Inn while I prepare your reward.\"";
goto L_Close;
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 406f4b24..9499507a 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -47,7 +47,7 @@ L_InitiateBattle:
goto L_BattleGood;
L_BattleBad:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"So this is where this whole shallow charade will end...\"";
mes "\"Good. Are you ready to get this over with?\"";
menu
@@ -56,7 +56,7 @@ L_BattleBad:
"Well... since you ask... I prefer to leave now, this is way to dangerous. I have responsibities.", L_Coward;
L_KeepGoing:
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"Okay now listen closely, at least for once.\"";
mes "\"Put the mana battery into that vessel in front of you.\"";
next;
@@ -362,33 +362,33 @@ L_Restart:
"Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
"Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
"Avalia : I am getting a weird sensation ... ",
- "Orum's Homunculus : I think they know what we are up to!",
+ "Balthasar : I think they know what we are up to!",
"Avalia : Oh no! This is going to blow up",
- "Orum's Homunculus : The Door is locked you idiot, fight for your life.",
+ "Balthasar : The Door is locked you idiot, fight for your life.",
"Avalia : Guards of Honor I demand you: STOP!",
- "Orum's Homunculus : Okay, this is somewhat funny... why are they coming back?!?",
+ "Balthasar : Okay, this is somewhat funny... why are they coming back?!?",
"Avalia : You brave fighters! Deactivate the nutcrackers! they are out of control!",
- "Orum's Homunculus : The good news is: if we make it this time we will never have to do that again!",
+ "Balthasar : The good news is: if we make it this time we will never have to do that again!",
"Avalia : Oh boy we are so screwed.",
- "Orum's Homunculus : Report: I am an Idiot",
+ "Balthasar : Report: I am an Idiot",
"Avalia : Quick, we need to kill the nutcrackers, before they ruin everything we've been working for.",
- "Orum's Homunculus : Strange they are getting more and not less.",
+ "Balthasar : Strange they are getting more and not less.",
"Avalia : Oh no, they are too powerful. Fight my warriors, Fight for the spirit of Christmas.",
- "Orum's Homunculus : If I was smart enough to stop talking, it would have happened already..",
+ "Balthasar : If I was smart enough to stop talking, it would have happened already..",
"Avalia : I cannot believe it, this is making them stronger. More and more of them are coming.",
- "Orum's Homunculus : I think we are almost done, the bomb should explode any second.",
+ "Balthasar : I think we are almost done, the bomb should explode any second.",
"Avalia : Those poor creatures. Just kill them all.",
- "Orum's Homunculus : A N Y S E C O N D.",
+ "Balthasar : A N Y S E C O N D.",
"Avalia : Oh well... just try again, I trust in you.",
- "Orum's Homunculus : just lol.",
+ "Balthasar : just lol.",
"Avalia : Wow! You saved christmas.",
- "Orum's Homunculus : Yep, it's over... and strange enough you survived.";
+ "Balthasar : Yep, it's over... and strange enough you survived.";
setarray $@xmas_final_announce$,
"Avalia : Oh no, not only did you slay half my Guard of Honour, but also the issue was not fixed, try to install the battery again!",
- "Orum's Homunculus : Boy are you lame. So what now? The battery is still not placed! Go try again!",
+ "Balthasar : Boy are you lame. So what now? The battery is still not placed! Go try again!",
"Avalia : W00t you actually made it through. I think now that the manabattery lost some of its abundant power this seems to have given those nutcrackers that didn't go crazy a good boost of life energy. Thank you for your help all and come see me for a reward.",
- "Orum's Homunculus : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
+ "Balthasar : Good. They are dead. Now GET OUT OF THERE, this bomb is dangerous!";
// Danger Cells to attack sitters
// 0: 19,20,29,29
// 1: 30,20,40,29
diff --git a/world/map/npc/099-7/boss.txt b/world/map/npc/099-7/boss.txt
index c621c68f..3980b2bb 100644
--- a/world/map/npc/099-7/boss.txt
+++ b/world/map/npc/099-7/boss.txt
@@ -681,7 +681,7 @@ L_Yes:
L_FlawedLens:
getitem "FlawedLens", 1;
- getexp 20000000, 0;
+ getexp 30000000, 0;
set FLAGS, FLAGS | FLAG_KESHLAM_FLAWEDLENS;
mes "[Chest]";
mes "You opened it and found...! Some flawed lens?! Meh.";
@@ -692,7 +692,7 @@ L_FlawedLens:
close;
L_Rare:
- getexp 10000000, 0;
+ getexp 15000000, 0;
set FLAGS, FLAGS | FLAG_KESHLAM_RAREDROP;
if (rand(4) == 1) goto L_Amulet; // 25% chance
goto L_Ring; // 75% chance
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 8726d29b..0670c3c9 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -81,17 +81,18 @@ L_Friday:
end;
L_Pirate:
- areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield";
- areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield";
- areamonster "003-4", 20, 20, 170, 120, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield";
- areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield";
- areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield";
- areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield";
- areamonster "018-1", 20, 20, 180, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield";
- areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield";
- areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield";
- areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield";
- areamonster "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield";
+ set $@BLANC, (getusers(1) / 5) + 1;
+ areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "003-4", 20, 20, 170, 120, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat";
+ areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "018-1", 20, 20, 180, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat";
+ areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield";
+ areamonster "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat";
end;
OnFriday:
@@ -99,11 +100,18 @@ OnFriday:
end;
OnLameShield:
- // Chance: 0.1%
+ // Chance: 0.1% - 0.01%
// TODO: Once MLP brings the Dragon Shield, replace with HMC Hat.
- if (rand(1000) > 1)
+ if (rand(10000) > 9)
goto L_Die;
- getitem DragonShield, 1;
+ getitem "DragonShield", 1;
+ end;
+
+OnLameHat:
+ // Chance: 0.1%
+ if (rand(1000) > 1)
+ goto OnLameShield;
+ getitem "HMCPirateHat", 1;
end;
L_Die:
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 8460e7bf..63af8eaf 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -16,7 +16,7 @@ L_SideOut:
L_Hint:
message strcharinfo(0), "I said get out! We've got no time for your kind here.";
- mes "[Orum's Homunculus]";
+ mes "[Balthasar]";
mes "\"What are you doing? Come, see me in the caves below!\"";
mes "\"I said go south till you reach the snowman. Then head into the cave to the east.\"";
close2;
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index dab56fde..690b0566 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -38,6 +38,10 @@ OnPCDieEvent:
set @killerrid, 0; // reset killer rid
end;
+OnPCLogoutEvent:
+ callfunc "VaultLogout";
+ end;
+
OnInit:
callfunc "ClearGlobalVars";
callfunc "MOTD"; // set the MOTD array
diff --git a/world/map/npc/functions/vault.txt b/world/map/npc/functions/vault.txt
index 25e6d263..ee30863c 100644
--- a/world/map/npc/functions/vault.txt
+++ b/world/map/npc/functions/vault.txt
@@ -6,6 +6,7 @@
function|script|VaultLogin
{
if (##VAULT < 1) goto L_Return;
+ // TODO: Or #VAULT ? Which of the two is set?
callsub S_Exp;
callsub S_Gold;
@@ -39,6 +40,8 @@ S_Preset:
set #X21, (#X21 & ~(BYTE_3_MASK)) | (##PRESET << BYTE_3_SHIFT);
// Each preset is 5 levels (Preset 1 = Lv 5, Preset 10 = Lv 50, Max Preset 20 - hard limit is 127)
+ // TODO: Give more ammo, iron powder, sulphur powder, etc. instead of equips
+ // Give also some bug legs and maggot slime if applicable?
/* Handle weapons */
if (##PRESET >= 1 && @last_preset < 1)
getitem "SharpKnife",1;
@@ -109,3 +112,76 @@ S_Preset:
return;
}
+
+// Remember: ##VAULT_EXP, ##VAULT_GOTO, ##VAULT_MLTO for Mirror Lake Protocol
+// However, without kick(7), it is not really worth anything
+// Remember: Quote symbols are illegal, simple or double, except for parameter
+// To reset the database:
+// cleararray $EXPORT_DATA$[0], "", 254;
+// set $EXPORT_MAX_ID, 0;
+
+// Schemas:
+//API_VAULT: "UID", ##VAULT, "GID", getcharid(3)
+//API_SENDMAIL: "UID": ##VAULT, "MSG": "message", "TITLE": "subject line"
+//
+// Using the API_EXPORT hack for TMWA:
+//
+// set $@API_PROTOCOL, API_SENDMAIL;
+// set $@API_DATA$, "'UID': 0, 'TITLE': 'About TMWA', 'MSG': 'I hate it!'";
+// callfunc "FlushAPI";
+//
+// (The curly brace is added to DATA on its own)
+function|script|FlushAPI
+{
+ // Function called improperly
+ // DATA cannot be null or the array order will crash
+ if ($@API_PROTO <= 0) goto L_Dumb;
+ if ($@API_DATA$ == "") goto L_Dumb;
+
+ // Save it to mapreg
+ // The script will strip "##"
+ // and convert the part after to a JSON dict
+ set $EXPORT_DATA$[$EXPORT_MAX_ID], $@API_PROTO + "##" + $@API_DATA$;
+ set $@API_PROTO, "";
+ set $@API_DATA$, "";
+
+ // Update TMWA tracker
+ set $EXPORT_MAX_ID, $EXPORT_MAX_ID + 1;
+
+ // Keep in mind an array can only go up to 255
+ // Trying to go past that, causes a SIGSEGV and map server dies
+ // So we periodically truncate the table when it's full
+ if ($EXPORT_MAX_ID > 240) goto L_Flush;
+ if ($EXPORT_MAX_ID == 120) goto L_Flush2;
+ return;
+
+L_Dumb:
+ debugmes "FlushAPI called without enough arguments";
+ debugmes " - $@API_PROTO, API_* constant";
+ debugmes " - $@API_DATA$, json dict without curly braces";
+ return;
+
+L_Flush:
+ cleararray $EXPORT_DATA$[0], "", 220;
+ set $EXPORT_MAX_ID, 0;
+ return;
+
+L_Flush2:
+ cleararray $EXPORT_DATA$[220], "", 25;
+ return;
+}
+
+function|script|VaultLogout
+{
+ if (##VAULT < 1) goto L_Return;
+ // TODO: Or #VAULT ? Which of the two is set?
+ set $@API_PROTOCOL, API_VAULT;
+ set $@API_DATA$, "'UID': "+##VAULT+", 'GID': "+getcharid(3);
+ callfunc "FlushAPI";
+
+ return;
+
+L_Return:
+ return;
+}
+
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt
index 9a92b16a..2581ab16 100644
--- a/world/map/npc/magic/event-summon-managuardian.txt
+++ b/world/map/npc/magic/event-summon-managuardian.txt
@@ -11,7 +11,7 @@ OnCast:
if (countitem("TinyManaElixir") < 1) end;
if (!$DOOMSDAY_SUMMON) end;
// if (@ddcooldown > gettimetick(2)) goto L_Cooldown;
- if (sc_check (SC_COOLDOWN_MG)) goto L_Cooldown;
+ if (sc_check(SC_COOLDOWN_MG)) goto L_Cooldown;
if (getmap() == "033-1") goto L_SpecialRules6;
goto L_Pay;
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index 284209c0..def8856e 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -28,8 +28,10 @@ L_Pay:
callfunc "magic_exp";
if (BL_ID != @target_id) misceffect FX_MAGIC_BARRIER_HIT, @args$;
set .@time, (@spellpower*200)+2000;
+ set .@time, .@time+5000; // FIXME: Temporary Boost!
set @asorm_time, .@time, @target_id;
- sc_start SC_MBARRIER, .@time, max(30,(@spellpower/8))+20, @target_id;
+ // FIXME: max(30,(@spellpower/8))+20
+ sc_start SC_MBARRIER, .@time, max(30,(@spellpower/7))+22, @target_id;
message @args$, "Barrier : You are surrounded by a magical barrier.";
set @asorm_future, gettimetick(0) + @asorm_time - 100, @target_id;
addtimer @asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id;
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index da276811..3f2d5da1 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -17,7 +17,7 @@
setarray @upmarmuspell[0],
max(1, BASE_ATK - 100 + min(100, Int)), // dmg
((@spellpower/10) + ((Dex * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
- (sqrt(300 - (Agi * 2)) + (5/2)), // delay
+ (sqrt(190)), // delay - see conf/battle_athena.conf @ max_aspd
((Agi + Int) / 2), // dmg bonus
(((BaseLevel/5) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
callfunc "magic_exp";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-02 02:58:46 +0000