From af9a89cbdcfbc803e44efa5f21052bde9f24085d Mon Sep 17 00:00:00 2001 From: brotalnia Date: Thu, 17 Mar 2022 00:19:32 +0200 Subject: [PATCH] Change war effort condition into generic saved variable check. --- .../FormConditionFinder.Designer.cs | 152 +++++++++--------- .../DataFinderForms/FormConditionFinder.cs | 137 ++++++++-------- ScriptEditor/GameData.cs | 2 +- 3 files changed, 151 insertions(+), 140 deletions(-) diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs index f0209e4..ad3edc7 100644 --- a/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs +++ b/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs @@ -86,12 +86,12 @@ private void InitializeComponent() this.lblQuestState = new System.Windows.Forms.Label(); this.lblQuestId = new System.Windows.Forms.Label(); this.lblConditionQuestTooltip = new System.Windows.Forms.Label(); - this.frmConditionWarEffort = new System.Windows.Forms.Panel(); - this.txtWarEffortStage = new System.Windows.Forms.TextBox(); - this.cmbWarEffortComparison = new System.Windows.Forms.ComboBox(); - this.lblWarEffortComparison = new System.Windows.Forms.Label(); - this.lblWarEffortStage = new System.Windows.Forms.Label(); - this.lblConditionWarEffortTooltip = new System.Windows.Forms.Label(); + this.frmConditionComparison = new System.Windows.Forms.Panel(); + this.txtComparisonValue = new System.Windows.Forms.TextBox(); + this.cmbComparisonComparison = new System.Windows.Forms.ComboBox(); + this.lblComparisonComparison = new System.Windows.Forms.Label(); + this.lblComparisonValue = new System.Windows.Forms.Label(); + this.lblConditionComparisonTooltip = new System.Windows.Forms.Label(); this.frmConditionGameEvent = new System.Windows.Forms.Panel(); this.btnGameEventId = new System.Windows.Forms.Button(); this.lvlGameEventId = new System.Windows.Forms.Label(); @@ -218,7 +218,7 @@ private void InitializeComponent() this.frmConditionTeam.SuspendLayout(); this.frmConditionSkill.SuspendLayout(); this.frmConditionQuest.SuspendLayout(); - this.frmConditionWarEffort.SuspendLayout(); + this.frmConditionComparison.SuspendLayout(); this.frmConditionGameEvent.SuspendLayout(); this.frmConditionRaceClass.SuspendLayout(); this.frmConditionInstanceScript.SuspendLayout(); @@ -818,68 +818,68 @@ private void InitializeComponent() this.lblConditionQuestTooltip.TabIndex = 0; this.lblConditionQuestTooltip.Text = "Returns true if the target Player has previously completed the specified quest."; // - // frmConditionWarEffort - // - this.frmConditionWarEffort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.frmConditionWarEffort.Controls.Add(this.txtWarEffortStage); - this.frmConditionWarEffort.Controls.Add(this.cmbWarEffortComparison); - this.frmConditionWarEffort.Controls.Add(this.lblWarEffortComparison); - this.frmConditionWarEffort.Controls.Add(this.lblWarEffortStage); - this.frmConditionWarEffort.Controls.Add(this.lblConditionWarEffortTooltip); - this.frmConditionWarEffort.Location = new System.Drawing.Point(12, 212); - this.frmConditionWarEffort.Name = "frmConditionWarEffort"; - this.frmConditionWarEffort.Size = new System.Drawing.Size(650, 150); - this.frmConditionWarEffort.TabIndex = 27; - this.frmConditionWarEffort.Visible = false; - // - // txtWarEffortStage - // - this.txtWarEffortStage.Location = new System.Drawing.Point(100, 68); - this.txtWarEffortStage.Name = "txtWarEffortStage"; - this.txtWarEffortStage.Size = new System.Drawing.Size(536, 20); - this.txtWarEffortStage.TabIndex = 8; - this.txtWarEffortStage.Leave += new System.EventHandler(this.txtWarEffortStage_Leave); - // - // cmbWarEffortComparison - // - this.cmbWarEffortComparison.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbWarEffortComparison.FormattingEnabled = true; - this.cmbWarEffortComparison.Items.AddRange(new object[] { + // frmConditionComparison + // + this.frmConditionComparison.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.frmConditionComparison.Controls.Add(this.txtComparisonValue); + this.frmConditionComparison.Controls.Add(this.cmbComparisonComparison); + this.frmConditionComparison.Controls.Add(this.lblComparisonComparison); + this.frmConditionComparison.Controls.Add(this.lblComparisonValue); + this.frmConditionComparison.Controls.Add(this.lblConditionComparisonTooltip); + this.frmConditionComparison.Location = new System.Drawing.Point(12, 212); + this.frmConditionComparison.Name = "frmConditionComparison"; + this.frmConditionComparison.Size = new System.Drawing.Size(650, 150); + this.frmConditionComparison.TabIndex = 27; + this.frmConditionComparison.Visible = false; + // + // txtComparisonValue + // + this.txtComparisonValue.Location = new System.Drawing.Point(100, 68); + this.txtComparisonValue.Name = "txtComparisonValue"; + this.txtComparisonValue.Size = new System.Drawing.Size(536, 20); + this.txtComparisonValue.TabIndex = 8; + this.txtComparisonValue.Leave += new System.EventHandler(this.txtComparisonValue_Leave); + // + // cmbComparisonComparison + // + this.cmbComparisonComparison.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbComparisonComparison.FormattingEnabled = true; + this.cmbComparisonComparison.Items.AddRange(new object[] { "==", ">=", "<="}); - this.cmbWarEffortComparison.Location = new System.Drawing.Point(100, 101); - this.cmbWarEffortComparison.Name = "cmbWarEffortComparison"; - this.cmbWarEffortComparison.Size = new System.Drawing.Size(536, 21); - this.cmbWarEffortComparison.TabIndex = 6; - this.cmbWarEffortComparison.SelectedIndexChanged += new System.EventHandler(this.cmbWarEffortComparison_SelectedIndexChanged); - // - // lblWarEffortComparison - // - this.lblWarEffortComparison.AutoSize = true; - this.lblWarEffortComparison.Location = new System.Drawing.Point(11, 106); - this.lblWarEffortComparison.Name = "lblWarEffortComparison"; - this.lblWarEffortComparison.Size = new System.Drawing.Size(65, 13); - this.lblWarEffortComparison.TabIndex = 2; - this.lblWarEffortComparison.Text = "Comparison:"; - // - // lblWarEffortStage - // - this.lblWarEffortStage.AutoSize = true; - this.lblWarEffortStage.Location = new System.Drawing.Point(11, 73); - this.lblWarEffortStage.Name = "lblWarEffortStage"; - this.lblWarEffortStage.Size = new System.Drawing.Size(38, 13); - this.lblWarEffortStage.TabIndex = 1; - this.lblWarEffortStage.Text = "Stage:"; - // - // lblConditionWarEffortTooltip - // - this.lblConditionWarEffortTooltip.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lblConditionWarEffortTooltip.Location = new System.Drawing.Point(12, 8); - this.lblConditionWarEffortTooltip.Name = "lblConditionWarEffortTooltip"; - this.lblConditionWarEffortTooltip.Size = new System.Drawing.Size(624, 42); - this.lblConditionWarEffortTooltip.TabIndex = 0; - this.lblConditionWarEffortTooltip.Text = "Returns true if the War Effort event is at the specified stage."; + this.cmbComparisonComparison.Location = new System.Drawing.Point(100, 101); + this.cmbComparisonComparison.Name = "cmbComparisonComparison"; + this.cmbComparisonComparison.Size = new System.Drawing.Size(536, 21); + this.cmbComparisonComparison.TabIndex = 6; + this.cmbComparisonComparison.SelectedIndexChanged += new System.EventHandler(this.cmbComparisonComparison_SelectedIndexChanged); + // + // lblComparisonComparison + // + this.lblComparisonComparison.AutoSize = true; + this.lblComparisonComparison.Location = new System.Drawing.Point(11, 106); + this.lblComparisonComparison.Name = "lblComparisonComparison"; + this.lblComparisonComparison.Size = new System.Drawing.Size(65, 13); + this.lblComparisonComparison.TabIndex = 2; + this.lblComparisonComparison.Text = "Comparison:"; + // + // lblComparisonValue + // + this.lblComparisonValue.AutoSize = true; + this.lblComparisonValue.Location = new System.Drawing.Point(11, 73); + this.lblComparisonValue.Name = "lblComparisonValue"; + this.lblComparisonValue.Size = new System.Drawing.Size(38, 13); + this.lblComparisonValue.TabIndex = 1; + this.lblComparisonValue.Text = "Stage:"; + // + // lblConditionComparisonTooltip + // + this.lblConditionComparisonTooltip.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.lblConditionComparisonTooltip.Location = new System.Drawing.Point(12, 8); + this.lblConditionComparisonTooltip.Name = "lblConditionComparisonTooltip"; + this.lblConditionComparisonTooltip.Size = new System.Drawing.Size(624, 42); + this.lblConditionComparisonTooltip.TabIndex = 0; + this.lblConditionComparisonTooltip.Text = "Returns true if the War Effort event is at the specified stage."; // // frmConditionGameEvent // @@ -2106,7 +2106,7 @@ private void InitializeComponent() this.Controls.Add(this.frmConditionInstanceScript); this.Controls.Add(this.frmConditionRaceClass); this.Controls.Add(this.frmConditionGameEvent); - this.Controls.Add(this.frmConditionWarEffort); + this.Controls.Add(this.frmConditionComparison); this.Controls.Add(this.frmConditionQuest); this.Controls.Add(this.frmConditionSkill); this.Controls.Add(this.frmConditionTeam); @@ -2150,7 +2150,7 @@ private void InitializeComponent() this.Controls.SetChildIndex(this.frmConditionTeam, 0); this.Controls.SetChildIndex(this.frmConditionSkill, 0); this.Controls.SetChildIndex(this.frmConditionQuest, 0); - this.Controls.SetChildIndex(this.frmConditionWarEffort, 0); + this.Controls.SetChildIndex(this.frmConditionComparison, 0); this.Controls.SetChildIndex(this.frmConditionGameEvent, 0); this.Controls.SetChildIndex(this.lstData, 0); this.Controls.SetChildIndex(this.btnSelectNone, 0); @@ -2186,8 +2186,8 @@ private void InitializeComponent() this.frmConditionSkill.PerformLayout(); this.frmConditionQuest.ResumeLayout(false); this.frmConditionQuest.PerformLayout(); - this.frmConditionWarEffort.ResumeLayout(false); - this.frmConditionWarEffort.PerformLayout(); + this.frmConditionComparison.ResumeLayout(false); + this.frmConditionComparison.PerformLayout(); this.frmConditionGameEvent.ResumeLayout(false); this.frmConditionGameEvent.PerformLayout(); this.frmConditionRaceClass.ResumeLayout(false); @@ -2282,12 +2282,12 @@ private void InitializeComponent() private System.Windows.Forms.Label lblQuestState; private System.Windows.Forms.Label lblQuestId; private System.Windows.Forms.Label lblConditionQuestTooltip; - private System.Windows.Forms.Panel frmConditionWarEffort; - private System.Windows.Forms.TextBox txtWarEffortStage; - private System.Windows.Forms.ComboBox cmbWarEffortComparison; - private System.Windows.Forms.Label lblWarEffortComparison; - private System.Windows.Forms.Label lblWarEffortStage; - private System.Windows.Forms.Label lblConditionWarEffortTooltip; + private System.Windows.Forms.Panel frmConditionComparison; + private System.Windows.Forms.TextBox txtComparisonValue; + private System.Windows.Forms.ComboBox cmbComparisonComparison; + private System.Windows.Forms.Label lblComparisonComparison; + private System.Windows.Forms.Label lblComparisonValue; + private System.Windows.Forms.Label lblConditionComparisonTooltip; private System.Windows.Forms.Panel frmConditionGameEvent; private System.Windows.Forms.Button btnGameEventId; private System.Windows.Forms.Label lvlGameEventId; diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.cs index fa6522a..4233b36 100644 --- a/ScriptEditor/DataFinderForms/FormConditionFinder.cs +++ b/ScriptEditor/DataFinderForms/FormConditionFinder.cs @@ -28,7 +28,7 @@ private void AddControlsToLists() conditionFormsList.Add(frmConditionTeam); conditionFormsList.Add(frmConditionSkill); conditionFormsList.Add(frmConditionQuest); - conditionFormsList.Add(frmConditionWarEffort); + conditionFormsList.Add(frmConditionComparison); conditionFormsList.Add(frmConditionGameEvent); conditionFormsList.Add(frmConditionRaceClass); conditionFormsList.Add(frmConditionInstanceScript); @@ -52,7 +52,7 @@ private void AddControlsToLists() conditionTooltipsList.Add(lblConditionTeamTooltip); conditionTooltipsList.Add(lblConditionSkillTooltip); conditionTooltipsList.Add(lblConditionQuestTooltip); - conditionTooltipsList.Add(lblConditionWarEffortTooltip); + conditionTooltipsList.Add(lblConditionComparisonTooltip); conditionTooltipsList.Add(lblConditionGameEventTooltip); conditionTooltipsList.Add(lblConditionRaceClassTooltip); conditionTooltipsList.Add(lblConditionInstanceScriptTooltip); @@ -282,9 +282,9 @@ private string DescribeCondition(ConditionInfo condition, bool targetsSwapped) description += targetName + " Has Argent Dawn Commission"; break; } - case 11: // War Effort Stage + case 11: // Saved Variable { - description += "War Effort Stage Is " + GetComparisonOperatorName(condition.Value2) + " " + condition.Value1; + description += "Saved Variable In Index " + condition.Value1 + " Is " + GetComparisonOperatorName(condition.Value3) + " " + condition.Value2; break; } case 12: // Active Game Event @@ -641,7 +641,6 @@ private void ResetAndHideConditionSpecificForms() cmbQuestState.SelectedIndex = 0; frmConditionQuest.Visible = false; - // CONDITION_WAR_EFFORT_STAGE (11) // CONDITION_LEVEL (15) // CONDITION_LAST_WAYPOINT (32) // CONDITION_MAP_EVENT_ACTIVE (36) @@ -649,9 +648,9 @@ private void ResetAndHideConditionSpecificForms() // CONDITION_HEALTH_PERCENT (41) // CONDITION_MANA_PERCENT (42) // CONDITION_PVP_RANK (51) - txtWarEffortStage.Text = ""; - cmbWarEffortComparison.SelectedIndex = 0; - frmConditionWarEffort.Visible = false; + txtComparisonValue.Text = ""; + cmbComparisonComparison.SelectedIndex = 0; + frmConditionComparison.Visible = false; // CONDITION_ACTIVE_GAME_EVENT (12) btnGameEventId.Text = "-NONE-"; @@ -695,6 +694,7 @@ private void ResetAndHideConditionSpecificForms() btnHasFlagFlags.Text = "-NONE-"; frmConditionHasFlag.Visible = false; + // CONDITION_SAVED_VARIABLE (11) // CONDITION_INSTANCE_DATA (34) txtInstanceDataIndex.Text = ""; txtInstanceDataValue.Text = ""; @@ -1087,7 +1087,6 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition) frmConditionQuest.Visible = true; break; } - case 11: // CONDITION_WAR_EFFORT_STAGE case 15: // CONDITION_LEVEL case 26: // CONDITION_ACTIVE_HOLIDAY case 32: // CONDITION_LAST_WAYPOINT @@ -1099,88 +1098,79 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition) { switch (selectedCondition.Type) { - case 11: // CONDITION_WAR_EFFORT_STAGE - { - lblConditionWarEffortTooltip.Text = "Returns true if the War Effort event is at the specified stage."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Stage:"; - break; - } case 15: // CONDITION_LEVEL { - lblConditionWarEffortTooltip.Text = "Returns true if the target Player fits the specified level requirement."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Level:"; + lblConditionComparisonTooltip.Text = "Returns true if the target Player fits the specified level requirement."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Level:"; break; } case 26: // CONDITION_ACTIVE_HOLIDAY { - lblConditionWarEffortTooltip.Text = "Returns true if the specified holiday is currently active."; - cmbWarEffortComparison.Visible = false; - lblWarEffortComparison.Visible = false; - lblWarEffortStage.Text = "Holiday Id:"; + lblConditionComparisonTooltip.Text = "Returns true if the specified holiday is currently active."; + cmbComparisonComparison.Visible = false; + lblComparisonComparison.Visible = false; + lblComparisonValue.Text = "Holiday Id:"; break; } case 32: // CONDITION_LAST_WAYPOINT { - lblConditionWarEffortTooltip.Text = "Returns true if the source Creature's last reached waypoint matches the one specified."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Waypoint:"; + lblConditionComparisonTooltip.Text = "Returns true if the source Creature's last reached waypoint matches the one specified."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Waypoint:"; break; } case 36: // CONDITION_MAP_EVENT_ACTIVE { - lblConditionWarEffortTooltip.Text = "Returns true if a scripted map event with the specified Id is currently running."; - cmbWarEffortComparison.Visible = false; - lblWarEffortComparison.Visible = false; - lblWarEffortStage.Text = "Event Id:"; + lblConditionComparisonTooltip.Text = "Returns true if a scripted map event with the specified Id is currently running."; + cmbComparisonComparison.Visible = false; + lblComparisonComparison.Visible = false; + lblComparisonValue.Text = "Event Id:"; break; } case 38: // CONDITION_DISTANCE { - lblConditionWarEffortTooltip.Text = "Returns true if the source and target WorldObjects are within a specified distance of each other."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Distance:"; + lblConditionComparisonTooltip.Text = "Returns true if the source and target WorldObjects are within a specified distance of each other."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Distance:"; break; } case 41: // CONDITION_HEALTH_PERCENT { - lblConditionWarEffortTooltip.Text = "Returns true if the target Unit's remaining health percent matches the specified criteria."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Health:"; + lblConditionComparisonTooltip.Text = "Returns true if the target Unit's remaining health percent matches the specified criteria."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Health:"; break; } case 42: // CONDITION_MANA_PERCENT { - lblConditionWarEffortTooltip.Text = "Returns true if the target Unit's remaining mana percent matches the specified criteria."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Mana:"; + lblConditionComparisonTooltip.Text = "Returns true if the target Unit's remaining mana percent matches the specified criteria."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Mana:"; break; } case 51: // CONDITION_PVP_RANK { - lblConditionWarEffortTooltip.Text = "Returns true if the target Player's honor rank matches the specified criteria."; - cmbWarEffortComparison.Visible = true; - cmbWarEffortComparison.SelectedIndex = (int)selectedCondition.Value2; - lblWarEffortComparison.Visible = true; - lblWarEffortStage.Text = "Rank:"; + lblConditionComparisonTooltip.Text = "Returns true if the target Player's honor rank matches the specified criteria."; + cmbComparisonComparison.Visible = true; + cmbComparisonComparison.SelectedIndex = (int)selectedCondition.Value2; + lblComparisonComparison.Visible = true; + lblComparisonValue.Text = "Rank:"; break; } } - txtWarEffortStage.Text = selectedCondition.Value1.ToString(); - frmConditionWarEffort.Visible = true; + txtComparisonValue.Text = selectedCondition.Value1.ToString(); + frmConditionComparison.Visible = true; break; } case 12: // CONDITION_ACTIVE_GAME_EVENT @@ -1251,8 +1241,22 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition) frmConditionHasFlag.Visible = true; break; } + case 11: // CONDITION_SAVED_VARIABLE case 34: // CONDITION_INSTANCE_DATA { + switch (selectedCondition.Type) + { + case 11: // CONDITION_SAVED_VARIABLE + { + lblConditionInstanceDataTooltip.Text = "Returns true if the value of the specified global saved variable fits the required criteria."; + break; + } + case 34: // CONDITION_INSTANCE_DATA + { + lblConditionInstanceDataTooltip.Text = "Returns true if the value in the specified instance data field fits the required criteria."; + break; + } + } txtInstanceDataIndex.Text = selectedCondition.Value1.ToString(); txtInstanceDataValue.Text = selectedCondition.Value2.ToString(); cmbInstanceDataComparison.SelectedIndex = (int)selectedCondition.Value3; @@ -2095,14 +2099,20 @@ private void cmbQuestState_Leave(object sender, EventArgs e) { SetScriptFieldFromCombobox(cmbQuestState, "Value2", false); } - // CONDITION_WAR_EFFORT_STAGE - private void txtWarEffortStage_Leave(object sender, EventArgs e) + // CONDITION_LEVEL + // CONDITION_LAST_WAYPOINT + // CONDITION_MAP_EVENT_ACTIVE + // CONDITION_DISTANCE + // CONDITION_HEALTH_PERCENT + // CONDITION_MANA_PERCENT + // CONDITION_PVP_RANK + private void txtComparisonValue_Leave(object sender, EventArgs e) { - SetScriptFieldFromTextbox(txtWarEffortStage, "Value1"); + SetScriptFieldFromTextbox(txtComparisonValue, "Value1"); } - private void cmbWarEffortComparison_SelectedIndexChanged(object sender, EventArgs e) + private void cmbComparisonComparison_SelectedIndexChanged(object sender, EventArgs e) { - SetScriptFieldFromCombobox(cmbWarEffortComparison, "Value2", false); + SetScriptFieldFromCombobox(cmbComparisonComparison, "Value2", false); } // CONDITION_ACTIVE_GAME_EVENT private void btnGameEventId_Click(object sender, EventArgs e) @@ -2187,6 +2197,7 @@ private void txtEscortDistance_Leave(object sender, EventArgs e) { SetScriptFieldFromTextbox(txtEscortDistance, "Value2"); } + // CONDITION_SAVED_VARIABLE // CONDITION_INSTANCE_DATA private void txtInstanceDataIndex_Leave(object sender, EventArgs e) { diff --git a/ScriptEditor/GameData.cs b/ScriptEditor/GameData.cs index c58801e..4e0479d 100644 --- a/ScriptEditor/GameData.cs +++ b/ScriptEditor/GameData.cs @@ -1751,7 +1751,7 @@ static GameData() ConditionNamesList.Add(new ComboboxPair("QUESTREWARDED", 8)); ConditionNamesList.Add(new ComboboxPair("QUESTTAKEN", 9)); ConditionNamesList.Add(new ComboboxPair("AD_COMMISSION_AURA", 10)); - ConditionNamesList.Add(new ComboboxPair("WAR_EFFORT_STAGE", 11)); + ConditionNamesList.Add(new ComboboxPair("SAVED_VARIABLE", 11)); ConditionNamesList.Add(new ComboboxPair("ACTIVE_GAME_EVENT", 12)); ConditionNamesList.Add(new ComboboxPair("CANT_PATH_TO_VICTIM", 13)); ConditionNamesList.Add(new ComboboxPair("RACE_CLASS", 14));