From c04247d9c0999c16522e740d182a9e6d5a06eace Mon Sep 17 00:00:00 2001
From: LostSavage <36807655+LostSavage@users.noreply.github.com>
Date: Tue, 30 Apr 2024 21:38:27 -0500
Subject: [PATCH 1/4] Update engine.ttslua

---
 src/engine.ttslua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/engine.ttslua b/src/engine.ttslua
index b178da1..3082f13 100644
--- a/src/engine.ttslua
+++ b/src/engine.ttslua
@@ -3,6 +3,7 @@
 
 state = {
    game_status = nil, -- SETUP, STARTING, STARTED, ENDED
+   round_num = 1,
    round_state = '',
    curr_president = nil, -- who the pres placard is currently on,
    next_president = nil, -- who the next pres is if special election stack is empty

From 84f73ad2a719da9cd8a36120ad2642642651d49a Mon Sep 17 00:00:00 2001
From: Tony Ye <eterna@gmail.com>
Date: Wed, 1 May 2024 00:53:35 -0400
Subject: [PATCH 2/4] Add abilities 11-20., modify engine fields

---
 src/ability.ttslua | 176 ++++++++++++++++++++++++++++++++++-----------
 src/engine.ttslua  |  13 ++--
 2 files changed, 143 insertions(+), 46 deletions(-)

diff --git a/src/ability.ttslua b/src/ability.ttslua
index 3039ed4..3e6fad3 100644
--- a/src/ability.ttslua
+++ b/src/ability.ttslua
@@ -8,13 +8,14 @@ function Ability:new(name, user, source, played_round_num)
     source = source, -- {is_starting = false, from_ability = nil, from_user = nil}
     played_round_num = played_round_num,
     is_tradable = true,
-    is_copyable = ability[name].is_copyable,
-    is_affectable = ability[name].is_affectable,
+    is_not_copyable = ability[name].is_not_copyable or false,
+    is_not_affectable = ability[name].is_not_affectable or false,
+    is_playable_when_dead = ability[name].is_playable_when_dead or false,
     side_1_conditions = ability[name].side_1_conditions or nil,
-    side_1_reaction_trigger = ability[name].side_1_reaction_trigger or nil,
+    side_1_reaction_triggers = ability[name].side_1_reaction_triggers or nil,
     side_1_resolve_steps = ability[name].side_1_resolve_steps or nil,
     side_2_conditions = ability[name].side_2_conditions or nil,
-    side_2_reaction_trigger = ability[name].side_2_reaction_trigger or nil,
+    side_2_reaction_triggers = ability[name].side_2_reaction_triggers or nil,
     side_2_resolve_steps = ability[name].side_2_resolve_steps or nil,
     resolve_step_num = 0, -- current resolve step
   }
