Merge branch 'master' of github.com:Fluorohydride/ygopro-core

card.cpp

@@ -915,6 +915,22 @@ int32 card::get_defense() {
 	temp.defense = -1;
 	return def;
 }
+int32 card::get_battle_attack() {
+	effect_set eset;
+	filter_effect(EFFECT_SET_BATTLE_ATTACK, &eset);
+	if(eset.size())
+		return eset.get_last()->get_value(this);
+	else
+		return get_attack();
+}
+int32 card::get_battle_defense() {
+	effect_set eset;
+	filter_effect(EFFECT_SET_BATTLE_DEFENSE, &eset);
+	if(eset.size())
+		return eset.get_last()->get_value(this);
+	else
+		return get_defense();
+}
 // Level/Attribute/Race is available for:
 // 1. cards with original type TYPE_MONSTER or
 // 2. cards with current type TYPE_MONSTER or

card.h

@@ -218,6 +218,8 @@ public:
 	int32 get_attack();
 	int32 get_base_defense();
 	int32 get_defense();
+	int32 get_battle_attack();
+	int32 get_battle_defense();
 	uint32 get_level();
 	uint32 get_rank();
 	uint32 get_link();

effect.h

@@ -467,6 +467,8 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
 #define EFFECT_QP_ACT_IN_SET_TURN		359
 #define EFFECT_EXTRA_PENDULUM_SUMMON	360
 #define EFFECT_MATERIAL_LIMIT			361
+#define EFFECT_SET_BATTLE_ATTACK		362
+#define EFFECT_SET_BATTLE_DEFENSE		363
 
 #define EVENT_STARTUP		1000
 #define EVENT_FLIP			1001

operations.cpp

@@ -29,7 +29,8 @@ int32 field::negate_chain(uint8 chaincount) {
 		}
 		pduel->write_buffer8(MSG_CHAIN_NEGATED);
 		pduel->write_buffer8(chaincount);
-		if(pchain.triggering_location & (LOCATION_DECK | LOCATION_EXTRA))
+		if(pchain.triggering_location == LOCATION_DECK
+			|| core.duel_rule >= 5 && pchain.triggering_location == LOCATION_EXTRA && (pchain.triggering_position & POS_FACEDOWN))
 			pchain.triggering_effect->handler->release_relation(pchain);
 		return TRUE;
 	}
@@ -48,7 +49,8 @@ int32 field::disable_chain(uint8 chaincount) {
 		core.current_chain[chaincount - 1].disable_player = core.reason_player;
 		pduel->write_buffer8(MSG_CHAIN_DISABLED);
 		pduel->write_buffer8(chaincount);
-		if(pchain.triggering_location & (LOCATION_DECK | LOCATION_EXTRA))
+		if(pchain.triggering_location == LOCATION_DECK
+			|| core.duel_rule >= 5 && pchain.triggering_location == LOCATION_EXTRA && (pchain.triggering_position & POS_FACEDOWN))
 			pchain.triggering_effect->handler->release_relation(pchain);
 		return TRUE;
 	}

processor.cpp

@@ -3300,7 +3300,7 @@ int32 field::process_damage_step(uint16 step, uint32 new_attack) {
 	return TRUE;
 }
 void field::calculate_battle_damage(effect** pdamchange, card** preason_card, uint8* battle_destroyed) {
-	uint32 aa = core.attacker->get_attack(), ad = core.attacker->get_defense();
+	uint32 aa = core.attacker->get_battle_attack(), ad = core.attacker->get_battle_defense();
 	uint32 da = 0, dd = 0, a = aa, d;
 	uint8 pa = core.attacker->current.controler, pd;
 	uint8 damp = 0;
@@ -3315,8 +3315,8 @@ void field::calculate_battle_damage(effect** pdamchange, card** preason_card, ui
 			a = ad;
 	}
 	if(core.attack_target) {
-		da = core.attack_target->get_attack();
-		dd = core.attack_target->get_defense();
+		da = core.attack_target->get_battle_attack();
+		dd = core.attack_target->get_battle_defense();
 		pd = core.attack_target->current.controler;
 		if(core.attack_target->is_position(POS_ATTACK)) {
 			d = da;