From 84d389cc253a1aed0fc4adfec1fe0c5bb7178004 Mon Sep 17 00:00:00 2001
From: Gurge44 <90392754+Gurge44@users.noreply.github.com>
Date: Mon, 28 Aug 2023 09:34:25 +0200
Subject: [PATCH] Add files via upload
Update README.md
---
FodyWeavers.xml | 7 +++
FodyWeavers.xsd | 141 ++++++++++++++++++++++++++++++++++++++++++++++++
README.md | 67 ++++++++++++++++++++++-
TOHE.csproj | 2 +-
main.cs | 25 ++++++---
5 files changed, 232 insertions(+), 10 deletions(-)
create mode 100644 FodyWeavers.xml
create mode 100644 FodyWeavers.xsd
diff --git a/FodyWeavers.xml b/FodyWeavers.xml
new file mode 100644
index 000000000..9574c9551
--- /dev/null
+++ b/FodyWeavers.xml
@@ -0,0 +1,7 @@
+
+
+
+ Csv
+
+
+
\ No newline at end of file
diff --git a/FodyWeavers.xsd b/FodyWeavers.xsd
new file mode 100644
index 000000000..ff119f713
--- /dev/null
+++ b/FodyWeavers.xsd
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
+
+
+
+
+ A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
+
+
+
+
+ A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ The order of preloaded assemblies, delimited with line breaks.
+
+
+
+
+
+ This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.
+
+
+
+
+ Controls if .pdbs for reference assemblies are also embedded.
+
+
+
+
+ Controls if runtime assemblies are also embedded.
+
+
+
+
+ Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.
+
+
+
+
+ Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.
+
+
+
+
+ As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.
+
+
+
+
+ Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.
+
+
+
+
+ Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.
+
+
+
+
+ A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
+
+
+
+
+ A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with |.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with |.
+
+
+
+
+ The order of preloaded assemblies, delimited with |.
+
+
+
+
+
+
+
+ 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
+
+
+
+
+ A comma-separated list of error codes that can be safely ignored in assembly verification.
+
+
+
+
+ 'false' to turn off automatic generation of the XML Schema file.
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 55c92e049..e666b044b 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,12 @@
> This mod is not affiliated with Among Us or Innersloth LLC, and the content contained therein is not endorsed or otherwise sponsored by Innersloth LLC. Portions of the materials contained herein are the property of Innersloth LLC.
-> Note: The website is still a Work In Progress, please bear with us - Moe
-
+
@@ -29,6 +28,70 @@
+## Additions, Changes, and improvements compared to TOHRE
+- Note: The goal with this branch is to improve the existing stuff over adding new roles. Some of the new stuff listed below are ported into TOHRE by me.
+### Overall improvements
+- Gain more ability uses for completing tasks as crewmate roles
+- Gain more ability uses for getting kills as impostor roles
+- Prevent kills while shifted when no abiltiy uses are left for some roles (Sniper, Twister, Disperser, Hangman, Camouflager, etc.)
+- Code cleanup and small performance improvement
+- Improved EAC
+- Better intro sounds
+- Better custom button images
+- Better progress text look
+- Visualized cooldowns for more roles
+- Disabled most shield animations for modded clients for a better experience, and even some for vanilla clients (all cooldowns are still reset properly, this is just a visual improvement)
+- Shapeshift and vent cooldowns are now always reset after meetings
+- Custom main menu
+- Improved strings and their appearance
+- More customizable settings; More reasonable default settings
+- Starting Kill Cooldown setting
+- Additional ejection confirmation message when crewmates win
+
+### Role specific Improvements
+#### Crewmates
+- Chameleon uses vanilla engineer cooldown
+- The target of the Deputy no longer gets a shield animation on top of the Deputy
+- Fortune Teller: Setting whether it shows specific roles after completing tasks
+- Merchant: Option to sell Balanced add-ons (based on my opinion)
+- Mortician: Setting whether it has arrows toward dead bodies
+- Oracle: Chance to show incorrect result
+- Mechanic: Settings that determine how many uses it takes to fix Lights/Comms and Reactor/O2
+- Sheriff: Setting whether to display the shot limit next to the role name
+- Tracefinder: Settings that determine the delay in which the arrows show up
+#### Impostors
+- Assassin: Kill Cooldown no longer resets when unshifting
+- Bounty Hunter: Swap Timer is displayed next to the role name, not on the Shapeshift button => Changed the basis to regular Impostor
+- Eraser: Erase by Voting or by Kill Button & What to do when target is neutral
+- Hangman: Kill Cooldown after strangling
+- Mare (add-on): Can kill at all times, but if lights are not out, the kill cooldown is higher
+- Quick Shooter now works correctly
+- Serial Killer: Suicide Timer is displayed next to the role name, not on the Shapeshift button => Changed the basis to regular Impostor; Setting whether the Suicide Timer only starts after their first kill
+- Swooper: Setting whether it can vent normally when swooping is on cooldown; Swoop Cooldown is visualized next to the role name
+- Wildling: Setting whether the role can Shapeshift or not; Setting whether the role can Vent or not
+- Underdog: Can kill at all times, but if the number of players alive is higher than the set amount, the kill cooldown is higher
+- Miner: Shapeshift Cooldown and Shapeshift Duration setting
+- Escapist: Shapeshift Cooldown and Shapeshift Duration setting
+- Cleaner: Can only clean bodies if their kill cooldown is up
+- Vampire: Kill Cooldown is reset when the bitten target dies
+- Capitalist: Can kill normally with the double click method (& + Kill Cooldown setting)
+- Killing Machine: Has impostor vision
+#### Neutrals
+- Medusa: Can only clean bodies if their kill cooldown is up
+- Wraith: Setting whether it can vent normally when invis is on cooldown; Invis Cooldown is visualized next to the role name
+- Poisoner: Kill Cooldown is reset when the poisoned target dies
+
+### Now, some new roles as well
+- Lighter (Crewmate)
+- Demolitionist (Crewmate)
+- Witness (Crewmate)
+- Task Manager (Crewmate)
+- Speedrunner (Crewmate)
+- Romantic (Neutral)
+- Undertaker (Impostor)
+
+
+
**Credit to these mods and their developers for the code and help:**
### :star: [TOHE](https://github.com/KARPED1EM/TownOfHostEdited) :
>
diff --git a/TOHE.csproj b/TOHE.csproj
index c9c3d46fb..49303534d 100644
--- a/TOHE.csproj
+++ b/TOHE.csproj
@@ -7,7 +7,7 @@
Town Of Host Edited
KARPED1EM
latest
- C:\Users\popul\Documents\Among Us v2023.7.12
+ E:\Program Files\AmongUs
true
diff --git a/main.cs b/main.cs
index 182769eb9..0687c7ae7 100644
--- a/main.cs
+++ b/main.cs
@@ -111,6 +111,7 @@ public class Main : BasePlugin
public static List CyberStarDead = new();
public static List DemolitionistDead = new();
public static List WorkaholicAlive = new();
+ public static List SpeedrunnerAlive = new();
public static List BaitAlive = new();
public static List BoobyTrapBody = new();
public static List BoobyTrapKiller = new();
@@ -136,6 +137,7 @@ public class Main : BasePlugin
public static Dictionary BitPlayers = new();
public static Dictionary WarlockTimer = new();
public static Dictionary AssassinTimer = new();
+ public static Dictionary UndertakerTimer = new();
public static Dictionary CursedPlayers = new();
public static Dictionary isCurseAndKill = new();
public static Dictionary MafiaRevenged = new();
@@ -160,7 +162,7 @@ public class Main : BasePlugin
public static Dictionary MarioVentCount = new();
public static Dictionary VeteranInProtect = new();
public static Dictionary VeteranNumOfUsed = new();
- public static Dictionary AllKillers = new();
+ public static Dictionary AllKillers = new();
public static Dictionary GrenadierNumOfUsed = new();
public static Dictionary LighterNumOfUsed = new();
public static Dictionary TimeMasterNumOfUsed = new();
@@ -323,6 +325,7 @@ public class Main : BasePlugin
{CustomRoles.Bodyguard, "#185abd"},
{CustomRoles.Counterfeiter, "#BE29EC"},
{CustomRoles.Witness, "#e70052"},
+ {CustomRoles.Lookout, "#2a52be"},
{CustomRoles.Grenadier, "#3c4a16"},
{CustomRoles.Lighter, "#eee5be"},
{CustomRoles.Medic, "#00ff97"},
@@ -341,6 +344,7 @@ public class Main : BasePlugin
{CustomRoles.Deputy, "#df9026"},
{CustomRoles.Guardian, "#2E8B57"},
{CustomRoles.Addict, "#008000"},
+ {CustomRoles.Alchemist, "#e6d798"},
{CustomRoles.Tracefinder, "#0066CC"},
{CustomRoles.Oracle, "#6666FF"},
{CustomRoles.Spiritualist, "#669999"},
@@ -371,6 +375,7 @@ public class Main : BasePlugin
{CustomRoles.Gamer, "#68bc71"},
{CustomRoles.DarkHide, "#483d8b"},
{CustomRoles.Workaholic, "#008b8b"},
+ {CustomRoles.Speedrunner, "#800080"},
{CustomRoles.Collector, "#9d8892"},
{CustomRoles.Provocateur, "#74ba43"},
{CustomRoles.Sunnyboy, "#ff9902"},
@@ -551,6 +556,7 @@ public enum CustomRoles
Witch,
Warlock,
Assassin,
+ Undertaker,
Vindicator,
Hacker,
Miner,
@@ -595,8 +601,8 @@ public enum CustomRoles
Convict,
Visionary,
Refugee,
- Underdog,
- // Flashbang,
+ Underdog,
+ // Flashbang,
//Crewmate(Vanilla)
Engineer,
GuardianAngel,
@@ -622,6 +628,7 @@ public enum CustomRoles
Snitch,
Marshall,
SpeedBooster,
+ Lookout,
Dictator,
Doctor,
Detective,
@@ -653,6 +660,7 @@ public enum CustomRoles
Deputy,
Guardian,
Addict,
+ Alchemist,
Tracefinder,
Oracle,
Spiritualist,
@@ -686,6 +694,7 @@ public enum CustomRoles
Gamer,
DarkHide,
Workaholic,
+ Speedrunner,
Collector,
Provocateur,
Sunnyboy,
@@ -717,8 +726,8 @@ public enum CustomRoles
Amnesiac,
Doomsayer,
Masochist,
- // Flux,
-
+ // Flux,
+
//SoloKombat
KB_Normal,
@@ -762,7 +771,7 @@ public enum CustomRoles
Lucky,
Unlucky,
DoubleShot,
- // Reflective,
+ // Reflective,
Rascal,
Soulless,
Gravestone,
@@ -807,6 +816,7 @@ public enum CustomWinner
Gamer = CustomRoles.Gamer,
DarkHide = CustomRoles.DarkHide,
Workaholic = CustomRoles.Workaholic,
+ Speedrunner = CustomRoles.Speedrunner,
Collector = CustomRoles.Collector,
BloodKnight = CustomRoles.BloodKnight,
Poisoner = CustomRoles.Poisoner,
@@ -851,12 +861,13 @@ public enum AdditionalWinners
Totocalcio = CustomRoles.Totocalcio,
Romantic = CustomRoles.Romantic,
VengefulRomantic = CustomRoles.VengefulRomantic,
+ RuthlessRomantic = CustomRoles.RuthlessRomantic,
Jackal = CustomRoles.Jackal,
Sidekick = CustomRoles.Sidekick,
Pursuer = CustomRoles.Pursuer,
Phantom = CustomRoles.Phantom,
Maverick = CustomRoles.Maverick,
- // Baker = CustomRoles.Baker,
+ // Baker = CustomRoles.Baker,
}
public enum SuffixModes
{