rework remove_disabler

- fixes interactor between cholera and big fifty

Author: salvoilmiosi

src/effects/armedanddangerous/bigfifty.cpp

@@ -15,7 +15,7 @@ namespace banggame {
                         || c == target->get_character();
                 });
                 origin->m_game->queue_action([=]{
-                    origin->m_game->remove_disablers(key);
+                    origin->m_game->remove_disabler(key);
                 }, 90);
                 origin->m_game->remove_listeners(key);
             }

src/effects/base/death.cpp

@@ -181,6 +181,6 @@ namespace banggame {
     }
 
     void revive_character(player_ptr target) {
-        target->m_game->remove_disablers({ target->get_character(), 90 });
+        target->m_game->remove_disabler({ target->get_character(), 90 });
     }
 }

src/effects/canyondiablo/brothel.cpp

@@ -36,7 +36,7 @@ namespace banggame {
                         });
                         auto clear_events = [target, event_key](player_ptr p) {
                             if (p == target) {
-                                target->m_game->remove_disablers(event_key);
+                                target->m_game->remove_disabler(event_key);
                                 target->m_game->remove_listeners(event_key);
                             }
                         };

src/effects/dodgecity/bellestar.cpp

@@ -16,13 +16,13 @@ namespace banggame {
         });
         p->m_game->add_listener<event_type::on_turn_end>(target_card, [=](player_ptr target, bool skipped) {
             if (p == target) {
-                p->m_game->remove_disablers({ target_card, 0 });
+                p->m_game->remove_disabler({ target_card, 0 });
             }
         });
     }
 
     void equip_bellestar::on_disable(card_ptr target_card, player_ptr target) {
-        target->m_game->remove_disablers({ target_card, 0 });
+        target->m_game->remove_disabler({ target_card, 0 });
         target->m_game->remove_listeners({ target_card, 0 });
     }
 }

src/effects/fistfulofcards/lasso.cpp

@@ -11,6 +11,6 @@ namespace banggame {
     }
 
     void equip_lasso::on_disable(card_ptr target_card, player_ptr target) {
-        target->m_game->remove_disablers(target_card);
+        target->m_game->remove_disabler(target_card);
     }
 }

src/effects/highnoon/hangover.cpp

@@ -12,6 +12,6 @@ namespace banggame {
     }
 
     void equip_hangover::on_disable(card_ptr target_card, player_ptr target) {
-        target->m_game->remove_disablers(target_card);
+        target->m_game->remove_disabler(target_card);
     }
 }

src/effects/highnoon/sermon.cpp

@@ -20,12 +20,12 @@ namespace banggame {
             }, true});
         });
         target->m_game->add_listener<event_type::on_turn_end>(target_card, [=](player_ptr p, bool skipped) {
-            target->m_game->remove_disablers(target_card);
+            target->m_game->remove_disabler(target_card);
         });
     }
 
     void equip_sermon::on_disable(card_ptr target_card, player_ptr target) {
-        target->m_game->remove_disablers(target_card);
+        target->m_game->remove_disabler(target_card);
         target->m_game->remove_listeners(target_card);
     }
 }

src/effects/valleyofshadows/ghost.cpp

@@ -18,7 +18,7 @@ namespace banggame {
 
     void equip_disable_character::on_disable(card_ptr target_card, player_ptr target) {
         target->m_game->queue_action([=]{
-            target->m_game->remove_disablers(target_card);
+            target->m_game->remove_disabler(target_card);
         }, 49);
     }
 

src/game/disabler_map.cpp

@@ -47,30 +47,33 @@ namespace banggame {
         m_disablers.emplace(key, std::move(fun));
     }
 
-    void disabler_map::do_remove_disablers(disabler_map_range range) {
-        for (const auto &[key, fun] : range) {
-            logging::debug("remove_disabler() on {}: {}", key, fun.target_type());
-        }
+    void disabler_map::remove_disabler(event_card_key key) {
+        auto iterator = m_disablers.find(key);
+        if (iterator == m_disablers.end()) return;
+        
+        logging::debug("remove_disabler() on {}: {}", iterator->first, iterator->second.target_type());
 
-        for (auto [owner, c] : disableable_cards(m_game)) {
-            auto disables_c = [c](const auto &pair) { return pair.second(c); };
-            auto outside_range = rv::concat(
-                rn::subrange(m_disablers.begin(), range.begin()),
-                rn::subrange(range.end(), m_disablers.end())
-            );
+        for (auto [owner, target_card] : disableable_cards(m_game)) {
+            bool disabled_by_this = iterator->second(target_card);
+
+            bool disabled_by_other = false;
+            for (auto it = m_disablers.begin(); it != m_disablers.end(); ++it) {
+                if (it != iterator && it->second(target_card)) {
+                    disabled_by_other = true;
+                    break;
+                }
+            }
 
-            // enables the card only if there are no disablers left after the removal of `range`
-            // AND the card is already disabled by at least one disabler in `range`
-            if (rn::any_of(range, disables_c) && rn::none_of(outside_range, disables_c)) {
-                for (const equip_holder &holder : c->equips) {
+            if (disabled_by_this && !disabled_by_other) {
+                for (const equip_holder &holder : target_card->equips) {
                     if (!holder.is_nodisable()) {
-                        holder.on_enable(c, owner);
+                        holder.on_enable(target_card, owner);
                     }
                 }
             }
         }
 
-        m_disablers.erase(range.begin(), range.end());
+        m_disablers.erase(iterator);
     }
 
     card_ptr disabler_map::get_disabler(const_card_ptr target_card, bool check_disable_use) const {

src/game/disabler_map.h

@@ -41,28 +41,17 @@ namespace banggame {
     private:
         using disabler_map_t = std::multimap<event_card_key, card_disabler_fun, std::less<>>;
         using disabler_map_iterator = disabler_map_t::const_iterator;
-        using disabler_map_range = rn::subrange<disabler_map_iterator>;
 
     private:
         disabler_map_t m_disablers;
         game_ptr m_game;
 
-        void do_remove_disablers(disabler_map_range range);
-
     public:
         disabler_map(game_ptr m_game): m_game(m_game) {}
 
         void add_disabler(event_card_key key, card_disabler_fun &&fun);
 
-        void remove_disablers(event_card_key key) {
-            auto [low, high] = m_disablers.equal_range(key);
-            do_remove_disablers({low, high});
-        }
-
-        void remove_disablers(card_ptr key) {
-            auto [low, high] = m_disablers.equal_range(key);
-            do_remove_disablers({low, high});
-        }
+        void remove_disabler(event_card_key key);
 
         card_ptr get_disabler(const_card_ptr target_card, bool check_disable_use = false) const;