add game_options.prompt_target_immunity

salvoilmiosi · salvoilmiosi · commit a4ffa5b64431 · 2026-06-24T09:35:59.000+02:00
diff --git a/src/effects/armedanddangerous/bomb.cpp b/src/effects/armedanddangerous/bomb.cpp
@@ -39,7 +39,7 @@ namespace banggame {
                 return {"PROMPT_MOVE_BOMB_TO_SELF", origin_card};
             }
             MAYBE_RETURN(prompts::bot_check_target_enemy(target, target_player));
-            MAYBE_RETURN(prompts::bot_check_immunity(origin_card, target, target_player));
+            MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, target, target_player));
             return {};
         }
 
@@ -55,7 +55,7 @@ namespace banggame {
     prompt_string equip_bomb::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target) {
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
         MAYBE_RETURN(prompts::prompt_target_self(origin_card, origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target));
         return {};
     }
 
diff --git a/src/effects/armedanddangerous/rust.cpp b/src/effects/armedanddangerous/rust.cpp
@@ -35,7 +35,7 @@ namespace banggame {
     };
 
     prompt_string effect_rust::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
     
diff --git a/src/effects/base/bang.cpp b/src/effects/base/bang.cpp
@@ -17,7 +17,7 @@ namespace banggame {
     prompt_string effect_bang::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_kill_sheriff(origin, target));
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));
         return {};
     }
diff --git a/src/effects/base/duel.cpp b/src/effects/base/duel.cpp
@@ -76,7 +76,7 @@ namespace banggame {
 
     prompt_string effect_duel::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));
         return {};
     }
diff --git a/src/effects/base/generalstore.cpp b/src/effects/base/generalstore.cpp
@@ -38,7 +38,7 @@ namespace banggame {
     }
 
     prompt_string effect_generalstore::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
 
diff --git a/src/effects/base/heal.cpp b/src/effects/base/heal.cpp
@@ -8,7 +8,7 @@ namespace banggame {
     
     prompt_string effect_heal::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_friend(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));
         if (target->m_hp == target->m_max_hp) {
             return {"PROMPT_CARD_NO_EFFECT", origin_card};
diff --git a/src/effects/base/indians.cpp b/src/effects/base/indians.cpp
@@ -68,7 +68,7 @@ namespace banggame {
     prompt_string effect_indians::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_kill_sheriff(origin, target));
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));
         return {};
     }
diff --git a/src/effects/base/steal_destroy.cpp b/src/effects/base/steal_destroy.cpp
@@ -25,7 +25,7 @@ namespace banggame {
 
     prompt_string effect_steal::on_prompt(card_ptr origin_card, player_ptr origin, card_ptr target_card, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_card(origin, target_card));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target_card->owner, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target_card->owner, flags));
 
         if (origin == target_card->owner) {
             if (target_card->is_train() || target_card->pocket == pocket_type::player_hand) {
@@ -189,7 +189,7 @@ namespace banggame {
     prompt_string effect_destroy::on_prompt(card_ptr origin_card, player_ptr origin, card_ptr target_card, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_card(origin, target_card));
         MAYBE_RETURN(prompts::prompt_target_self_card(origin_card, origin, target_card));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target_card->owner, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target_card->owner, flags));
         return {};
     }
 
