santa is no longer immune to everything

Author: ItsSammyM

client/src/resources/abilityId.json

@@ -155,6 +155,12 @@
     "role/politician/0": {
         "midnight": false
     },
+    "role/santaClaus/0": {
+        "midnight": true
+    },
+    "role/santaClaus/1": {
+        "midnight": true
+    },
     "role/scarecrow/0": {
         "midnight": true
     },

client/src/resources/lang/en_us.json

@@ -979,7 +979,7 @@
     "chatMessage.cultKillsNext": "The cult will attempt to sacrifice and kill someone tonight.",
     "chatMessage.addedToNiceList": "You've been good this year, so you have been added to the nice list.",
     "chatMessage.addedToNaughtyList": "You've been bad this year - you have been added to the naughty list.",
-    "chatMessage.nextSantaAbility.nice": "Tonight you will add up to two people to the nice list.",
+    "chatMessage.nextSantaAbility.nice": "Tonight you will add zer or one players to the nice list.",
     "chatMessage.nextSantaAbility.naughty": "Tonight you will add a player to the naughty list.",
     "chatMessage.nextKrampusAbility.kill": "Tonight you will attack someone and investigate them.",
     "chatMessage.nextKrampusAbility.doNothing": "Tonight you will investigate someone.",
@@ -1583,7 +1583,7 @@
     "wiki.article.role.santaClaus.reminder": "Add players to the nice and naughty lists. You win when only nice players remain alive.",
     "wiki.article.role.santaClaus.guide": "On odd nights: Select zero or one players to add to the nice list\n* This player retains their original win condition and gains the Nice List win condition.\n* Players on the nice list cannot be put on the naughty list.\n\nOn even nights: Select one player to add to the naughty list\n* This player retains their original win condition, and gains the Naughty List win condition.\n* Players on the Naughty list cannot be put on the nice list.",
     "wiki.article.role.santaClaus.abilities":"- None",
-    "wiki.article.role.santaClaus.attributes":"* If you don't select a player to put on the naughty list, you visit a random player to be put on the naughty list.\n* You are a nice list loyalist\n* You are roleblock immune.\n* You are wardblock immune.\n* You have innocent aura.\n* You are not told whether you were successful in adding your target to the list.\n- You can't visit due to your own ability while dead, even if possessed.",
+    "wiki.article.role.santaClaus.attributes":"* If you don't select a player to put on the naughty list, you visit a random player to be put on the naughty list.\n* You are a nice list loyalist\n* You are not told whether you were successful in adding your target to the list.\n- You can't visit due to your own ability while dead, even if possessed.",
     "wiki.article.role.santaClaus.extra":"* You can't add a player to both lists.\n* Visiting a player with independent win condition does nothing.",
 
     "wiki.article.role.krampus.reminder": "Each night, investigate a player's role and win condition. Every odd night, select a player to attack them.",
@@ -1784,7 +1784,7 @@
     "wiki.article.role.ojo.guide":"- You have multiple night abilities\n - Each night, select up to 2 outlines, for each outline, you are told what role generated from that outline\n - Each night except the first, select a role, you attack all players with that role\n - You see the role of all players who visit you, their role is revealed to you, this is a passive ability",
     "wiki.article.role.ojo.abilities":"- You have multiple night abilities\n - Each night, select up to 2 outlines, for each outline, you are told what role generated from that outline\n - Each night except the first, select a role, you attack all players with that role\n - You see the role of all players who visit you, their role is revealed to you, this is a passive ability",
     "wiki.article.role.ojo.attributes":"- If you are dead, you cant select to use your ability\n* If you are blocked, you have no ability\n* Your attack is an armor-piercing attack\n* You can't attack anybody on night 1",
-    "wiki.article.role.ojo.extra":"- Your attack ability works on the person you actually visited, so if a transporter transports a player you visit with someone else, you attack the other player, this only applies to the attack ability, not any other ability of yours\n- You wont visit dead players using your attack ability\n- You are immune to possession, but not wardblocks or roleblocks",
+    "wiki.article.role.ojo.extra":"- Your attack ability works on the person you actually visited, so if a transporter transports a player you visit with someone else, you attack the other player, this only applies to the attack ability, not any other ability of yours\n- You wont visit dead players using your attack ability",
 
     "wiki.article.role.puppeteer.reminder": "Each night, select a player to either poison them or recruit them.",
     "wiki.article.role.puppeteer.guide":"- You may choose to do one of the following\n    - Select and poison a player\n        - They are told they are poisoned, and then they are attacked the next night\n\n    - Select a player to string up into a marionette\n        - They are told they are strung up, and that they will win with fiends, regardless of their role\n        - They attacked the following night, and every night until they die\n        - They should try their hardest to help you and should NOT say they were strung up\n - At night all puppeteers and marionettes can chat in the puppeteer chat, even if dead\n    - The players in the puppeteer chat that are dead can chat during the day or night",

client/src/resources/roles.json

@@ -875,8 +875,8 @@
     "santaClaus": {
         "mainRoleSet": "neutral",
         "roleSets": ["neutral"],
-        "armor": true,
-        "aura": "innocent",
+        "armor": false,
+        "aura": null,
         "maxCount": 1,
         "canWriteDeathNote": false,
         "canBeConvertedTo": [],

server/src/game/role/mod.rs

@@ -383,38 +383,34 @@ mod macros {
 impl Role{
     pub fn possession_immune(&self)->bool{
         match self {
-            Role::TallyClerk
             | Role::Bouncer
             | Role::Veteran
             | Role::Transporter | Role::Retributionist
             | Role::Witch | Role::Doomsayer | Role::Scarecrow | Role::Warper
-            | Role::MafiaWitch | Role::Necromancer
-            | Role::Ojo => true,
+            | Role::MafiaWitch | Role::Necromancer => true,
             _ => false,
         }
     }
     pub fn roleblock_immune(&self)->bool{
         match self {
+            Role::Veteran | Role::Jester | 
             Role::Bouncer |
-            Role::Veteran | 
             Role::Transporter | Role::Escort | Role::Retributionist | 
-            Role::Jester | Role::Witch | Role::Scarecrow | Role::Warper |
-            Role::Hypnotist | Role::Consort | Role::MafiaWitch | Role::Necromancer |
-            Role::SantaClaus => true,
+            Role::Witch | Role::Scarecrow | Role::Warper |
+            Role::Hypnotist | Role::Consort | Role::MafiaWitch | Role::Necromancer => true,
             _ => false,
         }
     }
     pub fn wardblock_immune(&self)->bool{
         match self {
             Role::Jailor | Role::Kidnapper |
-            Role::Bouncer | Role::Scarecrow | Role::SantaClaus => true,
+            Role::Bouncer | Role::Scarecrow => true,
             _ => false
         }
     }
     pub fn has_innocent_aura(&self, game: &Game)->bool{
         match self {
             Role::Godfather => true,
-            Role::SantaClaus => true,
             Role::Pyrolisk => {
                 game.day_number() == 1
             },

server/src/game/role/santa_claus.rs

@@ -32,7 +32,7 @@ pub enum SantaListKind{
 
 
 pub(super) const MAXIMUM_COUNT: Option<u8> = Some(1);
-pub(super) const DEFENSE: DefensePower = DefensePower::Armor;
+pub(super) const DEFENSE: DefensePower = DefensePower::None;
 
 impl RoleStateImpl for SantaClaus {
     type ClientRoleState = SantaClaus;