Skip to content

Sage and Reaper #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nt153133 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Sage and Reaper #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
936774c
Sage and Reaper
Dec 17, 2021
9752a99
Change Settings directory
Feb 2, 2022
c474235
Added Viper and Pictomancer, Realigned classes
catrenelle Jun 30, 2024
f309564
Added SelectedIndexChanged... OOPS!
catrenelle Jun 30, 2024
4a57e8d
Merge pull request #1 from catrenelle/master
nt153133 Jun 30, 2024
dd9161e
Changes to check for RB_CN
catrenelle Jul 7, 2024
477a10c
Merge pull request #2 from catrenelle/master
nt153133 Jul 7, 2024
98e87e6
Changed checks for RB_CN into RB_DT
catrenelle Aug 28, 2024
3618248
Merge pull request #3 from catrenelle/master
nt153133 Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Data/Images/Pictomancer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Images/Reaper.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Images/Sage.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Data/Images/Thumbs.db
View file
Open in desktop
Binary file not shown.
Binary file added Data/Images/Viper.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Plugins/GameTitlebar/GameTitlebar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class GameTitlebar : BotPlugin
private static void SetGameTitle(bool customTitle = true)
{
var mainWindowHdl = Core.Memory.Process.MainWindowHandle;
var title = customTitle ? $@"{OriginalTitle} - {Core.Me.Name}" : OriginalTitle;
var title = customTitle ? $@"{OriginalTitle} - {Core.Me.Name} {Core.Memory.Process.Id}" : OriginalTitle;

SendMessage(mainWindowHdl, WM_SETTEXT, IntPtr.Zero, title);
}
Expand Down
18 changes: 17 additions & 1 deletion Plugins/SeleCR/Models/Scenario.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,23 @@ public class Scenario
[DefaultValue("")]
public string GunbreakerRoutine { get; set; }

public Scenario()
[Setting]
[DefaultValue("")]
public string ReaperRoutine { get; set; }

[Setting]
[DefaultValue("")]
public string SageRoutine { get; set; }

[Setting]
[DefaultValue("")]
public string ViperRoutine { get; set; }

[Setting]
[DefaultValue("")]
public string PictomancerRoutine { get; set; }

public Scenario()
{

}
Expand Down
79 changes: 78 additions & 1 deletion Plugins/SeleCR/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public Scenario Pvp
[DefaultValue(false)]
public bool AutoSelectPvp { get; set; }

public Settings() : base(CharacterSettingsDirectory + "/CarbuncleTech/SeleCR.json")
public Settings() : base(SettingsPath + "/CarbuncleTech/SeleCR.json")
{ }

[JsonIgnore]
Expand Down Expand Up @@ -416,6 +416,83 @@ public string SelectRoutine()
return Pvp.GunbreakerRoutine;
}
break;

case ClassJobType.Reaper:
if (WorldManager.InPvP)
{
if (AutoSelectPvp)
return Pvp.ReaperRoutine;

if (AutoSelectPve)
return Pve.ReaperRoutine;
}
else
{
if (AutoSelectPve)
return Pve.ReaperRoutine;

if (AutoSelectPvp)
return Pvp.ReaperRoutine;
}
break;
case ClassJobType.Sage:
if (WorldManager.InPvP)
{
if (AutoSelectPvp)
return Pvp.SageRoutine;

if (AutoSelectPve)
return Pve.SageRoutine;
}
else
{
if (AutoSelectPve)
return Pve.SageRoutine;

if (AutoSelectPvp)
return Pvp.SageRoutine;
}
break;

#if RB_DT
case ClassJobType.Viper:
if (WorldManager.InPvP)
{
if (AutoSelectPvp)
return Pvp.ViperRoutine;

if (AutoSelectPve)
return Pve.ViperRoutine;
}
else
{
if (AutoSelectPve)
return Pve.ViperRoutine;

if (AutoSelectPvp)
return Pvp.ViperRoutine;
}
break;

case ClassJobType.Pictomancer:
if (WorldManager.InPvP)
{
if (AutoSelectPvp)
return Pvp.PictomancerRoutine;

if (AutoSelectPve)
return Pve.PictomancerRoutine;
}
else
{
if (AutoSelectPve)
return Pve.PictomancerRoutine;

if (AutoSelectPvp)
return Pvp.PictomancerRoutine;
}
break;
#endif

default:
return "";
Expand Down
3,068 changes: 1,632 additions & 1,436 deletions Plugins/SeleCR/SettingsWindow.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions Plugins/SeleCR/SettingsWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ public SettingsWindow()
picWhiteMagePVP.ImageLocation = GetImageLocation("WhiteMage.png");
picMinerPVE.ImageLocation = GetImageLocation("Miner.png");
picBlueMagePVE.ImageLocation = GetImageLocation("BlueMage.png");
picReaperPVE.ImageLocation = GetImageLocation("Reaper.png");
picReaperPVP.ImageLocation = GetImageLocation("Reaper.png");
picSagePVE.ImageLocation = GetImageLocation("Sage.png");
picSagePVP.ImageLocation = GetImageLocation("Sage.png");
picViperPVE.ImageLocation = GetImageLocation("Viper.png");
picViperPVP.ImageLocation = GetImageLocation("Viper.png");
picPictomancerPVE.ImageLocation = GetImageLocation("Pictomancer.png");
picPictomancerPVP.ImageLocation = GetImageLocation("Pictomancer.png");