@@ -25,18 +26,14 @@ end
 ability_db = {
 
   'Mimic' = {
-    is_copyable = false,
-    is_affectable = false,
+    is_not_copyable = true,
     side_1_resolve_steps = {
-      {action = 'reveal'},
-      {action = 'copy', text = 'Copy an ability.'},
+      {action = 'copy'},
     },
   },
 
   'Saboteur' = {
-    is_copyable = true,
-    is_affectable = true,
-    side_1_reaction_trigger = 'reveal',
+    side_1_reaction_triggers = {'reveal'},
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'negate'},
@@ -44,20 +41,16 @@ ability_db = {
   },
 
   'Puppeteer' = {
-    is_copyable = true,
-    is_affectable = true,
-    side_1_reaction_trigger = 'puppeteer',
+    side_1_reaction_triggers = {'puppeteer'},
     side_1_resolve_steps = {
       {action = 'reveal'},
-      {action = 'choose original target'},
-      {action = 'target', use_original_conditions = true},
+      {action = 'choose target to change'},
+      {action = 'target', num_players = 1, mode = 'puppeteer'},
     },
   },
 
   'Hacker' = {
-    is_copyable = true,
-    is_affectable = true,
-    side_1_reaction_trigger = 'hacker',
+    side_1_reaction_triggers = {'hacker'},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
       {action = 'play instead'},
@@ -65,14 +58,12 @@ ability_db = {
   },
 
   'Interceptor' = {
-    is_copyable = true,
-    is_affectable = true,
-    side_1_reaction_trigger = 'interceptor',
+    side_1_reaction_triggers = {'interceptor'},
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'play instead'},
     },
-    side_2_reaction_trigger = 'interceptor',
+    side_2_reaction_triggers = {'interceptor'},
     side_2_resolve_steps = {
       {action = 'reveal'},
       {action = 'negate'},
@@ -80,41 +71,37 @@ ability_db = {
   },
 
   'The Confirmed' = {
-    is_copyable = false,
-    is affectable = false,
+    is_not_copyable = true,
+    is not_affectable = true,
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'reveal party', target = 'self'},
-      {action = 'choose from ability deck', num = 2},
+      {action = 'choose from ability deck', num_abilities = 2},
       {action = 'choose confirmed priority'},
     },
-    side_2_reaction_trigger = 'about to die',
+    side_2_reaction_triggers = {'about to die'},
     side_2_resolve_steps = {
       {action = 'reveal'},
-      {action = 'reveal party', target = 'dying'},
+      {action = 'reveal party', target = 'other'},
       {action = 'choose to die'},
     },
   },
 
   'Spy' = {
-    is_copyable = true,
-    is_affectable = true,
-    side_1_reaction_trigger = 'spy',
+    side_1_reaction_triggers = {'spy'},
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'gain power', power = 'inspect', active_triggers = {'spy'}},
     },
     side_2_resolve_steps = {
       {action = 'reveal party', target = 'self'},
-      {action = 'reveal', active_triggers = {'reveal'}},
+      {action = 'reveal'},
       {action = 'target', mode = 'spy', conditions = {'not self'}},
       {action = 'take', choose = false, active_triggers = {'jester'}},
     },
   },
 
   'Martyr' = {
-    is_copyable = true,
-    is_affectable = true,
     side_1_conditions = {{'before voting'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
@@ -129,24 +116,131 @@ ability_db = {
   },
 
   'Broker' = {
-    is_copyable = true,
-    is_affectable = true,
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'target', num_targets = 2, conditions = {'not self'}},
-      {action = 'swap cards', choose = false, num_cards = 'all', active_triggers = {'jester'}},
+      {action = 'swap cards', mode = 'broker', active_triggers = {'jester'}},
     },
   },
 
   'Harbinger' = {
-    is_copyable = true,
-    is_affectable = true,
     side_1_conditions = {{'both tracks full'}, {'both tracks empty'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'draw artifacts', num_artifacts = 4},
+      {action = 'draw artifacts', mode = 'harbinger', num_keep = 2},
       {action = 'target', num_targets = 2},
-      {action = 'swap cards', choose = false, num_cards = 'all', active_triggers = {'jester'}},
+      {action = 'place artifacts'},
+    },
+  },
+
+  'Underdog' = {
+    is_not_affectable = true,
+    side_1_conditions = {{'underdog'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'reveal party', target = 'self'},
+      {action = 'reshuffle'},
+      {action = 'play policy', own_party = true},
+      {action = 'gain power'},
+      {action = 'use power'},
+      {action = 'reshuffle'},
+      {action = 'choose from ability deck', num_abilities = 1, free = true},
+    },
+  },
+
+  'Swindler' = {
+    side_1_conditions = {{'elected president'}},
+    side_1_reaction_triggers = {'elected',
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
+      {action = 'cancel government'},
+      {action = 'lose presidency'},
+      {action = 'draw abilities', num_drawn = 2, num_keep = 2},
+      {action = 'give effect', effect_name = 'Mighty', target = 'self'},
+    },
+  },
+
+  'Desperado' = {
+    side_1_conditions = {{'one track full'}},
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
+      {action = 'flip coin'},
+      {action = 'draw abilities', num_drawn = 6, num_keep = 2, free = true},
+    },
+  },
+
+  'Gravekeeper' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'investigate dead'},
+    },
+    side_2_resolve_steps = {
+      {action = 'copy', restriction = 'dead'},
+    },
+  },
+
+  'Librarian' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'draw abilities', num_drawn = 4, num_keep = 2, free = true},
+      {action = 'target', num_players = 2, conditions = {'not self'}},
+      {action = 'give abilities', num_abilities = 2},
     },
   },
