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