Finished work on the condition editor.

brotalnia · Dec 13, 2018 · 02c4c9a · 02c4c9a
1 parent 085c40b
commit 02c4c9a
Show file tree

Hide file tree

Showing 16 changed files with 1,160 additions and 50 deletions.
diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs
diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.cs
diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.resx b/ScriptEditor/DataFinderForms/FormConditionFinder.resx
diff --git a/ScriptEditor/DataFinderForms/FormDataFinder.Designer.cs b/ScriptEditor/DataFinderForms/FormDataFinder.Designer.cs
diff --git a/ScriptEditor/DataFinderForms/FormDataFinder.cs b/ScriptEditor/DataFinderForms/FormDataFinder.cs
@@ -13,6 +13,7 @@ namespace ScriptEditor
     public partial class FormDataFinder : Form
     {
         public int ReturnValue { get; set; } // we return the chosen id in this
+        protected bool editMode = false;
 
         System.Collections.IComparer textComparer;
 
@@ -149,6 +150,9 @@ private void lstData_ColumnClick(object sender, ColumnClickEventArgs e)
 
         private void FormDataFinder_ResizeEnd(object sender, EventArgs e)
         {
+            if (editMode)
+                return;
+
             lstData.Width = this.Size.Width - 30;
             lstData.Height = this.Size.Height - lstData.Location.Y - 65;
             btnCancel.Location = new Point(lstData.Size.Width + lstData.Location.X - btnCancel.Size.Width, lstData.Location.Y + lstData.Height + 5);

diff --git a/ScriptEditor/Form1.Designer.cs b/ScriptEditor/Form1.Designer.cs
diff --git a/ScriptEditor/Form1.cs b/ScriptEditor/Form1.cs
@@ -21,6 +21,8 @@ public partial class Form1 : Form
         Image imgEventEditorHighlighted = ScriptEditor.Properties.Resources.event_editor_button;
         Image imgCastsEditor = ScriptEditor.Properties.Resources.cast_editor_button_black;
         Image imgCastsEditorHighlighted = ScriptEditor.Properties.Resources.cast_editor_button;
+        Image imgConditionsEditor = ScriptEditor.Properties.Resources.condition_editor_button_black;
+        Image imgConditionsEditorHighlighted = ScriptEditor.Properties.Resources.condition_editor_button;
         Image imgGitLink = ScriptEditor.Properties.Resources.gitlink1;
         Image imgGitLinkHighlighted = ScriptEditor.Properties.Resources.gitlink2;
 
@@ -95,5 +97,22 @@ private void picCastsEditor_Click(object sender, EventArgs e)
             FormCastsEditor editor = new FormCastsEditor();
             editor.Show();
         }
+
+        private void picConditionEditor_MouseEnter(object sender, EventArgs e)
+        {
+            picConditionEditor.BackgroundImage = imgConditionsEditorHighlighted;
+            player.Play();
+        }
+
+        private void picConditionEditor_MouseLeave(object sender, EventArgs e)
+        {
+            picConditionEditor.BackgroundImage = imgConditionsEditor;
+        }
+
+        private void picConditionEditor_Click(object sender, EventArgs e)
+        {
+            FormConditionFinder editor = new FormConditionFinder();
+            editor.ShowStandalone();
+        }
     }
 }
diff --git a/ScriptEditor/FormScriptEditor.cs b/ScriptEditor/FormScriptEditor.cs
@@ -2960,7 +2960,7 @@ private void Command4SetCheckboxNamesBasedOnFieldIndex(int field)
                     chkModifyFlags64.Visible = true;
                     chkModifyFlags128.Text = "NOT_ATTACKABLE_1";
                     chkModifyFlags128.Visible = true;
-                    chkModifyFlags256.Text = "OOC_NOT_ATTACKABLE";
+                    chkModifyFlags256.Text = "IMMUNE_TO_PLAYER";
                     chkModifyFlags256.Visible = true;
                     chkModifyFlags512.Text = "PASSIVE";
                     chkModifyFlags512.Visible = true;

