Add random gameobject target and extra fields to source entry condition.

Author: brotalnia

ScriptEditor/DataFinderForms/FormConditionFinder.cs

@@ -176,7 +176,6 @@ private void ResetAndHideConditionSpecificForms()
 
             // CONDITION_WAR_EFFORT_STAGE (11)
             // CONDITION_LEVEL (15)
-            // CONDITION_SOURCE_ENTRY (16)
             // CONDITION_LAST_WAYPOINT (32)
             // CONDITION_MAP_EVENT_ACTIVE (36)
             // CONDITION_DISTANCE (38)
@@ -238,11 +237,14 @@ private void ResetAndHideConditionSpecificForms()
             frmConditionMapEventData.Visible = false;
 
             // CONDITION_MAP_EVENT_TARGETS (47)
+            // CONDITION_OBJECT_FIT_CONDITION (50)
             txtMapEventTargetsEventId.Text = "";
             btnMapEventTargetsConditionId.Text = "-NONE-";
             frmConditionMapEventTargets.Visible = false;
 
+            // CONDITION_SOURCE_ENTRY (16)
             // CONDITION_DB_GUID (52)
+            // CONDITION_DISTANCE_TO_POSITION (54)
             txtConditionDbGuid1.Text = "";
             txtConditionDbGuid2.Text = "";
             txtConditionDbGuid3.Text = "";
@@ -616,7 +618,6 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition)
                 }
                 case 11: // CONDITION_WAR_EFFORT_STAGE
                 case 15: // CONDITION_LEVEL
-                case 16: // CONDITION_SOURCE_ENTRY
                 case 26: // CONDITION_ACTIVE_HOLIDAY
                 case 32: // CONDITION_LAST_WAYPOINT
                 case 36: // CONDITION_MAP_EVENT_ACTIVE
@@ -645,14 +646,6 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition)
                             lblWarEffortStage.Text = "Level:";
                             break;
                         }
-                        case 16: // CONDITION_SOURCE_ENTRY
-                        {
-                            lblConditionWarEffortTooltip.Text = "Returns true if the source WorldObject's entry Id matches the one specified.";
-                            cmbWarEffortComparison.Visible = false;
-                            lblWarEffortComparison.Visible = false;
-                            lblWarEffortStage.Text = "Entry:";
-                            break;
-                        }
                         case 26: // CONDITION_ACTIVE_HOLIDAY
                         {
                             lblConditionWarEffortTooltip.Text = "Returns true if the specified holiday is currently active.";
@@ -820,11 +813,22 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition)
                     frmConditionMapEventTargets.Visible = true;
                     break;
                 }
+                case 16: // CONDITION_SOURCE_ENTRY
                 case 52: // CONDITION_DB_GUID
                 case 54: // CONDITION_DISTANCE_TO_POSITION
                 {
                     switch (selectedCondition.Type)
                     {
+                        case 16: // CONDITION_SOURCE_ENTRY
+                        {
+                            lblConditionDbGuidTooltip.Text = "Returns true if the source object\'s entry matches any of the ones specified.";
+                            lblConditionDbGuid1.Text = "Entry 1:";
+                            lblConditionDbGuid2.Text = "Entry 2:";
+                            lblConditionDbGuid3.Text = "Entry 3:";
+                            lblConditionDbGuid4.Text = "Entry 4:";
+
+                            break;
+                        }
                         case 52: // CONDITION_DB_GUID
                         {
                             lblConditionDbGuidTooltip.Text = "Returns true if the source object\'s database guid matches any of the ones specified.";

ScriptEditor/FormEventEditor.Designer.cs

@@ -187,6 +187,7 @@ private void LoadControls()
             cmbTargetType.Items.Add(new ComboboxPair("Nearest Hostile Player", 24));
             cmbTargetType.Items.Add(new ComboboxPair("Nearest Friendly Player", 25));
             cmbTargetType.Items.Add(new ComboboxPair("Random Creature", 26));
+            cmbTargetType.Items.Add(new ComboboxPair("Random Gameobject", 27));
             cmbTargetType.SelectedIndex = 0;
 
             // Add chat types to combo box.
@@ -697,7 +698,6 @@ private void ResetAndHideCommandSpecificForms()
             // Update Entry (27)
             // Remove Guardians (56)
             btnUpdateEntryCreatureId.Text = "-NONE-";
-            cmbUpdateEntryTeam.SelectedIndex = 0;
             frmCommandUpdateEntry.Visible = false;
 
             // Set Stand State (28)
@@ -1575,24 +1575,19 @@ private void ShowCommandSpecificForm(ScriptAction selectedAction)
                     {
                         case 27: // Update Entry
                         {
-                            lblUpdateEntryTooltip.Text = "Temporarily changes the source Creature\'s entry, but preserves the same AI. The team setting determines which display Id will be used if there is a different one for each faction.";
-                            lblUpdateEntryTeam.Visible = true;
-                            cmbUpdateEntryTeam.Visible = true;
+                            lblUpdateEntryTooltip.Text = "Temporarily changes the source Creature\'s entry, but preserves the same AI.";
                             break;
                         }
                         case 56: // Remove Guardians
                         {
                             lblUpdateEntryTooltip.Text = "Unsummons all Guardian Pets with the given creature Id that are owned by the source Unit. If no creature Id is provided, it unsummons all of them.";
-                            cmbUpdateEntryTeam.Visible = false;
-                            lblUpdateEntryTeam.Visible = false;
                             break;
                         }
                     }
 
                     uint creatureId = selectedAction.Datalong;
                     if (creatureId > 0)
                         btnUpdateEntryCreatureId.Text = GameData.FindCreatureName(creatureId) + " (" + creatureId.ToString() + ")";
-                    cmbUpdateEntryTeam.SelectedIndex = (int)selectedAction.Datalong2;
                     frmCommandUpdateEntry.Visible = true;
                     break;
                 }
@@ -2484,6 +2479,7 @@ private void SetTargetControlsBasedOnType(int target_type)
                 case 8: // Nearest Creature with Entry
                 case 11: // Nearest GameObject with Entry
                 case 26: // Random Creature with Entry
+                case 27: // Random GameObject with Entry
                 {
 
                     lblTargetParam1.Text = "Entry:";
@@ -2633,6 +2629,7 @@ private void btnTargetParam1_Click(object sender, EventArgs e)
                     break;
                 }
                 case 11: // Nearest GameObject with Entry
+                case 27: // Random GameObject with Entry
                 {
                     SetScriptFieldFromDataFinderForm<FormGameObjectFinder>(btnTargetParam1, null, null, "TargetParam1");
                     break;
@@ -4039,10 +4036,6 @@ private void btnUpdateEntryCreatureId_Click(object sender, EventArgs e)
         {
             SetScriptFieldFromDataFinderForm<FormCreatureFinder>(btnUpdateEntryCreatureId, null, GameData.FindCreatureName, "Datalong");
         }
-        private void cmbUpdateEntryTeam_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetScriptFieldFromCombobox(cmbUpdateEntryTeam, "Datalong2", false);
-        }
 
         // SCRIPT_COMMAND_STAND_STATE (28)
         private void cmbSetStandState_SelectedIndexChanged(object sender, EventArgs e)

ScriptEditor/FormScriptEditor.Designer.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.9.0.0")]
-[assembly: AssemblyFileVersion("7.9.0.0")]
+[assembly: AssemblyVersion("8.0.0.0")]
+[assembly: AssemblyFileVersion("8.0.0.0")]