From 2b8eb22be9b20399bc29d20e7c51ce1b8a61666e Mon Sep 17 00:00:00 2001
From: Extremelyd1 <10898310+Extremelyd1@users.noreply.github.com>
Date: Sun, 1 Sep 2024 20:58:30 +0200
Subject: [PATCH] Various fixes for Dream Warriors in Godhome

---
 HKMP/Game/Client/Entity/EntitySpawner.cs |  8 ++++++--
 HKMP/Resource/entity-registry.json       | 12 ++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/HKMP/Game/Client/Entity/EntitySpawner.cs b/HKMP/Game/Client/Entity/EntitySpawner.cs
index 8f8f1ff..28880c3 100644
--- a/HKMP/Game/Client/Entity/EntitySpawner.cs
+++ b/HKMP/Game/Client/Entity/EntitySpawner.cs
@@ -116,11 +116,15 @@ List<PlayMakerFSM> clientFsms
         }
 
         if (spawningType == EntityType.Galien && spawnedType == EntityType.GalienMiniScythe) {
-            return SpawnGalienMiniScytheObject(clientFsms[2]);
+            // The reason we do not use a hardcoded index from the FSMs is because the Shield Attack FSM is indexed
+            // differently depending on whether Markoth is in Godhome or not
+            return SpawnGalienMiniScytheObject(clientFsms.Find(fsm => fsm.Fsm.Name.Equals("Summon Minis")));
         }
         
         if (spawningType == EntityType.Markoth && spawnedType == EntityType.MarkothShield) {
-            return SpawnMarkothShieldObject(clientFsms[3]);
+            // The reason we do not use a hardcoded index from the FSMs is because the Shield Attack FSM is indexed
+            // differently depending on whether Markoth is in Godhome or not
+            return SpawnMarkothShieldObject(clientFsms.Find(fsm => fsm.Fsm.Name.Equals("Shield Attack")));
         }
 
         if (spawningType == EntityType.Kingsmould && spawnedType == EntityType.KingsmouldBlade) {
diff --git a/HKMP/Resource/entity-registry.json b/HKMP/Resource/entity-registry.json
index f81c45d..c116251 100644
--- a/HKMP/Resource/entity-registry.json
+++ b/HKMP/Resource/entity-registry.json
@@ -1118,7 +1118,7 @@
     {
         "base_object_name": "Ghost Warrior Xero",
         "type": "Xero",
-        "fsm_name": "FSM",
+        "fsm_name": "Attacking",
         "components": [
             "Music"
         ]
@@ -1142,7 +1142,7 @@
     {
         "base_object_name": "Ghost Warrior Hu",
         "type": "ElderHu",
-        "fsm_name": "FSM",
+        "fsm_name": "Attacking",
         "components": [
             "Music"
         ]
@@ -1150,7 +1150,7 @@
     {
         "base_object_name": "Ghost Warrior Marmu",
         "type": "Marmu",
-        "fsm_name": "FSM",
+        "fsm_name": "Control",
         "components": [
             "Music"
         ]
@@ -1158,7 +1158,7 @@
     {
         "base_object_name": "Ghost Warrior No Eyes",
         "type": "NoEyes",
-        "fsm_name": "FSM",
+        "fsm_name": "Attacking",
         "components": [
             "Music"
         ]
@@ -1166,7 +1166,7 @@
     {
         "base_object_name": "Ghost Warrior Galien",
         "type": "Galien",
-        "fsm_name": "FSM",
+        "fsm_name": "Movement",
         "components": [
             "Music"
         ]
@@ -1187,7 +1187,7 @@
     {
         "base_object_name": "Ghost Warrior Markoth",
         "type": "Markoth",
-        "fsm_name": "FSM",
+        "fsm_name": "Attacking",
         "components": [
             "Music"
         ]