diff --git a/ScriptEditor/GameData.cs b/ScriptEditor/GameData.cs
@@ -1603,7 +1603,7 @@ static GameData()
             ConditionNamesList.Add(new ComboboxPair("AD_COMMISSION_AURA", 10));
             ConditionNamesList.Add(new ComboboxPair("WAR_EFFORT_STAGE", 11));
             ConditionNamesList.Add(new ComboboxPair("ACTIVE_GAME_EVENT", 12));
-            ConditionNamesList.Add(new ComboboxPair("AREA_FLAG", 13));
+            ConditionNamesList.Add(new ComboboxPair("CANT_PATH_TO_VICTIM", 13));
             ConditionNamesList.Add(new ComboboxPair("RACE_CLASS", 14));
             ConditionNamesList.Add(new ComboboxPair("LEVEL", 15));
             ConditionNamesList.Add(new ComboboxPair("SOURCE_ENTRY", 16));
@@ -1617,8 +1617,8 @@ static GameData()
             ConditionNamesList.Add(new ComboboxPair("WOW_PATCH", 24));
             ConditionNamesList.Add(new ComboboxPair("DEAD_OR_AWAY", 25));
             ConditionNamesList.Add(new ComboboxPair("ACTIVE_HOLIDAY", 26));
-            ConditionNamesList.Add(new ComboboxPair("TARGET_GENDER", 27));
-            ConditionNamesList.Add(new ComboboxPair("LEARNABLE_ABILITY", 28));
+            ConditionNamesList.Add(new ComboboxPair("GENDER", 27));
+            ConditionNamesList.Add(new ComboboxPair("IS_PLAYER", 28));
             ConditionNamesList.Add(new ComboboxPair("SKILL_BELOW", 29));
             ConditionNamesList.Add(new ComboboxPair("REPUTATION_RANK_MAX", 30));
             ConditionNamesList.Add(new ComboboxPair("HAS_FLAG", 31));
@@ -1638,10 +1638,8 @@ static GameData()
             ConditionNamesList.Add(new ComboboxPair("IS_IN_GROUP", 45));
             ConditionNamesList.Add(new ComboboxPair("IS_ALIVE", 46));
             ConditionNamesList.Add(new ComboboxPair("MAP_EVENT_TARGETS", 47));
-            ConditionNamesList.Add(new ComboboxPair("CANT_PATH_TO_VICTIM", 48));
-            ConditionNamesList.Add(new ComboboxPair("IS_PLAYER", 49));
-            ConditionNamesList.Add(new ComboboxPair("OBJECT_IS_SPAWNED", 50));
-            ConditionNamesList.Add(new ComboboxPair("OBJECT_LOOT_STATE", 51));
+            ConditionNamesList.Add(new ComboboxPair("OBJECT_IS_SPAWNED", 48));
+            ConditionNamesList.Add(new ComboboxPair("OBJECT_LOOT_STATE", 49));
 
             // Add skill names.
             SkillsList.Add(new ComboboxPair("Frost", 6));

diff --git a/ScriptEditor/Properties/AssemblyInfo.cs b/ScriptEditor/Properties/AssemblyInfo.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("6.1.0.0")]
-[assembly: AssemblyFileVersion("6.1.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/ScriptEditor/Properties/Resources.Designer.cs b/ScriptEditor/Properties/Resources.Designer.cs
diff --git a/ScriptEditor/Properties/Resources.resx b/ScriptEditor/Properties/Resources.resx
@@ -160,4 +160,10 @@
   <data name="mage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="condition_editor_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\condition_editor_button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="condition_editor_button_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\condition_editor_button_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/ScriptEditor/Resources/condition_editor_button.png b/ScriptEditor/Resources/condition_editor_button.png
diff --git a/ScriptEditor/Resources/condition_editor_button_black.png b/ScriptEditor/Resources/condition_editor_button_black.png
diff --git a/ScriptEditor/Resources/conditions.ico b/ScriptEditor/Resources/conditions.ico
diff --git a/ScriptEditor/ScriptEditor.csproj b/ScriptEditor/ScriptEditor.csproj
@@ -330,6 +330,12 @@
   <ItemGroup>
     <None Include="Resources\mage.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\condition_editor_button.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\condition_editor_button_black.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.