+
+  'Esper' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'draw esper cards'},
+      {action = 'reveal esper card'},
+    },
+  },
+
+  'Bandit' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'take', choose = true, active_triggers = {'jester'}},
+    },
+    side_2_reaction_triggers = {'topdeck power', 'gain topdeck power'},
+    side_2_resolve_steps = {
+      {action = 'gain topdeck power', active_triggers = {'gain topdeck power'}}
+    },
+  },
+
+  'Collector' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'draw artifacts', num_drawn = 3, num_keep = 1},
+      {action = 'target', num_targets = 1},
+      {action = 'place artifacts'},
+    },
+  }
+
+  'Pariah' = {
+    side_1_conditions = {{'before voting', 'one track full', 'not elected'}},
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker', 'interceptor'}},
+      {action = 'take presidency', target = 'self'},
+      {action = 'draw abilities', num_drawn = 3, num_keep = 1, free = true},
+    },
+  },
+
+  'Soulmate' = {
+    is_playable_when_dead = true,
+    side_1_reaction_triggers = {{'after you die'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self', 'not dead'}},
+      {action = 'kill'},
+    },
+    side_2_conditions = {'not dead'},
+    side_2_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target'. num_players = 1, conditions = {'not banished'}},
+      {action = 'give effect', effect_name = 'Banished'},
+      {action = 'kill', target = 'self', reveal_role = false},
+    },
+  },
+
 }
diff --git a/src/engine.ttslua b/src/engine.ttslua
index 3082f13..736b83d 100644
--- a/src/engine.ttslua
+++ b/src/engine.ttslua
@@ -5,14 +5,15 @@ state = {
    game_status = nil, -- SETUP, STARTING, STARTED, ENDED
    round_num = 1,
    round_state = '',
-   curr_president = nil, -- who the pres placard is currently on,
-   next_president = nil, -- who the next pres is if special election stack is empty
+   curr_president = nil, -- player color who the pres placard is currently on,
+   next_president = nil, -- player color who the next pres is if special election stack is empty
    elected_president = nil,
    elected_chancellor = nil,
-   policy_drawer = nil, -- defaults to curr_president
+   policy_drawer = nil, -- defaults to elected_president
    active_presidential_power = nil, -- set when player gains power or power is topdecked
-   presidential_power_holder = nil, -- player color that holds presidential power
-   deck_reshuffled = false,
+   presidential_power_holder = nil, -- player color who holds presidential power
+   active_ability_player = nil, -- player color that is currently playing an ability
+   is_deck_reshuffled = false,
    is_hitler_territory = false,
    num_policies_in_deck = nil,
    num_policies_in_discard = nil,
@@ -27,7 +28,9 @@ state = {
    active_artifacts = {}, -- for artifacts like Staff
    active_targets = {},
    active_reaction_triggers = {},
+   cards_to_give = {}, -- for resolving abilities that give abilities or artifacts
    special_election_stack = {},
    available_presidential_powers = {},
+   contest_order = {}, -- first element has highest priority
    users = {}, --user objects
 }

From 4707e630b228fc010744f3866ec80423a1a4d02e Mon Sep 17 00:00:00 2001
From: Tony Ye <eterna@gmail.com>
Date: Fri, 3 May 2024 22:20:10 -0400
Subject: [PATCH 3/4] Add abilities 21-30, add voting fields to user

---
 src/ability.ttslua | 129 ++++++++++++++++++++++++++++++++++++++++-----
 src/user.ttslua    |   2 +
 2 files changed, 118 insertions(+), 13 deletions(-)

diff --git a/src/ability.ttslua b/src/ability.ttslua
index 3e6fad3..ae979ea 100644
--- a/src/ability.ttslua
+++ b/src/ability.ttslua
@@ -97,7 +97,7 @@ ability_db = {
       {action = 'reveal party', target = 'self'},
       {action = 'reveal'},
       {action = 'target', mode = 'spy', conditions = {'not self'}},
-      {action = 'take', choose = false, active_triggers = {'jester'}},
+      {action = 'take ability', choose = false, active_triggers = {'jester'}},
     },
   },
 
