diff --git a/RogueEssence/Menu/Items/BuyChosenMenu.cs b/RogueEssence/Menu/Items/BuyChosenMenu.cs index badf876a..dfcbedda 100644 --- a/RogueEssence/Menu/Items/BuyChosenMenu.cs +++ b/RogueEssence/Menu/Items/BuyChosenMenu.cs @@ -8,8 +8,16 @@ namespace RogueEssence.Menu public class BuyChosenMenu : SingleStripMenu { - private int origIndex; + public int origIndex {get; private set;} private List selections; + public List Selections { + get + { + List newList = new List(); + newList.AddRange(selections); + return newList; + } + } private OnMultiChoice action; public BuyChosenMenu(List selections, int origIndex, string itemID, OnMultiChoice chooseSlots) : diff --git a/RogueEssence/Menu/Items/DepositChosenMenu.cs b/RogueEssence/Menu/Items/DepositChosenMenu.cs index ef414b0f..f7d43e45 100644 --- a/RogueEssence/Menu/Items/DepositChosenMenu.cs +++ b/RogueEssence/Menu/Items/DepositChosenMenu.cs @@ -10,8 +10,16 @@ namespace RogueEssence.Menu public class DepositChosenMenu : SingleStripMenu { - private int origIndex; + public int origIndex {get; private set;} private List selections; + public List Selections { + get + { + List newList = new List(); + selections.ForEach(elem => newList.Add(new InvSlot(elem.IsEquipped, elem.Slot))); + return newList; + } + } public DepositChosenMenu(List selections, int origIndex) : this(MenuLabel.DEPOSIT_CHOSEN_MENU, selections, origIndex) { } public DepositChosenMenu(string label, List selections, int origIndex) diff --git a/RogueEssence/Menu/Items/ItemChosenMenu.cs b/RogueEssence/Menu/Items/ItemChosenMenu.cs index abcfc865..4f0ea8bd 100644 --- a/RogueEssence/Menu/Items/ItemChosenMenu.cs +++ b/RogueEssence/Menu/Items/ItemChosenMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Items/SellChosenMenu.cs b/RogueEssence/Menu/Items/SellChosenMenu.cs index c5813a7f..d045f13c 100644 --- a/RogueEssence/Menu/Items/SellChosenMenu.cs +++ b/RogueEssence/Menu/Items/SellChosenMenu.cs @@ -10,8 +10,16 @@ namespace RogueEssence.Menu public class SellChosenMenu : SingleStripMenu { - private int origIndex; + public int origIndex {get; private set;} private List selections; + public List Selections { + get + { + List newList = new List(); + selections.ForEach(elem => newList.Add(new InvSlot(elem.IsEquipped, elem.Slot))); + return newList; + } + } private SellMenu.OnChooseSlots action; public SellChosenMenu(List selections, int origIndex, SellMenu.OnChooseSlots chooseSlots) : diff --git a/RogueEssence/Menu/Items/TeachMenu.cs b/RogueEssence/Menu/Items/TeachMenu.cs index ab82c78c..36887ccd 100644 --- a/RogueEssence/Menu/Items/TeachMenu.cs +++ b/RogueEssence/Menu/Items/TeachMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Items/WithdrawChosenMenu.cs b/RogueEssence/Menu/Items/WithdrawChosenMenu.cs index 1bc50780..ecdb7e94 100644 --- a/RogueEssence/Menu/Items/WithdrawChosenMenu.cs +++ b/RogueEssence/Menu/Items/WithdrawChosenMenu.cs @@ -11,8 +11,16 @@ namespace RogueEssence.Menu public class WithdrawChosenMenu : SingleStripMenu { - private int origIndex; + public int origIndex {get; private set;} private List selections; + public List Selections { + get + { + List newList = new List(); + selections.ForEach(elem => newList.Add(new WithdrawSlot(elem.IsBox, elem.ItemID, elem.BoxSlot))); + return newList; + } + } WithdrawMenu.OnWithdrawChoice storageChoice; bool continueOnChoose; diff --git a/RogueEssence/Menu/Records/ReplayChosenMenu.cs b/RogueEssence/Menu/Records/ReplayChosenMenu.cs index 20092e66..d8557be3 100644 --- a/RogueEssence/Menu/Records/ReplayChosenMenu.cs +++ b/RogueEssence/Menu/Records/ReplayChosenMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Rogue/QuicksaveChosenMenu.cs b/RogueEssence/Menu/Rogue/QuicksaveChosenMenu.cs index 55ff2317..1b174a49 100644 --- a/RogueEssence/Menu/Rogue/QuicksaveChosenMenu.cs +++ b/RogueEssence/Menu/Rogue/QuicksaveChosenMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Settings/SettingsPageMenu.cs b/RogueEssence/Menu/Settings/SettingsPageMenu.cs index 38738600..ae08221e 100644 --- a/RogueEssence/Menu/Settings/SettingsPageMenu.cs +++ b/RogueEssence/Menu/Settings/SettingsPageMenu.cs @@ -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); diff --git a/RogueEssence/Menu/Skills/IntrinsicForgetMenu.cs b/RogueEssence/Menu/Skills/IntrinsicForgetMenu.cs index 4ae1a809..3186397a 100644 --- a/RogueEssence/Menu/Skills/IntrinsicForgetMenu.cs +++ b/RogueEssence/Menu/Skills/IntrinsicForgetMenu.cs @@ -11,7 +11,7 @@ public class IntrinsicForgetMenu : TitledStripMenu { OnChooseSlot chooseSlotAction; Action refuseAction; - Character player; + public Character player {get; private set;} SummaryMenu summaryMenu; DialogueText Description; diff --git a/RogueEssence/Menu/Skills/IntrinsicRecallMenu.cs b/RogueEssence/Menu/Skills/IntrinsicRecallMenu.cs index 59d77c8a..202f7aa0 100644 --- a/RogueEssence/Menu/Skills/IntrinsicRecallMenu.cs +++ b/RogueEssence/Menu/Skills/IntrinsicRecallMenu.cs @@ -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; diff --git a/RogueEssence/Menu/Skills/SkillChosenMenu.cs b/RogueEssence/Menu/Skills/SkillChosenMenu.cs index 96a40aef..3f927f07 100644 --- a/RogueEssence/Menu/Skills/SkillChosenMenu.cs +++ b/RogueEssence/Menu/Skills/SkillChosenMenu.cs @@ -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) { } diff --git a/RogueEssence/Menu/Skills/SkillForgetMenu.cs b/RogueEssence/Menu/Skills/SkillForgetMenu.cs index 2b4a8f75..afb10a79 100644 --- a/RogueEssence/Menu/Skills/SkillForgetMenu.cs +++ b/RogueEssence/Menu/Skills/SkillForgetMenu.cs @@ -13,7 +13,7 @@ public class SkillForgetMenu : TitledStripMenu { OnChooseSlot chooseSlotAction; Action refuseAction; - Character player; + public Character player {get; private set;} SkillSummary summaryMenu; diff --git a/RogueEssence/Menu/Skills/SkillRecallMenu.cs b/RogueEssence/Menu/Skills/SkillRecallMenu.cs index 71f9b3b1..4faa4c83 100644 --- a/RogueEssence/Menu/Skills/SkillRecallMenu.cs +++ b/RogueEssence/Menu/Skills/SkillRecallMenu.cs @@ -14,7 +14,7 @@ public class SkillRecallMenu : MultiPageMenu string[] forgottenSkills; OnChooseSlot chooseSlotAction; Action refuseAction; - Character player; + public Character player {get; private set;} SkillSummary summaryMenu; diff --git a/RogueEssence/Menu/Skills/SkillReplaceMenu.cs b/RogueEssence/Menu/Skills/SkillReplaceMenu.cs index 32aa3ce5..4870532f 100644 --- a/RogueEssence/Menu/Skills/SkillReplaceMenu.cs +++ b/RogueEssence/Menu/Skills/SkillReplaceMenu.cs @@ -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; diff --git a/RogueEssence/Menu/Team/AssemblyChosenMenu.cs b/RogueEssence/Menu/Team/AssemblyChosenMenu.cs index 979aab76..bcb02997 100644 --- a/RogueEssence/Menu/Team/AssemblyChosenMenu.cs +++ b/RogueEssence/Menu/Team/AssemblyChosenMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Team/MemberFeaturesMenu.cs b/RogueEssence/Menu/Team/MemberFeaturesMenu.cs index 1a350dac..73923ade 100644 --- a/RogueEssence/Menu/Team/MemberFeaturesMenu.cs +++ b/RogueEssence/Menu/Team/MemberFeaturesMenu.cs @@ -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; diff --git a/RogueEssence/Menu/Team/MemberInfoMenu.cs b/RogueEssence/Menu/Team/MemberInfoMenu.cs index 8b813f36..9694596d 100644 --- a/RogueEssence/Menu/Team/MemberInfoMenu.cs +++ b/RogueEssence/Menu/Team/MemberInfoMenu.cs @@ -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; diff --git a/RogueEssence/Menu/Team/MemberLearnsetMenu.cs b/RogueEssence/Menu/Team/MemberLearnsetMenu.cs index 96839625..760bf0da 100644 --- a/RogueEssence/Menu/Team/MemberLearnsetMenu.cs +++ b/RogueEssence/Menu/Team/MemberLearnsetMenu.cs @@ -14,11 +14,11 @@ public class MemberLearnsetMenu : MultiPageMenu public static readonly int SLOTS_PER_PAGE = 6; private List Skills = new List(); - 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; diff --git a/RogueEssence/Menu/Team/MemberStatsMenu.cs b/RogueEssence/Menu/Team/MemberStatsMenu.cs index f9293b26..c17e9bf2 100644 --- a/RogueEssence/Menu/Team/MemberStatsMenu.cs +++ b/RogueEssence/Menu/Team/MemberStatsMenu.cs @@ -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; diff --git a/RogueEssence/Menu/Team/TeamChosenMenu.cs b/RogueEssence/Menu/Team/TeamChosenMenu.cs index 7bb5e396..3eb76492 100644 --- a/RogueEssence/Menu/Team/TeamChosenMenu.cs +++ b/RogueEssence/Menu/Team/TeamChosenMenu.cs @@ -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) diff --git a/RogueEssence/Menu/Team/TeamMenu.cs b/RogueEssence/Menu/Team/TeamMenu.cs index afbaaf25..da199c3f 100644 --- a/RogueEssence/Menu/Team/TeamMenu.cs +++ b/RogueEssence/Menu/Team/TeamMenu.cs @@ -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) { }