Skip to content
This repository has been archived by the owner on Jun 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request #4 from DanielHazzard/Version-2.0.0.2
Browse files Browse the repository at this point in the history
Code cleaning and further additions. (correct version)
  • Loading branch information
atom0s authored Jul 18, 2016
2 parents c54e6ce + 0b2a075 commit b9529a9
Show file tree
Hide file tree
Showing 12 changed files with 925 additions and 1,244 deletions.
99 changes: 63 additions & 36 deletions Form1.Designer.cs

Large diffs are not rendered by default.

1,380 changes: 314 additions & 1,066 deletions Form1.cs

Large diffs are not rendered by default.

342 changes: 245 additions & 97 deletions Form2.Designer.cs

Large diffs are not rendered by default.

29 changes: 25 additions & 4 deletions Form2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,13 @@ public Form2()
this.plGainBoost_spell.SelectedItem = Properties.Settings.Default.plGainBoost_Spell;
this.EntrustBox.Checked = Properties.Settings.Default.Entrust;
this.DematerializeBox.Checked = Properties.Settings.Default.Dematerialize;
this.plBarElement.Checked = Properties.Settings.Default.plBarElement;
this.plBarElement_Spell.SelectedIndex = Properties.Settings.Default.plBarElement_Spell;
this.plBarStatus.Checked = Properties.Settings.Default.plBarStatus;
this.plBarStatus_Spell.SelectedIndex = Properties.Settings.Default.plBarStatus_Spell;
this.plStormSpell.Checked = Properties.Settings.Default.plStormSpell;
this.plKlimaform.Checked = Properties.Settings.Default.plKlimaform;
this.plStormSpell_Spell.SelectedIndex = Properties.Settings.Default.plStormSpell_Spell;
}

private void curePercentage_ValueChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -441,8 +448,6 @@ private void button4_Click(object sender, EventArgs e)
Properties.Settings.Default.Entrusted_Target = this.entrustSpell_target.Text;
Properties.Settings.Default.Entrust = this.EntrustBox.Checked;
Properties.Settings.Default.Dematerialize = this.DematerializeBox.Checked;

// Additional PL cast
Properties.Settings.Default.plTemper = this.plTemper.Checked;
if (this.plTemperLevel1.Checked)
{
Expand All @@ -456,7 +461,13 @@ private void button4_Click(object sender, EventArgs e)
Properties.Settings.Default.plEnspell_Spell = this.plEnspell_spell.SelectedIndex;
Properties.Settings.Default.plGainBoost = this.plGainBoost.Checked;
Properties.Settings.Default.plGainBoost_Spell = (string)this.plGainBoost_spell.SelectedItem;

Properties.Settings.Default.plBarElement = this.plBarElement.Checked;
Properties.Settings.Default.plBarElement_Spell = this.plBarElement_Spell.SelectedIndex;
Properties.Settings.Default.plBarStatus = this.plBarStatus.Checked;
Properties.Settings.Default.plBarStatus_Spell = this.plBarStatus_Spell.SelectedIndex;
Properties.Settings.Default.plStormSpell = this.plStormSpell.Checked;
Properties.Settings.Default.plStormSpell_Spell = this.plStormSpell_Spell.SelectedIndex;
Properties.Settings.Default.plKlimaform = this.plKlimaform.Checked;

Properties.Settings.Default.Save();
this.Close();
Expand Down Expand Up @@ -648,7 +659,6 @@ private void plDebuffEnabled_CheckedChanged(object sender, EventArgs e)
}
#endregion


#region "== Na spell check boxes"
private void naSpellsenable_CheckedChanged(object sender, EventArgs e)
{
Expand Down Expand Up @@ -1135,11 +1145,22 @@ private void Form2_FormClosing(object sender, FormClosingEventArgs e)
Properties.Settings.Default.plEnspell_Spell = this.plEnspell_spell.SelectedIndex;
Properties.Settings.Default.plGainBoost = this.plGainBoost.Checked;
Properties.Settings.Default.plGainBoost_Spell = (string)this.plGainBoost_spell.SelectedItem;
Properties.Settings.Default.plBarElement = this.plBarElement.Checked;
Properties.Settings.Default.plBarElement_Spell = this.plBarElement_Spell.SelectedIndex;
Properties.Settings.Default.plBarStatus = this.plBarStatus.Checked;
Properties.Settings.Default.plBarStatus_Spell = this.plBarStatus_Spell.SelectedIndex;
Properties.Settings.Default.plStormSpell = this.plStormSpell.Checked;
Properties.Settings.Default.plStormSpell_Spell = this.plStormSpell_Spell.SelectedIndex;
Properties.Settings.Default.plKlimaform = this.plKlimaform.Checked;


Properties.Settings.Default.Save();
}

private void plShellralevel_ValueChanged(object sender, EventArgs e)
{

}
}
#endregion
}
2 changes: 1 addition & 1 deletion Form2.resx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>31</value>
<value>171</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Expand Down
28 changes: 25 additions & 3 deletions Form4.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

156 changes: 121 additions & 35 deletions Form4.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,148 @@
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Text.RegularExpressions;

