Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
This commit is contained in:
Tahir Akhlaq 2016-06-14 22:54:02 +01:00
commit 335a59204c
521 changed files with 12848 additions and 10394 deletions

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0, 0;
end

View file

@ -1,5 +1,6 @@
function init(npc)
return "/Chara/Npc/Object/ObjectBed", false, false, false, false, false, 0x1250FB, false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)

View file

@ -0,0 +1,19 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
defaultFst = getStaticActor("DftFst");
player:runEventFunction("delegateEvent", player, defaultFst, "defaultTalkWithInn_ExitDoor", nil, nil, nil);
end
function onEventUpdate(player, npc, resultId, isExitYes)
if (isExitYes ~= nil and isExitYes == 1) then
getWorldManager():DoZoneChange(player, 1);
else
player:endEvent();
end
end

View file

@ -1,8 +1,9 @@
function init(npc)
return "/Chara/Npc/Object/ObjectInnDoor", false, false, false, false, false, 0x1250F8, false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
player:endEvent();
end
function onEventUpdate(player, npc)

View file

@ -0,0 +1,13 @@
function init(npc)
return false, false, 0, 0;
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

View file

@ -0,0 +1,20 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
questNOC = getStaticActor("Noc000");
if (npc:getActorClassId() == 1200193) then
player:runEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskLimsa", nil, nil, nil);
elseif (npc:getActorClassId() == 1200194) then
player:runEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskUldah", nil, nil, nil);
else
player:runEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskGridania", nil, nil, nil);
end
end
function onEventUpdate(player, npc, step, menuOptionSelected)
player:endEvent();
end

View file

@ -21,7 +21,7 @@ Menu Ids:
--]]
function init(npc)
return "/Chara/Npc/Object/Aetheryte/AetheryteParent", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)

View file

@ -0,0 +1,9 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
end
function onEventUpdate(player, npc)
end

View file

@ -21,7 +21,7 @@ Menu Ids:
--]]
function init(npc)
return "/Chara/Npc/Populace/PopulaceGuildlevePublisher", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc)

View file

@ -1,5 +1,5 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceLinkshellManager", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc)

View file

@ -24,7 +24,7 @@ Menu Ids:
--]]
function init(npc)
return "/Chara/Npc/Populace/PopulacePassiveGLPublisher", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
return false, false, 0, 0;
end
function onEventStarted(player, npc)

View file

@ -0,0 +1,13 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc)
player:sendMessage(0x20, "", "This PopulaceStandard actor has no event set. Actor Class Id: " .. tostring(npc:getActorClassId()));
player:endEvent();
end
function onEventUpdate(player, npc, blah, menuSelect)
player:endEvent();
end

View file

@ -0,0 +1,15 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc)
player:sendMessage(0x20, "", "This PopulaceShopSalesman actor has no event set. Actor Class Id: " .. tostring(npc:getActorClassId()))
player:endEvent();
--player:runEventFunction("welcomeTalk");
end
function onEventUpdate(player, npc, step, menuOptionSelected, lsName, lsCrest)
player:endEvent();
end

View file

@ -0,0 +1,19 @@
--[[
PartyInviteCommand Script
Handles what happens when you invite
--]]
function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, actorId)
if (name ~= nil) then
getWorldManager():CreateInvitePartyGroup(player, name);
elseif (actorId ~= nil) then
getWorldManager():CreateInvitePartyGroup(player, actorId);
end
player:endCommand();
end

View file

@ -3,12 +3,12 @@ function onEventStarted(player, actor, triggerName)
man0u0Quest = getStaticActor("Man0u0");
man0l0Quest = getStaticActor("Man0l0");
--player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrBtl001");
player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrBtl001");
--player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrBtlMagic001");
--player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrBtl002");
--player:runEventFunction("delegateEvent", player, man0l0Quest, "processTtrBtl003");
player:runEventFunction("delegateEvent", player, man0u0Quest, "processTtrBtl004");
--player:runEventFunction("delegateEvent", player, man0u0Quest, "processTtrBtl004");
end

View file

