gh-space-shooter 0.0.2__tar.gz → 0.0.4__tar.gz

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/.github/workflows/publish.yml

@@ -48,7 +48,7 @@ jobs:
     - name: GitHub Release v${{ steps.bump.outputs.current-version }}
       uses: ncipollo/release-action@v1
       with:
-        name: pytest-asyncio-concurrent v${{ steps.bump.outputs.current-version }}
+        name: gh-space-shooter v${{ steps.bump.outputs.current-version }}
         tag: v${{ steps.bump.outputs.current-version }}
         body: "Automated release of version v${{ steps.bump.outputs.current-version }}"
         artifacts: dist/*

gh_space_shooter-0.0.4/.github/workflows/test.yml

@@ -0,0 +1,40 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize, reopened]
+
+env:
+  PYTHON_LATEST: 3.13
+
+jobs:
+  test:
+    name: Test Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.13"]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+
+    - name: Install Python ${{ matrix.python-version }}
+      run: uv python install ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: uv sync --extra dev
+
+    - name: Run tests
+      run: uv run pytest tests/ -v
+
+    - name: Test Summary
+      if: always()
+      run: |
+        echo "## Test Results" >> $GITHUB_STEP_SUMMARY
+        echo "Tests completed for Python ${{ matrix.python-version }}" >> $GITHUB_STEP_SUMMARY

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/.gitignore

@@ -17,3 +17,6 @@ wheels/
 # Environment variables (secrets)
 .env
 .env.*
+
+# Test output
+my-contributions.json

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/PKG-INFO

@@ -1,15 +1,17 @@
 Metadata-Version: 2.4
 Name: gh-space-shooter
-Version: 0.0.2
+Version: 0.0.4
 Summary: A CLI tool that visualizes GitHub contribution graphs as gamified GIFs
 Author-email: zane <czl970721@gmail.com>
 License-File: LICENSE
 Requires-Python: >=3.13
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: pillow>=10.0.0
+Requires-Dist: pillow>=10.1.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.12.0
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # gh-space-shooter 🚀
@@ -18,19 +20,50 @@ Transform your GitHub contribution graph into an epic space shooter game!
 
 ![Example Game](example.gif)
 
-## Features
+## Usage
+
+### GitHub Action
+
+Automatically update your game GIF daily using GitHub Actions! Add this workflow to your repository at `.github/workflows/update-game.yml`:
 
-- 🚀 **Galaga-style space shooter** - Classic arcade gameplay with your contribution data
-- 📊 **GitHub integration** - Fetches your last 52 weeks of contributions automatically
-- 🎮 **Smart enemy AI** - Multiple attack strategies (columns, rows, random patterns)
-- 💥 **Particle effects** - Explosions with randomized particles and smooth animations
-- 🎨 **Polished graphics** - Rounded enemies, smooth ship design, starfield background
-- 📈 **Contribution stats** - View your coding activity statistics
-- 💾 **Export options** - Save both the GIF and raw JSON data
+```yaml
+name: Update Space Shooter Game
 
-## Installation
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Daily at midnight UTC
+  workflow_dispatch:  # Allow manual trigger
 
-### From PyPI (Recommended)
+permissions:
+  contents: write
+
+jobs:
+  update-game:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: czl9707/gh-space-shooter@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          output-path: 'game.gif'
+          strategy: 'random'
+```
+
+Then display it in your README:
+```markdown
+![My GitHub Game](game.gif)
+```
+
+**Action Inputs:**
+- `github-token` (required): GitHub token for fetching contributions
+- `username` (optional): Username to generate game for (defaults to repo owner)
+- `output-path` (optional): Where to save the GIF (default: `gh-space-shooter.gif`)
+- `strategy` (optional): Attack pattern - `column`, `row`, or `random` (default: `random`)
+- `fps` (optional): Frames per second for the animation (default: `40`)
+- `commit-message` (optional): Commit message for the update
+
+### From PyPI
 
 ```bash
 pip install gh-space-shooter
@@ -92,6 +125,11 @@ gh-space-shooter torvalds -o my-game.gif
 gh-space-shooter torvalds --strategy column   # Enemies attack in columns
 gh-space-shooter torvalds --strategy row      # Enemies attack in rows
 gh-space-shooter torvalds -s random           # Random chaos (default)
+
+# Adjust animation frame rate
+gh-space-shooter torvalds --fps 25            # Slower, smaller file size
+gh-space-shooter torvalds --fps 40            # Default frame rate
+gh-space-shooter torvalds --fps 50            # Smoother animation
 ```
 
 This creates an animated GIF showing:
@@ -131,8 +169,7 @@ When saved to JSON, the data includes:
         }
       ]
     }
-  ],
-  "fetched_at": "2024-12-30T12:00:00"
+  ]
 }
 ```
 

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/README.md

@@ -4,19 +4,50 @@ Transform your GitHub contribution graph into an epic space shooter game!
 
 ![Example Game](example.gif)
 
-## Features
+## Usage
+
+### GitHub Action
+
+Automatically update your game GIF daily using GitHub Actions! Add this workflow to your repository at `.github/workflows/update-game.yml`:
 
-- 🚀 **Galaga-style space shooter** - Classic arcade gameplay with your contribution data
-- 📊 **GitHub integration** - Fetches your last 52 weeks of contributions automatically
-- 🎮 **Smart enemy AI** - Multiple attack strategies (columns, rows, random patterns)
-- 💥 **Particle effects** - Explosions with randomized particles and smooth animations
-- 🎨 **Polished graphics** - Rounded enemies, smooth ship design, starfield background
-- 📈 **Contribution stats** - View your coding activity statistics
-- 💾 **Export options** - Save both the GIF and raw JSON data
+```yaml
+name: Update Space Shooter Game
 
-## Installation
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Daily at midnight UTC
+  workflow_dispatch:  # Allow manual trigger
 
-### From PyPI (Recommended)
+permissions:
+  contents: write
+
+jobs:
+  update-game:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: czl9707/gh-space-shooter@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          output-path: 'game.gif'
+          strategy: 'random'
+```
+
+Then display it in your README:
+```markdown
+![My GitHub Game](game.gif)
+```
+
+**Action Inputs:**
+- `github-token` (required): GitHub token for fetching contributions
+- `username` (optional): Username to generate game for (defaults to repo owner)
+- `output-path` (optional): Where to save the GIF (default: `gh-space-shooter.gif`)
+- `strategy` (optional): Attack pattern - `column`, `row`, or `random` (default: `random`)
+- `fps` (optional): Frames per second for the animation (default: `40`)
+- `commit-message` (optional): Commit message for the update
+
+### From PyPI
 
 ```bash
 pip install gh-space-shooter
@@ -78,6 +109,11 @@ gh-space-shooter torvalds -o my-game.gif
 gh-space-shooter torvalds --strategy column   # Enemies attack in columns
 gh-space-shooter torvalds --strategy row      # Enemies attack in rows
 gh-space-shooter torvalds -s random           # Random chaos (default)
+
+# Adjust animation frame rate
+gh-space-shooter torvalds --fps 25            # Slower, smaller file size
+gh-space-shooter torvalds --fps 40            # Default frame rate
+gh-space-shooter torvalds --fps 50            # Smoother animation
 ```
 
 This creates an animated GIF showing:
@@ -117,8 +153,7 @@ When saved to JSON, the data includes:
         }
       ]
     }
-  ],
-  "fetched_at": "2024-12-30T12:00:00"
+  ]
 }
 ```
 

gh_space_shooter-0.0.4/action.yml

@@ -0,0 +1,71 @@
+name: 'GitHub Space Shooter'
+description: 'Transform your GitHub contribution graph into an space shooter game GIF'
+author: 'zane'
+
+branding:
+  icon: 'navigation-2'
+  color: 'black'
+
+inputs:
+  github-token:
+    description: 'GitHub token for fetching contribution data (usually secrets.GITHUB_TOKEN)'
+    required: true
+  username:
+    description: 'GitHub username to generate game for (defaults to repository owner)'
+    required: false
+    default: ${{ github.repository_owner }}
+  output-path:
+    description: 'Path where the GIF should be saved'
+    required: false
+    default: 'gh-space-shooter.gif'
+  strategy:
+    description: 'Enemy attack strategy (column, row, or random)'
+    required: false
+    default: 'random'
+  fps:
+    description: 'Frames per second for the animation (default: 40)'
+    required: false
+    default: '40'
+  commit-message:
+    description: 'Commit message for the GIF update'
+    required: false
+    default: 'Update space shooter game GIF'
+
+outputs:
+  gif-path:
+    description: 'Path to the generated GIF file'
+    value: ${{ steps.generate.outputs.gif-path }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+
+    - name: Install gh-space-shooter
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install gh-space-shooter
+
+    - name: Generate game GIF
+      id: generate
+      shell: bash
+      env:
+        GH_TOKEN: ${{ inputs.github-token }}
+      run: |
+        gh-space-shooter ${{ inputs.username }} \
+          --output ${{ inputs.output-path }} \
+          --strategy ${{ inputs.strategy }} \
+          --fps ${{ inputs.fps }}
+
+    - name: Commit and push GIF
+      shell: bash
+      run: |
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
+        git add ${{ inputs.output-path }}
+        git diff --staged --quiet || git commit -m "${{ inputs.commit-message }}"
+        git push

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gh-space-shooter"
-version = "0.0.2"
+version = "0.0.4"
 description = "A CLI tool that visualizes GitHub contribution graphs as gamified GIFs"
 readme = "README.md"
 authors = [
@@ -12,7 +12,12 @@ dependencies = [
     "httpx>=0.27.0",
     "python-dotenv>=1.0.0",
     "rich>=13.0.0",
-    "pillow>=10.0.0",
+    "pillow>=10.1.0",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0.0",
 ]
 
 [project.scripts]
@@ -24,7 +29,7 @@ build-backend = "hatchling.build"
 
 
 [tool.bumpversion]
-current_version = "0.0.2"
+current_version = "0.0.4"
 parse = """(?x)
   (?P<major>0|[1-9]\\d*)\\.
   (?P<minor>0|[1-9]\\d*)\\.
@@ -47,4 +52,8 @@ commit_args = ""
 [[tool.bumpversion.files]]
 filename = "pyproject.toml"
 search = "version = \"{current_version}\""
-replace = "version = \"{new_version}\""
+replace = "version = \"{new_version}\""
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+pythonpath = ["src"]

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/cli.py

@@ -8,8 +8,8 @@ import typer
 from dotenv import load_dotenv
 from rich.console import Console
 
-from gh_space_shooter.game.strategies.base_strategy import BaseStrategy
-
+from .constants import DEFAULT_FPS
+from .game.strategies.base_strategy import BaseStrategy
 from .console_printer import ContributionConsolePrinter
 from .game import Animator, ColumnStrategy, RandomStrategy, RowStrategy
 from .github_client import ContributionData, GitHubAPIError, GitHubClient
@@ -55,6 +55,11 @@ def main(
         "-s",
         help="Strategy for clearing enemies (column, row, random)",
     ),
+    fps: int = typer.Option(
+        DEFAULT_FPS,
+        "--fps",
+        help="Frames per second for the animation",
+    ),
 ) -> None:
     """
     Fetch or load GitHub contribution graph data and display it.
@@ -90,7 +95,7 @@ def main(
             _save_data_to_file(data, raw_output)
 
         # Generate GIF if requested
-        _generate_gif(data, out, strategy)
+        _generate_gif(data, out, strategy, fps)
 
     except CLIError as e:
         err_console.print(f"[bold red]Error:[/bold red] {e}")
@@ -146,8 +151,14 @@ def _save_data_to_file(data: ContributionData, file_path: str) -> None:
         raise CLIError(f"Failed to save file '{file_path}': {e}")
 
 
-def _generate_gif(data: ContributionData, file_path: str, strategy_name: str) -> None:
+def _generate_gif(data: ContributionData, file_path: str, strategy_name: str, fps: int) -> None:
     """Generate animated GIF visualization."""
+    # GIF format limitation: delays below 20ms (>50 FPS) are clamped by most browsers
+    if fps > 50:
+        console.print(
+            f"[yellow]Warning:[/yellow] FPS > 50 may not display correctly in browsers "
+            f"(GIF delay will be {1000 // fps}ms, but browsers clamp delays < 20ms to ~100ms)"
+        )
     console.print("\n[bold blue]Generating GIF animation...[/bold blue]")
 
     if strategy_name == "column":
@@ -163,7 +174,7 @@ def _generate_gif(data: ContributionData, file_path: str, strategy_name: str) ->
 
     # Create animator and generate GIF
     try:
-        animator = Animator(data, strategy)
+        animator = Animator(data, strategy, fps=fps)
         animator.generate_gif(file_path)
         console.print(f"[green]✓[/green] GIF saved to {file_path}")
     except Exception as e:

gh_space_shooter-0.0.4/src/gh_space_shooter/constants.py

@@ -0,0 +1,30 @@
+"""Global constants for the application."""
+
+# Animation settings
+DEFAULT_FPS = 40  # Default frames per second for animation
+
+# GitHub contribution graph dimensions
+NUM_WEEKS = 52  # Number of weeks in contribution graph
+NUM_DAYS = 7  # Number of days in a week (Sun-Sat)
+SHIP_POSITION_Y = NUM_DAYS + 3  # Ship is positioned just below the grid
+
+# Speeds in cells per second (frame-rate independent)
+SHIP_SPEED = 12.5  # Cells per second the ship moves
+BULLET_SPEED = 7.5  # Cells per second the bullet moves
+BULLET_TRAILING_LENGTH = 3  # Number of trailing segments for bullets
+BULLET_TRAIL_SPACING = 0.15  # Spacing between trail segments in cells
+
+# Durations in seconds (frame-rate independent)
+SHIP_SHOOT_COOLDOWN = 0.2  # Seconds between ship shots
+
+# Explosion settings
+EXPLOSION_PARTICLE_COUNT_LARGE = 8  # Number of particles in a large explosion
+EXPLOSION_PARTICLE_COUNT_SMALL = 4  # Number of particles in a small explosion
+EXPLOSION_MAX_RADIUS_LARGE = 20  # Max radius for large explosions
+EXPLOSION_MAX_RADIUS_SMALL = 10  # Max radius for small explosions
+EXPLOSION_DURATION_LARGE = 0.4  # Seconds for large explosion animation
+EXPLOSION_DURATION_SMALL = 0.12  # Seconds for small explosion animation
+
+# Starfield settings (speeds in cells per second)
+STAR_SPEED_MIN = 1.0  # Minimum star speed (dimmer/farther stars)
+STAR_SPEED_MAX = 2.5  # Maximum star speed (brighter/closer stars)

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/animator.py

@@ -5,7 +5,6 @@ from typing import Iterator
 from PIL import Image
 
 
-from ..constants import FRAME_DURATION_MS
 from ..github_client import ContributionData
 from .game_state import GameState
 from .renderer import Renderer
@@ -20,7 +19,7 @@ class Animator:
         self,
         contribution_data: ContributionData,
         strategy: BaseStrategy,
-        frame_duration: int = FRAME_DURATION_MS,
+        fps: int,
     ):
         """
         Initialize animator.
@@ -28,11 +27,15 @@ class Animator:
         Args:
             contribution_data: The GitHub contribution data
             strategy: The strategy to use for clearing enemies
-            frame_duration: Duration of each frame in milliseconds
+            fps: Frames per second for the animation
         """
         self.contribution_data = contribution_data
         self.strategy = strategy
-        self.frame_duration = frame_duration
+        self.fps = fps
+        self.frame_duration = 1000 // fps
+        # Delta time in seconds per frame
+        # Used to scale all speeds (cells/second) to per-frame movement
+        self.delta_time = 1.0 / fps
 
     def generate_gif(self, output_path: str) -> None:
         """
@@ -79,18 +82,18 @@ class Animator:
         for action in self.strategy.generate_actions(game_state):
             game_state.ship.move_to(action.x)
             while game_state.can_take_action() is False:
-                game_state.animate()
+                game_state.animate(self.delta_time)
                 yield renderer.render_frame()
 
             if action.shoot:
                 game_state.shoot()
-                game_state.animate()
+                game_state.animate(self.delta_time)
                 yield renderer.render_frame()
 
         force_kill_countdown = 100
         # Add final frames showing completion
         while not game_state.is_complete():
-            game_state.animate()
+            game_state.animate(self.delta_time)
             yield renderer.render_frame()
             
             force_kill_countdown -= 1

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/drawables/bullet.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 from PIL import ImageDraw
 
-from ...constants import BULLET_SPEED, SHIP_POSITION_Y
+from ...constants import BULLET_SPEED, BULLET_TRAILING_LENGTH, BULLET_TRAIL_SPACING, SHIP_POSITION_Y
 from .drawable import Drawable
 from .explosion import Explosion
 
@@ -37,9 +37,13 @@ class Bullet(Drawable):
                 return enemy
         return None
 
-    def animate(self) -> None:
-        """Update bullet position, check for collisions, and remove on hit."""
-        self.y -= BULLET_SPEED
+    def animate(self, delta_time: float) -> None:
+        """Update bullet position, check for collisions, and remove on hit.
+
+        Args:
+            delta_time: Time elapsed since last frame in seconds.
+        """
+        self.y -= BULLET_SPEED * delta_time
         hit_enemy = self._check_collision()
         if hit_enemy:
             explosion = Explosion(self.x, self.y, "small", self.game_state)
@@ -52,10 +56,9 @@ class Bullet(Drawable):
     def draw(self, draw: ImageDraw.ImageDraw, context: "RenderContext") -> None:
         """Draw the bullet with trailing tail effect."""
 
-        trail_num = 3
-        for i in range(trail_num):
-            trail_y = self.y + (i + 1) * BULLET_SPEED
-            fade_factor = (i + 1) / trail_num / 2
+        for i in range(BULLET_TRAILING_LENGTH):
+            trail_y = self.y + (i + 1) * BULLET_TRAIL_SPACING
+            fade_factor = (i + 1) / BULLET_TRAILING_LENGTH / 2
             self._draw_bullet(draw, context, (self.x, trail_y), fade_factor=fade_factor)
 
         self._draw_bullet(draw, context, (self.x, self.y), fade_factor=0.3, offset=.6)

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/drawables/drawable.py

@@ -13,8 +13,12 @@ class Drawable(ABC):
     """Interface for objects that can be animated and drawn."""
 
     @abstractmethod
-    def animate(self) -> None:
-        """Update the object's state for the next animation frame."""
+    def animate(self, delta_time: float) -> None:
+        """Update the object's state for the next animation frame.
+
+        Args:
+            delta_time: Time elapsed since last frame in seconds.
+        """
         pass
 
     @abstractmethod

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/drawables/enemy.py

@@ -42,7 +42,7 @@ class Enemy(Drawable):
             self.game_state.explosions.append(explosion)
             self.game_state.enemies.remove(self)
 
-    def animate(self) -> None:
+    def animate(self, delta_time: float) -> None:
         """Update enemy state for next frame (enemies don't animate currently)."""
         pass
 

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/drawables/explosion.py

@@ -6,6 +6,14 @@ from typing import TYPE_CHECKING, Literal
 
 from PIL import ImageDraw
 
+from ...constants import (
+    EXPLOSION_DURATION_LARGE,
+    EXPLOSION_DURATION_SMALL,
+    EXPLOSION_MAX_RADIUS_LARGE,
+    EXPLOSION_MAX_RADIUS_SMALL,
+    EXPLOSION_PARTICLE_COUNT_LARGE,
+    EXPLOSION_PARTICLE_COUNT_SMALL,
+)
 from .drawable import Drawable
 
 if TYPE_CHECKING:
@@ -29,36 +37,36 @@ class Explosion(Drawable):
         self.x = x
         self.y = y
         self.game_state = game_state
-        self.frame = 0
-        self.max_frames = 6 if size == "small" else 20
-        self.max_radius = 10 if size == "small" else 20
-        self.particle_count = 4 if size == "small" else 8
-        # Generate random angles for each particle
+        self.elapsed_time = 0.0  # Seconds elapsed since explosion started
+        self.duration = EXPLOSION_DURATION_SMALL if size == "small" else EXPLOSION_DURATION_LARGE
+        self.max_radius = EXPLOSION_MAX_RADIUS_SMALL if size == "small" else EXPLOSION_MAX_RADIUS_LARGE
+        self.particle_count = EXPLOSION_PARTICLE_COUNT_SMALL if size == "small" else EXPLOSION_PARTICLE_COUNT_LARGE
         self.particle_angles = [random.uniform(0, 2 * math.pi) for _ in range(self.particle_count)]
 
-    def animate(self) -> None:
-        """Progress the explosion animation and remove when complete."""
-        self.frame += 1
-        if self.frame >= self.max_frames:
+    def animate(self, delta_time: float) -> None:
+        """Progress the explosion animation and remove when complete.
+
+        Args:
+            delta_time: Time elapsed since last frame in seconds.
+        """
+        self.elapsed_time += delta_time
+        if self.elapsed_time >= self.duration:
             self.game_state.explosions.remove(self)
 
     def draw(self, draw: ImageDraw.ImageDraw, context: "RenderContext") -> None:
         """Draw expanding particle explosion with fade effect."""
-        # Calculate animation progress (0 to 1)
-        progress = self.frame / self.max_frames
+
+        progress = self.elapsed_time / self.duration
         fade = 1 - progress  # Fade out as animation progresses
 
-        # Get center position
         center_x, center_y = context.get_cell_position(self.x, self.y)
         center_x += context.cell_size // 2
         center_y += context.cell_size // 2
 
-        # Draw expanding particles in random directions
         for i in range(self.particle_count):
             distance = progress * self.max_radius
             angle = self.particle_angles[i]
 
-            # Particle position using random angle
             px = int(center_x + distance * math.cos(angle))
             py = int(center_y + distance * math.sin(angle))
 

{gh_space_shooter-0.0.2 → gh_space_shooter-0.0.4}/src/gh_space_shooter/game/drawables/ship.py

@@ -19,7 +19,7 @@ class Ship(Drawable):
         """Initialize the ship at starting position."""
         self.x: float = 25  # Start middle of screen
         self.target_x = self.x
-        self.shoot_cooldown = 0  # Frames until ship can shoot again
+        self.shoot_cooldown = 0.0  # Seconds until ship can shoot again
         self.game_state = game_state
 
     def move_to(self, x: int):
@@ -37,18 +37,23 @@ class Ship(Drawable):
 
     def can_shoot(self) -> bool:
         """Check if ship can shoot (cooldown has finished)."""
-        return self.shoot_cooldown == 0
+        return self.shoot_cooldown <= 0
 
-    def animate(self) -> None:
-        """Update ship position, moving toward target at constant speed."""
+    def animate(self, delta_time: float) -> None:
+        """Update ship position, moving toward target at constant speed.
+
+        Args:
+            delta_time: Time elapsed since last frame in seconds.
+        """
+        delta_x = SHIP_SPEED * delta_time
         if self.x < self.target_x:
-            self.x = min(self.x + SHIP_SPEED, self.target_x)
+            self.x = min(self.x + delta_x, self.target_x)
         elif self.x > self.target_x:
-            self.x = max(self.x - SHIP_SPEED, self.target_x)
+            self.x = max(self.x - delta_x, self.target_x)
 
-        # Decrement shoot cooldown
+        # Decrement shoot cooldown (scaled by delta_time)
         if self.shoot_cooldown > 0:
-            self.shoot_cooldown -= 1
+            self.shoot_cooldown -= delta_time
 
     def draw(self, draw: ImageDraw.ImageDraw, context: "RenderContext") -> None:
         """Draw a simple Galaga-style ship."""