Merge branch 'main' into NympheaR-patch-1

PokemonAutomation · Oct 6, 2023 · 6cedcfe · 6cedcfe
2 parents b3d59d0 + 347d35d
commit 6cedcfe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/PokemonScarletViolet/TeraAutoHost-BanList.json b/PokemonScarletViolet/TeraAutoHost-BanList.json
@@ -73,6 +73,7 @@
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Gaven", "notes": "2/1 rar capsakid"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "GENBBX", "notes": "4/3 redneck charcadet, 2/1 on a raid from Ath0m and got banned from CFW hosts as well. Expires January 8th, 2023."},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Gilgamesh", "notes": "2/1 on Donphan"},
+    {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Ghost", "notes": "Permanently banned from PA, SHA, and raids. Context: https://discord.com/channels/695809740428673034/1050667958562738197/1156452850612846643 (IGN:Medic,Ghost) (NID:14968799647731936724,14287169641547843721) (DiscordID:478861440455933972,925946108272836668,1156660350461149224,1142824870082781224,1156566490812780597)"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "go1", "notes": "2/1 rar Chansey"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Goose", "notes": "2/1 rar's Eiscue"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Grimmsnaw","notes": "2/1 in Nikki's Lycanroc"},
@@ -122,7 +123,7 @@
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "KUN", "notes": "2/1 in Redneck's Gyarados"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "lax", "notes": "2/1 on menschheit's mismagius"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Lexi", "notes": "3/2 on Vio's Eevee."},
-    {"enabled": true, "language": "eng", "log10p": -2.5, "name": "lain", "notes": "2/1 in rar's Esicue"},
+    {"enabled": false, "language": "eng", "log10p": -2.5, "name": "lain", "notes": "2/1 in rar's Esicue"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Laire", "notes": "4/3 in Kelp's Dratini"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "LGBTQIAP+", "notes": "3/2 on Vio's Eevee."},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Linnea", "notes": "8/3 on Nikki's Charcadet. Expires 30/12/2023."},
@@ -146,7 +147,7 @@
     {"enabled": false, "language": "eng", "log10p": -3.0, "name": "Matthew", "notes": "2/1 on Menschheit' mismagius"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Max","notes": "2/1 in Nikki's Lycanroc"},
     {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Mayaw", "notes": "2/1 rar capsakid"},
-    {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Medic", "notes": "Inflammatory remarks to hosts and staff. Ban evasion using multiple alts. Unapologetic and refusal to self-reflect. Permanently banned from PA, SHA, and raids. NID: 14968799647731936724 Context: https://discord.com/channels/695809740428673034/1050667958562738197/1156452850612846643"},
+    {"enabled": true, "language": "eng", "log10p": -2.5, "name": "Medic", "notes": "Permanently banned from PA, SHA, and raids. Context: https://discord.com/channels/695809740428673034/1050667958562738197/1156452850612846643 (IGN:Medic,Ghost) (NID:14968799647731936724,14287169641547843721) (DiscordID:478861440455933972,925946108272836668,1156660350461149224,1142824870082781224,1156566490812780597)"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Meegle", "notes": "2/1 rar capsakid"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Mereo", "notes": "8/3 Alice seviper. Banned till Jan 23, 2023"},
     {"enabled": false, "language": "eng", "log10p": -2.5, "name": "Mei","notes": "4/1 in Sangetsu's Maushold. (IGN collision with Mel)"},

diff --git a/PokemonScarletViolet/TeraAutoHost-BanListNid.json b/PokemonScarletViolet/TeraAutoHost-BanListNid.json
@@ -0,0 +1,8 @@
+{
+    "Blacklist": [
+        {"Enabled": true, "NIDs": [14968799647731936724,14287169641547843721], "Profiles": ["Medic:800028","Medic:44206","Ghost"], "DiscordIDs": [478861440455933972,925946108272836668,1156660350461149224,1142824870082781224,1156566490812780597], "Comment": "Permanently banned from PA, SHA, and raids. Context: https://discord.com/channels/695809740428673034/1050667958562738197/1156452850612846643"}
+    ],
+    "Whitelist": [
+
+    ]
+}