Fix half/double damage calculation from non piercing attacks

edo9300 · Dec 10, 2023 · b931f3e · b931f3e
1 parent 39e4ab2
commit b931f3e
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/processor.cpp b/processor.cpp
@@ -3799,15 +3799,16 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui
 								pduel->lua->add_param<LuaParam::CARD>(core.attacker);
 								val = peff->get_value(1);
 							}
-							if(val == 0) {
-								dam_value = 0;
-								break;
-							} else if(val > 0)
-								dam_value = static_cast<int32_t>(val);
-							else if(val == DOUBLE_DAMAGE)
+							if(val == DOUBLE_DAMAGE) {
 								double_dam = true;
-							else if(val == HALF_DAMAGE)
+							} else if(val == HALF_DAMAGE) {
 								half_dam = true;
+							} else if(val > 0) {
+								dam_value = static_cast<int32_t>(val);
+							} else if(val == 0) {
+								dam_value = 0;
+								break;
+							}
 						}
 						if(double_dam && half_dam) {
 							double_dam = false;
@@ -3922,15 +3923,16 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui
 					pduel->lua->add_param<LuaParam::CARD>(reason_card);
 					val = peff->get_value(1);
 				}
-				if(val == 0) {
-					dam_value = 0;
-					break;
-				} else if(val > 0)
-					dam_value = static_cast<int32_t>(val);
-				else if(val == DOUBLE_DAMAGE)
+				if(val == DOUBLE_DAMAGE) {
 					double_dam = true;
-				else if(val == HALF_DAMAGE)
+				} else if(val == HALF_DAMAGE) {
 					half_dam = true;
+				} else if(val > 0) {
+					dam_value = static_cast<int32_t>(val);
+				} else if(val == 0) {
+					dam_value = 0;
+					break;
+				}
 			}
 			if(double_dam && half_dam) {
 				double_dam = false;