cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Jorge/quest_system' into ioncannon/quest_system

Browse Source
This commit is contained in:
Filip Maj
2022-04-13 20:12:38 -04:00
parent 524f415b44 a7b1b79461
commit 9a2f8ef89a
31 changed files with 1730 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Data/scripts/base/chara/npc/object/MarketEntrance.lua
View File

@@ -82,13 +82,6 @@ city = {
[1500394] = 3, -- Ul'dah : Edine
}
ENTRANCE_LIMSA_DT = 1090238; -- Main Limsa Entrance
ENTRANCE_LIMSA_ALT = 1500392; -- M'septha Alternate
ENTRANCE_GRIDANIA_DT = 1090264; -- Main Grid Entrance
ENTRANCE_GRIDANIA_ALT = 1500393; -- Torsefers Alternate
ENTRANCE_ULDAH_DT = 1090265; -- Main Uldah Entrance
ENTRANCE_ULDAH_ALT = 1500394; -- Edine Alternate
function onEventStarted(player, npc, eventType, eventName)
local npcCity = city[npc:GetActorClassId()] or 1;
local marketPlaceName = CITY_INFO[npcCity][1]; -- Market Wards category name. Identical in all languages except Japanese

2
Data/scripts/base/chara/npc/object/ObjectInnDoor.lua
View File

@@ -4,7 +4,7 @@ function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
function onEventStarted(player, npc, eventType, eventName)
defaultFst = GetStaticActor("DftFst");
choice = callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithInn_ExitDoor", nil, nil, nil);

5
Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua
View File

@@ -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);

41
Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua
View File

@@ -3,15 +3,54 @@
InstanceRaidGuide Script
Functions;
askEnterInstanceRaid(arg1) -- Opens a widget asking to enter the given Raid id.
--]]
require ("global")
function init(npc)
return false, false, 0, 0;
if ((npc == 1002090) or (npc == 1002091)) then
-- This won't work due to how init() works, but old scripts had it, keeping it here for now
return false, false, 0, 0, 491, 2;
else
return false, false, 0, 0;
end
end
function onEventStarted(player, npc, eventType, eventName)
npcId = npc:GetActorClassId()
if (npcId == 1002090) then -- Serpent Private Hodder (Stewart) : Gcl107
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithStewart_001"); -- "defaultTalkWithStewart_002" -- Post-Raid dialog?
--[[
choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Gcl107"), "processEventStewart", 15);
if (choice == 1) then
callClientFunction(player, "askEnterInstanceRaid", 15); -- Rivenroad
end
--]]
elseif (npcId == 1002091) then -- Serpent Private Dauremant (Trisselle) : Sum6w0
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithTrisselle_001"); -- "defaultTalkWithTrisselle_002" -- No idea for context.
--[[
choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Sum6w0"), "processEventTrisselle", 16)
if (choice == 1) then
callClientFunction(player, "askEnterInstanceRaid", 16); -- Rivenroad (Hard)
end
--]]
elseif (npcId == 1060022) then -- Louisoix
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkLouisoix_001");
end
player:EndEvent();
end