From ddfc71d3af9c866dd2bda36e8a5dede2986996ff Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 6 Jul 2017 22:09:03 -0400 Subject: [PATCH] GLWarpPoint shows current difficulty now too. Added some test stuff to the Orb/Sweep directors. --- data/scripts/base/chara/npc/object/GuildleveWarpPoint.lua | 2 +- .../scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua | 5 +++++ .../directors/Guildleve/PrivateGLBattleSweepNormal.lua | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/scripts/base/chara/npc/object/GuildleveWarpPoint.lua b/data/scripts/base/chara/npc/object/GuildleveWarpPoint.lua index c15dbe0e..5c0ef971 100644 --- a/data/scripts/base/chara/npc/object/GuildleveWarpPoint.lua +++ b/data/scripts/base/chara/npc/object/GuildleveWarpPoint.lua @@ -20,7 +20,7 @@ function onEventStarted(player, npc, triggerName) local currentGLDirector = player:GetGuildleveDirector(); local glData = currentGLDirector.guildleveData; - callClientFunction(player, "eventGuildleveReward", currentGLDirector.guildleveId, currentGLDirector.completionTime, 24, 24, 0, 0, 0, 0, 0, 0, 0, 4); + callClientFunction(player, "eventGuildleveReward", currentGLDirector.guildleveId, currentGLDirector.completionTime, 24, 24, 0, 0, 0, 0, 0, 0, 0, currentGLDirector.selectedDifficulty); local choice = callClientFunction(player, "eventTalkGuildleveWarp", glData.aetheryte, 0); diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua index 6a9cdb81..2d5a6348 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua @@ -32,6 +32,11 @@ function main(thisDirector) thisDirector:UpdateAimNumNow(0, 4); wait(2); + thisDirector:EndGuildleve(true); + wait(30); + player:SendGameMessage(GetWorldMaster(), 50033, 0x20); + thisDirector:EndDirector(); + end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua index 82a0207c..c5c07150 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua @@ -29,4 +29,7 @@ function main(thisDirector) wait(3); thisDirector:UpdateAimNumNow(0, 3); + wait(3); + thisDirector:EndGuildleve(true); + end \ No newline at end of file