decide if can choose fellow insiders

mafia-rust · Jan 17, 2025 · 49451e9 · 49451e9
1 parent 7c1abcb
commit 49451e9
Show file tree

Hide file tree

Showing 38 changed files with 49 additions and 4 deletions.
diff --git a/server/src/game/components/syndicate_gun_item.rs b/server/src/game/components/syndicate_gun_item.rs
@@ -43,6 +43,7 @@ impl SyndicateGunItem {
                 game,
                 player_with_gun,
                 false,
+                false,
                 game.day_number() <= 1,
                 ControllerID::syndicate_gun_item_shoot()
             ).combine_overwrite_owned(

diff --git a/server/src/game/role/ambusher.rs b/server/src/game/role/ambusher.rs
@@ -84,6 +84,7 @@ impl RoleStateImpl for Ambusher {
             game,
             actor_ref,
             false,
+            false,
             !(game.day_number() > 1),
             ControllerID::role(actor_ref, Role::Ambusher, 0)
         )

diff --git a/server/src/game/role/apostle.rs b/server/src/game/role/apostle.rs
@@ -76,6 +76,7 @@ impl RoleStateImpl for Apostle {
             game,
             actor_ref,
             false,
+            false,
             grayed_out,
             ControllerID::role(actor_ref, Role::Apostle, 0)
         )

diff --git a/server/src/game/role/armorsmith.rs b/server/src/game/role/armorsmith.rs
@@ -105,6 +105,7 @@ impl RoleStateImpl for Armorsmith {
             game,
             actor_ref,
             false,
+            true,
             self.open_shops_remaining <= 0,
             ControllerID::role(actor_ref, Role::Armorsmith, 0)
         )

diff --git a/server/src/game/role/arsonist.rs b/server/src/game/role/arsonist.rs
@@ -53,6 +53,7 @@ impl RoleStateImpl for Arsonist {
             game,
             actor_ref,
             true,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Arsonist, 0)
         )

diff --git a/server/src/game/role/blackmailer.rs b/server/src/game/role/blackmailer.rs
@@ -34,6 +34,7 @@ impl RoleStateImpl for Blackmailer {
             actor_ref,
             false,
             false,
+            false,
             ControllerID::role(actor_ref, Role::Blackmailer, 0)
         )
     }

diff --git a/server/src/game/role/bodyguard.rs b/server/src/game/role/bodyguard.rs
@@ -111,6 +111,7 @@ impl RoleStateImpl for Bodyguard {
             game,
             actor_ref,
             self.self_shields_remaining > 0,
+            true,
             !(game.day_number() > 1),
             ControllerID::role(actor_ref, Role::Bodyguard, 0)
         )

diff --git a/server/src/game/role/bouncer.rs b/server/src/game/role/bouncer.rs
@@ -32,6 +32,7 @@ impl RoleStateImpl for Bouncer {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Bouncer, 0)
         )

