Changed counter permit handling, added location option to iscanaddcounter

card.cpp

@@ -2124,7 +2124,7 @@ int32 card::destination_redirect(uint8 destination, uint32 reason) {
 // cmit->second[0]: permanent
 // cmit->second[1]: reset while negated
 int32 card::add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly) {
-	if(!is_can_add_counter(playerid, countertype, count, singly, FALSE))
+	if(!is_can_add_counter(playerid, countertype, count, singly, 0))
 		return FALSE;
 	uint16 cttype = countertype & ~COUNTER_NEED_ENABLE;
 	auto pr = counters.insert(std::make_pair(cttype, counter_map::mapped_type()));
@@ -2182,15 +2182,28 @@ int32 card::remove_counter(uint16 countertype, uint16 count) {
 	pduel->write_buffer16(count);
 	return TRUE;
 }
-int32 card::is_can_add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly, uint8 temp) {
+int32 card::is_can_add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly, uint32 temploc) {
 	effect_set eset;
 	if(!pduel->game_field->is_player_can_place_counter(playerid, this, countertype, count))
 		return FALSE;
-	if((!(current.location & LOCATION_ONFIELD) || !is_position(POS_FACEUP)) && !temp)
-		return FALSE;
 	if((countertype & COUNTER_NEED_ENABLE) && is_status(STATUS_DISABLED))
 		return FALSE;
-	if(!(countertype & COUNTER_WITHOUT_PERMIT) && !is_affected_by_effect(EFFECT_COUNTER_PERMIT + (countertype & 0xffff)))
+	filter_effect(EFFECT_COUNTER_PERMIT + (countertype & 0xffff), &eset);
+	if (eset.size() < 1 && !(countertype & COUNTER_WITHOUT_PERMIT))
+		return FALSE;
+	bool check = false;
+	for(int32 i = 0; i < eset.size(); ++i){
+		uint32 prange = eset[i]->get_value();
+		if (!(countertype & COUNTER_WITHOUT_PERMIT)) {
+			if(temploc)
+				check = (temploc & prange);
+			else
+				check = (current.is_location(prange) && is_position(POS_FACEUP));
+			if(check)
+				break;
+		}
+	}
+	if(!check)
 		return FALSE;
 	uint16 cttype = countertype & ~COUNTER_NEED_ENABLE;
 	int32 limit = -1;

card.h

@@ -265,7 +265,7 @@ public:
 	int32 destination_redirect(uint8 destination, uint32 reason);
 	int32 add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly);
 	int32 remove_counter(uint16 countertype, uint16 count);
-	int32 is_can_add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly, uint8 temp);
+	int32 is_can_add_counter(uint8 playerid, uint16 countertype, uint16 count, uint8 singly, uint32 temploc);
 	int32 get_counter(uint16 countertype);
 	void set_material(card_set* materials);
 	void add_card_target(card* pcard);

libcard.cpp

@@ -2173,13 +2173,11 @@ int32 scriptlib::card_enable_counter_permit(lua_State *L) {
 		prange = LOCATION_MZONE;
 	else
 		prange = LOCATION_SZONE | LOCATION_FZONE;
-	prange |= LOCATION_GRAVE + LOCATION_REMOVED + LOCATION_EXTRA + LOCATION_OVERLAY + LOCATION_HAND + LOCATION_DECK;
 	effect* peffect = pcard->pduel->new_effect();
 	peffect->owner = pcard;
 	peffect->type = EFFECT_TYPE_SINGLE;
 	peffect->code = EFFECT_COUNTER_PERMIT | countertype;
-	peffect->flag[0] = EFFECT_FLAG_SINGLE_RANGE;
-	peffect->range = prange;
+	peffect->value = prange;
 	pcard->add_effect(peffect);
 	return 0;
 }