EFFECT_REFLECT_DAMAGE

Now it will check EFFECT_REFLECT_DAMAGE before EFFECT_CHANGE_DAMAGE.

operations.cpp

@@ -467,32 +467,33 @@ int32 field::damage(uint16 step, effect* reason_effect, uint32 reason, uint8 rea
 				}
 			}
 		}
-		uint32 val = amount;
 		eset.clear();
-		filter_player_effect(playerid, EFFECT_CHANGE_DAMAGE, &eset);
-		for(int32 i = 0; i < eset.size(); ++i) {
+		filter_player_effect(playerid, EFFECT_REFLECT_DAMAGE, &eset);
+		for (int32 i = 0; i < eset.size(); ++i) {
 			pduel->lua->add_param(reason_effect, PARAM_TYPE_EFFECT);
 			pduel->lua->add_param(amount, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason_player, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason_card, PARAM_TYPE_CARD);
-			val = eset[i]->get_value(5);
-			returns.ivalue[0] = val;
-			if(val == 0)
-				return TRUE;
+			if (eset[i]->check_value_condition(5)) {
+				playerid = 1 - playerid;
+				core.units.begin()->arg2 |= 1 << 29;
+				break;
 			}
+		}
+		uint32 val = amount;
 		eset.clear();
-		filter_player_effect(playerid, EFFECT_REFLECT_DAMAGE, &eset);
+		filter_player_effect(playerid, EFFECT_CHANGE_DAMAGE, &eset);
 		for(int32 i = 0; i < eset.size(); ++i) {
 			pduel->lua->add_param(reason_effect, PARAM_TYPE_EFFECT);
 			pduel->lua->add_param(val, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason_player, PARAM_TYPE_INT);
 			pduel->lua->add_param(reason_card, PARAM_TYPE_CARD);
-			if(eset[i]->check_value_condition(5)) {
-				core.units.begin()->arg2 |= 1 << 29;
-				break;
-			}
+			val = eset[i]->get_value(5);
+			returns.ivalue[0] = val;
+			if(val == 0)
+				return TRUE;
 		}
 		core.units.begin()->arg2 = (core.units.begin()->arg2 & 0xff000000) | (val & 0xffffff);
 		if(is_step) {