zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-11 23:14:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
data/scripts/zones/244/npcs/objBed_01@0F400.lua
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

2
data/scripts/zones/244/npcs/objInnDoor_01@0F400.lua
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

2
data/scripts/zones/244/npcs/objItemStore_01@0F400.lua
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

2
data/scripts/zones/244/npcs/pplCutscene_01@0F400.lua
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

2
data/scripts/zones/244/npcs/test1.lua
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