Merge branch '1.1_bug_fixes'

NPBruce · May 17, 2017 · 62f7b14 · 62f7b14
2 parents b3a06f9 + b4abc80
commit 62f7b14
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/content/MoM/base/activations.ini b/content/MoM/base/activations.ini
@@ -1,3 +1,8 @@
+[MonsterActivationDunwichHorror]
+ability="The {0} moves 2 spaces toward the nearest investigator. Then it attacks the investigator in its space who has suffered the least Damage."
+master="The creature gathers its tangle of limbs together and smashes a portion of its bulk down on you. Suffer 3 Damage ( negates). Then, if you suffered any Damage, become Stunned and Dazed."
+movebutton="Unable to Attack"
+
 [MonsterActivationByakhee01]
 ability={ffg:MONSTER_BYAKHEE_MOVE_01}
 master={ffg:MONSTER_BYAKHEE_ATTACK_01}

diff --git a/content/MoM/base/evade.ini b/content/MoM/base/evade.ini
@@ -1,3 +1,7 @@
+[EvadeDunwichHorror]
+monster=DunwichHorror
+text="You duck to race past the horrifying abomination when suddenly its human-like face appears before you, burbling nonsense; suffer 2 Horror ( negates). If you suffer any Horror, forfeit your action."
+
 [EvadeByakhee01]
 monster=Byakhee
 text={ffg:MONSTER_BYAKHEE_EVADE_01}

diff --git a/content/MoM/base/horror.ini b/content/MoM/base/horror.ini
@@ -1,3 +1,7 @@
+[HorrorDunwichHorror]
+monster=DunwichHorror
+text="The thing's complex and improbable anatomy drives reason from your mind, making you doubt what you thought you understood; discard 1 Clue. The more you dwell upon it, the more your stomach revolts and your palms sweat; suffer 3 Horror ( negates)."
+
 [HorrorByakhee01]
 monster=Byakhee
 text={ffg:MONSTER_BYAKHEE_HORROR_01}

diff --git a/unity/Assets/Scripts/Content/QuestData.cs b/unity/Assets/Scripts/Content/QuestData.cs
@@ -1733,6 +1733,20 @@ override public string ToString()
             }
             return r;
         }
+
+        // When changing the name placement event need to update in array
+        override public void ChangeReference(string oldName, string newName)
+        {
+            for (int i = 0; i < itemName.Length; i++)
+            {
+                if (itemName[i].Equals(oldName))
+                {
+                    itemName[i] = newName;
+                }
+            }
+            // If any were replaced with "", remove them
+            itemName = RemoveFromArray(itemName, "");
+        }
     }
 
     // Quest ini component has special data

diff --git a/unity/Assets/Scripts/QuestEditor/EditorComponentActivation.cs b/unity/Assets/Scripts/QuestEditor/EditorComponentActivation.cs
@@ -18,7 +18,7 @@ public class EditorComponentActivation : EditorComponent
 
     QuestData.Activation activationComponent;
     PaneledDialogBoxEditable abilityDBE;
-    PaneledDialogBoxEditable moveButtonDBE;
+    DialogBoxEditable moveButtonDBE;
     PaneledDialogBoxEditable masterActionsDBE;
     PaneledDialogBoxEditable minionActionsDBE;
     PaneledDialogBoxEditable moveDBE;
@@ -132,10 +132,11 @@ public void MoMActivation()
         abilityDBE.AddBorder();
 
         db = new DialogBox(new Vector2(0, 10), new Vector2(10, 1), UNABLE_BUTTON);
+        db.ApplyTag(Game.EDITOR);
 
-        moveButtonDBE = new PaneledDialogBoxEditable(
+        moveButtonDBE = new DialogBoxEditable(
             new Vector2(10, 10), new Vector2(10, 1), 
-            activationComponent.moveButton.Translate(true),
+            activationComponent.moveButton.Translate(true), false,
             delegate { UpdateMoveButton(); });
         moveButtonDBE.ApplyTag(Game.EDITOR);
         moveButtonDBE.AddBorder();