mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-09 14:04:41 +02:00
Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing
# Conflicts: # data/scripts/base/chara/npc/object/TaskBoard.lua # data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua # data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua # data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua # data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua # data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua # data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua # data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua # data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua # data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua # data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua
This commit is contained in:
commit
c413006a91
57 changed files with 99 additions and 52 deletions
|
@ -1,5 +1,5 @@
|
|||
function init(npc)
|
||||
return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
end
|
||||
|
||||
function onEventStarted(player, npc, triggerName)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require("/quests/man/man0g0")
|
||||
|
||||
function init(npc)
|
||||
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
end
|
||||
|
||||
function onSpawn(player, npc)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require("/quests/man/man0g0")
|
||||
|
||||
function init(npc)
|
||||
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST";
|
||||
end
|
||||
|
||||
function onEventStarted(player, npc, triggerName)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue