Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion RogueEssence/Menu/Items/BuyChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@ namespace RogueEssence.Menu
public class BuyChosenMenu : SingleStripMenu
{

private int origIndex;
public int origIndex {get; private set;}
private List<int> selections;
public List<int> Selections {
get
{
List<int> newList = new List<int>();
newList.AddRange(selections);
return newList;
}
}
private OnMultiChoice action;

public BuyChosenMenu(List<int> selections, int origIndex, string itemID, OnMultiChoice chooseSlots) :
Expand Down
10 changes: 9 additions & 1 deletion RogueEssence/Menu/Items/DepositChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ namespace RogueEssence.Menu
public class DepositChosenMenu : SingleStripMenu
{

private int origIndex;
public int origIndex {get; private set;}
private List<InvSlot> selections;
public List<InvSlot> Selections {
get
{
List<InvSlot> newList = new List<InvSlot>();
selections.ForEach(elem => newList.Add(new InvSlot(elem.IsEquipped, elem.Slot)));
return newList;
}
}

public DepositChosenMenu(List<InvSlot> selections, int origIndex) : this(MenuLabel.DEPOSIT_CHOSEN_MENU, selections, origIndex) { }
public DepositChosenMenu(string label, List<InvSlot> selections, int origIndex)
Expand Down
4 changes: 2 additions & 2 deletions RogueEssence/Menu/Items/ItemChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ namespace RogueEssence.Menu
public class ItemChosenMenu : SingleStripMenu
{

private int slot;
private bool held;
public int slot {get; private set;}
public bool held {get; private set;}

public ItemChosenMenu(int slot, bool held) : this(MenuLabel.ITEM_CHOSEN_MENU ,slot, held) { }
public ItemChosenMenu(string label, int slot, bool held)
Expand Down
10 changes: 9 additions & 1 deletion RogueEssence/Menu/Items/SellChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ namespace RogueEssence.Menu
public class SellChosenMenu : SingleStripMenu
{

private int origIndex;
public int origIndex {get; private set;}
private List<InvSlot> selections;
public List<InvSlot> Selections {
get
{
List<InvSlot> newList = new List<InvSlot>();
selections.ForEach(elem => newList.Add(new InvSlot(elem.IsEquipped, elem.Slot)));
return newList;
}
}
private SellMenu.OnChooseSlots action;

public SellChosenMenu(List<InvSlot> selections, int origIndex, SellMenu.OnChooseSlots chooseSlots) :
Expand Down
6 changes: 3 additions & 3 deletions RogueEssence/Menu/Items/TeachMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public class TeachMenu : TitledStripMenu
MenuText[] Skills;
MenuText[] SkillCharges;

private int slot;
private bool held;
private int commandIdx;
public int slot {get; private set;}
public bool held {get; private set;}
public int commandIdx {get; private set;}

public TeachMenu(int slot, bool held, int commandIdx) : this(MenuLabel.TEACH_MENU, slot, held, commandIdx) { }
public TeachMenu(string label, int slot, bool held, int commandIdx)
Expand Down
10 changes: 9 additions & 1 deletion RogueEssence/Menu/Items/WithdrawChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@ namespace RogueEssence.Menu
public class WithdrawChosenMenu : SingleStripMenu
{

private int origIndex;
public int origIndex {get; private set;}
private List<WithdrawSlot> selections;
public List<WithdrawSlot> Selections {
get
{
List<WithdrawSlot> newList = new List<WithdrawSlot>();
selections.ForEach(elem => newList.Add(new WithdrawSlot(elem.IsBox, elem.ItemID, elem.BoxSlot)));
return newList;
}
}
WithdrawMenu.OnWithdrawChoice storageChoice;
bool continueOnChoose;

Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Records/ReplayChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace RogueEssence.Menu
public class ReplayChosenMenu : SingleStripMenu
{

private string recordDir;
public string recordDir {get; private set;}

public ReplayChosenMenu(string dir) : this(MenuLabel.REPLAY_CHOSEN_MENU, dir) { }
public ReplayChosenMenu(string label, string dir)
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Rogue/QuicksaveChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace RogueEssence.Menu
public class QuicksaveChosenMenu : SingleStripMenu
{

private string recordDir;
public string recordDir {get; private set;}

public QuicksaveChosenMenu(string dir) : this(MenuLabel.ROGUE_QUICKSAVE_CHOSEN_MENU, dir) { }
public QuicksaveChosenMenu(string label, string dir)
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Settings/SettingsPageMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private void ConfirmAction()
{
foreach (IChoosable element in Choices)
{
if(element is MenuSetting || SettingsData.ContainsKey((MenuSetting)element))
if(element is MenuSetting && SettingsData.ContainsKey((MenuSetting)element))
{
MenuSetting setting = element as MenuSetting;
SettingsData[setting].SaveAction.Invoke(setting);
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Skills/IntrinsicForgetMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class IntrinsicForgetMenu : TitledStripMenu
{
OnChooseSlot chooseSlotAction;
Action refuseAction;
Character player;
public Character player {get; private set;}

SummaryMenu summaryMenu;
DialogueText Description;
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Skills/IntrinsicRecallMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class IntrinsicRecallMenu : MultiPageMenu
string[] intrinsicChoices;
OnChooseSlot chooseSlotAction;
Action refuseAction;
Character player;
public Character player {get; private set;}

SummaryMenu summaryMenu;
DialogueText Description;
Expand Down
6 changes: 3 additions & 3 deletions RogueEssence/Menu/Skills/SkillChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ namespace RogueEssence.Menu
{
public class SkillChosenMenu : SingleStripMenu
{
private string parentLabel;
public string parentLabel {get; private set;}

private int teamIndex;
private int skillSlot;
public int teamIndex {get; private set;}
public int skillSlot {get; private set;}


public SkillChosenMenu(string parentLabel, int teamIndex, int skillSlot) : this(MenuLabel.SKILL_CHOSEN_MENU, parentLabel, teamIndex, skillSlot) { }
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Skills/SkillForgetMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class SkillForgetMenu : TitledStripMenu
{
OnChooseSlot chooseSlotAction;
Action refuseAction;
Character player;
public Character player {get; private set;}

SkillSummary summaryMenu;

Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Skills/SkillRecallMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class SkillRecallMenu : MultiPageMenu
string[] forgottenSkills;
OnChooseSlot chooseSlotAction;
Action refuseAction;
Character player;
public Character player {get; private set;}

SkillSummary summaryMenu;

Expand Down
4 changes: 2 additions & 2 deletions RogueEssence/Menu/Skills/SkillReplaceMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class SkillReplaceMenu : TitledStripMenu
{
OnChooseSlot learnAction;
Action refuseAction;
Character player;
string skillNum;
public Character player {get; private set;}
public string skillNum {get; private set;}

SkillSummary summaryMenu;

Expand Down
6 changes: 3 additions & 3 deletions RogueEssence/Menu/Team/AssemblyChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace RogueEssence.Menu
{
public class AssemblyChosenMenu : SingleStripMenu
{
private int teamSlot;
private bool assembly;
public int teamSlot {get; private set;}
public bool assembly {get; private set;}

private AssemblyMenu baseMenu;
public AssemblyMenu baseMenu {get; private set;}

public AssemblyChosenMenu(int teamSlot, bool assembly, AssemblyMenu baseMenu) : this(MenuLabel.ASSEMBLY_CHOSEN_MENU, teamSlot, assembly, baseMenu) { }
public AssemblyChosenMenu(string label, int teamSlot, bool assembly, AssemblyMenu baseMenu)
Expand Down
10 changes: 5 additions & 5 deletions RogueEssence/Menu/Team/MemberFeaturesMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ namespace RogueEssence.Menu
{
public class MemberFeaturesMenu : InteractableMenu
{
Team team;
int teamSlot;
bool assembly;
bool allowAssembly;
bool guest;
public Team team {get; private set;}
public int teamSlot {get; private set;}
public bool assembly {get; private set;}
public bool allowAssembly {get; private set;}
public bool guest {get; private set;}

public MenuText Title;
public MenuText PageText;
Expand Down
10 changes: 5 additions & 5 deletions RogueEssence/Menu/Team/MemberInfoMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ namespace RogueEssence.Menu
{
public class MemberInfoMenu : InteractableMenu
{
Team team;
int teamSlot;
bool assembly;
bool allowAssembly;
bool guest;
public Team team {get; private set;}
public int teamSlot {get; private set;}
public bool assembly {get; private set;}
public bool allowAssembly {get; private set;}
public bool guest {get; private set;}

public MenuText Title;
public MenuText PageText;
Expand Down
10 changes: 5 additions & 5 deletions RogueEssence/Menu/Team/MemberLearnsetMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ public class MemberLearnsetMenu : MultiPageMenu
public static readonly int SLOTS_PER_PAGE = 6;
private List<string> Skills = new List<string>();

Team team;
int teamSlot;
bool assembly;
bool allowAssembly;
bool guest;
public Team team {get; private set;}
public int teamSlot {get; private set;}
public bool assembly {get; private set;}
public bool allowAssembly {get; private set;}
public bool guest {get; private set;}

SkillSummary summaryMenu;

Expand Down
12 changes: 6 additions & 6 deletions RogueEssence/Menu/Team/MemberStatsMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ namespace RogueEssence.Menu
{
public class MemberStatsMenu : InteractableMenu
{
Team team;
int teamSlot;
bool assembly;
bool allowAssembly;
bool guest;
bool boostView;
public Team team {get; private set;}
public int teamSlot {get; private set;}
public bool assembly {get; private set;}
public bool allowAssembly {get; private set;}
public bool guest {get; private set;}
public bool boostView {get; private set;}

public MenuText Title;
public MenuText PageText;
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Team/TeamChosenMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace RogueEssence.Menu
public class TeamChosenMenu : SingleStripMenu
{

private int teamSlot;
public int teamSlot {get; private set;}

public TeamChosenMenu(int teamSlot) : this(MenuLabel.TEAM_CHOSEN_MENU, teamSlot) { }
public TeamChosenMenu(string label, int teamSlot)
Expand Down
2 changes: 1 addition & 1 deletion RogueEssence/Menu/Team/TeamMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class TeamMenu : TitledStripMenu

TeamMiniSummary summaryMenu;

bool sendHome;
public bool sendHome {get; private set;}

public TeamMenu(bool sendHome) : this(sendHome, -1)
{ }
Expand Down