Merge pull request #9 from ethanrusz/actions

Update workflows

.github/workflows/build-latest.yml

@@ -0,0 +1,29 @@
+name: Build and Push to git.beans.team
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update-registry:
+    name: Update Registry Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to git.beans.team
+        uses: docker/login-action@v3
+        with:
+          registry: git.beans.team
+          username: em
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: git.beans.team/em/scouter:latest

.github/workflows/build-release.yml

@@ -0,0 +1,28 @@
+name: Build and Push Releases
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  update-registry:
+    name: Update Registry Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to git.beans.team
+        uses: docker/login-action@v3
+        with:
+          registry: git.beans.team
+          username: em
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: git.beans.team/em/scouter:${{ github.event.release.tag_name }}

app.py

@@ -25,13 +25,23 @@ class Run:
         self.outside_power = moon.outside_max_power
 
 
-def find_spawnlist(run: Run, creatures: list[Creature]) -> list[str]:
+def find_spawnlist(remaining_power: int, creatures: list[Creature]) -> list[str] | None:
     """
-    Given a run, return all possible spwns for location.
+    Given a run, return all possible spawns for location.
 
-    :param run: The current run object.
+    :param remaining_power: The remaining power in the current location.
-    :return: A list of all creatures that could still spawn.
+    :return: A list of all creatures that may still spawn or None.
     """
+    if remaining_power == 0:
+        return None
+
+    spawnable = sorted(
+        [creature.name for creature in creatures if creature.power <= remaining_power]
+    )
+    if spawnable != []:
+        return spawnable
+    else:
+        return None
 
 
 def main():
@@ -97,7 +107,6 @@ def main():
 
     with left_column:
         st.markdown("### Outside")
-        st.info(f"Maximum power: {run.moon.outside_max_power}")
 
         with st.form("outside"):
             for creature in outside_creatures:
@@ -126,16 +135,17 @@ def main():
 
             outside_submit = st.form_submit_button("Calculate")
             if outside_submit:
+                st.info(f"Maximum power: {run.moon.outside_max_power}")
                 if run.outside_power >= 0:
-                    st.toast(f"🌳 Outside power remaining: {run.outside_power}")
+                    st.warning(f"🌳 Outside power remaining: {run.outside_power}")
+                    st.write(find_spawnlist(run.outside_power, outside_creatures))
                 else:
                     st.error(
-                        f"Power level exceedes maximum possible for {run.moon.name}."
+                        f"Power level exceeds maximum possible for {run.moon.name}."
                     )
 
     with right_column:
         st.markdown("### Inside")
-        st.info(f"Maximum power: {run.moon.inside_max_power}")
 
         with st.form("inside"):
             for creature in inside_creatures:
@@ -164,11 +174,13 @@ def main():
 
             inside_submit = st.form_submit_button("Calculate")
             if inside_submit:
+                st.info(f"Maximum power: {run.moon.inside_max_power}")
                 if run.inside_power >= 0:
-                    st.toast(f"🏭 Inside power remaining: {run.inside_power}")
+                    st.warning(f"🏭 Inside power remaining: {run.inside_power}")
+                    st.write(find_spawnlist(run.inside_power, inside_creatures))
                 else:
                     st.error(
-                        f"Power level exceedes maximum possible for {run.moon.name}."
+                        f"Power level exceeds maximum possible for {run.moon.name}."
                     )