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