WIP: Allow toggling loving impostor #301

Anusien · 2021-08-05T05:35:49Z

This is just a first draft. I'm not able to test it yet nor have I figured out how to add unit tests. If someone can point me toward contributing guidelines, I'm happy to flesh this out more fully.

NotSugden · 2021-08-05T06:04:03Z

source/Patches/Roles/Lover.cs

@@ -71,22 +71,22 @@ public static void Gen(List<PlayerControl> crewmates, List<PlayerControl> impost
        {
            //System.Console.WriteLine("LOVER2");
            if (crewmates.Count <= 0) return;
-            if (crewmates.Count <= 1 && impostors.Count < 1) return;
+            if (crewmates.Count <= 1 && (impostors.Count < 1 || !CustomGameOptions.AllowLovingImpostor)) return;


Suggested change

if (crewmates.Count <= 1 && (impostors.Count < 1 || !CustomGameOptions.AllowLovingImpostor)) return;

if (crewmates.Count <= 1 && (!CustomGameOptions.AllowLovingImpostor || impostors.Count < 1)) return;

NotSugden · 2021-08-05T06:08:38Z

if you want to test this, build the project (either using dotnet build in the command line, or building in visual studio) then in source\bin\Debug\netstandard2.1 will be the compiled TownOfUs.dll plugin file, replace the same file in the BepInEx/plugins folder in your modded among us folder 👍

(it would previously be automatically moved to an AmongUs folder in the root dir of the project, but that was accidentally removed in 2.2.0, see #294)

NotSugden · 2021-08-05T06:13:25Z

source/Patches/Roles/Lover.cs

@@ -71,22 +71,22 @@ public static void Gen(List<PlayerControl> crewmates, List<PlayerControl> impost
        {
            //System.Console.WriteLine("LOVER2");
            if (crewmates.Count <= 0) return;
-            if (crewmates.Count <= 1 && impostors.Count < 1) return;
+            if (crewmates.Count <= 1 && (impostors.Count < 1 || !CustomGameOptions.AllowLovingImpostor)) return;

            //System.Console.WriteLine("LOVER3");
            var b = Random.RandomRangeInt(0, 3);


slightly out of scope i know, but could b be changed to just be the lovingImpostor boolean?

seems it was originally just meant to be 1 or 0 indicating if a loving impostor should be generated

I wanted to, but it urns out at 1am after like 5 hours of Among Us, my brain couldn't figure out how. I've attempted to rewrite this whole section to not reassign stuff to the same variable.

Anusien · 2021-08-05T16:20:37Z

I haven't touched C# in a while; I've been doing Java for the past 7 years. I also prefer a more verbose, more risk averse coding style. So I avoided var in favor of actually typing the variables and used curly braces even for one line blocks following an if clause. I also attempted to add XML style comments and added some documentation in places where I had to go to do some research.

If you'd prefer another coding style, or if this isn't idiomatic C#, feel free to ask for changes.

Anusien · 2021-08-05T16:23:04Z

source/Patches/Roles/Lover.cs

@@ -9,24 +9,31 @@ namespace TownOfUs.Roles
 {
    public class Lover : Role
    {
-        public Lover(PlayerControl player, int num, bool loverImpostor) : base(player)


The convention where num == 2 for impostor seemed really brittle to me. So I changed it to always specify.

Anusien · 2021-08-05T16:23:13Z

source/Patches/Roles/Lover.cs

        }

        public Lover OtherLover { get; set; }
        public bool LoveCoupleWins { get; set; }
-        public int Num { get; set; }


I couldn't find where this was used?

NotSugden

for the sake of consistency, should probably use var, and remove the docstring comments, but other than that LGTM

NotSugden · 2021-08-06T02:29:33Z

source/Patches/Roles/Lover.cs

@@ -67,26 +74,29 @@ protected override string NameText(PlayerVoteArea player = null)
            return Player.name + "\n" + "Lover";
        }

+        private static readonly int LOVING_IMPOSTOR_CHANCE = 25;


Suggested change

private static readonly int LOVING_IMPOSTOR_CHANCE = 25;

private const int LOVING_IMPOSTOR_CHANCE = 25;

NotSugden · 2021-08-06T02:31:55Z

source/Patches/Roles/Lover.cs

-            writer.Write(b);
-            var lover1 = new Lover(player1, 1, b == 0);
-            var lover2 = new Lover(player2, 2, b == 0);
+            writer.Write(lovingImpostor ? 0 : 1);


theres a writer.WriteBoolean method

…ingImpostor

NotSugden

i think it would also be nice to have an option to change the chance of a loving impostor (possibly replacing the toggle?)

NotSugden · 2021-08-07T20:13:07Z

source/Patches/CustomOption/Generate.cs

@@ -284,6 +285,8 @@ public static void GenerateAll()
            Lovers =
                new CustomHeaderOption(num++, "<color=#FF66CCFF>Lovers</color>");
            BothLoversDie = new CustomToggleOption(num++, "Both Lovers Die");
+            LovingImpostorOn = new CustomNumberOption(num++, "Allow Loving Impostor",25f, 0f, 100f, 10f,


Suggested change

LovingImpostorOn = new CustomNumberOption(num++, "Allow Loving Impostor",25f, 0f, 100f, 10f,

LovingImpostorOn = new CustomNumberOption(num++, "Loving Impostor Chance", 25f, 0f, 100f, 10f,

NotSugden · 2021-08-07T20:14:36Z

source/Patches/Roles/Lover.cs

+            var lovingImpostorEnabled = Random.RandomRangeInt(1, 101) <= CustomGameOptions.LovingImpostorOn;
+
+            var canMakeCrewCrewLovers = crewmates.Count >= 2;
+            var canMakeCrewImpostorLovers = crewmates.Count >= 1 && impostors.Count >= 2 && lovingImpostorEnabled;


Suggested change

var canMakeCrewImpostorLovers = crewmates.Count >= 1 && impostors.Count >= 2 && lovingImpostorEnabled;

var canMakeCrewImpostorLovers = crewmates.Count >= 1 && impostors.Count >= 1 && lovingImpostorEnabled;

there would only need to be one impostor free

NotSugden · 2021-08-07T20:15:51Z

source/Patches/RpcHandling.cs

@@ -338,12 +338,12 @@ public static void Postfix([HarmonyArgument(0)] byte callId, [HarmonyArgument(1)
                    case CustomRPC.SetCouple:
                        var id = reader.ReadByte();
                        var id2 = reader.ReadByte();
-                        var b1 = reader.ReadByte();
+                        bool lovingImpostor = reader.ReadByte() == 0;


Suggested change

bool lovingImpostor = reader.ReadByte() == 0;

var lovingImpostor = reader.ReadByte() == 0;

NotSugden · 2021-08-07T20:17:10Z

README.md


 ### Game Options
 | Name | Description | Type | Default |
 |----------|:-------------:|:------:|:------:|
 | Lovers | The percentage probability of the Lovers appearing | Percentage | 0% |
 | Both Lovers Die | Whether the other Lover automatically dies if the other does | Toggle | True |
+| Allow Loving Impostor | Whether one of the Lovers can be an Impostor | Percentage | 25% |


stale · 2021-09-06T21:37:26Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

Anusien added 2 commits August 5, 2021 00:33

WIP: Allow toggling loving impostor

9635707

Fix some typos

98b6c11

NotSugden reviewed Aug 5, 2021

View reviewed changes

Rewrite the logic to be clearer and not reassign variables

7d3570c

Anusien commented Aug 5, 2021

View reviewed changes

NotSugden reviewed Aug 6, 2021

View reviewed changes

Anusien added 3 commits August 6, 2021 13:22

Merge branch 'master' of github.com:polusgg/Town-Of-Us into toggleLov…

b2d1dd7

…ingImpostor

Restyle to be more in line the rest of the codebase

4c6b853

Missed one stylistic change

f182f8a

NotSugden reviewed Aug 7, 2021

View reviewed changes

Change Loving Impostor toggle to a percentage

e92215a

NotSugden reviewed Aug 7, 2021

View reviewed changes

stale bot added the wontfix This will not be worked on label Sep 6, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Allow toggling loving impostor #301

WIP: Allow toggling loving impostor #301

Anusien commented Aug 5, 2021

NotSugden Aug 5, 2021

NotSugden commented Aug 5, 2021 •

edited

Loading

NotSugden Aug 5, 2021

Anusien Aug 5, 2021

Anusien commented Aug 5, 2021

Anusien Aug 5, 2021

Anusien Aug 5, 2021

NotSugden left a comment •

edited

Loading

NotSugden Aug 6, 2021

NotSugden Aug 6, 2021

NotSugden left a comment

NotSugden Aug 7, 2021 •

edited

Loading

NotSugden Aug 7, 2021

NotSugden Aug 7, 2021

NotSugden Aug 7, 2021

stale bot commented Sep 6, 2021

	if (crewmates.Count <= 1 && (impostors.Count < 1 \|\| !CustomGameOptions.AllowLovingImpostor)) return;
	if (crewmates.Count <= 1 && (!CustomGameOptions.AllowLovingImpostor \|\| impostors.Count < 1)) return;

	private static readonly int LOVING_IMPOSTOR_CHANCE = 25;
	private const int LOVING_IMPOSTOR_CHANCE = 25;

	LovingImpostorOn = new CustomNumberOption(num++, "Allow Loving Impostor",25f, 0f, 100f, 10f,
	LovingImpostorOn = new CustomNumberOption(num++, "Loving Impostor Chance", 25f, 0f, 100f, 10f,

	var canMakeCrewImpostorLovers = crewmates.Count >= 1 && impostors.Count >= 2 && lovingImpostorEnabled;
	var canMakeCrewImpostorLovers = crewmates.Count >= 1 && impostors.Count >= 1 && lovingImpostorEnabled;

	bool lovingImpostor = reader.ReadByte() == 0;
	var lovingImpostor = reader.ReadByte() == 0;

	\| Allow Loving Impostor \| Whether one of the Lovers can be an Impostor \| Percentage \| 25% \|
	\| Loving Impostor Chance \| The percentage probability of a Loving Impostor appearing \| Percentage \| 25% \|

WIP: Allow toggling loving impostor #301

Are you sure you want to change the base?

WIP: Allow toggling loving impostor #301

Conversation

Anusien commented Aug 5, 2021

Choose a reason for hiding this comment

NotSugden commented Aug 5, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anusien commented Aug 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NotSugden left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NotSugden left a comment

Choose a reason for hiding this comment

NotSugden Aug 7, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stale bot commented Sep 6, 2021

NotSugden commented Aug 5, 2021 •

edited

Loading

NotSugden left a comment •

edited

Loading

NotSugden Aug 7, 2021 •

edited

Loading