mirror of
				https://bitbucket.org/Ioncannon/project-meteor-server.git
				synced 2025-05-20 08:26:59 -04:00 
			
		
		
		
	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:
		| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user