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

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into logging_and_casing

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua
View file

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

2
data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua
View file

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