summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2023-08-20 19:37:53 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2023-08-20 19:37:53 +0000
commit6e337a20cf3b3a7b41699e526ca8ba63c13c4a1e (patch)
tree86b95e16f5b9584a12d057644bc1ee78320a2ded
parentaed8aeb9340e98eb633b644a2ce01e31d2b5ce07 (diff)
parent935686070ebe5bce272eb094431b1a52b3dcd278 (diff)
downloadserverdata-6e337a20cf3b3a7b41699e526ca8ba63c13c4a1e.tar.gz
serverdata-6e337a20cf3b3a7b41699e526ca8ba63c13c4a1e.tar.bz2
serverdata-6e337a20cf3b3a7b41699e526ca8ba63c13c4a1e.tar.xz
serverdata-6e337a20cf3b3a7b41699e526ca8ba63c13c4a1e.zip
Merge branch 'magic_olympics_friendship_fix' into 'master'
Fix magic olympics' friendship challenge score accounting typo. See merge request ml/serverdata!115
-rw-r--r--npc/003-3/malindou.txt6
-rw-r--r--npc/functions/aurora.txt2
2 files changed, 7 insertions, 1 deletions
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 9b2c34fc1..d267120f4 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -664,6 +664,12 @@ OnInit:
debugmes "* New homunculus skills";
debugmes "";
}
+ // The following UPDATE value on: Sun Aug 20 05:11:46 PM CEST 2023
+ // Typo update: FMOLY -> FYMOLY.
+ if ($UPDATE < 1692544306) {
+ $UPDATE = 1692544306;
+ DelChrRegFromEveryPlayer("FMOLY_FRIEND");
+ }
// This mensures Contributors Credits, and changes only during updates.
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index e31f56247..d754f8e5d 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -590,7 +590,7 @@ function script FYE_Olympics_SK {
.@st > 1 &&
.@sk != SM_PROVOKE &&
.@sk != EVOL_AREA_PROVOKE)
- FMOLY_FRIEND += 1;
+ FYMOLY_FRIEND += 1;
// Generic
if (.@sk != TMW2_FAKESKILL &&