mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 05:07:47 +00:00
Code Activity

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

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
Tahir Akhlaq 2017-08-26 18:04:31 +01:00
commit 922f3ccd1e
12 changed files with 106 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1466,6 +1466,25 @@ namespace FFXIVClassic_Map_Server.Actors
QueuePackets(propPacketUtil.Done());
}
public void SendStartCastbar(uint commandId, uint endTime)
{
playerWork.castCommandClient = commandId;
playerWork.castEndClient = endTime;
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("playerWork/castState", this);
propPacketUtil.AddProperty("playerWork.castEndClient");
propPacketUtil.AddProperty("playerWork.castCommandClient");
QueuePackets(propPacketUtil.Done());
}
public void SendEndCastbar()
{
playerWork.castCommandClient = 0;
playerWork.castEndClient = 0;
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("playerWork/castState", this);
propPacketUtil.AddProperty("playerWork.castCommandClient");
QueuePackets(propPacketUtil.Done());
}
public void SetLoginDirector(Director director)
{
if (ownedDirectors.Contains(director))

4
FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs
View file

@ -18,8 +18,8 @@
public bool isContentsCommand;
public int castCommandClient;
public int castEndClient;
public uint castCommandClient;
public uint castEndClient;
public int[] comboNextCommandId = new int[2];
public float comboCostBonusRate;

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_4");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc002");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_3");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_2");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc003");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_14");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_6");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_7");
player:EndEvent();
end

8
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua Normal file
View file

@ -0,0 +1,8 @@
require ("global")
require ("quests/man/man0u0")
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc001");
player:EndEvent();
end

13
data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua Normal file
View file

@ -0,0 +1,13 @@
require ("global")
require ("quests/man/man0u0")
function onSpawn(player, npc)
npc:SetQuestGraphic(player, 0x2);
end
function onEventStarted(player, npc, triggerName)
man0u0Quest = GetStaticActor("Man0u0");
callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_8");
npc:SetQuestGraphic(player, 0x0);
player:EndEvent();
end