cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases 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
parent 2b81660dce c612b885dd
commit c413006a91
57 changed files with 99 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/scripts/base/chara/npc/object/BookShelf.lua Normal file
View File

@@ -0,0 +1,11 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
player:RunEventFunction("bookTalk");
end
function onEventUpdate(player, npc, step, menuOptionSelected)
player:EndEvent();
end

11
data/scripts/base/chara/npc/object/MateriaBook.lua Normal file
View File

@@ -0,0 +1,11 @@
function init(npc)
return false, false, 0, 0;
end
function onEventStarted(player, npc, triggerName)
player:RunEventFunction("materiabookTalk");
end
function onEventUpdate(player, npc, step, menuOptionSelected)
player:EndEvent();
end

3
data/scripts/base/chara/npc/object/TaskBoard.lua
View File

@@ -11,8 +11,7 @@ function onEventStarted(player, npc, triggerName)
player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskUldah", nil, nil, nil);
else
player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskGridania", nil, nil, nil);
end
end
end
function onEventUpdate(player, npc, step, menuOptionSelected)