Merge branch 'master' of https://github.com/purerosefallen/ygopro-core into 2pick

libcard.cpp

@@ -707,14 +707,20 @@ int32 scriptlib::card_get_attack(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	lua_pushinteger(L, pcard->get_attack());
+	int32 atk = pcard->get_attack();
+	if(atk < 0)
+		atk = 0;
+	lua_pushinteger(L, atk);
 	return 1;
 }
 int32 scriptlib::card_get_origin_attack(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	lua_pushinteger(L, pcard->get_base_attack());
+	int32 atk = pcard->get_base_attack();
+	if(atk < 0)
+		atk = 0;
+	lua_pushinteger(L, atk);
 	return 1;
 }
 int32 scriptlib::card_get_text_attack(lua_State *L) {
@@ -731,14 +737,20 @@ int32 scriptlib::card_get_defense(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	lua_pushinteger(L, pcard->get_defense());
+	int32 def = pcard->get_defense();
+	if(def < 0)
+		def = 0;
+	lua_pushinteger(L, def);
 	return 1;
 }
 int32 scriptlib::card_get_origin_defense(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
-	lua_pushinteger(L, pcard->get_base_defense());
+	int32 def = pcard->get_base_defense();
+	if(def < 0)
+		def = 0;
+	lua_pushinteger(L, def);
 	return 1;
 }
 int32 scriptlib::card_get_text_defense(lua_State *L) {

operations.cpp

@@ -59,7 +59,11 @@ void field::change_chain_effect(uint8 chaincount, int32 rep_op) {
 		return;
 	if(chaincount > core.current_chain.size() || chaincount < 1)
 		chaincount = core.current_chain.size();
-	core.current_chain[chaincount - 1].replace_op = rep_op;
+	chain& pchain = core.current_chain[chaincount - 1];
+	pchain.replace_op = rep_op;
+	if((pchain.triggering_effect->type & EFFECT_TYPE_ACTIVATE) && (pchain.triggering_effect->handler->current.location == LOCATION_SZONE)) {
+		pchain.triggering_effect->handler->set_status(STATUS_LEAVE_CONFIRMED, TRUE);
+	}
 }
 void field::change_target(uint8 chaincount, group* targets) {
 	if(core.current_chain.size() == 0)