diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/006-1/tree.txt | 6 | ||||
-rw-r--r-- | npc/magic/level2-rain.txt | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/npc/006-1/tree.txt b/npc/006-1/tree.txt index 6c961691..df6dd2ef 100644 --- a/npc/006-1/tree.txt +++ b/npc/006-1/tree.txt @@ -6,13 +6,13 @@ function script QuestTreeTrigger { @Q_status_lower = @Q_status & 3; @Q_status = (@Q_status & 12) >> 2; - if (@Q_status & @flag) goto L_close; // already did that + if (@Q_status & getarg(0, @flag)) goto L_close; // already did that - if (@flag == 2) goto L_hug; + if (getarg(0, @flag) == 2) goto L_hug; goto L_Cont; L_Cont: - @Q_status = @Q_status | @flag; + @Q_status = @Q_status | getarg(0, @flag); callsub S_Update_Var; if (@Q_status != 3) goto L_close; diff --git a/npc/magic/level2-rain.txt b/npc/magic/level2-rain.txt index c008ae3a..30171c06 100644 --- a/npc/magic/level2-rain.txt +++ b/npc/magic/level2-rain.txt @@ -46,6 +46,10 @@ function script SK_Kaflosh { // The builtin checks are not necessary in this case =D // But would be for a sandstorm or snowstorm. "#WeatherCore"::weather_override(MASK_RAIN, .@time, .@m$, true); + + // Eventually, a quest or another will depend on Kaflosh, so + if (isin("006-1", 82, 59, 14)) + callfunc "QuestTreeTrigger", 1; return; } |