summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-01-14 11:53:55 -0300
committerJesusaves <cpntb1@ymail.com>2022-01-14 11:53:55 -0300
commite33967ae6a9f5b4da37b1175c5e0b909ec501cdb (patch)
treee307b61054ccfa4e1afbcfce5b97f21178ddd689
parent81223843ed6c3e773af5235aae19c23d7a00354a (diff)
downloadserverdata-e33967ae6a9f5b4da37b1175c5e0b909ec501cdb.tar.gz
serverdata-e33967ae6a9f5b4da37b1175c5e0b909ec501cdb.tar.bz2
serverdata-e33967ae6a9f5b4da37b1175c5e0b909ec501cdb.tar.xz
serverdata-e33967ae6a9f5b4da37b1175c5e0b909ec501cdb.zip
Test and fix some stuff (mana exp and support still untested)
-rw-r--r--npc/001-14/_warps.txt2
-rw-r--r--npc/functions/aurora.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/001-14/_warps.txt b/npc/001-14/_warps.txt
index 8b9e8e99f..86f8a3f2f 100644
--- a/npc/001-14/_warps.txt
+++ b/npc/001-14/_warps.txt
@@ -23,7 +23,7 @@ OnTouch:
001-14,137,85,0 script #001-14_137_85 NPC_HIDDEN,0,0,{
end;
OnTouch:
- slide 111,91; end;
+ slide 111,89; end;
}
001-14,135,113,0 script #001-14_135_113 NPC_HIDDEN,0,0,{
end;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 8e9c45800..00e1159e1 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -572,8 +572,9 @@ function script FYEConf_Olympics {
// Modify Magic Skills
function script FYE_Olympics_SK {
if ($EVENT$ != "Olympics") return;
+
.@sk=getarg(0, @skillId);
- .@sl=getarg(1, @skillLevel);
+ .@sl=max(getarg(1, @skillLv), 1);
.@st=getarg(2, @skillTarget);
.@cl = $@MSK_CLASS[.@sk];
@@ -595,6 +596,7 @@ function script FYE_Olympics_SK {
.@sk != TMW2_TRANSMIGRATION &&
.@sk != TMW2_OVHFIRE)
FYMOLY_SPAMMY += .@sl;
+
setq Q_AuroraEvent, getq2(Q_AuroraEvent) + rand2(.@sl + 1);
return;
}