fix rich/sniper restriction check

Author: iREDMe

src/main/java/page/battle/BattleSetupPage.java

@@ -3,6 +3,7 @@
 import common.CommonStatic;
 import common.battle.BasisLU;
 import common.battle.BasisSet;
+import common.util.stage.Limit;
 import common.util.stage.RandStage;
 import common.util.stage.Stage;
 import page.JBTN;
@@ -70,14 +71,13 @@ protected LineUpBox getLub() {
 	protected void renew() {
 		BasisSet b = BasisSet.current();
 		jl.setText(b + "-" + b.sele);
-		if (st.lim != null && st.lim.lvr != null)
+		Limit lim = st.getLim(jls.getSelectedIndex());
+		if (lim.lvr != null)
 			strt.setEnabled(st.lim.lvr.isValid(b.sele.lu));
 		else
 			tmax.setEnabled(false);
-		if (st.lim != null && st.lim.rich == 1)
-			rich.setEnabled(false);
-		if (st.lim != null && st.lim.sniper == 1)
-			snip.setEnabled(false);
+		rich.setEnabled(lim.rich == 0);
+		snip.setEnabled(lim.sniper == 0);
 		if (lub.getLU() != b.sele.lu)
 			lub.setLU(b.sele.lu);
 		mod.setBasis(BasisSet.current());
@@ -135,9 +135,10 @@ private void addListeners() {
 		strt.addActionListener(arg0 -> {
 			int star = jls.getSelectedIndex();
 			int[] ints = new int[1];
-			if (rich.isSelected())
+			Limit lim = st.getLim(star);
+			if (rich.isSelected() && lim.rich == 0)
 				ints[0] |= 1;
-			if (snip.isSelected())
+			if (snip.isSelected() && lim.rich == 0)
 				ints[0] |= 2;
 			BasisLU b = BasisSet.current().sele;
 			if (conf == 0) {

src/main/java/page/info/edit/LimitTable.java

@@ -35,12 +35,12 @@ protected static void redefine() {
 	private final JTF max = new JTF();
 	private final JTF jcg = new JTF();
 	private final JTF jlr = new JTF();
-	private final JBTN cgb = new JBTN(1, "ht15");
-	private final JBTN lrb = new JBTN(1, "ht16");
-	private final JTG one = new JTG(1, "ht12");
-	private final JTG rich = new JTG(1, "ht17");
-	private final JTG snip = new JTG(1, "ht18");
-	private final JL rar = new JL(1, "ht10");
+	private final JBTN cgb = new JBTN(MainLocale.INFO, "ht15");
+	private final JBTN lrb = new JBTN(MainLocale.INFO, "ht16");
+	private final JTG one = new JTG(MainLocale.INFO, "ht12");
+	private final JTG rich = new JTG(MainLocale.INFO, "ht17");
+	private final JTG snip = new JTG(MainLocale.INFO, "ht18");
+	private final JL rar = new JL(MainLocale.INFO, "ht10");
 	private final JTG[] brars = new JTG[6];
 
 	private final UserPack pac;

src/main/java/page/info/edit/StageEditPage.java

@@ -165,7 +165,7 @@ protected synchronized void resized(int x, int y) {
 
 		if (headEdit == 0) {
 			set(hinf, x, y, 900, 50, 1400, 200);
-			set(linf, x, y, 900, 250, 1400, 100);
+			set(linf, x, y, 900, 250, 1400, 150);
 			set(jssl, x, y, 900, 50, 0, 0);
 		} else if (headEdit == 1) {
 			set(hinf, x, y, 900, 50, 0, 0);

src/main/resources/info.properties

@@ -124,6 +124,8 @@ rewid=Reward ID
 once=(Once)
 radar=(Radar)
 mat=Material
+ht17=rich
+ht18=sniper
 ht23=Cat price
 ht24=Cat speed
 ht25=Enemy speed