Merge pull request #753 from sidschingis/patch-6

new effect

ocgcore/effect.h

@@ -218,6 +218,7 @@ public:
 #define EFFECT_CANNOT_DISCARD_HAND		55	//
 #define EFFECT_CANNOT_DISCARD_DECK		56	//
 #define EFFECT_CANNOT_USE_AS_COST		57	//
+#define EFFECT_CANNOT_PLACE_COUNTER		58	//
 
 #define EFFECT_LEAVE_FIELD_REDIRECT		60	//
 #define EFFECT_TO_HAND_REDIRECT			61	//

ocgcore/field.cpp

@@ -1853,6 +1853,9 @@ int32 field::is_player_can_release(uint8 playerid, card * pcard) {
 	}
 	return TRUE;
 }
+int32 field::is_player_can_place_counter(uint8 playerid, card * pcard, uint16 countertype, uint16 count) {
+	return !is_player_affected_by_effect(playerid,EFFECT_CANNOT_PLACE_COUNTER);
+}
 int32 field::is_player_can_remove_counter(uint8 playerid, card * pcard, uint8 s, uint8 o, uint16 countertype, uint16 count, uint32 reason) {
 	if((pcard && pcard->get_counter(countertype) >= count) || (!pcard && get_field_counter(playerid, s, o, countertype) >= count))
 		return TRUE;

ocgcore/field.h

@@ -376,6 +376,7 @@ public:
 	int32 is_player_can_flipsummon(uint8 playerid, card* pcard);
 	int32 is_player_can_spsummon_monster(uint8 playerid, uint8 toplayer, uint8 sumpos, card_data* pdata);
 	int32 is_player_can_release(uint8 playerid, card* pcard);
+	int32 is_player_can_place_counter(uint8 playerid, card* pcard, uint16 countertype, uint16 count);
 	int32 is_player_can_remove_counter(uint8 playerid, card* pcard, uint8 s, uint8 o, uint16 countertype, uint16 count, uint32 reason);
 	int32 is_player_can_remove_overlay_card(uint8 playerid, card* pcard, uint8 s, uint8 o, uint16 count, uint32 reason);
 	int32 is_player_can_send_to_grave(uint8 playerid, card* pcard);

ocgcore/libcard.cpp

@@ -1617,7 +1617,10 @@ int32 scriptlib::card_add_counter(lua_State *L) {
 	card* pcard = *(card**) lua_touserdata(L, 1);
 	uint32 countertype = lua_tointeger(L, 2);
 	uint32 count = lua_tointeger(L, 3);
-	if(pcard->is_affect_by_effect(pcard->pduel->game_field->core.reason_effect))
+	field* game_field = pcard->pduel->game_field;
+	uint8 player = game_field->core.reason_player;
+	if(pcard->is_affect_by_effect(game_field->core.reason_effect)
+		&& game_field->is_player_can_place_counter(player,pcard,countertype,count))
 		lua_pushboolean(L, pcard->add_counter(countertype, count));
 	else lua_pushboolean(L, 0);
 	return 1;

script/constant.lua

@@ -311,6 +311,7 @@ EFFECT_SEND_REPLACE				=52	--
 EFFECT_CANNOT_DISCARD_HAND		=55	--
 EFFECT_CANNOT_DISCARD_DECK		=56	--
 EFFECT_CANNOT_USE_AS_COST		=57	--
+EFFECT_CANNOT_PLACE_COUNTER =58 --
 
 EFFECT_LEAVE_FIELD_REDIRECT		=60	--
 EFFECT_TO_HAND_REDIRECT			=61	--