From a0c4d80c5e767e68a64d4d491fad252ba1d8a148 Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Thu, 5 Oct 2017 18:37:51 +0100
Subject: [PATCH] broken attempt at opening quest director combat

---
 data/scripts/ally.lua                         | 56 ++++++++++---------
 .../directors/Quest/QuestDirectorMan0g001.lua | 23 ++++----
 .../unique/fst0Battle03/Monster/yda.lua       |  8 +--
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/data/scripts/ally.lua b/data/scripts/ally.lua
index 97d797dd..b8c39ff3 100644
--- a/data/scripts/ally.lua
+++ b/data/scripts/ally.lua
@@ -4,35 +4,35 @@ require ("weaponskill")
 
 allyGlobal =
 {
-};
+}
 
 function allyGlobal.onSpawn(ally, target)
 
-end;
+end
 
 function allyGlobal.onEngage(ally, target)
 
-end;
+end
 
 function allyGlobal.onAttack(ally, target, damage)
 
-end;
+end
 
 function allyGlobal.onDamageTaken(ally, attacker, damage)
 
-end;
+end
 
 function allyGlobal.onCombatTick(ally, target, tick, contentGroupCharas)
-    allyGlobal.HelpPlayers(ally, contentGroupCharas);
-end;
+    allyGlobal.HelpPlayers(ally, contentGroupCharas)
+end
 
 function allyGlobal.onDeath(ally, player, lastAttacker)
 
-end;
+end
 
 function allyGlobal.onDespawn(ally)
 
-end;
+end
 
 function allyGlobal.HelpPlayers(ally, contentGroupCharas, pickRandomTarget)
     if contentGroupCharas then
@@ -44,35 +44,37 @@ function allyGlobal.HelpPlayers(ally, contentGroupCharas, pickRandomTarget)
                     -- do stuff
                     if not ally.IsEngaged() then
                         if chara.IsEngaged() then
-                            allyGlobal.EngageTarget(ally, target, nil);
-                        end;
-                    end;
+                            allyGlobal.EngageTarget(ally, chara.target, nil)
+                        end
+                    end
                 elseif chara.IsMonster() and chara.IsEngaged() then
-                    
-                end;
-            end;
-        end;
-    end;
-end;
+                    if not ally.IsEngaged() then
+                        allyGlobal.EngageTarget(ally, chara.target, nil)
+                    end
+                end
+            end
+        end
+    end
+end
 
 function allyGlobal.HealPlayer(ally, player)
 
-end;
+end
 
 function allyGlobal.SupportAction(ally, player)
 
-end;
+end
 
 function allyGlobal.EngageTarget(ally, target, contentGroupCharas)
     if contentGroupCharas then
         for _, chara in pairs(contentGroupCharas) do
             if chara.IsMonster() then
                 if chara.allegiance ~= ally.allegiance then
-                    ally.Engage(chara);
-                end;
-            end;
-        end;
+                    ally.Engage(chara)
+                end
+            end
+        end
     elseif target then
-        ally.Engage(target);
-    end;
-end;
\ No newline at end of file
+        ally.Engage(target)
+    end
+end
\ No newline at end of file
diff --git a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
index 56fb527d..81bf270e 100644
--- a/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
+++ b/data/scripts/directors/Quest/QuestDirectorMan0g001.lua
@@ -14,29 +14,30 @@ function onCreateContentArea(players, director, contentArea, contentGroup)
 
     local worldManager = GetWorldManager();
     
-	yshtola = GetWorldManager():SpawnBattleNpcById(6, contentArea);
-	stahlmann = GetWorldManager():SpawnBattleNpcById(7, contentArea);
+	yshtola = GetWorldManager().SpawnBattleNpcById(6, contentArea);
+	stahlmann = GetWorldManager().SpawnBattleNpcById(7, contentArea);
 	
-	mob1 = GetWorldManager():SpawnBattleNpcById(3, contentArea);
-	mob2 = GetWorldManager():SpawnBattleNpcById(4, contentArea);
-	mob3 = GetWorldManager():SpawnBattleNpcById(5, contentArea);
+	mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea);
+	mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea);
+	mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea);
 	
     local added = false;
     for i = 0, players.Count do
         local player = players[i];
+		print("asses "..players.Count)
         if player.currentParty and not added then
-            player.currentParty.members.Add(6);
+			print("shitness")
+            player.currentParty.members:Add(yshtola.actorId);
             print("cunt")
-            player.currentParty.members.Add(7);
+            player.currentParty.members:Add(stahlmann.actorId);
             print("dickbag")
             added = true;
         end;
         -- dont let player die
-        player.SetMod(modifiersGlobal.MinimumHpLock, 1);
+        player:SetMod(modifiersGlobal.MinimumHpLock, 1);
+		contentGroup:AddMember(player)
         print("shittttt")
-        contentGroup:AddMember(player);
-        player:EndEvent();
-        i = i + 1;
+		break
     end;
     print("shit")
 	contentGroup:AddMember(director);
diff --git a/data/scripts/unique/fst0Battle03/Monster/yda.lua b/data/scripts/unique/fst0Battle03/Monster/yda.lua
index a262f46b..2abf6f76 100644
--- a/data/scripts/unique/fst0Battle03/Monster/yda.lua
+++ b/data/scripts/unique/fst0Battle03/Monster/yda.lua
@@ -3,9 +3,9 @@ require ("global")
 require ("ally")
 
 function onSpawn(ally)
-    ally.isAutoAttackEnabled = false;
-end;
+    ally.isAutoAttackEnabled = false
+end
 
 function onCombatTick(ally, target, tick, contentGroupCharas)	
-    allyGlobal.onCombatTick(ally, target, tick, contentGroupCharas);
-end;
\ No newline at end of file
+    allyGlobal.onCombatTick(ally, target, tick, contentGroupCharas)
+end
\ No newline at end of file