@@ -127,9 +127,9 @@ ability_db = {
     side_1_conditions = {{'both tracks full'}, {'both tracks empty'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'draw artifacts', mode = 'harbinger', num_keep = 2},
+      {action = 'draw artifacts', mode = 'harbinger', num_discard = 2},
       {action = 'target', num_targets = 2},
-      {action = 'place artifacts'},
+      {action = 'give artifacts', target = 'targets'},
     },
   },
 
@@ -144,7 +144,8 @@ ability_db = {
       {action = 'gain power'},
       {action = 'use power'},
       {action = 'reshuffle'},
-      {action = 'choose from ability deck', num_abilities = 1, free = true},
+      {action = 'choose from ability deck', num_abilities = 1},
+      {action = 'make abilities free'},
     },
   },
 
@@ -155,7 +156,8 @@ ability_db = {
       {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
       {action = 'cancel government'},
       {action = 'lose presidency'},
-      {action = 'draw abilities', num_drawn = 2, num_keep = 2},
+      {action = 'draw abilities', num_drawn = 2, num_discard = 0},
+      {action = 'give abilities', target = 'self', free = false},
       {action = 'give effect', effect_name = 'Mighty', target = 'self'},
     },
   },
@@ -165,7 +167,8 @@ ability_db = {
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
       {action = 'flip coin'},
-      {action = 'draw abilities', num_drawn = 6, num_keep = 2, free = true},
+      {action = 'draw abilities', num_drawn = 6, num_discard = 4},
+      {action = 'give abilities', target = 'self', free = false},
     },
   },
 
@@ -182,9 +185,9 @@ ability_db = {
   'Librarian' = {
     side_1_resolve_steps = {
       {action = 'reveal'},
-      {action = 'draw abilities', num_drawn = 4, num_keep = 2, free = true},
+      {action = 'draw abilities', num_drawn = 4, num_discard = 2},
       {action = 'target', num_players = 2, conditions = {'not self'}},
-      {action = 'give abilities', num_abilities = 2},
+      {action = 'give abilities', target = 'targets', free = true},
     },
   },
 
@@ -211,9 +214,9 @@ ability_db = {
   'Collector' = {
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'draw artifacts', num_drawn = 3, num_keep = 1},
+      {action = 'draw artifacts', num_draw = 3, num_discard = 2},
       {action = 'target', num_targets = 1},
-      {action = 'place artifacts'},
+      {action = 'give artifacts', target = 'targets'},
     },
   }
 
@@ -221,8 +224,9 @@ ability_db = {
     side_1_conditions = {{'before voting', 'one track full', 'not elected'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker', 'interceptor'}},
-      {action = 'take presidency', target = 'self'},
-      {action = 'draw abilities', num_drawn = 3, num_keep = 1, free = true},
+      {action = 'special election', target = 'self'},
+      {action = 'draw abilities', num_drawn = 3, num_discard = 2},
+      {action = 'give abilities', target = 'self', free = true},
     },
   },
 
@@ -238,9 +242,108 @@ ability_db = {
     side_2_resolve_steps = {
       {action = 'reveal'},
       {action = 'target'. num_players = 1, conditions = {'not banished'}},
-      {action = 'give effect', effect_name = 'Banished'},
+      {action = 'give effect', effect_name = 'Banished', target = 'target'},
       {action = 'kill', target = 'self', reveal_role = false},
     },
   },
 
+  'Peacemaker' = {
+    side_1_conditions = {{'before voting', 'after hitler territory'}},
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'peacemaker'},
+    },
+  },
+
+  'Guardian Angel' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Aegis', target = 'target'},
+    },
+  },
+
+  'Pacifist' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'pacifist'},
+    },
+    side_2_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Protected', target = 'target'},
+    },
+  },
+
+  'Silencer' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Silenced', target = 'target'},
+    },
+  },
+
+  'Lobbyist' = {
+    side_1_conditions = {{'before voting', 'lobbyist not active'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'set active'}
+      {action = 'lobbyist'},
+    },
+  },
+
+  'Big Brother' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Tracked', target = 'target'},
+    },
+  },
+
+  'Decider' = {
+    side_1_reaction_triggers = {{'tied votes'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'pass election'},
+    },
+    side_2_conditions = {{'election tracker topdeck'}},
+    side_2_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'draw policies', num_drawn = 2, num_to_policy = 1, num_to_discard = 1}
+    },
+  },
+
+  'Scion' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'name ability'},
+      {action = 'look abilities', target = 'target', active_triggers = {'jester'}},
+      {action = 'take abilities', target = 'target', mode = 'scion', active_triggers = {'jester'}},
+    },
+    side_2_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
+      {action = 'name ability'},
+      {action = 'reveal third of deck'},
+      {action = 'scion ability'},
+    }
+  },
+
+  'Knight' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'target', num_players = 1, conditions = {'not self', 'has artifact or effect'}}
+      {action = 'receive artifact or effect'},
+      {action = 'set artifact owner', target = 'self'},
+  },
+
+  'Surgeon' = {
+    side_1_conditions = {{'after reshuffle', 'seven cards in policy deck'}}
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'draw policies', num_drawn = 6, num_to_policy = 4, num_to_discard = 2},
+      {action = 'shuffle policy deck'},
+    },
+  },
+  
 }
