diff --git a/scripts/commands/ActivateCommand.lua b/scripts/commands/ActivateCommand.lua index 347ce39d..898665c6 100644 --- a/scripts/commands/ActivateCommand.lua +++ b/scripts/commands/ActivateCommand.lua @@ -6,7 +6,7 @@ Switches between active and passive mode states --]] -function onEventStarted(player, actor) +function onEventStarted(player, actor, triggerName) if (player:getState() == 0) then player:changeState(2); diff --git a/scripts/commands/AttackWeaponSkill.lua b/scripts/commands/AttackWeaponSkill.lua index 83af12dc..7329b613 100644 --- a/scripts/commands/AttackWeaponSkill.lua +++ b/scripts/commands/AttackWeaponSkill.lua @@ -8,7 +8,7 @@ Finds the correct weaponskill subscript to fire when a weaponskill actor is acti -function onEventStarted(player, actor) +function onEventStarted(player, actor, triggerName) worldMaster = getWorldMaster(); diff --git a/scripts/commands/BonusPointCommand.lua b/scripts/commands/BonusPointCommand.lua index b73477b0..d6e95444 100644 --- a/scripts/commands/BonusPointCommand.lua +++ b/scripts/commands/BonusPointCommand.lua @@ -8,7 +8,7 @@ operateUI(pointsAvailable, pointsLimit, str, vit, dex, int, min, pie) --]] -function onEventStarted(player, actor) +function onEventStarted(player, actor, triggerName) --local points = player:getAttributePoints(); --player:runEventFunction("delegateCommand", actor, "operateUI", points.available, points.limit, points.inSTR, points.inVIT, points.inDEX, points.inINT, points.inMIN, points.inPIT); player:runEventFunction("delegateCommand", actor, "operateUI", 10, 10, 10, 10, 10, 10, 10, 10); diff --git a/scripts/commands/CheckCommand.lua b/scripts/commands/CheckCommand.lua index f5c20c0a..6800f279 100644 --- a/scripts/commands/CheckCommand.lua +++ b/scripts/commands/CheckCommand.lua @@ -6,7 +6,7 @@ Handles player examining someone --]] -function onEventStarted(player, commandactor, arg1, arg2, arg3, arg4, checkedActorId) +function onEventStarted(player, commandactor, triggerName, arg1, arg2, arg3, arg4, checkedActorId) actor = player:getActorInInstance(checkedActorId); diff --git a/scripts/commands/ChocoboRideCommand.lua b/scripts/commands/ChocoboRideCommand.lua index 5d3814d5..3c95e3da 100644 --- a/scripts/commands/ChocoboRideCommand.lua +++ b/scripts/commands/ChocoboRideCommand.lua @@ -6,7 +6,7 @@ Handles mounting and dismounting the Chocobo and Goobbue --]] -function onEventStarted(player, actor, isGoobbue) +function onEventStarted(player, actor, triggerName, isGoobbue) if (player:getState() == 0) then diff --git a/scripts/commands/DiceCommand.lua b/scripts/commands/DiceCommand.lua index 00dfdce8..b48e4e37 100644 --- a/scripts/commands/DiceCommand.lua +++ b/scripts/commands/DiceCommand.lua @@ -4,7 +4,7 @@ DiceCommand Script --]] -function onEventStarted(player, actor, maxNumber) +function onEventStarted(player, actor, triggerName, maxNumber) if (maxNumber == nil) then maxNumber = 999; diff --git a/scripts/commands/EmoteSitCommand.lua b/scripts/commands/EmoteSitCommand.lua index 19296a12..e244a436 100644 --- a/scripts/commands/EmoteSitCommand.lua +++ b/scripts/commands/EmoteSitCommand.lua @@ -4,7 +4,7 @@ EmoteSitCommand Script --]] -function onEventStarted(player, actor, emoteId) +function onEventStarted(player, actor, triggerName, emoteId) if (player:getState() == 0) then if (emoteId == 0x2712) then diff --git a/scripts/commands/EmoteStandardCommand.lua b/scripts/commands/EmoteStandardCommand.lua index b481b027..dac96794 100644 --- a/scripts/commands/EmoteStandardCommand.lua +++ b/scripts/commands/EmoteStandardCommand.lua @@ -9,7 +9,7 @@ emoteTable = { }; -function onEventStarted(player, actor, emoteId) +function onEventStarted(player, actor, triggerName, emoteId) if (player:getState() == 0) then player:doEmote(emoteId); diff --git a/scripts/commands/EquipCommand.lua b/scripts/commands/EquipCommand.lua index 5e7d93c3..d9c4ad02 100644 --- a/scripts/commands/EquipCommand.lua +++ b/scripts/commands/EquipCommand.lua @@ -53,7 +53,7 @@ GRAPHICSLOT_L_RINGFINGER = 24; GRAPHICSLOT_R_INDEXFINGER = 25; GRAPHICSLOT_L_INDEXFINGER = 26; -function onEventStarted(player, actor, invActionInfo, param1, param2, param3, param4, param5, param6, param7, equipSlot, itemDBIds) +function onEventStarted(player, actor, triggerName, invActionInfo, param1, param2, param3, param4, param5, param6, param7, equipSlot, itemDBIds) equipSlot = equipSlot-1; --Equip Item diff --git a/scripts/commands/ItemWasteCommand.lua b/scripts/commands/ItemWasteCommand.lua index d208124b..78e568c8 100644 --- a/scripts/commands/ItemWasteCommand.lua +++ b/scripts/commands/ItemWasteCommand.lua @@ -9,7 +9,7 @@ The param "itemDBIds" has the vars: item1 and item2. --]] -function onEventStarted(player, actor, invActionInfo, param1, param2, param3, param4, param5, param6, param7, param8, itemDBIds) +function onEventStarted(player, actor, triggerName, invActionInfo, param1, param2, param3, param4, param5, param6, param7, param8, itemDBIds) player:getInventory(0x00):removeItem(invActionInfo.slot); player:endEvent(); end diff --git a/scripts/commands/LogoutCommand.lua b/scripts/commands/LogoutCommand.lua index 727e5a95..9ccd3deb 100644 --- a/scripts/commands/LogoutCommand.lua +++ b/scripts/commands/LogoutCommand.lua @@ -20,7 +20,7 @@ function onEventStarted(player, command) player:runEventFunction("delegateCommand", command, "eventConfirm"); end -function onEventUpdate(player, command, step, arg1, arg2) +function onEventUpdate(player, command, triggerName, step, arg1, arg2) currentMenuId = player:getCurrentMenuId(); diff --git a/scripts/commands/RequestInformationCommand.lua b/scripts/commands/RequestInformationCommand.lua index c16e66ce..1b13672d 100644 --- a/scripts/commands/RequestInformationCommand.lua +++ b/scripts/commands/RequestInformationCommand.lua @@ -8,6 +8,6 @@ function onEventStarted(player, actor, questId) -- player:sendRequestedInfo("requestedData", "glHist", 10, 0x1D4F2, 1009, 12464, 11727, 12485, 12526); end -function onEventUpdate(player, actor, step, arg1) +function onEventUpdate(player, actor, triggerName, step, arg1) end \ No newline at end of file diff --git a/scripts/commands/RequestQuestJournalCommand.lua b/scripts/commands/RequestQuestJournalCommand.lua index e90a91ba..85ec082e 100644 --- a/scripts/commands/RequestQuestJournalCommand.lua +++ b/scripts/commands/RequestQuestJournalCommand.lua @@ -7,6 +7,6 @@ function onEventStarted(player, actor, questId) player:sendRequestedInfo("requestedData", "qtdata", 0x1D4F2); end -function onEventUpdate(player, actor, step, arg1) +function onEventUpdate(player, actor, triggerName, step, arg1) end \ No newline at end of file diff --git a/scripts/commands/TeleportCommand.lua b/scripts/commands/TeleportCommand.lua index ddcdcb0c..05b893c9 100644 --- a/scripts/commands/TeleportCommand.lua +++ b/scripts/commands/TeleportCommand.lua @@ -16,7 +16,7 @@ Confirm Menu: 2 --]] -function onEventStarted(player, actor, isTeleport) +function onEventStarted(player, actor, triggerName, isTeleport) if (isTeleport == 0) then player:setCurrentMenuId(0); player:runEventFunction("delegateCommand", actor, "eventRegion", 100); diff --git a/scripts/zones/133/npcs/aetheryteP_01@08500.lua b/scripts/zones/133/npcs/aetheryteP_01@08500.lua index 8f5b879e..e252c1d1 100644 --- a/scripts/zones/133/npcs/aetheryteP_01@08500.lua +++ b/scripts/zones/133/npcs/aetheryteP_01@08500.lua @@ -24,7 +24,7 @@ function onInstantiate(npc) return "/Chara/Npc/Object/Aetheryte/AetheryteParent", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) player:runEventFunction("eventAetheryteParentSelect", 0x0, false, 0x61, 0x0,0,0,0,0); end diff --git a/scripts/zones/166/npcs/openingStop_fstBtl03_03@0A600.lua b/scripts/zones/166/npcs/openingStop_fstBtl03_03@0A600.lua new file mode 100644 index 00000000..3e1d2f67 --- /dev/null +++ b/scripts/zones/166/npcs/openingStop_fstBtl03_03@0A600.lua @@ -0,0 +1,13 @@ +function onInstantiate(npc) + return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, 0x10A350, false, false, 0, 1, "TEST"; +end + +function onEventStarted(player, npc, triggerName) + if (triggerName == "caution") then + worldMaster = getWorldMaster(); + player:sendGameMessage(player, worldMaster, 34109, 0x20); + elseif (triggerName == "exit") then + getWorldManager():DoPlayerMoveInZone(player, 5); + end + player:endEvent(); +end \ No newline at end of file diff --git a/scripts/zones/166/zone.lua b/scripts/zones/166/zone.lua new file mode 100644 index 00000000..703d61b9 --- /dev/null +++ b/scripts/zones/166/zone.lua @@ -0,0 +1,10 @@ + + +function onZoneInit(zone) +end + +function onZoneIn(zone, player) +end + +function onZoneOut(zone, player) +end \ No newline at end of file diff --git a/scripts/zones/193/npcs/pplStd_11@0C100.lua b/scripts/zones/193/npcs/pplStd_11@0C100.lua index 7448d456..8d43ebf5 100644 --- a/scripts/zones/193/npcs/pplStd_11@0C100.lua +++ b/scripts/zones/193/npcs/pplStd_11@0C100.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Populace/PopulaceTutorial", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) man0l0Quest = getStaticActor("Man0l0"); player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrNomal003", nil, nil, nil); --player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_002", nil, nil, nil); --LTW diff --git a/scripts/zones/244/npcs/objBed_01@0F400.lua b/scripts/zones/244/npcs/objBed_01@0F400.lua index 3f0cce38..de11bf32 100644 --- a/scripts/zones/244/npcs/objBed_01@0F400.lua +++ b/scripts/zones/244/npcs/objBed_01@0F400.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Object/ObjectBed", false, false, false, false, false, 0x1250FB, false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) player:runEventFunction("askLogout", player); end diff --git a/scripts/zones/244/npcs/objInnDoor_01@0F400.lua b/scripts/zones/244/npcs/objInnDoor_01@0F400.lua index 59e9eb69..0f279f41 100644 --- a/scripts/zones/244/npcs/objInnDoor_01@0F400.lua +++ b/scripts/zones/244/npcs/objInnDoor_01@0F400.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Object/ObjectInnDoor", false, false, false, false, false, 0x1250F8, false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) end function onEventUpdate(player, npc) diff --git a/scripts/zones/244/npcs/objItemStore_01@0F400.lua b/scripts/zones/244/npcs/objItemStore_01@0F400.lua index ab605060..7a9c2b74 100644 --- a/scripts/zones/244/npcs/objItemStore_01@0F400.lua +++ b/scripts/zones/244/npcs/objItemStore_01@0F400.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Object/ObjectItemStorage", false, false, false, false, false, 0x1250F8, false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) end function onEventUpdate(player, npc) diff --git a/scripts/zones/244/npcs/pplCutscene_01@0F400.lua b/scripts/zones/244/npcs/pplCutscene_01@0F400.lua index ee33a00b..7162a996 100644 --- a/scripts/zones/244/npcs/pplCutscene_01@0F400.lua +++ b/scripts/zones/244/npcs/pplCutscene_01@0F400.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Populace/PopulaceCutScenePlayer", false, false, false, false, false, 0x107B38, false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) end function onEventUpdate(player, npc) diff --git a/scripts/zones/244/npcs/test1.lua b/scripts/zones/244/npcs/test1.lua index 8c67d57d..e3943072 100644 --- a/scripts/zones/244/npcs/test1.lua +++ b/scripts/zones/244/npcs/test1.lua @@ -2,7 +2,7 @@ function onInstantiate(npc) return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST"; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) end function onEventUpdate(player, npc)