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

interpreter.cpp

@@ -329,6 +329,8 @@ static const struct luaL_Reg effectlib[] = {
 	{ "IsActivated", scriptlib::effect_is_activated },
 	{ "GetActivateLocation", scriptlib::effect_get_activate_location },
 	{ "GetActivateSequence", scriptlib::effect_get_activate_sequence },
+	{ "CheckCountLimit", scriptlib::effect_check_count_limit },
+	{ "UseCountLimit", scriptlib::effect_use_count_limit },
 	{ NULL, NULL }
 };
 

libeffect.cpp

@@ -564,3 +564,31 @@ int32 scriptlib::effect_get_activate_sequence(lua_State *L) {
 	lua_pushinteger(L, peffect->active_sequence);
 	return 1;
 }
+int32 scriptlib::effect_check_count_limit(lua_State *L) {
+	check_param_count(L, 2);
+	check_param(L, PARAM_TYPE_EFFECT, 1);
+	effect* peffect = *(effect**) lua_touserdata(L, 1);
+	uint32 p = lua_tointeger(L, 2);
+	lua_pushboolean(L, peffect->check_count_limit(p));
+	return 1;
+}
+int32 scriptlib::effect_use_count_limit(lua_State *L) {
+	check_param_count(L, 2);
+	check_param(L, PARAM_TYPE_EFFECT, 1);
+	effect* peffect = *(effect**) lua_touserdata(L, 1);
+	uint32 p = lua_tointeger(L, 2);
+	uint32 count = 1;
+	uint32 oath_only = 0;
+	uint32 code = peffect->count_code;
+	if(lua_gettop(L) > 2) {
+		count = lua_tointeger(L, 3);
+		if (lua_gettop(L) > 3)
+			oath_only = lua_toboolean(L, 4);
+	}
+	if (!oath_only || code & EFFECT_COUNT_CODE_OATH)
+		while(count) {
+			peffect->dec_count(p);
+			count--;
+		}
+	return 0;
+}

scriptlib.h

@@ -339,6 +339,8 @@ public:
 	static int32 effect_is_activated(lua_State *L);
 	static int32 effect_get_activate_location(lua_State *L);
 	static int32 effect_get_activate_sequence(lua_State *L);
+	static int32 effect_check_count_limit(lua_State *L);
+	static int32 effect_use_count_limit(lua_State *L);
 
 	//Group functions
 	static int32 group_new(lua_State *L);