From 99dc2905a93b6d3088ad3a91e169c144da121a81 Mon Sep 17 00:00:00 2001
From: Sakimori <sakimorihalley@gmail.com>
Date: Thu, 1 Jul 2021 17:35:17 -0400
Subject: [PATCH] Added draftflagscommand

---
 the_prestige.py | 15 +++++++++++++++
 weather.py      | 16 ++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/the_prestige.py b/the_prestige.py
index 265fe2f..9c21645 100644
--- a/the_prestige.py
+++ b/the_prestige.py
@@ -629,6 +629,20 @@ class DraftPlayerCommand(Command):
         """
         pass
 
+class DraftFlagsCommand(Command):
+    name = "draftflags"
+    template = "m;draftflags"
+    description = "Shows all currently accepted flags for the startdraft command."
+
+    async def execute(self, msg, command, flags):
+        text = """Currently accepted flags:
+--draftsize or -d: Sets the size of each draft pool.
+--minsize or -m: Sets the size at which the pool completely refreshes.
+--teamsize or -t: How big each team should be, including pitchers.
+--pitchercount or -p: How many pitchers each team should have.
+--wait or -w: Sets the timeout, in seconds, to wait for draftees to pick a player.
+--chaos or -c: The percentage of onomancer names in the pool. Higher numbers mean less real names, but faster pool generation. Accepts any number between 0 and 1.
+"""
 
 class StartDraftCommand(Command):
     name = "startdraft"
@@ -1546,6 +1560,7 @@ commands = [
     RomanCommand(),
     HelpCommand(),
     StartDraftCommand(),
+    DraftFlagsCommand(),
     DraftPlayerCommand()
 ]
 
diff --git a/weather.py b/weather.py
index 1049cd7..842eca7 100644
--- a/weather.py
+++ b/weather.py
@@ -553,12 +553,11 @@ class LeafEddies(Weather):
 class Smog(Weather):
     name = "Smog"
     emoji = "🚌"
-    duration_range = [1,1]
+    duration_range = [1,2]
 
     def __init__(self, game):
         game.random_weather_flag = True
         setattr(game, "weather", random.choice(list(safe_weathers().values()))(game))
-        pass
 
 
 
@@ -605,27 +604,28 @@ def safe_weathers():
 class WeatherChains():
     light = [SlightTailwind, Twilight, Breezy, Drizzle, SummerMist, LeafEddies] #basic starting points for weather, good comfortable spots to return to
     magic = [Twilight, ThinnedVeil, MeteorShower, Starlight] #weathers involving breaking the fabric of spacetime
-    sudden = [Tornado, Hurricane, Twilight, Starlight, Midnight, Downpour] #weathers that always happen and leave over 1-3 games
+    sudden = [Tornado, Hurricane, Twilight, Starlight, Midnight, Downpour, Smog] #weathers that always happen and leave over 1-3 games
     disaster = [Hurricane, Tornado, Downpour, Blizzard] #storms
     aftermath = [Midnight, Starlight, MeteorShower, SummerMist, LeafEddies] #calm epilogues
 
     dictionary = {
             #Supernova : (magic + sudden + disaster, None), supernova happens leaguewide and shouldn't need a chain, but here just in case
             Midnight : ([SlightTailwind, Breezy, Drizzle, Starlight, MeteorShower, HeatWave, SummerMist],[2,2,2,4,4,1,2]),
-            SlightTailwind : ([Breezy, Drizzle, LeafEddies, Tornado], [3,3,3,1]),
+            SlightTailwind : ([Breezy, Drizzle, LeafEddies, Smog, Tornado], [3,3,3,3,1]),
             Blizzard : ([Midnight, Starlight, MeteorShower, Twilight, Downpour], [2,2,2,2,4]),
             Twilight : ([ThinnedVeil, Midnight, MeteorShower, SlightTailwind, SummerMist], [2,4,2,1,2]),
             ThinnedVeil : (light, None),
             HeatWave : ([Tornado, Hurricane, SlightTailwind, Breezy, SummerMist],[4,4,1,1,2]),
             Drizzle : ([Hurricane, Downpour, Blizzard],[2,2,1]),
-            Breezy : ([Drizzle, HeatWave, Blizzard, Tornado], [3,3,1,1]),
+            Breezy : ([Drizzle, HeatWave, Blizzard, Smog, Tornado], [3,3,1,3,1]),
             Starlight : ([SlightTailwind, Twilight, Breezy, Drizzle, ThinnedVeil, HeatWave], None),
-            MeteorShower : ([Starlight, ThinnedVeil, HeatWave], None),
+            MeteorShower : ([Starlight, ThinnedVeil, HeatWave, Smog], None),
             Hurricane : ([LeafEddies, Midnight, Starlight, MeteorShower, Twilight, Downpour], [3,2,2,2,2,4]),
             Tornado : ([LeafEddies, Midnight, Starlight, MeteorShower, Twilight, Downpour],[3,2,2,2,2,4]),
             SummerMist : ([Drizzle, Breezy, Hurricane, Downpour],[2, 1, 1, 1]),
-            LeafEddies : ([Breezy, Tornado, SummerMist, ThinnedVeil], None),
-            Downpour : (aftermath, None)
+            LeafEddies : ([Breezy, Tornado, SummerMist, ThinnedVeil, Smog], None),
+            Downpour : (aftermath, None),
+            Smog : (disaster + [Drizzle], None)
         }
 
     chains = [