diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs index 8ee7462..516570c 100644 --- a/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs +++ b/ScriptEditor/DataFinderForms/FormConditionFinder.Designer.cs @@ -191,6 +191,18 @@ private void InitializeComponent() this.lblConditionDbGuid3 = new System.Windows.Forms.Label(); this.lblConditionDbGuid1 = new System.Windows.Forms.Label(); this.lblConditionDbGuidTooltip = new System.Windows.Forms.Label(); + this.frmConditionLocalTime = new System.Windows.Forms.Panel(); + this.txtLocalTimeEndMinutes = new System.Windows.Forms.TextBox(); + this.txtLocalTimeEndHour = new System.Windows.Forms.TextBox(); + this.txtLocalTimeStartMinutes = new System.Windows.Forms.TextBox(); + this.txtLocalTimeStartHour = new System.Windows.Forms.TextBox(); + this.lblLocalTimeTwoDots2 = new System.Windows.Forms.Label(); + this.lblLocalTimeTwoDots1 = new System.Windows.Forms.Label(); + this.lblLocalTimeEndTime = new System.Windows.Forms.Label(); + this.lblLocalTimeStartTime = new System.Windows.Forms.Label(); + this.lblConditionLocalTimeTooltip = new System.Windows.Forms.Label(); + this.lblLocalTimeHour = new System.Windows.Forms.Label(); + this.lblLocalTimeMinutes = new System.Windows.Forms.Label(); this.frmConditionNot.SuspendLayout(); this.frmConditionAura.SuspendLayout(); this.frmConditionItem.SuspendLayout(); @@ -213,6 +225,7 @@ private void InitializeComponent() this.frmConditionMapEventTargets.SuspendLayout(); this.frmConditionAnd.SuspendLayout(); this.frmConditionDbGuid.SuspendLayout(); + this.frmConditionLocalTime.SuspendLayout(); this.SuspendLayout(); // // lstData @@ -1876,11 +1889,128 @@ private void InitializeComponent() this.lblConditionDbGuidTooltip.TabIndex = 0; this.lblConditionDbGuidTooltip.Text = "Returns true if the source object\'s database guid matches any of the ones specifi" + "ed."; + // + // frmConditionLocalTime + // + this.frmConditionLocalTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeMinutes); + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeHour); + this.frmConditionLocalTime.Controls.Add(this.txtLocalTimeEndMinutes); + this.frmConditionLocalTime.Controls.Add(this.txtLocalTimeEndHour); + this.frmConditionLocalTime.Controls.Add(this.txtLocalTimeStartMinutes); + this.frmConditionLocalTime.Controls.Add(this.txtLocalTimeStartHour); + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeTwoDots2); + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeTwoDots1); + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeEndTime); + this.frmConditionLocalTime.Controls.Add(this.lblLocalTimeStartTime); + this.frmConditionLocalTime.Controls.Add(this.lblConditionLocalTimeTooltip); + this.frmConditionLocalTime.Location = new System.Drawing.Point(12, 212); + this.frmConditionLocalTime.Name = "frmConditionLocalTime"; + this.frmConditionLocalTime.Size = new System.Drawing.Size(650, 150); + this.frmConditionLocalTime.TabIndex = 41; + this.frmConditionLocalTime.Visible = false; + // + // txtLocalTimeEndMinutes + // + this.txtLocalTimeEndMinutes.Location = new System.Drawing.Point(374, 117); + this.txtLocalTimeEndMinutes.Name = "txtLocalTimeEndMinutes"; + this.txtLocalTimeEndMinutes.Size = new System.Drawing.Size(255, 20); + this.txtLocalTimeEndMinutes.TabIndex = 12; + this.txtLocalTimeEndMinutes.Leave += new System.EventHandler(this.txtLocalTimeEndMinutes_Leave); + // + // txtLocalTimeEndHour + // + this.txtLocalTimeEndHour.Location = new System.Drawing.Point(100, 117); + this.txtLocalTimeEndHour.Name = "txtLocalTimeEndHour"; + this.txtLocalTimeEndHour.Size = new System.Drawing.Size(255, 20); + this.txtLocalTimeEndHour.TabIndex = 11; + this.txtLocalTimeEndHour.Leave += new System.EventHandler(this.txtLocalTimeEndHour_Leave); + // + // txtLocalTimeStartMinutes + // + this.txtLocalTimeStartMinutes.Location = new System.Drawing.Point(374, 84); + this.txtLocalTimeStartMinutes.Name = "txtLocalTimeStartMinutes"; + this.txtLocalTimeStartMinutes.Size = new System.Drawing.Size(255, 20); + this.txtLocalTimeStartMinutes.TabIndex = 10; + this.txtLocalTimeStartMinutes.Leave += new System.EventHandler(this.txtLocalTimeStartMinutes_Leave); + // + // txtLocalTimeStartHour + // + this.txtLocalTimeStartHour.Location = new System.Drawing.Point(100, 84); + this.txtLocalTimeStartHour.Name = "txtLocalTimeStartHour"; + this.txtLocalTimeStartHour.Size = new System.Drawing.Size(255, 20); + this.txtLocalTimeStartHour.TabIndex = 9; + this.txtLocalTimeStartHour.Leave += new System.EventHandler(this.txtLocalTimeStartHour_Leave); + // + // lblLocalTimeTwoDots2 + // + this.lblLocalTimeTwoDots2.AutoSize = true; + this.lblLocalTimeTwoDots2.Location = new System.Drawing.Point(361, 122); + this.lblLocalTimeTwoDots2.Name = "lblLocalTimeTwoDots2"; + this.lblLocalTimeTwoDots2.Size = new System.Drawing.Size(10, 13); + this.lblLocalTimeTwoDots2.TabIndex = 6; + this.lblLocalTimeTwoDots2.Text = ":"; + // + // lblLocalTimeTwoDots1 + // + this.lblLocalTimeTwoDots1.AutoSize = true; + this.lblLocalTimeTwoDots1.Location = new System.Drawing.Point(361, 89); + this.lblLocalTimeTwoDots1.Name = "lblLocalTimeTwoDots1"; + this.lblLocalTimeTwoDots1.Size = new System.Drawing.Size(10, 13); + this.lblLocalTimeTwoDots1.TabIndex = 5; + this.lblLocalTimeTwoDots1.Text = ":"; + // + // lblLocalTimeEndTime + // + this.lblLocalTimeEndTime.AutoSize = true; + this.lblLocalTimeEndTime.Location = new System.Drawing.Point(31, 122); + this.lblLocalTimeEndTime.Name = "lblLocalTimeEndTime"; + this.lblLocalTimeEndTime.Size = new System.Drawing.Size(55, 13); + this.lblLocalTimeEndTime.TabIndex = 2; + this.lblLocalTimeEndTime.Text = "End Time:"; + // + // lblLocalTimeStartTime + // + this.lblLocalTimeStartTime.AutoSize = true; + this.lblLocalTimeStartTime.Location = new System.Drawing.Point(28, 89); + this.lblLocalTimeStartTime.Name = "lblLocalTimeStartTime"; + this.lblLocalTimeStartTime.Size = new System.Drawing.Size(58, 13); + this.lblLocalTimeStartTime.TabIndex = 1; + this.lblLocalTimeStartTime.Text = "Start Time:"; + // + // lblConditionLocalTimeTooltip + // + this.lblConditionLocalTimeTooltip.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.lblConditionLocalTimeTooltip.Location = new System.Drawing.Point(12, 8); + this.lblConditionLocalTimeTooltip.Name = "lblConditionLocalTimeTooltip"; + this.lblConditionLocalTimeTooltip.Size = new System.Drawing.Size(624, 42); + this.lblConditionLocalTimeTooltip.TabIndex = 0; + this.lblConditionLocalTimeTooltip.Text = "Returns true if the current time is in the specified range. The range is inclusiv" + + "e."; + // + // lblLocalTimeHour + // + this.lblLocalTimeHour.AutoSize = true; + this.lblLocalTimeHour.Location = new System.Drawing.Point(103, 65); + this.lblLocalTimeHour.Name = "lblLocalTimeHour"; + this.lblLocalTimeHour.Size = new System.Drawing.Size(30, 13); + this.lblLocalTimeHour.TabIndex = 13; + this.lblLocalTimeHour.Text = "Hour"; + // + // lblLocalTimeMinutes + // + this.lblLocalTimeMinutes.AutoSize = true; + this.lblLocalTimeMinutes.Location = new System.Drawing.Point(377, 65); + this.lblLocalTimeMinutes.Name = "lblLocalTimeMinutes"; + this.lblLocalTimeMinutes.Size = new System.Drawing.Size(44, 13); + this.lblLocalTimeMinutes.TabIndex = 14; + this.lblLocalTimeMinutes.Text = "Minutes"; // // FormConditionFinder // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.ClientSize = new System.Drawing.Size(674, 395); + this.Controls.Add(this.frmConditionLocalTime); this.Controls.Add(this.frmConditionDbGuid); this.Controls.Add(this.frmConditionAnd); this.Controls.Add(this.frmConditionMapEventTargets); @@ -1955,6 +2085,7 @@ private void InitializeComponent() this.Controls.SetChildIndex(this.frmConditionMapEventTargets, 0); this.Controls.SetChildIndex(this.frmConditionAnd, 0); this.Controls.SetChildIndex(this.frmConditionDbGuid, 0); + this.Controls.SetChildIndex(this.frmConditionLocalTime, 0); this.frmConditionNot.ResumeLayout(false); this.frmConditionNot.PerformLayout(); this.frmConditionAura.ResumeLayout(false); @@ -1999,6 +2130,8 @@ private void InitializeComponent() this.frmConditionAnd.PerformLayout(); this.frmConditionDbGuid.ResumeLayout(false); this.frmConditionDbGuid.PerformLayout(); + this.frmConditionLocalTime.ResumeLayout(false); + this.frmConditionLocalTime.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -2168,5 +2301,17 @@ private void InitializeComponent() private System.Windows.Forms.Label lblConditionDbGuid3; private System.Windows.Forms.Label lblConditionDbGuid1; private System.Windows.Forms.Label lblConditionDbGuidTooltip; + private System.Windows.Forms.Panel frmConditionLocalTime; + private System.Windows.Forms.Label lblLocalTimeMinutes; + private System.Windows.Forms.Label lblLocalTimeHour; + private System.Windows.Forms.TextBox txtLocalTimeEndMinutes; + private System.Windows.Forms.TextBox txtLocalTimeEndHour; + private System.Windows.Forms.TextBox txtLocalTimeStartMinutes; + private System.Windows.Forms.TextBox txtLocalTimeStartHour; + private System.Windows.Forms.Label lblLocalTimeTwoDots2; + private System.Windows.Forms.Label lblLocalTimeTwoDots1; + private System.Windows.Forms.Label lblLocalTimeEndTime; + private System.Windows.Forms.Label lblLocalTimeStartTime; + private System.Windows.Forms.Label lblConditionLocalTimeTooltip; } } diff --git a/ScriptEditor/DataFinderForms/FormConditionFinder.cs b/ScriptEditor/DataFinderForms/FormConditionFinder.cs index 91d3dcb..041ade6 100644 --- a/ScriptEditor/DataFinderForms/FormConditionFinder.cs +++ b/ScriptEditor/DataFinderForms/FormConditionFinder.cs @@ -39,6 +39,8 @@ private void AddControlsToLists() conditionFormsList.Add(frmConditionInstanceData); conditionFormsList.Add(frmConditionMapEventData); conditionFormsList.Add(frmConditionMapEventTargets); + conditionFormsList.Add(frmConditionDbGuid); + conditionFormsList.Add(frmConditionLocalTime); conditionFormsList.Add(frmConditionUnknown); conditionTooltipsList.Clear(); conditionTooltipsList.Add(lblConditionNotTooltip); @@ -61,6 +63,8 @@ private void AddControlsToLists() conditionTooltipsList.Add(lblConditionInstanceDataTooltip); conditionTooltipsList.Add(lblConditionMapEventDataTooltip); conditionTooltipsList.Add(lblConditionMapEventTargetsTooltip); + conditionTooltipsList.Add(lblConditionDbGuidTooltip); + conditionTooltipsList.Add(lblConditionLocalTimeTooltip); conditionTooltipsList.Add(lblConditionUnknownTooltip); } private ComboboxPair[] ConditionTeam_ComboOptions = @@ -245,6 +249,13 @@ private void ResetAndHideConditionSpecificForms() txtConditionDbGuid4.Text = ""; frmConditionDbGuid.Visible = false; + // CONDITION_LOCAL_TIME (53) + txtLocalTimeStartHour.Text = ""; + txtLocalTimeStartMinutes.Text = ""; + txtLocalTimeEndHour.Text = ""; + txtLocalTimeEndMinutes.Text = ""; + frmConditionLocalTime.Visible = false; + // Unknown Condition Id txtUnknownValue1.Text = ""; txtUnknownValue2.Text = ""; @@ -818,6 +829,15 @@ private void ShowConditionSpecificForm(ConditionInfo selectedCondition) frmConditionDbGuid.Visible = true; break; } + case 53: // CONDITION_LOCAL_TIME + { + txtLocalTimeStartHour.Text = selectedCondition.Value1.ToString(); + txtLocalTimeStartMinutes.Text = selectedCondition.Value2.ToString(); + txtLocalTimeEndHour.Text = selectedCondition.Value3.ToString(); + txtLocalTimeEndMinutes.Text = selectedCondition.Value4.ToString(); + frmConditionLocalTime.Visible = true; + break; + } default: { txtUnknownValue1.Text = selectedCondition.Value1.ToString(); @@ -1827,6 +1847,23 @@ private void txtConditionDbGuid4_Leave(object sender, EventArgs e) { SetScriptFieldFromTextbox(txtConditionDbGuid4, "Value4"); } + // CONDITION_LOCAL_TIME + private void txtLocalTimeStartHour_Leave(object sender, EventArgs e) + { + SetScriptFieldFromTextbox(txtLocalTimeStartHour, "Value1"); + } + private void txtLocalTimeStartMinutes_Leave(object sender, EventArgs e) + { + SetScriptFieldFromTextbox(txtLocalTimeStartMinutes, "Value2"); + } + private void txtLocalTimeEndHour_Leave(object sender, EventArgs e) + { + SetScriptFieldFromTextbox(txtLocalTimeEndHour, "Value3"); + } + private void txtLocalTimeEndMinutes_Leave(object sender, EventArgs e) + { + SetScriptFieldFromTextbox(txtLocalTimeEndMinutes, "Value4"); + } // Unknown Condition Id private void txtUnknownValue1_Leave(object sender, EventArgs e) { diff --git a/ScriptEditor/FormScriptEditor.Designer.cs b/ScriptEditor/FormScriptEditor.Designer.cs index 23927ed..ea3afe8 100644 --- a/ScriptEditor/FormScriptEditor.Designer.cs +++ b/ScriptEditor/FormScriptEditor.Designer.cs @@ -4657,7 +4657,7 @@ private void InitializeComponent() this.lblStartScriptId.Name = "lblStartScriptId"; this.lblStartScriptId.Size = new System.Drawing.Size(82, 13); this.lblStartScriptId.TabIndex = 11; - this.lblStartScriptId.Text = "Event Script ID:"; + this.lblStartScriptId.Text = "Generic Script ID:"; // // lblStartScriptTooltip // @@ -4666,7 +4666,7 @@ private void InitializeComponent() this.lblStartScriptTooltip.Name = "lblStartScriptTooltip"; this.lblStartScriptTooltip.Size = new System.Drawing.Size(453, 32); this.lblStartScriptTooltip.TabIndex = 10; - this.lblStartScriptTooltip.Text = "Starts one of the specified event script Ids. Chosen script is determined by a ra" + + this.lblStartScriptTooltip.Text = "Starts one of the specified generic script Ids. Chosen script is determined by a ra" + "ndom chance roll. Total chance must not exceed 100%."; // // lblNoAction diff --git a/ScriptEditor/FormScriptEditor.cs b/ScriptEditor/FormScriptEditor.cs index afca26f..845542d 100644 --- a/ScriptEditor/FormScriptEditor.cs +++ b/ScriptEditor/FormScriptEditor.cs @@ -115,6 +115,7 @@ public partial class FormScriptEditor : Form "Load GameObject", // 82 "Quest Credit", // 83 "Set Gossip Menu", // 84 + "Send AI Event", // 85 }; // Options for combo boxes. @@ -760,6 +761,7 @@ private void ResetAndHideCommandSpecificForms() // Set Random AI Phase (45) // Set Range AI Phase (46) // Set Server Variable (54) + // Send AI Event (85) txtSetRandomPhase1.Text = ""; txtSetRandomPhase2.Text = ""; txtSetRandomPhase3.Text = ""; @@ -1770,6 +1772,7 @@ private void ShowCommandSpecificForm(ScriptAction selectedAction) case 45: // Set Random AI Phase case 46: // Set Range AI Phase case 54: // Set Server Variable + case 85: // Send AI Event { txtSetRandomPhase1.Text = selectedAction.Datalong.ToString(); txtSetRandomPhase2.Text = selectedAction.Datalong2.ToString(); @@ -1810,6 +1813,17 @@ private void ShowCommandSpecificForm(ScriptAction selectedAction) lblSetRandomPhase2.Text = "Value:"; break; } + case 85: // Send AI Event + { + lblSetRandomPhaseTooltip.Text = "Notifies the source Creature's AI that an event took place."; + lblSetRandomPhase3.Visible = false; + lblSetRandomPhase4.Visible = false; + txtSetRandomPhase3.Visible = false; + txtSetRandomPhase4.Visible = false; + lblSetRandomPhase1.Text = "Event Id:"; + lblSetRandomPhase2.Text = "Data:"; + break; + } } lblSetRandomPhase1.Location = new Point(txtSetRandomPhase1.Location.X - lblSetRandomPhase1.Size.Width - 4, lblSetRandomPhase1.Location.Y); lblSetRandomPhase2.Location = new Point(txtSetRandomPhase2.Location.X - lblSetRandomPhase2.Size.Width - 4, lblSetRandomPhase2.Location.Y); diff --git a/ScriptEditor/GameData.cs b/ScriptEditor/GameData.cs index 37a8e30..eb62d8e 100644 --- a/ScriptEditor/GameData.cs +++ b/ScriptEditor/GameData.cs @@ -1676,6 +1676,7 @@ static GameData() ConditionNamesList.Add(new ComboboxPair("OBJECT_FIT_CONDITION", 50)); ConditionNamesList.Add(new ComboboxPair("PVP_RANK", 51)); ConditionNamesList.Add(new ComboboxPair("DB_GUID", 52)); + ConditionNamesList.Add(new ComboboxPair("LOCAL_TIME", 53)); // Add skill names. SkillsList.Add(new ComboboxPair("Frost", 6)); diff --git a/ScriptEditor/Properties/AssemblyInfo.cs b/ScriptEditor/Properties/AssemblyInfo.cs index 752bc59..a580233 100644 --- 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("7.7.0.0")] -[assembly: AssemblyFileVersion("7.7.0.0")] +[assembly: AssemblyVersion("7.8.0.0")] +[assembly: AssemblyFileVersion("7.8.0.0")]