diff --git a/src/effects/dodgecity/doc_holyday.cpp b/src/effects/dodgecity/doc_holyday.cpp
@@ -10,7 +10,7 @@ namespace banggame {
 
     prompt_string handler_doc_holyday::on_prompt(card_ptr origin_card, player_ptr origin, const card_list &target_cards, player_ptr target) {
         MAYBE_RETURN(prompts::select_prompt_fallback_empty(target_cards | rv::transform([&](card_ptr target_card) {
-            return prompts::bot_check_immunity(target_card, origin, target);
+            return prompts::prompt_target_immunity(target_card, origin, target);
         })));
         return effect_bang{}.on_prompt(origin_card, origin, target);
     }
diff --git a/src/effects/frontier/ballad.cpp b/src/effects/frontier/ballad.cpp
@@ -18,7 +18,7 @@ namespace banggame {
 
     prompt_string effect_ballad::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
 
         if ((origin == target || target->empty_hand()) && rn::none_of(target->m_table, is_valid_ballad_card)) {
             return {"PROMPT_CARD_NO_EFFECT", origin_card};
diff --git a/src/effects/frontier/chinatown.cpp b/src/effects/frontier/chinatown.cpp
@@ -40,7 +40,7 @@ namespace banggame {
 
     prompt_string effect_chinatown::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_self(origin_card, origin, target));
 
         if (target->empty_hand()) {
diff --git a/src/effects/frontier/falcon.cpp b/src/effects/frontier/falcon.cpp
@@ -62,7 +62,7 @@ namespace banggame {
     };
 
     prompt_string effect_falcon::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         if (target->empty_hand() || target->m_game->check_flags(game_flag::hands_shown)) {
             return {"PROMPT_CARD_NO_EFFECT", origin_card};
         }
diff --git a/src/effects/frontier/stampede.cpp b/src/effects/frontier/stampede.cpp
@@ -11,7 +11,7 @@ namespace banggame {
 
     prompt_string effect_stampede::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         MAYBE_RETURN(prompts::prompt_target_self(origin_card, origin, target));
         return {};
     }
diff --git a/src/effects/greattrainrobbery/most_wanted.cpp b/src/effects/greattrainrobbery/most_wanted.cpp
@@ -59,7 +59,7 @@ namespace banggame {
     };
 
     prompt_string effect_most_wanted::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
 
diff --git a/src/effects/greattrainrobbery/train_robbery.cpp b/src/effects/greattrainrobbery/train_robbery.cpp
@@ -55,7 +55,7 @@ namespace banggame {
     };
 
     prompt_string effect_train_robbery::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         if (origin->is_bot()) {
             if (bot_suggestion::is_target_enemy(origin, target)) {
                 if (rn::any_of(target->m_table, [](card_ptr target_card) {
diff --git a/src/effects/valleyofshadows/bandidos.cpp b/src/effects/valleyofshadows/bandidos.cpp
@@ -52,7 +52,7 @@ namespace banggame {
 
     prompt_string effect_bandidos::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
         MAYBE_RETURN(prompts::bot_check_kill_sheriff(origin, target));
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         if (origin == target && !origin->is_ghost() && target->m_hp <= 1 && target->m_hand.size() <= 1) {
             return {1, "PROMPT_SUICIDE", origin_card};
         }
@@ -107,7 +107,7 @@ namespace banggame {
     };
     
     prompt_string effect_bandidos2::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
 
diff --git a/src/effects/valleyofshadows/poker.cpp b/src/effects/valleyofshadows/poker.cpp
@@ -125,7 +125,7 @@ namespace banggame {
     };
 
     prompt_string effect_poker::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
 
diff --git a/src/effects/valleyofshadows/tornado.cpp b/src/effects/valleyofshadows/tornado.cpp
@@ -65,7 +65,7 @@ namespace banggame {
     };
 
     prompt_string effect_tornado::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
     
@@ -128,7 +128,7 @@ namespace banggame {
     };
 
     prompt_string effect_tornado2::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));
+        MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));
         return {};
     }
     
diff --git a/src/game/game_options.h b/src/game/game_options.h
@@ -20,6 +20,7 @@ namespace banggame {
         bool add_bots = false;
         bool quick_discard_all = true;
         bool auto_pick_predraw = true;
+        bool prompt_target_immunity = false;
         bool allow_bot_rejoin = false;
         bool only_base_characters = false;
         int scenario_deck_size = 12;
diff --git a/src/game/prompts.cpp b/src/game/prompts.cpp
@@ -8,6 +8,7 @@
 
 #include "game_table.h"
 #include "bot_suggestion.h"
+#include "game_options.h"
 
 
 namespace banggame::prompts {
@@ -36,6 +37,16 @@ namespace banggame::prompts {
         return {};
     }
 
+    prompt_string prompt_target_immunity(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
+        if (origin->m_game->m_options.prompt_target_immunity || origin->is_bot()) {
+            flags.add(effect_flag::is_prompt);
+            if (target->immune_to(origin_card, origin, flags, true)) {
+                return {"PROMPT_TARGET_IMMUNE", origin_card, target};
+            }
+        }
+        return {};
+    }
+
     prompt_string bot_check_kill_sheriff(player_ptr origin, player_ptr target) {
         if (origin->is_bot()) {
             auto role = origin->get_base_role();
@@ -102,14 +113,4 @@ namespace banggame::prompts {
         }
         return {};
     }
-
-    prompt_string bot_check_immunity(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {
-        if (origin->is_bot()) {
-            flags.add(effect_flag::is_prompt);
-            if (target->immune_to(origin_card, origin, flags, true)) {
-                return {"PROMPT_TARGET_IMMUNE", origin_card, target};
-            }
-        }
-        return {};
-    }
 }
diff --git a/src/game/prompts.h b/src/game/prompts.h
@@ -11,6 +11,8 @@ namespace banggame::prompts {
 
     prompt_string prompt_target_self_card(card_ptr origin_card, player_ptr origin, card_ptr target_card);
 
+    prompt_string prompt_target_immunity(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags = {});
+
     prompt_string bot_check_kill_sheriff(player_ptr origin, player_ptr target);
 
     game_string bot_check_target_enemy(player_ptr origin, player_ptr target, bool confident = false);
@@ -20,8 +22,6 @@ namespace banggame::prompts {
     prompt_string bot_check_target_card(player_ptr origin, card_ptr target);
 
     prompt_string bot_check_discard_card(player_ptr origin, card_ptr target);
-
-    prompt_string bot_check_immunity(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags = {});
     
     template<typename R>
     concept prompt_range = rn::input_range<R> && std::convertible_to<rn::range_value_t<R>, prompt_string>;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace banggame {`
`39`	`39`	`return {"PROMPT_MOVE_BOMB_TO_SELF", origin_card};`
`40`	`40`	`}`
`41`	`41`	`MAYBE_RETURN(prompts::bot_check_target_enemy(target, target_player));`
`42`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, target, target_player));`
	`42`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, target, target_player));`
`43`	`43`	`return {};`
`44`	`44`	`}`
`45`	`45`
`@@ -55,7 +55,7 @@ namespace banggame {`
`55`	`55`	`prompt_string equip_bomb::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target) {`
`56`	`56`	`MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));`
`57`	`57`	`MAYBE_RETURN(prompts::prompt_target_self(origin_card, origin, target));`
`58`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target));`
	`58`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target));`
`59`	`59`	`return {};`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace banggame {`
`35`	`35`	`};`
`36`	`36`
`37`	`37`	`prompt_string effect_rust::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {`
`38`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));`
	`38`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));`
`39`	`39`	`return {};`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace banggame {`
`17`	`17`	`prompt_string effect_bang::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {`
`18`	`18`	`MAYBE_RETURN(prompts::bot_check_kill_sheriff(origin, target));`
`19`	`19`	`MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));`
`20`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));`
	`20`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));`
`21`	`21`	`MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));`
`22`	`22`	`return {};`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ namespace banggame {`
`76`	`76`
`77`	`77`	`prompt_string effect_duel::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {`
`78`	`78`	`MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));`
`79`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));`
	`79`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));`
