small qol

battle/entity/Entity.java

@@ -955,14 +955,18 @@ private void add(POISON ws) {
 			if (ws.type.unstackable)
 				list.removeIf(e -> e.type.unstackable && type(e) == type(ws));
 			ws.prob = 0; // used as counter
+
 			list.add(ws);
 			getMax();
 		}
 
 		private void damage(int dmg, int type) {
 			type &= 3;
 			long mul = type == 0 ? 100 : type == 1 ? e.maxH : type == 2 ? e.health : (e.maxH - e.health);
+
 			e.damage += mul * dmg / 100;
+
+
 		}
 
 		private void getMax() {
@@ -1125,7 +1129,24 @@ private void doRevive(int c) {
 			deadAnim += ea.getEAnim(ZombieEff.REVIVE).len();
 			e.status[P_REVIVE][1] = deadAnim;
 			int maxR = maxRevHealth();
-			e.health = e.maxH * maxR / 100;
+
+			// set how much health to revive with
+			long reviveHealth = e.maxH * maxR / 100;
+
+			// if revive health exceeds max health, update the max health
+			if (reviveHealth > e.maxH)
+			{
+				e.maxH = reviveHealth;
+				e.health = e.maxH;
+			}
+
+			// otherwise set health as normal
+			else
+			{
+				e.health = reviveHealth;
+			}
+
+
 			if (c == 1)
 				e.status[P_REVIVE][0]--;
 			else if (c == 2)
@@ -1438,6 +1459,12 @@ public void update() {
 	 */
 	private boolean killCounted = false;
 
+
+	/**
+	 * Damage to use for poison
+	 */
+	private int poisonDamage = 0;
+
 	/**
 	 * cooldown timer for regeneration ability
 	 */
@@ -1455,6 +1482,12 @@ protected Entity(StageBasis b, MaskEntity de, EAnimU ea, float atkMagnif, float
 		maxCurrentShield = currentShield = (int) (de.getProc().DEMONSHIELD.hp * hpMagnif);
 		shieldMagnification = hpMagnif;
 		regentimer = getProc().HPREGEN.interval;
+
+		// scale poison damage with mag if option is enabled, otherwise keep poison damage to set value
+		poisonDamage = de.getProc().POISON.damage;
+		if (de.getProc().POISON.type.scaleWithBuff) {
+			poisonDamage = (int) (((float) poisonDamage) * atkMagnif);
+		}
 	}
 
 	protected Entity(StageBasis b, MaskEntity de, EAnimU ea, float lvMagnif, float tAtk, float tHP, PCoin pc, Level lv) {
@@ -1478,6 +1511,7 @@ protected Entity(StageBasis b, MaskEntity de, EAnimU ea, float lvMagnif, float t
 		status[P_REVIVE][0] = getProc().REVIVE.count;
 		status[P_DMGCUT][0] = getProc().DMGCUT.type.magnif ? (int) (lvMagnif * getProc().DMGCUT.dmg) : getProc().DMGCUT.dmg;
 		status[P_DMGCAP][0] = getProc().DMGCAP.type.magnif ? (int) (lvMagnif * getProc().DMGCAP.dmg) : getProc().DMGCAP.dmg;
+
 		presetStatus(lvMagnif);
 		presetSealedProcs();
 		maxCurrentShield = currentShield = (int) (de.getProc().DEMONSHIELD.hp * lvMagnif);
@@ -1825,6 +1859,7 @@ private void processProcs(AttackAb atk) {
 		if (!(ctargetable(atk.trait, atk.attacker, false) || (receive(-1) && atk.SPtr) || (receive(1) && !atk.SPtr)))
 			return;
 
+
 		boolean cannonResist = atk.canon > 0 && getProc().IMUCANNON.exists() && (atk.canon & getProc().IMUCANNON.type) > 0;
 		if (atk.getProc().POIATK.mult > 0) {
 			int rst = getProc().IMUPOIATK.mult;
@@ -1992,8 +2027,10 @@ private void processProcs(AttackAb atk) {
 
 				ws.time = ws.time * (100 - res) / 100;
 
+				ws.damage = atk.attacker.poisonDamage;
+
 				if (atk.atk != 0 && ws.type.modifAffected)
-					ws.damage = (int) (ws.damage * (float) getDamage(atk, atk.atk) / atk.atk);
+					ws.damage = (int) (atk.attacker.poisonDamage * (float) getDamage(atk, atk.atk) / atk.atk);
 
 				pois.add(ws);
 				anim.getEff(P_POISON);

common.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="common" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

util/Data.java

@@ -194,6 +194,8 @@ public static class TYPE extends IntType {
 				public boolean ignoreMetal;
 				@Order(3)
 				public boolean modifAffected;
+				@Order(4)
+				public boolean scaleWithBuff;
 			}
 
 			@Order(0)

util/lang/Editors.java

@@ -384,7 +384,9 @@ else if (t.mult == 0)
 				t.type.range_type = 0;
 				t.type.revive_non_zombie = false;
 			} else {
-				t.health = MathUtil.clip(t.health, 1, 100);
+				// min revive health should be 1% with no upper cap
+				t.health = Math.max(1, t.health);
+
 				t.time = Math.max(t.time, 1);
 				if (!t.type.revive_others) {
 					t.dis_0 = t.dis_1 = 0;
@@ -494,6 +496,7 @@ else if (t.mult == 0)
 				t.type.unstackable = false;
 				t.type.ignoreMetal = false;
 				t.type.modifAffected = false;
+				t.type.scaleWithBuff = false;
 			} else {
 				t.time = Math.max(1, t.time);
 				t.itv = Math.max(1, t.itv);

util/lang/assets/proc.json

@@ -792,6 +792,10 @@
             "type.modifAffected": {
                 "name": "Consider Abilities",
                 "tooltip": "Toggle this to make poison damage affected by damage-modifying abilities such as strong against or critical."
+            },
+            "type.scaleWithBuff": {
+                "name": "Scale With Buff",
+                "tooltip": "Toggle this to make the damage increase with magnifications. Works best with burn."
             }
         }
     },