Merge branch 'develop'

# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/Server.cs
#	data/scripts/player.lua
#	scripts/zones/193/npcs/[email protected]
This commit is contained in:
Filip Maj committed 2016-04-18 13:31:55 -04:00
commit 3d5fa45730
134 files changed
+1926 -242

No files matched your search

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