@ -18,11 +18,11 @@ function onBeginLogin(player)
--For Opening. Set Director and reset position incase d/c
if (player:hasQuest(110001) == true) then
player:setDirector("openingDirector", false);
--player:setDirector("openingDirector", false);
player.positionX = 0.016;
player.positionY = 10.35;
player.positionZ = -36.91;
--player.positionZ = -20.91;
--player.positionZ = -36.91;
player.positionZ = -20.91;
player.rotation = 0.025;
player:getQuest(110001):ClearQuestData();
player:getQuest(110001):ClearQuestFlags();

View file

@ -0,0 +1,15 @@
function onEventStarted(player, npc)
defaultFst = getStaticActor("DftFst");
player:runEventFunction("delegateEvent", player, defaultFst, "defaultTalkWithInn_Desk", nil, nil, nil);
end
function onEventUpdate(player, npc, blah, menuSelect)
if (menuSelect == 1) then
getWorldManager():DoZoneChange(player, 13);
end
player:endEvent();
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB84;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB83;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB81;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB7D;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB85;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB7E;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB80;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB7F;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x141, 0xB82;
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil);
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBaderon_001", nil, nil, nil);
end

View file

@ -0,0 +1,7 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_002", nil, nil, nil); --LNC
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_003", nil, nil, nil); --LNC NO GUILD
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_001", nil, nil, nil); --DEFAULT
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_002", nil, nil, nil); --IF ARCHER
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_003", nil, nil, nil); --IF ARCHER
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_002", nil, nil, nil); --LTW
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_003", nil, nil, nil); --LTW NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFzhumii_001", nil, nil, nil);
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_001", nil, nil, nil);
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_002", nil, nil, nil); --THM
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_003", nil, nil, nil); --THM NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_003", nil, nil, nil); --THM NO GUILD
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil);
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_002", nil, nil, nil); --CNJ
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_003", nil, nil, nil); --CNJ NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil);
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil);
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_002", nil, nil, nil); --CRP
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_003", nil, nil, nil); --CRP NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_002", nil, nil, nil); --IF ALC
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_003", nil, nil, nil); --IF ALC
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -0,0 +1,7 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_002", nil, nil, nil); --LNC
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_003", nil, nil, nil); --LNC NO GUILD
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil);
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_002", nil, nil, nil); --BTN
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_003", nil, nil, nil); --BTN NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_002", nil, nil, nil); --PUG
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_003", nil, nil, nil); --PUG NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,12 +1,15 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithInn_Desk", nil, nil, nil);
end
function onEventUpdate(player, npc)
function onEventUpdate(player, npc, blah, menuSelect)
if (menuSelect == 1) then
getWorldManager():DoZoneChange(player, 12);
end
player:endEvent();
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_002", nil, nil, nil); --GSM
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_003", nil, nil, nil); --GSM NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,14 +1,7 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_001", nil, nil, nil);
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_002", nil, nil, nil); --MIN
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_003", nil, nil, nil); --MIN NO GUILD
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -1,6 +1,3 @@
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
@ -8,8 +5,4 @@ function onEventStarted(player, npc)
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_002", nil, nil, nil); --LNC
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_003", nil, nil, nil); --LNC NO GUILD
--player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_010", nil, nil, nil); --NOT DOW/DOM
end
function onEventUpdate(player, npc)
player:endEvent();
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZanthael_001", nil, nil, nil);
end

View file

@ -0,0 +1,5 @@
function onEventStarted(player, npc)
defaultSea = getStaticActor("DftSea");
player:runEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZehrymm_001", nil, nil, nil);
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x96C;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x96A;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x96D;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x970;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x974;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x972;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x83, 0x1B8E;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x83, 0x1B89;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x83, 0x1B90;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x976;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x954;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x956;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x952;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x958;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x960;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x95A;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x95E;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x95C;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x96D;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x94C;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x94E;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x94A;
end

View file

@ -0,0 +1,3 @@
function init(npc)
return false, false, 0, 0, 0x79, 0x950;
end

Some files were not shown because too many files have changed in this diff Show more