`80`	`80`	`MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));`
`81`	`81`	`return {};`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace banggame {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`prompt_string effect_generalstore::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {`
`41`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));`
	`41`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));`
`42`	`42`	`return {};`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace banggame {`
`68`	`68`	`prompt_string effect_indians::on_prompt(card_ptr origin_card, player_ptr origin, player_ptr target, effect_flags flags) {`
`69`	`69`	`MAYBE_RETURN(prompts::bot_check_kill_sheriff(origin, target));`
`70`	`70`	`MAYBE_RETURN(prompts::bot_check_target_enemy(origin, target));`
`71`		`- MAYBE_RETURN(prompts::bot_check_immunity(origin_card, origin, target, flags));`
	`71`	`+ MAYBE_RETURN(prompts::prompt_target_immunity(origin_card, origin, target, flags));`
`72`	`72`	`MAYBE_RETURN(prompts::prompt_target_ghost(origin_card, origin, target));`
`73`	`73`	`return {};`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace banggame {`
`10`	`10`
`11`	`11`	`prompt_string handler_doc_holyday::on_prompt(card_ptr origin_card, player_ptr origin, const card_list &target_cards, player_ptr target) {`
`12`	`12`	`MAYBE_RETURN(prompts::select_prompt_fallback_empty(target_cards \| rv::transform([&](card_ptr target_card) {`
`13`		`- return prompts::bot_check_immunity(target_card, origin, target);`
	`13`	`+ return prompts::prompt_target_immunity(target_card, origin, target);`
`14`	`14`	`})));`
`15`	`15`	`return effect_bang{}.on_prompt(origin_card, origin, target);`
`16`	`16`	`}`