diff --git a/src/user.ttslua b/src/user.ttslua
index c29970d..eb187a4 100644
--- a/src/user.ttslua
+++ b/src/user.ttslua
@@ -8,6 +8,8 @@ function User:new(player_obj, role, party, color)
     party = party, -- 'liberal' or 'fascist'
     color = color, -- 'White'
     vote = nil, -- yes, no, and nil for not voted
+    vote_weight = 1,
+    vote_forced = false,
     is_alive = true,
     is_confirmed_not_hitler = false, -- if they have been elected chancellor after Hitler Territory
     is_confirmed_role = false, -- revealed to all if they are Liberal or Fascist

From 2cdca868461beed76dc448be1f9c7b51ba5af41b Mon Sep 17 00:00:00 2001
From: Tony Ye <eterna@gmail.com>
Date: Sat, 4 May 2024 00:13:36 -0400
Subject: [PATCH 4/4] Add abilities 31-40, add fields to ability and user

---
 src/ability.ttslua | 158 +++++++++++++++++++++++++++++++++++++++------
 src/engine.ttslua  |   2 +-
 src/user.ttslua    |   3 +-
 3 files changed, 143 insertions(+), 20 deletions(-)

diff --git a/src/ability.ttslua b/src/ability.ttslua
index ae979ea..973c9bf 100644
--- a/src/ability.ttslua
+++ b/src/ability.ttslua
@@ -1,12 +1,16 @@
 Ability = {}
 Ability.__index = Ability
 