diff --git a/server/src/game/role/common_role.rs b/server/src/game/role/common_role.rs
@@ -20,6 +20,7 @@ pub fn controller_parameters_map_player_list_night_typical(
     game: &Game,
     actor_ref: PlayerReference,
     can_select_self: bool,
+    can_select_insiders: bool,
     grayed_out: bool,
     ability_id: ControllerID,
 ) -> ControllerParametersMap {
@@ -35,10 +36,17 @@ pub fn controller_parameters_map_player_list_night_typical(
         AvailableAbilitySelection::new_player_list(
             PlayerReference::all_players(game)
                 .into_iter()
-                .filter(|p| can_select_self || *p != actor_ref)
-                .filter(|player| 
-                    player.alive(game) &&
-                    !InsiderGroupID::in_same_revealed_group(game, actor_ref, *player)
+                .filter(|player|
+                    if !player.alive(game){
+                        false
+                    }else if *player == actor_ref{
+                        can_select_self
+                    }else if InsiderGroupID::in_same_revealed_group(game, actor_ref, *player){
+                        can_select_insiders
+                    }else{
+                        true
+                    }
+
                 )
                 .collect(),
                 false,

diff --git a/server/src/game/role/consort.rs b/server/src/game/role/consort.rs
@@ -34,6 +34,7 @@ impl RoleStateImpl for Consort {
             actor_ref,
             false,
             false,
+            false,
             ControllerID::role(actor_ref, Role::Consort, 0)
         )
     }

diff --git a/server/src/game/role/cop.rs b/server/src/game/role/cop.rs
@@ -97,6 +97,7 @@ impl RoleStateImpl for Cop {
             game,
             actor_ref,
             false,
+            true,
             !(game.day_number() > 1),
             ControllerID::role(actor_ref, Role::Cop, 0)
         )

diff --git a/server/src/game/role/counterfeiter.rs b/server/src/game/role/counterfeiter.rs
@@ -122,6 +122,7 @@ impl RoleStateImpl for Counterfeiter {
             game,
             actor_ref,
             false,
+            false,
             game.day_number() <= 1,
             ControllerID::role(actor_ref, Role::Counterfeiter, 0)
         ).combine_overwrite_owned(

diff --git a/server/src/game/role/detective.rs b/server/src/game/role/detective.rs
@@ -42,6 +42,7 @@ impl RoleStateImpl for Detective {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Detective, 0)
         )

diff --git a/server/src/game/role/doctor.rs b/server/src/game/role/doctor.rs
@@ -77,6 +77,7 @@ impl RoleStateImpl for Doctor {
             game,
             actor_ref,
             self.self_heals_remaining > 0,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Doctor, 0)
         )

diff --git a/server/src/game/role/engineer.rs b/server/src/game/role/engineer.rs
@@ -147,6 +147,7 @@ impl RoleStateImpl for Engineer {
                     game,
                     actor_ref,
                     false,
+                    true,
                     false,
                     ControllerID::role(actor_ref, Role::Engineer, 0)
                 )

diff --git a/server/src/game/role/escort.rs b/server/src/game/role/escort.rs
@@ -32,6 +32,7 @@ impl RoleStateImpl for Escort {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Escort, 0)
         )

diff --git a/server/src/game/role/forger.rs b/server/src/game/role/forger.rs
@@ -100,6 +100,7 @@ impl RoleStateImpl for Forger {
             game,
             actor_ref,
             false,
+            false,
             self.forges_remaining == 0,
             ControllerID::role(actor_ref, Role::Forger, 0)
         ).combine_overwrite_owned(

diff --git a/server/src/game/role/godfather.rs b/server/src/game/role/godfather.rs
@@ -28,6 +28,7 @@ impl RoleStateImpl for Godfather {
             game,
             actor_ref,
             false,
+            false,
             game.day_number() <= 1,
             ControllerID::role(actor_ref, Role::Godfather, 0)
         )

diff --git a/server/src/game/role/gossip.rs b/server/src/game/role/gossip.rs
@@ -41,6 +41,7 @@ impl RoleStateImpl for Gossip {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Gossip, 0)
         )

diff --git a/server/src/game/role/hypnotist.rs b/server/src/game/role/hypnotist.rs
@@ -96,6 +96,7 @@ impl RoleStateImpl for Hypnotist {
             actor_ref,
             false,
             false,
+            false,
             ControllerID::role(actor_ref, Role::Hypnotist, 0)
         )
     }

diff --git a/server/src/game/role/impostor.rs b/server/src/game/role/impostor.rs
@@ -49,6 +49,7 @@ impl RoleStateImpl for Impostor {
             game,
             actor_ref,
             false,
+            false,
             game.day_number() <= 1,
             ControllerID::role(actor_ref, Role::Impostor, 0)
         ).combine_overwrite_owned(ControllerParametersMap::new_controller_fast(

diff --git a/server/src/game/role/informant.rs b/server/src/game/role/informant.rs
@@ -47,6 +47,7 @@ impl RoleStateImpl for Informant {
             actor_ref,
             false,
             false,
+            false,
             ControllerID::role(actor_ref, Role::Informant, 0)
         )
     }

diff --git a/server/src/game/role/krampus.rs b/server/src/game/role/krampus.rs
@@ -110,6 +110,7 @@ impl RoleStateImpl for Krampus {
             actor_ref,
             false,
             false,
+            false,
             ControllerID::role(actor_ref, Role::Krampus, ability_index)
         )
     }

diff --git a/server/src/game/role/lookout.rs b/server/src/game/role/lookout.rs
@@ -39,6 +39,7 @@ impl RoleStateImpl for Lookout {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Lookout, 0)
         )

diff --git a/server/src/game/role/mafioso.rs b/server/src/game/role/mafioso.rs
@@ -35,6 +35,7 @@ impl RoleStateImpl for Mafioso {
             game,
             actor_ref,
             false,
+            false,
             game.day_number() <= 1,
             ControllerID::role(actor_ref, Role::Mafioso, 0)
         )  

