Movement command and event changes.

brotalnia · Dec 30, 2020 · 86432bf · 86432bf
1 parent e5f58cd
commit 86432bf
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 173 deletions.
diff --git a/ScriptEditor/FormCastFlags.Designer.cs b/ScriptEditor/FormCastFlags.Designer.cs
diff --git a/ScriptEditor/FormCastFlags.cs b/ScriptEditor/FormCastFlags.cs
@@ -103,6 +103,10 @@ public bool ShowDialog(ref uint flags, ref uint script, uint targettype, ref uin
             if ((flags & 128) != 0)
                 chkCastFlag128.Checked = true;
 
+            // CF_TARGET_CASTING
+            if ((flags & 256) != 0)
+                chkCastFlag256.Checked = true;
+
             // Show the form.
             this.ShowDialog();
 
@@ -144,6 +148,10 @@ public bool ShowDialog(ref uint flags, ref uint script, uint targettype, ref uin
             if (chkCastFlag128.Checked)
                 new_flags += 128;
 
+            // CF_TARGET_CASTING
+            if (chkCastFlag256.Checked)
+                new_flags += 256;
+
             uint new_targetparam1 = 0;
             uint.TryParse(txtTargetParam1.Text, out new_targetparam1);
 

diff --git a/ScriptEditor/FormEventEditor.Designer.cs b/ScriptEditor/FormEventEditor.Designer.cs
diff --git a/ScriptEditor/FormEventEditor.cs b/ScriptEditor/FormEventEditor.cs
@@ -121,10 +121,6 @@ private void LoadControls()
             // Add options to Hit By Aura combo box.
             cmbHitByAuraType.DataSource = GameData.SpellAuraNamesList;
 
-            // Fix size of textbox.
-            txtMovementInformType.AutoSize = false;
-            txtMovementInformType.Height = 21;
-
             dontUpdate = false;
         }
 
@@ -594,7 +590,6 @@ private void ShowEventSpecificForm(CreatureEvent selectedEvent)
                 }
                 case 29: // EVENT_T_MOVEMENT_INFORM
                 {
-                    txtMovementInformType.Text = selectedEvent.Param1.ToString();
                     cmbMovementInformType.SelectedIndex = GameData.FindIndexOfMotionTypeFull((uint)selectedEvent.Param1);
                     txtMovementInformPoint.Text = selectedEvent.Param2.ToString();
                     txtMovementInformRepeatMin.Text = selectedEvent.Param3.ToString();
@@ -1369,30 +1364,6 @@ private void cmbMovementInformType_SelectedIndexChanged(object sender, EventArgs
                 return;
 
             SetScriptFieldFromCombobox(cmbMovementInformType, "Param1", true);
-            txtMovementInformType.Text = (cmbMovementInformType.SelectedItem as ComboboxPair).Value.ToString();
-        }
-
-        private void txtMovementInformType_Leave(object sender, EventArgs e)
-        {
-            if (dontUpdate)
-                return;
-
-            uint motion_type;
-            if (uint.TryParse(txtMovementInformType.Text, out motion_type) && (GameData.FindIndexOfMotionTypeFull(motion_type) != -1))
-            {
-                dontUpdate = true;
-                cmbMovementInformType.SelectedIndex = GameData.FindIndexOfMotionTypeFull(motion_type);
-                dontUpdate = false;
-                SetScriptFieldFromValue(motion_type, "Param1");
-            }
-            else
-            {
-                dontUpdate = true;
-                txtMovementInformType.Text = "0";
-                cmbMovementInformType.SelectedIndex = 0;
-                dontUpdate = false;
-                SetScriptFieldFromValue(0, "Param1");
-            }
         }
 
         private void txtMovementInformPoint_Leave(object sender, EventArgs e)