Skip to content

Merge flood & tsunami scenarios into main#2

Open
lolismek wants to merge 3 commits intomainfrom
flood-merge
Open

Merge flood & tsunami scenarios into main#2
lolismek wants to merge 3 commits intomainfrom
flood-merge

Conversation

@lolismek
Copy link
Copy Markdown
Collaborator

@lolismek lolismek commented Feb 8, 2026

Summary

  • Integrates the flood branch's flood and tsunami disaster scenarios into main's agent-based scenario architecture
  • Resolves merge conflicts in index.html, index.ts, and src/main.ts by adapting flood/tsunami to main's existing patterns
  • Flood and tsunami now appear as selectable scenario cards alongside fire, tornado, and earthquake
  • Adds a dynamic disaster control panel with real-time parameter sliders for both new scenarios
  • Preserves main's VLM agent system, replay recording, and port-fallback server logic

Conflict resolution approach

  • index.html: Kept main's full UI (scenario panel, fire config, agent HUD, tornado/earthquake panels). Added a generic disaster-control panel for flood/tsunami.
  • index.ts: Kept main's VLM/WebSocket agent system. Integrated flood's port-fallback logic so the server tries multiple ports.
  • src/main.ts: Kept main's scenario registry + agent system. Added flood/tsunami as available scenarios using the DisasterController interface from disasters/factory.ts.

New files (from flood branch)

  • disasters/types.tsDisasterController interface, DisasterControl union type
  • disasters/factory.ts — Factory pattern for creating flood/tsunami instances
  • disasters/flood/ — 8 files: shallow water solver, water surface rendering, environment effects
  • disasters/tsunami/ — 10 files: wave field, destruction system, splash/debris physics, sediment overlay

Test plan

  • bun build ./src/main.ts compiles without errors
  • bun build ./index.ts compiles without errors
  • Load a location, verify all 5 scenario cards appear (fire, tornado, earthquake, flood, tsunami)
  • Launch flood scenario — verify water surface renders and controls panel works
  • Launch tsunami scenario — verify wave propagation and destruction system
  • Verify existing scenarios (fire, tornado, earthquake) still function correctly

🤖 Generated with Claude Code

Anirudh Sridharan and others added 3 commits February 8, 2026 00:41
…t system

Resolves conflicts by adapting flood/tsunami disasters to main's scenario
selection architecture. Flood and tsunami now appear as available scenario
cards alongside fire, tornado, and earthquake, with a dynamic control panel
for real-time parameter tuning. Also integrates main's port-fallback logic.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant