Merge branch 'main' of https://github.com/fluffy-marmot/codejam2025

Author: TheRatLord

horizons_data/planets.json

@@ -159,7 +159,7 @@
             "\tMovement: Arrow Keys or WASD",
             "\tUse scanner: Hold Spacebar"
         ],
-        "scan_multiplier": 1.6,
+        "scan_multiplier": 1.8,
         "asteroid": {
             "count": 12,
             "speed": 15,

static/scripts/asteroid.py

@@ -137,7 +137,7 @@ def should_be_removed(self):
 
 
 class AsteroidAttack:
-    def __init__(self, spritesheet, width: int, height: int, max_size_px: float, spawnrate: int = 500):
+    def __init__(self, spritesheet, width: int, height: int, max_size_px: float, spawnrate: int = 500, spawn_at_player_chance: int = 10):
         self.sheet = spritesheet
         self.w = width
         self.h = height
@@ -150,7 +150,7 @@ def __init__(self, spritesheet, width: int, height: int, max_size_px: float, spa
         self._use_grow_rate = 6.0 # default growth rate (how fast they appear to approach the player)
         self._use_health = 450 # default durability (affects asteroids being destroyed by impacts w/ player)
         self._use_damage_mul = 1.0
-
+        self.spawn_at_player_chance = spawn_at_player_chance
     def _spawn_one(self):
         # Don't spawn if at the limit
         if len(self.asteroids) >= self._max_asteroids:
@@ -159,9 +159,13 @@ def _spawn_one(self):
         # Planet area (left side)
         planet_width = self.w * 0.3
         space_start_x = planet_width + 50
-
-        x = random.uniform(space_start_x, self.w)
-        y = random.uniform(0, self.h)
+        if random.randint(1, self.spawn_at_player_chance) == 1:
+            print("spawning at player")
+            x = window.player.x
+            y = window.player.y
+        else:
+            x = random.uniform(space_start_x, self.w)
+            y = random.uniform(0, self.h)
 
         if x < (SCREEN_W / 2):
             velocity_x = random.uniform(-15, -5)

static/scripts/player.py

@@ -259,15 +259,15 @@ def check_collision(self, asteroid: Asteroid):
             window.audio_handler.play_bang()
             window.debris.generate_debris(self.get_position(), Position(ast_x, ast_y))
 
-    def nudge_towards(self, pos: Position, momentum_amount: float) -> None:
+    def nudge_towards(self, pos: Position, gravity_strength: float = 0.75) -> None:
         distance = self.get_position().distance(pos)
         if distance == 0: return
 
         x_dir = (pos.x - self.x) / distance
         y_dir = (pos.y - self.y) / distance
 
-        self.x += x_dir * 0.75
-        self.y += y_dir * 0.75
+        self.x += x_dir * gravity_strength
+        self.y += y_dir * gravity_strength
 
         # x_dir = math.cos((pos.x - self.x )/(pos.y - self.y))
         # y_dir = math.sin((pos.x - self.x )/(pos.y - self.y))
@@ -400,7 +400,7 @@ def render_beam(self, ctx):  # seprate function so it can go under the planet
 
         player_x, player_y = self.player.get_position()
         origin_x = player_x - 150
-        origin_y = player_y - 10
+        origin_y = player_y - 15
 
         # Create animated pulsing effect based on time
         pulse = (math.sin(time.time() * 8) + 1) / 2  # 0 to 1

static/scripts/scene_descriptions.py

@@ -278,7 +278,7 @@ def check_special_level_interactions(self, timestamp: int):
         """
         # nudge player in the direction of jupiter if on the left 2/3 of the screen
         if self.planet.name.lower() == "jupiter":
-            get_player().nudge_towards(self.planet.get_position(), 0.6)
+            get_player().nudge_towards(self.planet.get_position(), 0.5)
         elif self.planet.name.lower() == "mercury":
             get_player().health = max(0, get_player().health - (timestamp - self.last_timestamp) / 1_200_000)