Merge remote-tracking branch 'mercury/patch-disable-chain' into develop

README.md

@@ -21,7 +21,11 @@ Interface provided function that handles error messages.
 
 These functions create the game itself and then manipulate it.
 - `intptr_t create_duel(uint_fast32_t seed);`  
-Create a the instance of the duel with a PRNG seed.
+(Deprecated) Create an instance of `duel` with 1 uint32 PRNG seed.  
+This function is reserved for replay mode only.
+
+- `intptr_t create_duel_v2(uint32_t seed_sequence[]);`  
+Create an instance of `duel` with PRNG seed `seed_sequence[]` of length `SEED_COUNT`.
 
 - `void start_duel(intptr_t pduel, uint32_t options);`  
 Start the duel.

libdebug.cpp

@@ -149,6 +149,10 @@ int32_t scriptlib::debug_reload_field_begin(lua_State *L) {
 		pduel->game_field->core.duel_rule = 1;
 	else
 		pduel->game_field->core.duel_rule = CURRENT_RULE;
+	if (pduel->game_field->core.duel_rule == MASTER_RULE3) {
+		pduel->game_field->player[0].szone_size = 8;
+		pduel->game_field->player[1].szone_size = 8;
+	}
 	return 0;
 }
 int32_t scriptlib::debug_reload_field_end(lua_State *L) {

operations.cpp

@@ -45,8 +45,7 @@ int32_t field::disable_chain(uint8_t chaincount, uint8_t forced) {
 	chain& pchain = core.current_chain[chaincount - 1];
 	card* phandler = pchain.triggering_effect->get_handler();
 	if(!(pchain.flag & CHAIN_DISABLE_EFFECT) && is_chain_disablable(pchain.chain_count)
-		&& (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect))
-		&& !(phandler->is_has_relation(pchain) && phandler->is_status(STATUS_DISABLED) && !forced)) {
+		&& (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect))) {
 		core.current_chain[chaincount - 1].flag |= CHAIN_DISABLE_EFFECT;
 		core.current_chain[chaincount - 1].disable_reason = core.reason_effect;
 		core.current_chain[chaincount - 1].disable_player = core.reason_player;