diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-14/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/functions/aurora.txt | 4 |
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; } |