From cd0bb10ef6c4ed4916587e3e3f69d0a6b2987bb7 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 25 Jun 2017 20:43:23 -0400 Subject: [PATCH] Forgot to push GL scripts. --- .../directors/Guildleve/GuildleveCommon.lua | 54 +++++++++++++++++++ .../Guildleve/PrivateGLBattleChaseNormal.lua | 32 +++++++++++ .../Guildleve/PrivateGLBattleDetectNormal.lua | 37 +++++++------ .../Guildleve/PrivateGLBattleGatherNormal.lua | 19 ++++++- .../Guildleve/PrivateGLBattleHuntNormal.lua | 29 ++++++++-- .../Guildleve/PrivateGLBattleOrbNormal.lua | 32 +++++++++++ .../Guildleve/PrivateGLBattleRoundNormal.lua | 32 +++++++++++ .../PrivateGLBattleSurviveNormal.lua | 32 +++++++++++ .../Guildleve/PrivateGLBattleSweepNormal.lua | 32 +++++++++++ .../Guildleve/PrivateGLBattleTutorial.lua | 50 +++++++++++------ 10 files changed, 313 insertions(+), 36 deletions(-) create mode 100644 data/scripts/directors/Guildleve/GuildleveCommon.lua create mode 100644 data/scripts/directors/Guildleve/PrivateGLBattleChaseNormal.lua create mode 100644 data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua create mode 100644 data/scripts/directors/Guildleve/PrivateGLBattleRoundNormal.lua create mode 100644 data/scripts/directors/Guildleve/PrivateGLBattleSurviveNormal.lua create mode 100644 data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua diff --git a/data/scripts/directors/Guildleve/GuildleveCommon.lua b/data/scripts/directors/Guildleve/GuildleveCommon.lua new file mode 100644 index 00000000..489cbe9b --- /dev/null +++ b/data/scripts/directors/Guildleve/GuildleveCommon.lua @@ -0,0 +1,54 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleSweepNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + guildleveData = GetGuildleveGamedata(thisDirector.guildleveId); + members = thisDirector:GetPlayerMembers(); + + if (members ~= nil and #members ~= 0) then + player = members[0]; + player:SendGameMessage(GetWorldMaster(), 50036, 0x20, thisDirector.guildleveId, player, 0); --"You have started the leve..." + player:PlayAnimation(getGLStartAnimationFromSheet(guildleveData.borderId, guildleveData.plateId, false)); + end + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + if (members ~= nil and #members ~= 0) then + player = members[0]; + + player:ChangeMusic(22); + attentionMessage(player, 50022, thisDirector.guildleveId, thisDirector.selectedDifficulty, 0); + player:SendGameMessage(GetWorldMaster(), 50026, 0x20, guildleveData.timeLimit); + end + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end + +function attentionMessage(player, textId, ...) + player:SendGameMessage(GetWorldMaster(), textId, 0x20, ...); + player:SendDataPacket("attention", GetWorldMaster(), "", textId, ...); +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleChaseNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleChaseNormal.lua new file mode 100644 index 00000000..35a5a693 --- /dev/null +++ b/data/scripts/directors/Guildleve/PrivateGLBattleChaseNormal.lua @@ -0,0 +1,32 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleChaseNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleDetectNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleDetectNormal.lua index 315974d6..4e138ef0 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleDetectNormal.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleDetectNormal.lua @@ -3,23 +3,30 @@ require ("guildleve") --DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ -function init(thisDirector) - guildleveData = GetGuildleveGamedata(thisDirector.guildleveId); - members = thisDirector:GetPlayerMembers(); - - if (members ~= nil and #members ~= 0) then - player = members[0]; - player:SendGameMessage(GetWorldMaster(), 50036, 0x20, thisDirector.guildleveId, player, 0); --"You have started the leve..." - player:PlayAnimation(getGLStartAnimationFromSheet(guildleveData.borderId, guildleveData.plateId, false)); - end - +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) return "/Director/Guildleve/PrivateGLBattleDetectNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; end -function mainLoop(thisDirector) +function main(thisDirector) - wait(3) - thisDirector:StartGuildleve(); - thisDirector:SyncAllInfo(); + wait(3); -end \ No newline at end of file + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleGatherNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleGatherNormal.lua index 7098c209..683a0d34 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleGatherNormal.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleGatherNormal.lua @@ -1,11 +1,26 @@ require ("global") +require ("guildleve") --DirectorId, GuildleveId function init() - return "/Director/Guildleve/PrivateGLBattleGatherNormal", 0x4e26, 1220, 6, 100, 0.0, -100; + return "/Director/Guildleve/PrivateGLBattleGatherNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; end -function onEventStarted(player, actor, triggerName) +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); end \ No newline at end of file diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleHuntNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleHuntNormal.lua index f2b4e534..f165cea4 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleHuntNormal.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleHuntNormal.lua @@ -1,11 +1,32 @@ require ("global") +require ("guildleve") --DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ -function init() - return "/Director/Guildleve/PrivateGLBattleHuntNormal", 0x4e25, 10844, 6, 32.1, 45.1, -35.1; +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleHuntNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; end -function onEventStarted(player, actor, triggerName) +function main(thisDirector) + + wait(3); -end \ No newline at end of file + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua new file mode 100644 index 00000000..37b9648f --- /dev/null +++ b/data/scripts/directors/Guildleve/PrivateGLBattleOrbNormal.lua @@ -0,0 +1,32 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleOrbNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleRoundNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleRoundNormal.lua new file mode 100644 index 00000000..77bc5046 --- /dev/null +++ b/data/scripts/directors/Guildleve/PrivateGLBattleRoundNormal.lua @@ -0,0 +1,32 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleRoundNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end \ No newline at end of file diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleSurviveNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleSurviveNormal.lua new file mode 100644 index 00000000..f8eaa791 --- /dev/null +++ b/data/scripts/directors/Guildleve/PrivateGLBattleSurviveNormal.lua @@ -0,0 +1,32 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleSurviveNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua b/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua new file mode 100644 index 00000000..82a0207c --- /dev/null +++ b/data/scripts/directors/Guildleve/PrivateGLBattleSweepNormal.lua @@ -0,0 +1,32 @@ +require ("global") +require ("guildleve") + +--DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) + return "/Director/Guildleve/PrivateGLBattleSweepNormal", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; +end + +function main(thisDirector) + + wait(3); + + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end \ No newline at end of file diff --git a/data/scripts/directors/Guildleve/PrivateGLBattleTutorial.lua b/data/scripts/directors/Guildleve/PrivateGLBattleTutorial.lua index c0cdfbc7..9eaffe00 100644 --- a/data/scripts/directors/Guildleve/PrivateGLBattleTutorial.lua +++ b/data/scripts/directors/Guildleve/PrivateGLBattleTutorial.lua @@ -3,23 +3,43 @@ require ("guildleve") --DirectorId, GuildleveId, Aetheryte Location (6 or ~6), exMarkerX, exMarkerY, exMarkerZ -function init(thisDirector) - guildleveData = GetGuildleveGamedata(thisDirector.guildleveId); - members = thisDirector:GetPlayerMembers(); - - if (members ~= nil and #members ~= 0) then - player = members[0]; - player:SendGameMessage(GetWorldMaster(), 50036, 0x20, thisDirector.guildleveId, player, 0); --"You have started the leve..." - player:PlayAnimation(getGLStartAnimationFromSheet(guildleveData.borderId, guildleveData.plateId, false)); - end - +--50101: This is a tutorial covering regional levequests for Disciples of War and Disciples of Magic. +--50102: The general location of your target can be determined by using the minimap. +--50105: Your target is nearby. Proceed with the levequest objectives. +--50107: This levequest asks that you exterminate a total of [@VALUE($E8(1))] targets. Try finding the next one. +--50110: Defeating targets will sometimes earn you experience points. +--50112: An aetherial node will appear when levequest objectives have been met. Try approaching it. +--50114: Use the node to collect your reward and teleport back to the starting location of the levequest. + +--22: Limsa Battle Leve +--14: Gridania Battle Leve +--26: Uldah Battle Leve +--16: Coerthas Faction Leve +--72: Harvest Leve + +function init(thisDirector) return "/Director/Guildleve/PrivateGLBattleTutorial", 0x4e25, thisDirector.guildleveId, 6, 0, 0, 0; end -function mainLoop(thisDirector) +function main(thisDirector) - wait(2) - thisDirector:StartGuildleve(); - thisDirector:SyncAllInfo(); + wait(3); -end \ No newline at end of file + thisDirector:StartGuildleve(); + thisDirector:SyncAllInfo(); + thisDirector:UpdateMarkers(0, 59.0, 44.0, -163.0); + + wait(5); + + thisDirector:UpdateAimNumNow(0, 1); + wait(3); + thisDirector:UpdateAimNumNow(0, 2); + wait(3); + thisDirector:UpdateAimNumNow(0, 3); + +end + +function attentionMessage(player, textId, args ...) + player:SendGameMessage(GetWorldMaster(), textId, 0x20, args); + player:SendDataPacket("attention", GetWorldMaster(), "", textId, args); +end