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:
Tahir Akhlaq 2016-06-15 04:41:15 +01:00
commit c413006a91
57 changed files with 99 additions and 52 deletions

View file

@ -1,6 +1,7 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDariustel_001", nil, nil, nil);
player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId()));
player:EndEvent();
end

View file

@ -1,6 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFruhybolg_001", nil, nil, nil);
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFhruybolg_001", nil, nil, nil);
end

View file

@ -1,6 +1,7 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuencen_001", nil, nil, nil);
player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId()));
player:EndEvent();
end

View file

@ -1,6 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHcidjaa_001", nil, nil, nil);
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHCidjaa_001", nil, nil, nil);
end

View file

@ -0,0 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll004_001", nil, nil, nil);
end

View file

@ -0,0 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll001_001", nil, nil, nil);
end

View file

@ -0,0 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll002_001", nil, nil, nil);
end

View file

@ -0,0 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll003_001", nil, nil, nil);
end

View file

@ -1,6 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithUwilsyng_001", nil, nil, nil);
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_003", nil, nil, nil);
end

View file

@ -1,6 +1,6 @@
function onEventStarted(player, npc)
defaultWil = GetStaticActor("DftWil");
player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithVavaki_001", nil, nil, nil);
player:RunEventFunction("delegateEvent", player, defaultWil, "tribeTalk", nil, nil, nil);
end