diff --git a/server/src/game/role/psychic.rs b/server/src/game/role/psychic.rs
@@ -40,6 +40,7 @@ impl RoleStateImpl for Psychic {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Psychic, 0)
         )

diff --git a/server/src/game/role/pyrolisk.rs b/server/src/game/role/pyrolisk.rs
@@ -64,6 +64,7 @@ impl RoleStateImpl for Pyrolisk {
             game,
             actor_ref,
             false,
+            true,
             game.day_number() <= 1 ,
             ControllerID::role(actor_ref, Role::Pyrolisk, 0)
         )

diff --git a/server/src/game/role/recruiter.rs b/server/src/game/role/recruiter.rs
@@ -85,6 +85,7 @@ impl RoleStateImpl for Recruiter {
             game,
             actor_ref,
             false,
+            false,
             (!choose_attack && self.recruits_remaining <= 0) || (choose_attack && game.day_number() == 1),
             ControllerID::role(actor_ref, Role::Recruiter, 0)
         ).combine_overwrite_owned(

diff --git a/server/src/game/role/scarecrow.rs b/server/src/game/role/scarecrow.rs
@@ -52,6 +52,7 @@ impl RoleStateImpl for Scarecrow {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Scarecrow, 0)
         )

diff --git a/server/src/game/role/serial_killer.rs b/server/src/game/role/serial_killer.rs
@@ -42,6 +42,7 @@ impl RoleStateImpl for SerialKiller {
             game,
             actor_ref,
             false,
+            true,
             game.day_number() <= 1,
             ControllerID::role(actor_ref, Role::SerialKiller, 0)
         )

diff --git a/server/src/game/role/snoop.rs b/server/src/game/role/snoop.rs
@@ -44,6 +44,7 @@ impl RoleStateImpl for Snoop {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Snoop, 0)
         )

diff --git a/server/src/game/role/spiral.rs b/server/src/game/role/spiral.rs
@@ -59,6 +59,7 @@ impl RoleStateImpl for Spiral {
             game,
             actor_ref,
             false,
+            true,
             game.day_number() <= 1 || !self.spiraling.is_empty(),
             ControllerID::role(actor_ref, Role::Spiral, 0)
         )

diff --git a/server/src/game/role/spy.rs b/server/src/game/role/spy.rs
@@ -75,6 +75,7 @@ impl RoleStateImpl for Spy {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Spy, 0)
         )

diff --git a/server/src/game/role/tracker.rs b/server/src/game/role/tracker.rs
@@ -41,6 +41,7 @@ impl RoleStateImpl for Tracker {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Tracker, 0)
         )

diff --git a/server/src/game/role/vigilante.rs b/server/src/game/role/vigilante.rs
@@ -88,6 +88,7 @@ impl RoleStateImpl for Vigilante {
             game,
             actor_ref,
             false,
+            true,
             !can_shoot,
             ControllerID::role(actor_ref, Role::Vigilante, 0)
         )

diff --git a/server/src/game/role/werewolf.rs b/server/src/game/role/werewolf.rs
@@ -127,6 +127,7 @@ impl RoleStateImpl for Werewolf {
             game,
             actor_ref,
             false,
+            true,
             false,
             ControllerID::role(actor_ref, Role::Werewolf, 0)
         )

diff --git a/server/src/game/role/yer.rs b/server/src/game/role/yer.rs
@@ -103,6 +103,7 @@ impl RoleStateImpl for Yer {
                 game,
                 actor_ref,
                 false,
+                true,
                 game.day_number() <= 1,
                 ControllerID::role(actor_ref, Role::Yer, 1)
             )

diff --git a/server/src/game/role/zealot.rs b/server/src/game/role/zealot.rs
@@ -40,6 +40,7 @@ impl RoleStateImpl for Zealot {
             game,
             actor_ref,
             false,
+            false,
             Cult::next_ability(game) != CultAbility::Kill,
             ControllerID::role(actor_ref, Role::Zealot, 0)
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,6 +84,7 @@ impl RoleStateImpl for Ambusher { @@
                 game,
                 actor_ref,
                 false,
+                false,
                 !(game.day_number() > 1),
                 ControllerID::role(actor_ref, Role::Ambusher, 0)
             )
@@ Expand Down @@