From 9c8702fb208ff34cf87aadc056c100234190e981 Mon Sep 17 00:00:00 2001 From: Hardel <42413417+Hardel-DW@users.noreply.github.com> Date: Tue, 29 Jun 2021 01:15:10 +0200 Subject: [PATCH] Define RoleType and Change color --- RolesMods/Roles/Collaborator.cs | 1 + RolesMods/Roles/Executioner.cs | 3 ++- RolesMods/Roles/Janitor.cs | 5 +++-- RolesMods/Roles/Jester.cs | 3 ++- RolesMods/Roles/Lover.cs | 10 +++++----- RolesMods/Roles/Miner.cs | 5 +++-- RolesMods/Roles/Morphing.cs | 5 +++-- RolesMods/Roles/SecurityGuard.cs | 8 ++++---- RolesMods/Roles/SerialKiller.cs | 1 + RolesMods/Roles/Shifter.cs | 2 ++ RolesMods/Roles/Spirit.cs | 1 + RolesMods/Roles/Swooper.cs | 3 ++- RolesMods/Roles/Tracker.cs | 8 ++++---- 13 files changed, 33 insertions(+), 22 deletions(-) diff --git a/RolesMods/Roles/Collaborator.cs b/RolesMods/Roles/Collaborator.cs index a286d2a..451e782 100644 --- a/RolesMods/Roles/Collaborator.cs +++ b/RolesMods/Roles/Collaborator.cs @@ -20,6 +20,7 @@ public Collaborator() : base() { TasksDescription = "Collaborator: Help the serial killer to win"; Name = "Collaborator"; HasTask = false; + RoleType = RoleType.Undefined; Side = PlayerSide.Crewmate; GiveTasksAt = Moment.Never; ShowIntroCutScene = false; diff --git a/RolesMods/Roles/Executioner.cs b/RolesMods/Roles/Executioner.cs index e87471d..27e246c 100644 --- a/RolesMods/Roles/Executioner.cs +++ b/RolesMods/Roles/Executioner.cs @@ -17,8 +17,9 @@ public class Executioner : CustomRole { public Executioner() : base() { GameOptionFormat(); - Side = PlayerSide.Crewmate; RoleActive = true; + Side = PlayerSide.Crewmate; + RoleType = RoleType.Neutral; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; Color = new Color(0.388f, 0.227f, 0.215f, 1f); diff --git a/RolesMods/Roles/Janitor.cs b/RolesMods/Roles/Janitor.cs index a2293cf..89994f3 100644 --- a/RolesMods/Roles/Janitor.cs +++ b/RolesMods/Roles/Janitor.cs @@ -20,14 +20,15 @@ public class Janitor : CustomRole { public Janitor() : base() { GameOptionFormat(); - Side = PlayerSide.Impostor; RoleActive = true; + Side = PlayerSide.Impostor; + RoleType = RoleType.Impostor; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; Color = Palette.ImpostorRed; Name = "Janitor"; IntroDescription = "Je sais pas"; - TasksDescription = "Janitor: Faut définir une description pffff"; + TasksDescription = "Janitor: Faut définir une description pffff"; } public override void OnInfectedStart() { diff --git a/RolesMods/Roles/Jester.cs b/RolesMods/Roles/Jester.cs index 7d65757..7031bd5 100644 --- a/RolesMods/Roles/Jester.cs +++ b/RolesMods/Roles/Jester.cs @@ -14,10 +14,11 @@ public class Jester : CustomRole { public Jester() : base() { GameOptionFormat(); - Side = PlayerSide.Crewmate; HasTask = false; RoleActive = true; ForceExiledReveal = true; + Side = PlayerSide.Crewmate; + RoleType = RoleType.Neutral; GiveTasksAt = Moment.StartGame; Color = new Color(0.819f, 0f, 0.321f, 1f); Name = "Jester"; diff --git a/RolesMods/Roles/Lover.cs b/RolesMods/Roles/Lover.cs index a480f72..85b8321 100644 --- a/RolesMods/Roles/Lover.cs +++ b/RolesMods/Roles/Lover.cs @@ -9,8 +9,8 @@ namespace RolesMods.Roles { [RegisterInCustomRoles(typeof(Lover))] public class Lover : CustomRole { - // Color: ##f570dcff - public static CustomNumberOption LoverPercent = CustomOption.AddNumber("Lover", "Lover Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); + // Color: #f5b2e4ff + public static CustomNumberOption LoverPercent = CustomOption.AddNumber("Lover", "Lover Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); public static CustomToggleOption LoverDies = CustomOption.AddToggle("Lover die with both", false, LoverPercent); private static PlayerControl Target; private bool TargetIsDead = false; @@ -22,10 +22,10 @@ public Lover() : base() { GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; NumberPlayers = 2; - Color = new Color(0.388f, 0.227f, 0.215f, 1f); + Color = new Color(0.960f, 0.698f, 0.894f, 1f); Name = "Lover"; - IntroDescription = $"You are in Love with {Target?.name}"; - TasksDescription = $"Lover: You are in Love with {Target?.name}"; + IntroDescription = $"You are in Love with {Target?.name}"; + TasksDescription = $"Lover: You are in Love with {Target?.name}"; OutroDescription = "Lovers win"; } diff --git a/RolesMods/Roles/Miner.cs b/RolesMods/Roles/Miner.cs index c9c9693..a7b7329 100644 --- a/RolesMods/Roles/Miner.cs +++ b/RolesMods/Roles/Miner.cs @@ -21,14 +21,15 @@ public class Miner : CustomRole { public Miner() : base() { GameOptionFormat(); - Side = PlayerSide.Impostor; RoleActive = true; + Side = PlayerSide.Impostor; + RoleType = RoleType.Impostor; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; Color = Palette.ImpostorRed; Name = "Miner"; IntroDescription = "You can be Invisible"; - TasksDescription = "Miner: Use your ability to be invisible"; + TasksDescription = "Miner: Use your ability to be invisible"; } public override void OnInfectedStart() { diff --git a/RolesMods/Roles/Morphing.cs b/RolesMods/Roles/Morphing.cs index 9c63d03..461ef6a 100644 --- a/RolesMods/Roles/Morphing.cs +++ b/RolesMods/Roles/Morphing.cs @@ -22,14 +22,15 @@ public class Morphing : CustomRole { public Morphing() : base() { GameOptionFormat(); - Side = PlayerSide.Impostor; RoleActive = true; + Side = PlayerSide.Impostor; + RoleType = RoleType.Impostor; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; Color = Palette.ImpostorRed; Name = "Morphing"; IntroDescription = "Je sais pas"; - TasksDescription = "Morphing: Faut définir une description pffff"; + TasksDescription = "Morphing: Faut définir une description pffff"; } public override void OnInfectedStart() { diff --git a/RolesMods/Roles/SecurityGuard.cs b/RolesMods/Roles/SecurityGuard.cs index 6710512..d96a0e7 100644 --- a/RolesMods/Roles/SecurityGuard.cs +++ b/RolesMods/Roles/SecurityGuard.cs @@ -9,8 +9,8 @@ namespace RolesMods.Roles { [RegisterInCustomRoles(typeof(SecurityGuard))] public class SecurityGuard : CustomRole { - // Color: #07db00FF - public static CustomNumberOption SecurityGuardPercent = CustomOption.AddNumber("SecurityGuard", "SecurityGuard Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); + // Color: #eaf5b2ff + public static CustomNumberOption SecurityGuardPercent = CustomOption.AddNumber("SecurityGuard", "SecurityGuard Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); public static CustomNumberOption NumberSecurityGuard = CustomOption.AddNumber("Number Security Guard", 1f, 1f, 10f, 1f, SecurityGuardPercent); public static CustomNumberOption CooldownSecurityGuard = CustomOption.AddNumber("Security Guard Cooldown", 30f, 10f, 120f, 5f, SecurityGuardPercent); public static CustomNumberOption NumberScrews = CustomOption.AddNumber("Security Guard Number Of Screws", 1f, 1f, 30f, 1f, SecurityGuardPercent); @@ -25,10 +25,10 @@ public SecurityGuard() : base() { RoleActive = true; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; - Color = new Color(0.831f, 0.705f, 0.047f, 1f); + Color = new Color(0.917f, 0.960f, 0.698f, 1f); Name = "Security Guard"; IntroDescription = "Seal vents and place cameras"; - TasksDescription = "Security Guard: Seal vents and place cameras"; + TasksDescription = "Security Guard: Seal vents and place cameras"; } public override void OnInfectedStart() { diff --git a/RolesMods/Roles/SerialKiller.cs b/RolesMods/Roles/SerialKiller.cs index 381e6f2..cfaa87d 100644 --- a/RolesMods/Roles/SerialKiller.cs +++ b/RolesMods/Roles/SerialKiller.cs @@ -38,6 +38,7 @@ public SerialKiller() : base() { Name = "Serial Killer"; HasTask = false; Side = PlayerSide.Crewmate; + RoleType = RoleType.Neutral; GiveTasksAt = Moment.StartGame; RoleActive = true; Color = new Color(0.101f, 0.933f, 0.976f, 1f); diff --git a/RolesMods/Roles/Shifter.cs b/RolesMods/Roles/Shifter.cs index 134031d..e76a58b 100644 --- a/RolesMods/Roles/Shifter.cs +++ b/RolesMods/Roles/Shifter.cs @@ -1,5 +1,6 @@ using Harion.CustomOptions; using Harion.CustomRoles; +using Harion.Enumerations; using UnityEngine; namespace RolesMods.Roles { @@ -13,6 +14,7 @@ public class Shifter : CustomRole { public Shifter() : base() { GameOptionFormat(); + RoleType = RoleType.Neutral; TasksDescription = "Shifter: Shift your role before the game ends"; IntroDescription = "Shift your role before the game ends"; Name = "Shifter"; diff --git a/RolesMods/Roles/Spirit.cs b/RolesMods/Roles/Spirit.cs index 9338808..b5524ac 100644 --- a/RolesMods/Roles/Spirit.cs +++ b/RolesMods/Roles/Spirit.cs @@ -23,6 +23,7 @@ public Spirit() : base() { Side = PlayerSide.Everyone; GiveTasksAt = Moment.OnDie; GiveRoleAt = Moment.StartGame; + RoleType = RoleType.Dead; RoleActive = true; ShowIntroCutScene = false; } diff --git a/RolesMods/Roles/Swooper.cs b/RolesMods/Roles/Swooper.cs index b937c28..f8e9d9d 100644 --- a/RolesMods/Roles/Swooper.cs +++ b/RolesMods/Roles/Swooper.cs @@ -25,10 +25,11 @@ public Swooper() : base() { RoleActive = true; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; + RoleType = RoleType.Impostor; Color = Palette.ImpostorRed; Name = "Swooper"; IntroDescription = "You can be Invisible"; - TasksDescription = "Swooper: Use your ability to be invisible"; + TasksDescription = "Swooper: Use your ability to be invisible"; } public override void OnInfectedStart() { diff --git a/RolesMods/Roles/Tracker.cs b/RolesMods/Roles/Tracker.cs index a747334..517f4d5 100644 --- a/RolesMods/Roles/Tracker.cs +++ b/RolesMods/Roles/Tracker.cs @@ -7,8 +7,8 @@ namespace RolesMods.Roles { [RegisterInCustomRoles(typeof(Tracker))] public class Tracker : CustomRole { - // Color: #07 db 00 FF - public static CustomNumberOption TrackerPercent = CustomOption.AddNumber("Tracker", "Tracker Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); + // Color: #b2f5e3ff + public static CustomNumberOption TrackerPercent = CustomOption.AddNumber("Tracker", "Tracker Apparition", 0f, 0f, 100f, 5f, RoleModPlugin.CrewmateHolder); public static CustomNumberOption NumberTracker = CustomOption.AddNumber("Number Tracker", 1f, 1f, 10f, 1f, TrackerPercent); public static CustomNumberOption TargetUpdate = CustomOption.AddNumber("Arrow Interval", 5f, 0f, 30f, 0.5f, TrackerPercent); @@ -18,10 +18,10 @@ public Tracker() : base() { RoleActive = true; GiveRoleAt = Moment.StartGame; GiveTasksAt = Moment.StartGame; - Color = new Color(0.027f, 0.858f, 0f, 1f); + Color = new Color(0.698f, 0.960f, 0.890f, 1f); Name = "Tracker"; IntroDescription = "Track a player and do your tasks"; - TasksDescription = "Tracker: You can see the player\nposition with an arrow."; + TasksDescription = "Tracker: You can see the player\nposition with an arrow."; } public override void OnInfectedStart() {