-function Ability:new(name, user, source, played_round_num)
+function Ability:new(name, user, played_round_num)
   local ability = {
     name = name, -- name of ability
     user = user, -- player color who owns this ability
+    playable = nil, -- can be played by user
     source = source, -- {is_starting = false, from_ability = nil, from_user = nil}
     played_round_num = played_round_num,
+    is_starting_card = nil,
+    from_ability = nil, -- came from an ability like Reporter or Mentor
+    from_user = nil, -- from Trader or Broker
     is_tradable = true,
     is_not_copyable = ability[name].is_not_copyable or false,
     is_not_affectable = ability[name].is_not_affectable or false,
@@ -77,6 +81,7 @@ ability_db = {
       {action = 'reveal'},
       {action = 'reveal party', target = 'self'},
       {action = 'choose from ability deck', num_abilities = 2},
+      {action = 'give abilities', target = 'self'},
       {action = 'choose confirmed priority'},
     },
     side_2_reaction_triggers = {'about to die'},
@@ -127,7 +132,8 @@ ability_db = {
     side_1_conditions = {{'both tracks full'}, {'both tracks empty'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'draw artifacts', mode = 'harbinger', num_discard = 2},
+      {action = 'check harbinger bonus'},
+      {action = 'draw artifacts', num_drawn = 4, num_discard = 2},
       {action = 'target', num_targets = 2},
       {action = 'give artifacts', target = 'targets'},
     },
@@ -140,12 +146,13 @@ ability_db = {
       {action = 'reveal'},
       {action = 'reveal party', target = 'self'},
       {action = 'reshuffle'},
-      {action = 'play policy', own_party = true},
+      {action = 'check underdog party'},
+      {action = 'play policy', party = nil},
       {action = 'gain power'},
       {action = 'use power'},
       {action = 'reshuffle'},
       {action = 'choose from ability deck', num_abilities = 1},
-      {action = 'make abilities free'},
+      {action = 'give abilities', target = 'self', free = true},
     },
   },
 
@@ -194,8 +201,10 @@ ability_db = {
   'Esper' = {
     side_1_resolve_steps = {
       {action = 'reveal'},
-      {action = 'draw esper cards'},
-      {action = 'reveal esper card'},
+      {action = 'check esper policies'},
+      {action = 'draw abilities', num_drawn = nil, num_discard = nil},
+      {action = 'give abilities', target = 'self', free = true},
+      {action = 'play ability'},
     },
   },
 
@@ -251,7 +260,7 @@ ability_db = {
     side_1_conditions = {{'before voting', 'after hitler territory'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'peacemaker'},
+      {action = 'destroy artifacts and effects'},
     },
   },
 
@@ -266,7 +275,7 @@ ability_db = {
   'Pacifist' = {
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'pacifist'},
+      {action = 'disable next power'},
     },
     side_2_resolve_steps = {
       {action = 'reveal'},
@@ -287,8 +296,8 @@ ability_db = {
     side_1_conditions = {{'before voting', 'lobbyist not active'}},
     side_1_resolve_steps = {
       {action = 'reveal'},
-      {action = 'set active'}
-      {action = 'lobbyist'},
+      {action = 'set active ability'},
+      {action = 'set lobbyist vote'},
     },
   },
 
@@ -296,6 +305,7 @@ ability_db = {
     side_1_resolve_steps = {
       {action = 'reveal'},
       {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'look abilities', target = 'target', active_triggers = {'jester'}},
       {action = 'give effect', effect_name = 'Tracked', target = 'target'},
     },
   },
@@ -319,31 +329,143 @@ ability_db = {
       {action = 'target', num_players = 1, conditions = {'not self'}},
       {action = 'name ability'},
       {action = 'look abilities', target = 'target', active_triggers = {'jester'}},
-      {action = 'take abilities', target = 'target', mode = 'scion', active_triggers = {'jester'}},
+      {action = 'take abilities', target = 'target', active_triggers = {'jester'}},
     },
     side_2_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
-      {action = 'name ability'},
-      {action = 'reveal third of deck'},
-      {action = 'scion ability'},
-    }
+      {action = 'name ability'},  -- sets ability.named_ability
+      {action = 'check ability deck size'},
+      {action = 'reveal abilities'},
+      {action = 'gain ability', free = true},
+      {action = 'discard abilities', num = nil},
+    },
   },
 
   'Knight' = {
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
-      {action = 'target', num_players = 1, conditions = {'not self', 'has artifact or effect'}}
+      {action = 'target', num_players = 1, conditions = {'not self', 'has artifact or effect'}},
       {action = 'receive artifact or effect'},
       {action = 'set artifact owner', target = 'self'},
   },
 
   'Surgeon' = {
-    side_1_conditions = {{'after reshuffle', 'seven cards in policy deck'}}
+    side_1_conditions = {{'after reshuffle', 'seven cards in policy deck'}},
     side_1_resolve_steps = {
       {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
       {action = 'draw policies', num_drawn = 6, num_to_policy = 4, num_to_discard = 2},
       {action = 'shuffle policy deck'},
     },
   },
-  
+
+  'Jester' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'reshuffle'},
+    },
+    side_2_conditions = {{'taking from user'}},
+    side_2_reaction_triggers = {{'jester'}},
+    side_2_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal'}},
+      {action = 'check jester target'},
+      {action = 'negate'},
+      {action = 'take ability', choose = true, active_triggers = {'jester'}, free = true},
+    },
+  },
+
+  'Usurper' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'special election', target = 'self'},
+    },
+    side_2_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'hacker'}},
+      {action = 'take chancellorship', target = 'self'},
+    },
+  },
+
+  'Mentor' = {
+    side_1_resolve_steps = {
+      {action = 'reveal', active_triggers = {'reveal', 'interceptor'}},
+      {action = 'target', num_players = 1},
+      {action = 'discard unused abilities'},
+      {action = 'draw abilities', num_drawn = nil, num_discard = 0},
+    },
+  },
+
+  'Assassin' = {
+    side_1_conditions = {{'before voting', 'after hitler territory'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Death Sentence', target = 'target'},
+    },
+  },
+
+  'Poisoner' = {
+    side_1_conditions = {{'after hitler territory'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'draw poisoner effects'},
+      {action = 'target', num_players = 4, conditions = {'not self'}},
+      {action = 'give poisoner effects'},
+    },
+  },
+
+  'Specter' = {
+    is_playable_when_dead = true,
+    side_1_conditions = {{'dead'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'check num artifacts'},
+      {action = 'draw artifacts', num_drawn = nil, num_discard = nil},
+      {action = 'target', num_targets = 1},
+      {action = 'give artifacts', target = 'targets'},
+    },
+  },
+
+  'Spiritualist' = {
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'dead'}},
+      {action = 'give effect', effect_name = 'Death Sentence', target = 'target'},
+    },
+  },
+
+  'Messiah' = {
+    is_playable_when_dead = true,
+    side_1_conditions = {{'before voting, not dead'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'set active ability'},
+      {action = 'trigger messiah', targets = 'all'},
+    },
+    side_2_conditions = {{'dead'}},
+    side_2_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'set active ability'},
+      {action = 'trigger messiah', targets = 'self'},
+      {action = 'set '}
+    },
+  },
+
+  'Denouncer' = {
+    side_1_conditions = {{'before voting'}},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'not self'}},
+      {action = 'give effect', effect_name = 'Unpopular', target = 'target'},
+    },
+  },
+
+  'Avenger' = {
+    side_1_reaction_triggers = {'avenger'},
+    side_1_resolve_steps = {
+      {action = 'reveal'},
+      {action = 'target', num_players = 1, conditions = {'downvoted user'}},
+      {action = 'take ability', choose = true, active_triggers = {'jester'}, free = true},
+    },
+  },
+
+
 }
