Browse Source

perfect conc

lakebane-master
FatBoy-DOTC 10 months ago
parent
commit
7ff879ea64
  1. 1
      src/engine/gameManager/CombatManager.java
  2. 26
      src/engine/powers/effectmodifiers/AbstractEffectModifier.java

1
src/engine/gameManager/CombatManager.java

@ -950,6 +950,7 @@ public enum CombatManager {
} catch (Exception e) { } catch (Exception e) {
Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e); Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e);
e.printStackTrace();
} }
} }

26
src/engine/powers/effectmodifiers/AbstractEffectModifier.java

@ -47,9 +47,9 @@ public abstract class AbstractEffectModifier {
this.modType = ModType.GetModType(this.effectType); this.modType = ModType.GetModType(this.effectType);
this.type = rs.getString("type").replace("\"", ""); this.type = rs.getString("type").replace("\"", "");
this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", "")); this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
this.minMod = rs.getFloat("minMod"); this.minMod = getConcMin(rs.getString("IDString"),rs.getFloat("minMod"));
this.maxMod = rs.getFloat("maxMod"); this.maxMod = rs.getFloat("maxMod");
this.percentMod = rs.getFloat("percentMod"); this.percentMod = getConcPercentMod(rs.getString("IDString"),rs.getFloat("percentMod"));
this.ramp = rs.getFloat("ramp"); this.ramp = rs.getFloat("ramp");
this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false; this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false;
@ -57,7 +57,29 @@ public abstract class AbstractEffectModifier {
this.string2 = rs.getString("string2"); this.string2 = rs.getString("string2");
} }
public static float getConcMin(String idString,float current){
switch(idString){
case "POT-014A":
case "POT-013A":
case "POT-012A":
case "POT-011A":
case "POT-010A":
return 60;
case "POT-015B":
return 50;
}
return current;
}
public static float getConcPercentMod(String idString, float current) {
switch (idString) {
case "POT-018A":
return 150;
case "POT-017A":
return -40;
}
return current;
}
public int getUUID() { public int getUUID() {
return this.UUID; return this.UUID;
} }

Loading…
Cancel
Save