Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY

ocgcore/interpreter.cpp

@@ -333,6 +333,10 @@ static const struct luaL_Reg effectlib[] = {
 };
 
 static const struct luaL_Reg grouplib[] = {
+	//metatable
+	{ "__add", scriptlib::group_meta_add },
+	{ "__sub", scriptlib::group_meta_sub },
+
 	{ "CreateGroup", scriptlib::group_new },
 	{ "KeepAlive", scriptlib::group_keep_alive },
 	{ "DeleteGroup", scriptlib::group_delete },
@@ -344,6 +348,7 @@ static const struct luaL_Reg grouplib[] = {
 	{ "GetNext", scriptlib::group_get_next },
 	{ "GetFirst", scriptlib::group_get_first },
 	{ "GetCount", scriptlib::group_get_count },
+	{ "__len", scriptlib::group_get_count },
 	{ "ForEach", scriptlib::group_for_each },
 	{ "Filter", scriptlib::group_filter },
 	{ "FilterCount", scriptlib::group_filter_count },

ocgcore/libgroup.cpp

@@ -11,6 +11,63 @@
 #include "effect.h"
 #include "duel.h"
 
+//metatables
+//metatable functions
+int32 scriptlib::group_meta_add(lua_State* L) {
+	check_param_count(L, 2);
+	if(!check_param(L, PARAM_TYPE_CARD, 1, TRUE) && !check_param(L, PARAM_TYPE_GROUP, 1, TRUE))
+		luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
+	if(!check_param(L, PARAM_TYPE_CARD, 2, TRUE) && !check_param(L, PARAM_TYPE_GROUP, 2, TRUE))
+		luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2);		
+	duel* pduel = interpreter::get_duel_info(L);
+	group* pgroup=pduel->new_group();
+	if(check_param(L, PARAM_TYPE_CARD, 1, TRUE)) {
+		card* ccard = *(card**) lua_touserdata(L, 1);
+		pgroup->container.insert(ccard);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 1, TRUE)) {
+		group* cgroup = *(group**) lua_touserdata(L, 1);
+		for(auto cit = cgroup->container.begin(); cit != cgroup->container.end(); ++cit)
+			pgroup->container.insert(*cit);
+	}
+	if(check_param(L, PARAM_TYPE_CARD, 2, TRUE)) {
+		card* ccard = *(card**) lua_touserdata(L, 2);
+		pgroup->container.insert(ccard);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 2, TRUE)) {
+		group* cgroup = *(group**) lua_touserdata(L, 2);
+		for(auto cit = cgroup->container.begin(); cit != cgroup->container.end(); ++cit)
+			pgroup->container.insert(*cit);
+	}
+	interpreter::group2value(L, pgroup);
+	return 1;
+}
+int32 scriptlib::group_meta_sub(lua_State* L) {
+	check_param_count(L, 2);
+	if(!check_param(L, PARAM_TYPE_CARD, 1, TRUE) && !check_param(L, PARAM_TYPE_GROUP, 1, TRUE))
+		luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
+	if(!check_param(L, PARAM_TYPE_CARD, 2, TRUE) && !check_param(L, PARAM_TYPE_GROUP, 2, TRUE))
+		luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2);		
+	duel* pduel = interpreter::get_duel_info(L);
+	group* pgroup=pduel->new_group();
+	if(check_param(L, PARAM_TYPE_CARD, 1, TRUE)) {
+		card* ccard = *(card**) lua_touserdata(L, 1);
+		pgroup->container.insert(ccard);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 1, TRUE)) {
+		group* cgroup = *(group**) lua_touserdata(L, 1);
+		for(auto cit = cgroup->container.begin(); cit != cgroup->container.end(); ++cit)
+			pgroup->container.insert(*cit);
+	}
+	if(check_param(L, PARAM_TYPE_CARD, 2, TRUE)) {
+		card* ccard = *(card**) lua_touserdata(L, 2);
+		pgroup->container.erase(ccard);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 2, TRUE)) {
+		group* cgroup = *(group**) lua_touserdata(L, 2);
+		for(auto cit = cgroup->container.begin(); cit != cgroup->container.end(); ++cit)
+			pgroup->container.erase(*cit);
+	}
+	interpreter::group2value(L, pgroup);
+	return 1;
+}
+
 int32 scriptlib::group_new(lua_State *L) {
 	duel* pduel = interpreter::get_duel_info(L);
 	group* pgroup = pduel->new_group();

ocgcore/scriptlib.h

@@ -38,6 +38,9 @@ public:
 	static int32 duel_disable_action_check(lua_State *L);
 	static int32 duel_setmetatable(lua_State *L);
 	static int32 duel_move_turn_count(lua_State *L);
+	//metatable
+	static int32 group_meta_add(lua_State *L);
+	static int32 group_meta_sub(lua_State *L);
 
 	//card lib
 	static int32 card_get_code(lua_State *L);