11 files changed, 46 insertions, 8 deletions
diff --git a/client-data b/client-data
-Subproject 7f7a8d64a7504f37e97c8d28f7c6b1d6680aa3b
+Subproject 15d304213edf016983c5a7c30286824606352fe
diff --git a/world/map/data/011-1.wlk b/world/map/data/011-1.wlk
index bcd21991..ceb12317 100644
--- a/world/map/data/011-1.wlk
+++ b/world/map/data/011-1.wlk
diff --git a/world/map/data/012-4.wlk b/world/map/data/012-4.wlk
index 1d642c07..4784cc41 100644
--- a/world/map/data/012-4.wlk
+++ b/world/map/data/012-4.wlk
diff --git a/world/map/data/013-3.wlk b/world/map/data/013-3.wlk
index 79e4426d..0513d327 100644
--- a/world/map/data/013-3.wlk
+++ b/world/map/data/013-3.wlk
diff --git a/world/map/data/017-3.wlk b/world/map/data/017-3.wlk
index f12fa0ec..46f8c266 100644
--- a/world/map/data/017-3.wlk
+++ b/world/map/data/017-3.wlk
diff --git a/world/map/data/025-1.wlk b/world/map/data/025-1.wlk
index 7f2e8c05..62fac2c3 100644
--- a/world/map/data/025-1.wlk
+++ b/world/map/data/025-1.wlk
diff --git a/world/map/data/030-3.wlk b/world/map/data/030-3.wlk
index c5d5bce0..1ab7dd7c 100644
--- a/world/map/data/030-3.wlk
+++ b/world/map/data/030-3.wlk
diff --git a/world/map/data/099-7.wlk b/world/map/data/099-7.wlk
index 6dc44e32..5563107f 100644
--- a/world/map/data/099-7.wlk
+++ b/world/map/data/099-7.wlk
diff --git a/world/map/news.d/94-news-2021-05-28.txt b/world/map/news.d/94-news-2021-05-28.txt
new file mode 100644
index 00000000..6de82ecb
--- /dev/null
+++ b/world/map/news.d/94-news-2021-05-28.txt
@@ -0,0 +1,35 @@
+{title:IRC Migration}
+{date:2021-05-28}
+
+{b}We are moving to Libera.Chat on IRC.{/b}
+
+Game Chat, Discord Integration, et cetera are unaffected. All our bots have moved
+as well. For those whom do not use IRC directly, no action is needed.
+
+There weren't many votes on our community poll, but after witnessing with our own
+eyes a channel being taken over without any sort of warning or whatsoever, we
+have decided that Freenode no longer provides any sort of reliable operational
+stability.
+
+We are NOT taking this decision based on rumors - both true and fake - which are
+circulating from both sides; We are taking this decision based on what we witnessed.
+
+Therefore, we have settled to move all our infrastructure to Libera Chat, based
+among other things, on the community will.
+
+This is a strictly technical decision; Operational stability has always been a
+priority for us, from backup to the choice of applications which are exposed to
+the public, like our wiki and forums backbone. IRC is no exception to this rule.
+
+We also have decided to DROP the bridge which was maintaining a link between
+both networks for the reasons mentioned above. Therefore, users connecting to the
+old network WON'T be able to receive any support whatsoever. Our other bots have
+also withdrawn.
+
+{b}Improvements to #upmarmu{/b}
+
+dangerDuck did some improvements to upmarmu (brawling skill).
+
+Check it out if you are a brawler!
+
+{author:Jesusalva}
diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt
index 321b6e0f..53cc8b68 100644
--- a/world/map/npc/001-2/heathin.txt
+++ b/world/map/npc/001-2/heathin.txt
@@ -20,7 +20,7 @@
     if (QL_TERRANITE_ARMOR == 2) && (BaseLevel >= 70) goto L_Hood;
     if (QL_TERRANITE_ARMOR == 2) && (BaseLevel >= 60) goto L_Forge_Thanks;
     if (QL_TERRANITE_ARMOR == 1) && (BaseLevel >= 60) goto L_Forge_Award;
-    if (BaseLevel >= 60) goto L_Start;
+    if (QL_TERRANITE_ARMOR < 1) && (BaseLevel >= 60) goto L_Start;
 
     mes "[Heathin]";
     mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \"";
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 95ab9120..ab74d474 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -1,10 +1,11 @@
 -|script|magic-knuckles|32767
 {
-    if(call("magic_checks")) end;
+    if (call("magic_checks")) end;
     if (Sp < 20) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
+    if (getequipid(equip_hand1) != -1 || getequipid(equip_hand2) != -1) end;
     if (.@level <= 3 && countitem("Beer") >= 1) delitem "Beer", 1;
     elif (.@level <= 3) end;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
@@ -13,16 +14,18 @@
     set Sp, Sp - 20;
     misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0);
     setarray @upmarmuspell[0],
-        @spellpower,
-        ((@spellpower/10) + 10), // charges
-        (((200 - Agi) * 1300) / 200), // delay
-        Str; // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
+        (BASE_ATK), // dmg
+        ((Dex/3) + 10), // charges
+        (sqrt(300 - (Agi * 2))+(5/2)), // delay
+        Agi, // dmg bonus
+        ((sqrt(BaseLevel + 9) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
     callfunc "magic_exp";
     goto L_FreeRecast;
 
 OnAttack:
+    if (getequipid(equip_hand1) != -1 || getequipid(equip_hand2) != -1) goto OnDischarge;
     if (target(BL_ID, @target_id, 22) != 22) goto L_FreeRecast; // 0x10 | 0x02 | 0x04
-    void call("melee_damage", @upmarmuspell[0], @target_id, (30 + rand((@upmarmuspell[3]*2) + 5)));
+    void call("elt_damage", @upmarmuspell[0], (@upmarmuspell[3] + @upmarmuspell[4]), ELT_WATER, ELT_FIRE, FX_NONE);
     set @upmarmuspell[1], @upmarmuspell[1] - 1;
     goto L_FreeRecast;
 
@@ -39,7 +42,7 @@ OnDischarge:
     end;
 
 OnSetRecast:
-    overrideattack @upmarmuspell[2], 1, ATTACK_ICON_GENERIC, OVERRIDE_KNUCKLES, strnpcinfo(0)+"::OnAttack", @upmarmuspell[1];
+    overrideattack (@upmarmuspell[2] * @upmarmuspell[2]), 1, ATTACK_ICON_GENERIC, OVERRIDE_KNUCKLES, strnpcinfo(0)+"::OnAttack", @upmarmuspell[1]; // delay neeeds to be squared
     end;
 
 OnInit: