fix psychic vision timings

client/src/resources/excludedRolePresets.json

@@ -193,85 +193,20 @@
             "role": "death"
         }
     ],
-    "El opuesto de mi novio": [
+    "Draculas Palace": [
         {
             "type": "exact",
-            "role": "mayor"
-        },
-        {
-            "type": "exact",
-            "role": "transporter"
-        },
-
-        {
-            "type": "exact",
-            "role": "sheriff"
-        },
-        {
-            "type": "exact",
-            "role": "lookout"
-        },
-
-        {
-            "type": "exact",
-            "role": "tracker"
-        },
-        {
-            "type": "exact",
-            "role": "seer"
-        },
-
-        {
-            "type": "exact",
-            "role": "doctor"
-        },
-        {
-            "type": "exact",
-            "role": "crusader"
-        },
-
-        {
-            "type": "exact",
-            "role": "vigilante"
-        },
-        {
-            "type": "exact",
-            "role": "veteran"
-        },
-        {
-            "type": "exact",
-            "role": "deputy"
-        },
-
-        {
-            "type": "exact",
-            "role": "mafioso"
-        },
-        {
-            "type": "exact",
-            "role": "consort"
-        },
-        {
-            "type": "exact",
-            "role": "blackmailer"
+            "role": "bodyguard"
         },
 
         {
             "type": "exact",
-            "role": "janitor"
+            "role": "spy"
         },
 
         {
             "type": "exact",
-            "role": "jester"
-        },
-        {
-            "type": "exact",
-            "role": "executioner"
-        },
-        {
-            "type": "exact",
-            "role": "doomsayer"
+            "role": "death"
         }
     ]
 

client/src/resources/lang/en_us.json

@@ -415,7 +415,7 @@
     "chatMessage.spyBug.protected":"Your target was protected from an attack.",
     "chatMessage.spyBug.transported":"Your target was transported.",
     "chatMessage.psychicGood":"At least one of these players is a townie: \\0",
-    "chatMessage.psychicEvil":"At least one of these players is not a townie: \\0",
+    "chatMessage.psychicEvil":"At least one of these players is evil: \\0",
     "chatMessage.psychicFailed":"There are not enough living players to have a vision.",
     "chatMessage.retributionistMessage":"Your target got the following message:",
     "chatMessage.necromancerMessage":"Your target got the following message:",
@@ -523,7 +523,7 @@
 
     "wiki.entry.role.medium.title": "Medium",
     "wiki.entry.role.medium.abilities":"* You can talk with the dead during the night\n* After you died, you can seance a living player twice",
-    "wiki.entry.role.medium.attributes":"* You can talk to other mediums during the night as well\n* A seance lets you communicate with the living after you died\n* Seance has two uses",
+    "wiki.entry.role.medium.attributes":"* You can talk to other mediums during the night\n* A seance lets you communicate with a living player after you died\n* Seance has two uses",
 
     "wiki.entry.role.retributionist.title": "Retributionist",
     "wiki.entry.role.retributionist.abilities":"* Force a dead player to use their ability on a living one",

server/src/game/role/psychic.rs

@@ -40,7 +40,8 @@ impl RoleStateImpl for Psychic {
 
         let mut rng = rand::thread_rng();
         actor_ref.push_night_message(game, 'a: {match game.day_number() % 2 {
-           0=>{
+            1=>{
+                //evil vision
                 let all_non_townies: Vec<_> = PlayerReference::all_players(game)
                     .into_iter()
                     .filter(|p|p.alive(game)&&*p!=actor_ref&&p.night_appeared_role(game).faction_alignment().faction()!=Faction::Town)
@@ -66,6 +67,7 @@ impl RoleStateImpl for Psychic {
                 ChatMessage::PsychicFailed
             },
             _=>{
+                //good vision
                 let all_townies: Vec<_> = PlayerReference::all_players(game)
                     .into_iter()
                     .filter(|p|p.alive(game)&&*p!=actor_ref&&p.night_appeared_role(game).faction_alignment().faction()==Faction::Town)

server/tests/role.rs

@@ -866,4 +866,30 @@ fn seer_cant_see_godfather() {
         ),
         ChatMessage::SeerResult { enemies: false }
     );
+}
+
+#[test]
+fn vampire_convert_bodyguard() {
+    kit::scenario!(game in Night 1 where
+        vamp: Vampire,
+        bg: Bodyguard,
+        _bg2: Bodyguard
+    );
+
+    assert!(vamp.set_night_targets(vec![bg]));
+    assert!(bg.set_night_targets(vec![bg]));
+
+    game.next_phase();
+
+    assert!(vamp.role_state().role() == Role::Vampire);
+    assert!(bg.role_state().role() == Role::Bodyguard);
+
+    game.skip_to(PhaseType::Night, 2);
+
+    assert!(vamp.set_night_targets(vec![bg]));
+
+    game.next_phase();
+
+    assert!(vamp.role_state().role() == Role::Vampire);
+    assert!(bg.role_state().role() == Role::Vampire);
 }