puppeteer kills instantly

Author: ItsSammyM

client/src/resources/lang/en_us.json

@@ -498,6 +498,7 @@
     "role.puppeteer.name:var.0": "Puppeteers",
     "role.puppeteer.smallRoleMenu.marionettesRemaining": "\\0 marionettes remaining.",
     "role.puppeteer.smallRoleMenu": "Tonight you will \\0.",
+    "controllerId.role.puppeteer.0.name": "Target",
     "controllerId.role.puppeteer.1.name": "Choose Ability",
     "controllerId.role.puppeteer.1.integer.0": "Kill",
     "controllerId.role.puppeteer.1.integer.1": "Marionette",

server/src/game/role/puppeteer.rs

@@ -13,7 +13,7 @@ use crate::game::visit::Visit;
 use crate::game::Game;
 use crate::vec_set;
 
-use super::{AbilitySelection, ControllerID, ControllerParametersMap, IntegerSelection, Priority, Role, RoleState, RoleStateImpl};
+use super::{AbilitySelection, ControllerID, ControllerParametersMap, IntegerSelection, Priority, Role, RoleStateImpl};
 
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -40,24 +40,27 @@ impl RoleStateImpl for Puppeteer {
     }
     fn do_night_action(mut self, game: &mut Game, actor_ref: PlayerReference, priority: Priority) {
         if priority != Priority::Kill {return;}
+        if game.day_number() <= 1 {return;}
 
         let actor_visits = actor_ref.untagged_night_visits_cloned(game);
         if let Some(visit) = actor_visits.first(){
             let target = visit.target;
 
-            if game.saved_controllers.get_controller_current_selection_integer(
-                ControllerID::role(actor_ref, Role::Puppeteer, 1)
-            ).unwrap_or(IntegerSelection(0)).0 == 1 {
+            if 
+                game.saved_controllers.get_controller_current_selection_integer(
+                    ControllerID::role(actor_ref, Role::Puppeteer, 1)
+                ).unwrap_or(IntegerSelection(0)).0 == 1
+            {
                 if !AttackPower::ArmorPiercing.can_pierce(target.defense(game)) {
                     actor_ref.push_night_message(game, crate::game::chat::ChatMessageVariant::YourConvertFailed);
                 }else{
                     if PuppeteerMarionette::string(game, target){
                         self.marionettes_remaining = self.marionettes_remaining.saturating_sub(1);
                     }
-                    actor_ref.set_role_state(game, RoleState::Puppeteer(self));
+                    actor_ref.set_role_state(game, self);
                 }
             }else{
-                actor_ref.try_night_kill_single_attacker(
+                target.try_night_kill_single_attacker(
                     actor_ref,
                     game,
                     crate::game::grave::GraveKiller::Role(Role::Puppeteer),
@@ -83,7 +86,7 @@ impl RoleStateImpl for Puppeteer {
                 Some(1)
             ),
             AbilitySelection::new_player_list(vec![]),
-            Detained::is_detained(game, actor_ref) || !actor_ref.alive(game),
+            Detained::is_detained(game, actor_ref) || !actor_ref.alive(game) || game.day_number() <= 1,
             None,
             false,
             vec_set!(actor_ref),
@@ -95,7 +98,7 @@ impl RoleStateImpl for Puppeteer {
                     if self.marionettes_remaining > 0 {1} else {0}
                 ),
                 AbilitySelection::new_integer(0),
-                false,
+                Detained::is_detained(game, actor_ref) || !actor_ref.alive(game) || game.day_number() <= 1,
                 None,
                 false,
                 vec_set!(actor_ref),

server/src/game/role_list.rs

@@ -208,7 +208,7 @@ impl RoleSet{
             RoleSet::Neutral =>
                 vec![
                     Role::Jester, Role::Revolutionary, Role::Politician, Role::Doomsayer,
-                    Role::Martyr, Role::Chronokaiser
+                    Role::Martyr, Role::Chronokaiser, Role::SantaClaus, Role::Krampus,
                 ],
             RoleSet::Fiends =>
                 vec![

server/tests/role.rs

@@ -1731,7 +1731,7 @@ fn cult_alternates() {
 
 #[test]
 fn puppeteer_marionettes_philosopher(){
-    kit::scenario!(game in Night 1 where
+    kit::scenario!(game in Night 2 where
         puppeteer: Puppeteer,
         philo: Philosopher,
         townie: Detective,
@@ -1752,7 +1752,7 @@ fn puppeteer_marionettes_philosopher(){
         ChatMessageVariant::SeerResult{ enemies: true }
     );
 
-    game.skip_to(Night, 2);
+    game.skip_to(Night, 3);
 
     assert!(philo.send_ability_input_two_player_typical(puppeteer, townie));
 
@@ -1765,7 +1765,7 @@ fn puppeteer_marionettes_philosopher(){
 
 #[test]
 fn puppeteer_marionettes_die(){
-    kit::scenario!(game in Night 1 where
+    kit::scenario!(game in Night 2 where
         puppeteer: Puppeteer,
         townie: Detective,
         townie2: Detective,
@@ -1779,19 +1779,17 @@ fn puppeteer_marionettes_die(){
 
     assert!(puppeteer.send_ability_input_player_list_typical(townie));
 
-    game.skip_to(Night, 2);
+    game.skip_to(Night, 3);
+
+    puppeteer.send_ability_input(AbilityInput::new(
+        ControllerID::role(puppeteer.player_ref(), Role::Puppeteer, 1),
+        AbilitySelection::new_integer(0)
+    ));
 
     assert!(puppeteer.send_ability_input_player_list_typical(townie2));
 
     game.next_phase();
 
-    assert!(!townie.alive());
-    assert!(townie2.alive());
-    assert!(townie3.alive());
-    assert!(puppeteer.alive());
-
-    game.skip_to(Obituary, 4);
-
     assert!(!townie.alive());
     assert!(!townie2.alive());
     assert!(townie3.alive());
@@ -1800,7 +1798,7 @@ fn puppeteer_marionettes_die(){
 
 #[test]
 fn puppeteer_marionettes_win(){
-    kit::scenario!(game in Night 1 where
+    kit::scenario!(game in Night 2 where
         puppeteer: Puppeteer,
         townie: Detective,
         townie2: Detective
@@ -1813,16 +1811,16 @@ fn puppeteer_marionettes_win(){
 
     assert!(puppeteer.send_ability_input_player_list_typical(townie));
 
-    game.skip_to(Nomination, 2);
+    game.skip_to(Nomination, 3);
 
     puppeteer.vote_for_player(Some(townie2));
     townie.vote_for_player(Some(townie2));
 
-    game.skip_to(Judgement, 2);
+    game.skip_to(Judgement, 3);
 
     puppeteer.set_verdict(Verdict::Guilty);
 
-    game.skip_to(Dusk, 2);
+    game.skip_to(Dusk, 3);
 
     assert!(puppeteer.alive());
     assert!(townie.alive());
@@ -1835,7 +1833,7 @@ fn puppeteer_marionettes_win(){
 
 #[test]
 fn deputy_shoots_marionette(){
-    kit::scenario!(game in Night 1 where
+    kit::scenario!(game in Night 2 where
         deputy: Deputy,
         puppeteer: Puppeteer,
         townie: Detective
@@ -1847,7 +1845,7 @@ fn deputy_shoots_marionette(){
     ));
     assert!(puppeteer.send_ability_input_player_list_typical(townie));
 
-    game.skip_to(Discussion, 2);
+    game.skip_to(Discussion, 3);
 
     deputy.send_ability_input_player_list_typical(townie);