From 460722d3d5be1c42abdfd260f2216d87f363ac99 Mon Sep 17 00:00:00 2001 From: yogurt Date: Wed, 11 Oct 2017 06:42:06 -0500 Subject: [PATCH] Opening changes --- FFXIVClassic Map Server/WorldManager.cs | 3 +- .../actors/chara/Character.cs | 1 - .../actors/chara/npc/BattleNpc.cs | 2 +- data/scripts/content/SimpleContent30010.lua | 36 ++++++++++--------- .../directors/Quest/QuestDirectorMan0g001.lua | 11 +++--- data/scripts/spells/blizzara.lua | 19 ++++++++++ data/scripts/spells/thunder.lua | 18 ++++++++++ 7 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 data/scripts/spells/blizzara.lua create mode 100644 data/scripts/spells/thunder.lua diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs index a3c2db1d..69b55b3b 100644 --- a/FFXIVClassic Map Server/WorldManager.cs +++ b/FFXIVClassic Map Server/WorldManager.cs @@ -640,7 +640,8 @@ namespace FFXIVClassic_Map_Server battleNpc.dropListId = reader.GetUInt32("dropListId"); battleNpc.spellListId = reader.GetUInt32("spellListId"); battleNpc.skillListId = reader.GetUInt32("skillListId"); - + battleNpc.SetMaxHP(1000); + battleNpc.SetHP(1000); battleNpc.SetBattleNpcId(reader.GetUInt32("bnpcId")); battleNpc.CalculateBaseStats(); battleNpc.RecalculateStats(); diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs index c9621219..e34164ac 100644 --- a/FFXIVClassic Map Server/actors/chara/Character.cs +++ b/FFXIVClassic Map Server/actors/chara/Character.cs @@ -603,7 +603,6 @@ namespace FFXIVClassic_Map_Server.Actors { if (GetMod((uint)Modifier.Hp) != 0) { - } // todo: recalculate stats and crap updateFlags |= ActorUpdateFlags.HpTpMp; diff --git a/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs b/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs index c528a12c..e52940fc 100644 --- a/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs +++ b/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs @@ -82,7 +82,7 @@ namespace FFXIVClassic_Map_Server.Actors //charaWork.property[2] = 1; //npcWork.hateType = 1; - + this.hateContainer = new HateContainer(this); this.allegiance = CharacterTargetingAllegiance.BattleNpcs; diff --git a/data/scripts/content/SimpleContent30010.lua b/data/scripts/content/SimpleContent30010.lua index 3e3b72f9..6f1a7de6 100644 --- a/data/scripts/content/SimpleContent30010.lua +++ b/data/scripts/content/SimpleContent30010.lua @@ -1,29 +1,33 @@ require ("global") +require ("modifiers") function onCreate(starterPlayer, contentArea, director) --papalymo = contentArea:SpawnActor(2290005, "papalymo", 365.89, 4.0943, -706.72, -0.718); --yda = contentArea:SpawnActor(2290006, "yda", 365.266, 4.122, -700.73, 1.5659); - --yda = GetWorldManager().SpawnBattleNpcById(6, contentArea); - --papalymo = GetWorldManager().SpawnBattleNpcById(7, contentArea); - - --mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea); - --mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea); - --mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea); - ---yda:ChangeState(2); - + --mob1 = contentArea:SpawnActor(2201407, "mob1", 374.427, 4.4, -698.711, -1.942); --mob2 = contentArea:SpawnActor(2201407, "mob2", 375.377, 4.4, -700.247, -1.992); --mob3 = contentArea:SpawnActor(2201407, "mob3", 375.125, 4.4, -703.591, -1.54); + yda = GetWorldManager().SpawnBattleNpcById(6, contentArea); + papalymo = GetWorldManager().SpawnBattleNpcById(7, contentArea); + yda:ChangeState(2); + mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea); + mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea); + mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea); + starterPlayer.currentParty.members:Add(yda.actorId); + starterPlayer.currentParty.members:Add(papalymo.actorId); + starterPlayer:SetMod(modifiersGlobal.MinimumHpLock, 1); - --openingStoper = contentArea:SpawnActor(1090384, "openingstoper", 356.09, 3.74, -701.62, -1.41); - --director:AddMember(starterPlayer); - --director:AddMember(director); --- director:AddMember(papalymo); - --director:AddMember(yda); - --director:AddMember(mob1); - --director:AddMember(mob2); - --director:AddMember(mob3); + openingStoper = contentArea:SpawnActor(1090384, "openingstoper", 356.09, 3.74, -701.62, -1.41); + + director:AddMember(starterPlayer); + director:AddMember(director); + director:AddMember(papalymo); + director:AddMember(yda); + director:AddMember(mob1); + director:AddMember(mob2); + director:AddMember(mob3); --director:StartContentGroup(); diff --git a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua index e6dc16e3..26dacb87 100644 --- a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua +++ b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua @@ -13,10 +13,10 @@ end function onCreateContentArea(players, director, contentArea, contentGroup) local worldManager = GetWorldManager(); - - yda = GetWorldManager().SpawnBattleNpcById(6, contentArea); - papalymo = GetWorldManager().SpawnBattleNpcById(7, contentArea); - + --[[ + --yda = GetWorldManager().SpawnBattleNpcById(6, contentArea); + --papalymo = GetWorldManager().SpawnBattleNpcById(7, contentArea); + --yda:ChangeState(2); mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea); mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea); mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea); @@ -47,7 +47,6 @@ function onCreateContentArea(players, director, contentArea, contentGroup) print("shittttt2"); director:AddMember(player) print("shittttt1"); - --GetWorldManager():DoZoneChangeContent(player, contentArea, 362.4087, 4, -703.8168, 1.5419, 16); end; print("shit") director:AddMember(director); @@ -58,7 +57,7 @@ function onCreateContentArea(players, director, contentArea, contentGroup) print("shit6") director:AddMember(mob3); print("dicks") - +]] director:StartContentGroup(); end diff --git a/data/scripts/spells/blizzara.lua b/data/scripts/spells/blizzara.lua new file mode 100644 index 00000000..72ccc0bd --- /dev/null +++ b/data/scripts/spells/blizzara.lua @@ -0,0 +1,19 @@ +function onSpellPrepare(caster, target, spell) + return 0; +end; + +function onSpellStart(caster, target, spell) + return 0; +end; + +function onSpellFinish(caster, target, spell, action) + local damage = math.random(10, 100); + print("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuckkk") + + action.param = damage; + if target.hateContainer then + target.hateContainer.AddBaseHate(caster); + target.hateContainer.UpdateHate(caster, damage); + end; + return damage; +end; \ No newline at end of file diff --git a/data/scripts/spells/thunder.lua b/data/scripts/spells/thunder.lua new file mode 100644 index 00000000..1418061a --- /dev/null +++ b/data/scripts/spells/thunder.lua @@ -0,0 +1,18 @@ +function onSpellPrepare(caster, target, spell) + return 0; +end; + +function onSpellStart(caster, target, spell) + return 0; +end; + +function onSpellFinish(caster, target, spell, action) + local damage = math.random(10, 100); + print("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuckkk") + + if target.hateContainer then + target.hateContainer.AddBaseHate(caster); + target.hateContainer.UpdateHate(caster, damage); + end; + return damage; +end; \ No newline at end of file