v1.4.0: berserking recovery now accounts for locked floor regen timer

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java

@@ -142,7 +142,8 @@ public class Berserk extends Buff implements ActionIndicator.Action {
 					detach();
 				}
 			}
-		} else if (state == State.RECOVERING && levelRecovery == 0){
+		} else if (state == State.RECOVERING && levelRecovery == 0
+				&& (target.buff(LockedFloor.class) == null || target.buff(LockedFloor.class).regenOn())){
 			turnRecovery--;
 			if (turnRecovery <= 0){
 				turnRecovery = 0;