Improve Adratha's spawn location

Argent77 · May 31, 2021 · f0b0c66 · f0b0c66
1 parent e602f4c
commit f0b0c66
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 46 deletions.
diff --git a/DjinniCompanion/scripts/a77001.baf b/DjinniCompanion/scripts/a77001.baf
@@ -36,49 +36,19 @@ END
 
 // Adratha's remains taken
 IF
-  HasItem("a7misc2", Player1)
+  PartyHasItem("a7misc2")
   Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player1, 0, 0, 0)
-END
-
-IF
-  HasItem("a7misc2", Player2)
-  Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player2, 0, 0, 0)
-END
-
-IF
-  HasItem("a7misc2", Player3)
-  Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player3, 0, 0, 0)
-END
-
-IF
-  HasItem("a7misc2", Player4)
-  Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player4, 0, 0, 0)
-END
-
-IF
-  HasItem("a7misc2", Player5)
-  Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player5, 0, 0, 0)
-END
-
-IF
-  HasItem("a7misc2", Player6)
-  Global("A7AdrathaSummoned", "A77001", 0)
-THEN RESPONSE #100
-  SetGlobal("A7AdrathaSummoned", "A77001", 1)
-  CreateCreatureObjectOffScreen("a7q1adra", Player6, 0, 0, 0)
+THEN
+  RESPONSE #100
+    SetGlobal("A7AdrathaSummoned", "A77001", 1)
+    CreateCreature("a7q1adra", [3010.772], 10)
+  RESPONSE #100
+    SetGlobal("A7AdrathaSummoned", "A77001", 1)
+    CreateCreature("a7q1adra", [3165.860], 9)
+  RESPONSE #100
+    SetGlobal("A7AdrathaSummoned", "A77001", 1)
+    CreateCreature("a7q1adra", [3448.816], 6)
+  RESPONSE #100
+    SetGlobal("A7AdrathaSummoned", "A77001", 1)
+    CreateCreature("a7q1adra", [3455.730], 5)
 END
diff --git a/DjinniCompanion/scripts/a7q1adra.baf b/DjinniCompanion/scripts/a7q1adra.baf
@@ -1,17 +1,27 @@
 // *** Actions for Adratha's ghost ***
 
+IF
+  Global("A7AdrathaTalkTimer", "A77001", 0)
+THEN RESPONSE #100
+  SetGlobalTimer("A7AdrathaTalkTimer", "A77001", 12)
+  Continue()
+END
+
 IF
   OR(2)
     !See([PC])
-    !Range([PC], 15)
+    !Range([PC], 10)
+  !GlobalTimerExpired("A7AdrathaTalkTimer", "A77001")
   Global("AskForHelp", "LOCALS", 0)
 THEN RESPONSE #100
   MoveToObject([PC])
 END
 
 IF
   See([PC])
-  Range([PC], 15)
+  OR(2)
+    Range([PC], 10)
+    GlobalTimerExpired("A7AdrathaTalkTimer", "A77001")
   Global("AskForHelp", "LOCALS", 0)
 THEN RESPONSE #100
   SetGlobal("AskForHelp", "LOCALS", 1)