From b08827568c871eb14fea0b356f55cd76965f8e5d Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 13 Mar 2022 18:26:20 -0400 Subject: [PATCH] Chocobo stuff: PopulaceChocoboLender - Made rental time 10 minutes again (as retail had it). Added Vesper Bay NPC's rental location as close as I could get it from a blurry source. ChocoboRideCommand - Fixed the method used to pull a zone's music so the script doesn't fail. --- .../base/chara/npc/populace/PopulaceChocoboLender.lua | 5 +++-- Data/scripts/commands/ChocoboRideCommand.lua | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua b/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua index a4000a36..0ac4f0a9 100644 --- a/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua +++ b/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua @@ -41,7 +41,8 @@ local startAppearances = { local cityExits = { [1500006] = {133, -6.032, 46.356, 132.572, 3.034}, [1500061] = {150, 333.271, 5.889, -943.275, 0.794}, - [1000840] = {170, -26.088, 181.846, -79.438, 2.579} + [1000840] = {170, -26.088, 181.846, -79.438, 2.579}, + [1500059] = {172, -2133.028, 15.476, -421.471, 1.5} }; function init(npc) @@ -110,7 +111,7 @@ function onEventStarted(player, npc, triggerName) elseif(menuChoice == 3) then -- Change Barding callClientFunction(player, "eventTalkStepBreak", player); elseif(menuChoice == 5) then -- Rent Bird - mountChocobo(player, true, 1); + mountChocobo(player, true, 10); GetWorldManager():DoZoneChange(player, cityExits[classId][1], nil, 0, SPAWN_CHOCOBO_RENTAL, cityExits[classId][2], cityExits[classId][3], cityExits[classId][4], cityExits[classId][5]); else callClientFunction(player, "eventTalkStepBreak", player); diff --git a/Data/scripts/commands/ChocoboRideCommand.lua b/Data/scripts/commands/ChocoboRideCommand.lua index 24f56ffd..01c2fba3 100644 --- a/Data/scripts/commands/ChocoboRideCommand.lua +++ b/Data/scripts/commands/ChocoboRideCommand.lua @@ -26,7 +26,7 @@ function onEventStarted(player, actor, eventType, eventName, isGoobbue) player:ChangeSpeed(0.0, 3.6, 9.0, 9.0); player:ChangeState(15); else - player:ChangeMusic(player:GetZone().bgmDay, MUSIC_FADEIN); + player:ChangeMusic(player.currentArea.bgmDay, MUSIC_FADEIN); worldMaster = GetWorldMaster();