diff --git a/src/engine.ttslua b/src/engine.ttslua
index 736b83d..3a94997 100644
--- a/src/engine.ttslua
+++ b/src/engine.ttslua
@@ -12,7 +12,7 @@ state = {
    policy_drawer = nil, -- defaults to elected_president
    active_presidential_power = nil, -- set when player gains power or power is topdecked
    presidential_power_holder = nil, -- player color who holds presidential power
-   active_ability_player = nil, -- player color that is currently playing an ability
+   current_ability_player = nil, -- player color that is currently playing an ability
    is_deck_reshuffled = false,
    is_hitler_territory = false,
    num_policies_in_deck = nil,
diff --git a/src/user.ttslua b/src/user.ttslua
index eb187a4..0bb7b31 100644
--- a/src/user.ttslua
+++ b/src/user.ttslua
@@ -8,7 +8,7 @@ function User:new(player_obj, role, party, color)
     party = party, -- 'liberal' or 'fascist'
     color = color, -- 'White'
     vote = nil, -- yes, no, and nil for not voted
-    vote_weight = 1,
+    vote_weight = 1, -- 3 for lobbyist
     vote_forced = false,
     is_alive = true,
     is_confirmed_not_hitler = false, -- if they have been elected chancellor after Hitler Territory
@@ -18,6 +18,7 @@ function User:new(player_obj, role, party, color)
     can_be_affected = true,
     can_be_president = true, -- false if dead
     can_be_chancellor = true,
+    can_play_another_ability = true, -- true if user hasn't played any regular abilities
     was_elected = false, -- for Pariah
     used_abilities = {},
     unused_abilities = {},