Merge branch 'develop'

# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/Server.cs
#	data/scripts/player.lua
#	scripts/zones/193/npcs/pplStd_11@0C100.lua
This commit is contained in:
Filip Maj 2016-04-18 13:31:55 -04:00
commit 3d5fa45730
134 changed files with 1926 additions and 242 deletions

View file

@ -1,3 +1,3 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Monster/Lemming/NuteaterStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 10, 1, 4, false, false, false, false, false, false, false, false, 2;
end

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -32,7 +32,7 @@ Menu Ids:
--]]
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/Shop/PopulaceShopSalesman", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Object/TaskBoard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -1,5 +1,5 @@
function onInstantiate(npc)
return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, 0x10A350, false, false, 0, 1, "TEST";
function init(npc)
return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end
function onEventStarted(player, npc, triggerName)

View file

@ -3,7 +3,17 @@
function onZoneInit(zone)
end
function onZoneIn(zone, player)
function onZoneIn(player)
openingQuest = player:getQuest(110001);
--Opening Quest
if (openingQuest ~= nil) then
if (openingQuest:GetQuestFlag(0) == false) then
player:kickEvent(player:getDirector(), "noticeEvent");
end
end
end
function onZoneOut(zone, player)

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Object/ObjectBed", false, false, false, false, false, 0x1250FB, false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Object/ObjectInnDoor", false, false, false, false, false, 0x1250F8, false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Object/ObjectItemStorage", false, false, false, false, false, 0x1250F8, false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceCutScenePlayer", false, false, false, false, false, 0x107B38, false, false, 0, 1, "TEST";
end

View file

@ -1,4 +1,4 @@
function onInstantiate(npc)
function init(npc)
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.getActorClassId(), false, false, 0, 1, "TEST";
end

View file

@ -3,7 +3,17 @@
function onZoneInit(zone)
end
function onZoneIn(zone, player)
function onZoneIn(player)
openingQuest = player:getQuest(110005);
--Opening Quest
if (openingQuest ~= nil) then
if (openingQuest:GetQuestFlag(0) == false) then
player:kickEvent(player:getDirector(), "noticeEvent");
end
end
end
function onZoneOut(zone, player)