namespace CurePlease
{

using EliteMMO.API;
using System.Threading;
using static Form1;
public partial class Form4 : Form
{
private Form1 f1;

public enum LoginStatus
{
CharacterLoginScreen = 0,
Loading = 1,
LoggedIn = 2
}
#region=="Chat Modes"
public enum ChatMode
{
Error = -1, // "Invented" chat mode, to help catch errors
Generic = 0, // Unknown = 0, // Catch all. it's not a catch all.

//--------------------------------------------------------------'
//-Text That's Been Sent To The ChatLog By You aKa (The Player-)'
//--------------------------------------------------------------'
SentSay = 1, // = a say message that the user sends
SentShout = 2, // = a shout message that the user sends
SentYell = 3,
SentTell = 4, // = user sends tell to someone else
SentParty = 5, // = user message to Party
SentLinkShell = 6, // = user message to linkshell
SentEmote = 7, // = user uses /emote

//--------------------------------------------------------------'
//----Text That's Been Recieved In ChatLog By Other Players-----'
//--------------------------------------------------------------'
RcvdSay = 9, // = a say mesage the user recieves from someone else
RcvdShout = 10, // = incoming shout
RcvdYell = 11,
RcvdTell = 12, // = incoming tell
RcvdParty = 13, // = incoming party message
RcvdLinkShell = 14, // = incoming linkshell text
RcvdEmote = 15, // = received Emote
// Yell???

//--------------------------------------------------------------'
//-----------You aKa (The Player's) Fight Log Stuff-------------'
//--------------------------------------------------------------'
PlayerHits = 20, // eg. Player hits the Thread Leech for XX points of damage.
PlayerMisses = 21,
TargetUsesJobAbility = 22, // eg. The Thread Leech uses TP Drainkiss.
SomeoneRecoversHP = 23,
TargetHits = 28, // eg. The Thread Leech hits Player for XX points of damage.
TargetMisses = 29, // eg. The Thread Leech misses Player.
PlayerAdditionalEffect = 30,
PlayerRecoversHP = 31, // Player casts Cure. Player recovers 30 HP.
PlayerDefeats = 36, // eg. Player Defeats the T
PlayedDefeated = 38,
NPCHit = 40,
NPCMiss = 41,
NPCSpellEffect = 42,
SomeoneSpellEffect = 43,
SomeoneDefeats = 44, // = somebody "defeats the" river crab or whatever
PlayerCastComplete = 50,
PartySpellEffect = 51,
PlayerStartCasting = 52, // eg. Player starts casting Dia on the Thread Leech., The Antican Princeps starts casting Flash.
PlayerSpellResult = 56,
PlayerRcvdEffect = 57, // The Antican Princeps casts Flash. <name> is blinded.
PlayerSpellResist = 59,
PlayerSpellEffect = 64,
TargetEffectOff = 65,
SomeoneNoEffect = 69,
PlayerLearnedSpell = 81,
Itemused = 90,
SomeoneItemBadEffect = 91,
SomeoneItemGoodEfect = 92,
TargetActionStart = 100,
PlayerUsesJobAbility = 101, // eg. Player uses Divine Seal.
PlayerStatusResult = 102,
TargetActionMiss = 104,
PlayerReadiesMove = 110, // eg. The Thread Leech readies Brain Drain.
SomeoneAbility = 111,
SomeoneBadEffect = 112,
PlayerWSMiss = 114,
SynthResult = 121, // = you throw away a rusty subligar or whatever
PlayersBadCast = 122, // eg. Inturrupted or Unable to Cast. eg: Unable To Cast That Spell
TellNotRcvd = 123, // = your tell was not received
Obtained = 127,
SkillBoost = 129, // = you fishing skill rises 0.1 points
Experience = 131,
ActionStart = 135,
LogoutMessage = 136,
ItemSold = 138, // = item sold
ClockInfo = 140,
MoogleYellow = 141,
NPCChat = 142,
MoogleWhite = 144,
FishObtained = 146, // "player caught ....!"
FishResult = 148, // = fishing result including:
NPCSpeaking = 152, // = something caught on hook... incorrect, NPC speaking to you
CommandError = 157, // = A command error occurred
DropRipCap = 159, // = you release the ripped cap regretfully
RegConquest = 161, // = regional conquest update message
ChangeJob = 190,
EffectWearOff = 191, // eg. Player's Protect effect wears off
ServerNotice = 200, // = notice of upcoming server maintenance
SearchComment = 204,
LSMES = 205,
Echo = 206, // = echo
Examined = 208,
AbilTimeLeft = 209 // Time left on "job ability"
} // @ public enum ChatMode : short

#endregion

public static EliteAPI _ELITEAPIPL;
public EliteAPI _ELITEAPIMonitored;
public partial class Form4 : Form
{

private Form1 f1;

public Form4(Form1 f)
{

InitializeComponent();

f1 = f;

if (f1.setinstance2.Enabled == true)
{
_ELITEAPIPL = new EliteAPI((int)f1.processids.SelectedItem);
chatlog_box.Text = _ELITEAPIPL.Player.Name;




















characterNamed_label.Text = "Chatlog for character: " + _ELITEAPIPL.Player.Name+"\n";

// EliteAPI.ChatEntry chatline;
// var lines = new List<EliteAPI.ChatEntry>();

// while ((chatline = _ELITEAPIPL.Chat.GetNextChatLine()) != null)
// {
// chatlog_box.AppendText(chatline.Text + "\n");
// lines.Add(chatline);
// }


}


}
else {
else
{
chatlog_box.Text = "No character was selected as the power leveler, close this window and select one.";
}

Expand All @@ -75,5 +156,10 @@ private void CloseChatLog_button_Click(object sender, EventArgs e)
{
this.Close();
}

private void chatlogscan_timer_Tick(object sender, EventArgs e)
{

}
}
}
3 changes: 3 additions & 0 deletions Form4.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="chatlogscan_timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("2.0.0.1")]
[assembly: AssemblyFileVersion("2.0.0.1")]
[assembly: AssemblyVersion("2.0.0.2")]
[assembly: AssemblyFileVersion("2.0.0.2")]
Loading

0 comments on commit b9529a9

Please sign in to comment.