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