Merge branch 'master' into local

purerosefallen · Mar 23, 2018 · 1040450 · 1040450
2 parents cad6649 + 2422327
commit 1040450
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ocgcore/effect.h b/ocgcore/effect.h
@@ -113,6 +113,7 @@ class effect {
 #define EFFECT_ADD_LINK_MARKER_KOISHI		37564151
 #define EFFECT_REMOVE_LINK_MARKER_KOISHI	37564152
 #define EFFECT_CANNOT_LOSE_KOISHI			37564153
+#define EFFECT_EXTRA_TOMAIN_KOISHI			37564154
 
 //status
 #define EFFECT_STATUS_AVAILABLE	0x0001

diff --git a/ocgcore/field.cpp b/ocgcore/field.cpp
@@ -578,7 +578,7 @@ int32 field::get_useable_count_fromex(card* pcard, uint8 playerid, uint8 uplayer
 		pcard->current.location = LOCATION_EXTRA;
 	}
 	int useable_count = 0;
-	if(core.duel_rule >= 4)
+	if(core.duel_rule >= 4 && !is_player_affected_by_effect(playerid, EFFECT_EXTRA_TOMAIN_KOISHI) && !pcard->is_affected_by_effect(EFFECT_EXTRA_TOMAIN_KOISHI))
 		useable_count = get_useable_count_fromex_rule4(pcard, playerid, uplayer, zone, list);
 	else
 		useable_count = get_useable_count_other(pcard, playerid, LOCATION_MZONE, uplayer, LOCATION_REASON_TOFIELD, zone, list);

diff --git a/ocgcore/interpreter.cpp b/ocgcore/interpreter.cpp
@@ -693,6 +693,8 @@ interpreter::interpreter(duel* pd): coroutines(256) {
 	lua_setglobal(lua_state, "EFFECT_REMOVE_LINK_MARKER_KOISHI");
 	lua_pushinteger(lua_state, EFFECT_CANNOT_LOSE_KOISHI);
 	lua_setglobal(lua_state, "EFFECT_CANNOT_LOSE_KOISHI");
+	lua_pushinteger(lua_state, EFFECT_EXTRA_TOMAIN_KOISHI);
+	lua_setglobal(lua_state, "EFFECT_EXTRA_TOMAIN_KOISHI");
 	//music hints
 	lua_pushinteger(lua_state, HINT_MUSIC);
 	lua_setglobal(lua_state, "HINT_MUSIC");