string[] routines = PopulateRoutines();
cmbArcanistPVE.Items.AddRange(routines);
Expand Down Expand Up @@ -91,6 +100,28 @@ public SettingsWindow()
cmbWhiteMagePVP.Items.AddRange(routines);
cmbNonBattlePVE.Items.AddRange(routines);
cmbBlueMagePVE.Items.AddRange(routines);
cmbSagePVE.Items.AddRange(routines);
cmbSagePVP.Items.AddRange(routines);
cmbReaperPVE.Items.AddRange(routines);
cmbReaperPVP.Items.AddRange(routines);
cmbViperPVE.Items.AddRange(routines);
cmbViperPVP.Items.AddRange(routines);
cmbPictomancerPVE.Items.AddRange(routines);
cmbPictomancerPVP.Items.AddRange(routines);


#if !RB_DT
picViperPVE.Visible = false;
picViperPVP.Visible = false;
picPictomancerPVE.Visible = false;
picPictomancerPVP.Visible = false;


cmbViperPVE.Visible = false;
cmbViperPVP.Visible = false;
cmbPictomancerPVE.Visible = false;
cmbPictomancerPVP.Visible = false;
#endif
}

private string GetImageLocation(string fileName)
Expand Down Expand Up @@ -136,6 +167,11 @@ private void SettingsWindow_Load(object sender, EventArgs e)
cmbWarriorPVE.Text = Settings.Instance.Pve.WarriorRoutine;
cmbNonBattlePVE.Text = Settings.Instance.HandRoutine;
cmbBlueMagePVE.Text = Settings.Instance.Pve.BlueMageRoutine;
cmbSagePVE.Text = Settings.Instance.Pve.SageRoutine;
cmbReaperPVE.Text = Settings.Instance.Pve.ReaperRoutine;
cmbViperPVE.Text = Settings.Instance.Pve.ViperRoutine;
cmbPictomancerPVE.Text = Settings.Instance.Pve.PictomancerRoutine;

chkEnableInPve.Checked = Settings.Instance.AutoSelectPve;

/* Scenario PVP */
Expand All @@ -157,6 +193,11 @@ private void SettingsWindow_Load(object sender, EventArgs e)
cmbSummonerPVP.Text = Settings.Instance.Pvp.SummonerRoutine;
cmbWhiteMagePVP.Text = Settings.Instance.Pvp.WhiteMageRoutine;
cmbWarriorPVP.Text = Settings.Instance.Pvp.WarriorRoutine;
cmbReaperPVP.Text = Settings.Instance.Pvp.ReaperRoutine;
cmbSagePVP.Text = Settings.Instance.Pvp.SageRoutine;
cmbViperPVP.Text = Settings.Instance.Pvp.ViperRoutine;
cmbPictomancerPVP.Text = Settings.Instance.Pvp.PictomancerRoutine;

chkEnableInPvp.Checked = Settings.Instance.AutoSelectPvp;
}

Expand Down Expand Up @@ -287,6 +328,34 @@ private void SettingsChanged(object sender, EventArgs e)

if(sender == cmbWhiteMagePVP)
Settings.Instance.Pvp.WhiteMageRoutine = cmbWhiteMagePVP.Text;

// Sage
if(sender == cmbSagePVE)
Settings.Instance.Pve.SageRoutine = cmbSagePVE.Text;

if(sender == cmbSagePVP)
Settings.Instance.Pvp.SageRoutine = cmbSagePVP.Text;

// Reaper
if(sender == cmbReaperPVE)
Settings.Instance.Pve.ReaperRoutine = cmbReaperPVE.Text;

if(sender == cmbReaperPVP)
Settings.Instance.Pvp.ReaperRoutine = cmbReaperPVP.Text;

// Viper
if (sender == cmbViperPVE)
Settings.Instance.Pve.ViperRoutine = cmbViperPVE.Text;

if (sender == cmbViperPVP)
Settings.Instance.Pvp.ViperRoutine = cmbViperPVP.Text;

// Pictomancer
if (sender == cmbPictomancerPVE)
Settings.Instance.Pve.PictomancerRoutine = cmbPictomancerPVE.Text;

if (sender == cmbPictomancerPVP)
Settings.Instance.Pvp.PictomancerRoutine = cmbPictomancerPVP.Text;

// Non battle
if(sender == cmbNonBattlePVE)
Expand Down