doom 0.8.0 → 0.11.0

data/lib/doom/game/menu.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'framebuffer_blitter'
+
 module Doom
   module Game
     # DOOM main menu system with title screen, new game, and difficulty selection.
     class Menu
-      SKULL_ANIM_TICS = 8  # Skull cursor blink rate
+      include FramebufferBlitter
+
+      SKULL_ANIM_TICS = 8 # Skull cursor blink rate
 
       # Difficulty levels matching DOOM's skill levels
       SKILL_BABY = 0      # I'm too young to die
@@ -18,24 +22,37 @@ module Doom
       STATE_MAIN = :main
       STATE_SKILL = :skill
       STATE_OPTIONS = :options
-      STATE_NONE = :none   # In-game, no menu
+      STATE_NONE = :none # In-game, no menu
 
       # Main menu items
       MAIN_ITEMS = %i[new_game options quit].freeze
 
+      # Menu entries that change the simulation on this machine alone. In a
+      # netgame every peer must run the same world from the same commands, so
+      # a local cheat or a local new game is a genuine desync, not a nuisance.
+      # They are hidden rather than ignored: an option that silently does
+      # nothing is worse than one that is not offered.
+      NETGAME_UNSAFE_OPTIONS = %i[god_mode infinite_ammo all_weapons].freeze
+      NETGAME_UNSAFE_MAIN = %i[new_game].freeze
+
       # Options menu items
-      OPTIONS_ITEMS = %i[god_mode infinite_ammo all_weapons fullscreen rubykaigi_mode].freeze
+      OPTIONS_ITEMS = %i[god_mode infinite_ammo all_weapons uncapped_fps fullscreen fog flashlight rt_bounces
+                         rubykaigi_mode].freeze
       OPTIONS_LABELS = {
-        god_mode: "GOD MODE",
-        infinite_ammo: "INFINITE AMMO",
-        all_weapons: "ALL WEAPONS",
-        fullscreen: "FULLSCREEN",
-        rubykaigi_mode: "RUBYKAIGI MODE",
+        god_mode: 'GOD MODE',
+        infinite_ammo: 'INFINITE AMMO',
+        all_weapons: 'ALL WEAPONS',
+        uncapped_fps: 'UNCAPPED FPS',
+        fullscreen: 'FULLSCREEN',
+        fog: 'RAY FOG',
+        flashlight: 'FLASHLIGHT',
+        rt_bounces: 'RT BOUNCES',
+        rubykaigi_mode: 'RUBYKAIGI MODE'
       }.freeze
 
       OPTIONS_X = 48
       OPTIONS_Y = 50
-      OPTIONS_SPACING = 18
+      OPTIONS_SPACING = 16
 
       # Skill menu items
       SKILL_ITEMS = [SKILL_BABY, SKILL_EASY, SKILL_MEDIUM, SKILL_HARD, SKILL_NIGHTMARE].freeze
@@ -50,25 +67,30 @@ module Doom
       SKILL_SPACING = 16
 
       attr_reader :state, :selected_skill, :options, :font
+      attr_accessor :netgame
 
-      def initialize(wad, hud_graphics, font = nil)
-        @wad = wad
+      def initialize(_wad, hud_graphics, font = nil)
         @gfx = hud_graphics
         @font = font
         @state = STATE_TITLE
         @cursor = 0
         @skull_frame = 0
         @skull_tic = 0
-        @selected_skill = SKILL_MEDIUM  # Default difficulty
+        @selected_skill = SKILL_MEDIUM # Default difficulty
         @game_started = false
+        @netgame = false
 
         # Options toggles
         @options = {
           god_mode: false,
           infinite_ammo: false,
           all_weapons: false,
+          uncapped_fps: true,
           fullscreen: false,
-          rubykaigi_mode: false,
+          fog: true,
+          flashlight: true,
+          rt_bounces: true,
+          rubykaigi_mode: false
         }
 
         load_graphics
@@ -84,13 +106,15 @@ module Doom
 
       def update
         @skull_tic += 1
-        if @skull_tic >= SKULL_ANIM_TICS
-          @skull_tic = 0
-          @skull_frame = 1 - @skull_frame
-        end
+        return unless @skull_tic >= SKULL_ANIM_TICS
+
+        @skull_tic = 0
+        @skull_frame = 1 - @skull_frame
       end
 
-      def render(framebuffer, palette_colors)
+      # NOTE: palette_colors is unused here (callers in gosu_window.rb pass nil).
+      # Kept only to preserve the call signature; drop it once the callers do.
+      def render(framebuffer, _palette_colors)
         case @state
         when STATE_TITLE
           render_title(framebuffer)
@@ -104,6 +128,14 @@ module Doom
       end
 
       # Returns :start_game, :resume, :quit, or option action symbols
+      def main_items
+        @netgame ? MAIN_ITEMS - NETGAME_UNSAFE_MAIN : MAIN_ITEMS
+      end
+
+      def options_items
+        @netgame ? OPTIONS_ITEMS - NETGAME_UNSAFE_OPTIONS : OPTIONS_ITEMS
+      end
+
       def handle_key(key)
         case @state
         when STATE_TITLE
@@ -148,29 +180,26 @@ module Doom
         @m_skill = load_patch('M_SKILL')
         @m_jkill = load_patch('M_JKILL')
         @m_hurt = load_patch('M_HURT')
-        @m_rough = load_patch('M_ROUGH')  # Not used, but loaded
+        @m_rough = load_patch('M_ROUGH')
         @m_ultra = load_patch('M_ULTRA')
         @m_nmare = load_patch('M_NMARE')
 
-        # Episode (shareware only has 1)
-        @m_episod = load_patch('M_EPISOD')
-        @m_epi1 = load_patch('M_EPI1')
-
         # Skull cursor
         @skulls = [load_patch('M_SKULL1'), load_patch('M_SKULL2')]
       end
 
       def load_patch(name)
-        @gfx.send(:load_graphic, name)
+        @gfx.load_graphic(name)
       end
 
       def render_title(framebuffer)
         if @options[:rubykaigi_mode] && @kaigi_title
           # Draw kaigi title (raw palette indices, 320x200, offset 20px down)
+          w = Render::SCREEN_WIDTH
           @kaigi_title.each_with_index do |color, i|
-            x = i % 320
-            y = (i / 320) + 20
-            framebuffer[y * 320 + x] = color if y < 240
+            x = i % w
+            y = (i / w) + 20
+            framebuffer[(y * w) + x] = color if y < Render::SCREEN_HEIGHT
           end
         elsif @title
           draw_fullscreen(framebuffer, @title)
@@ -185,16 +214,17 @@ module Doom
         items = [@m_newg, @m_option, @m_quitg]
         items.each_with_index do |item, i|
           next unless item
-          draw_sprite(framebuffer, item, MAIN_X, MAIN_Y + i * MAIN_SPACING)
+
+          draw_sprite(framebuffer, item, MAIN_X, MAIN_Y + (i * MAIN_SPACING))
         end
 
         # Draw skull cursor
         skull = @skulls[@skull_frame]
-        if skull
-          skull_x = MAIN_X - 32
-          skull_y = MAIN_Y + @cursor * MAIN_SPACING - 5
-          draw_sprite(framebuffer, skull, skull_x, skull_y)
-        end
+        return unless skull
+
+        skull_x = MAIN_X - 32
+        skull_y = MAIN_Y + (@cursor * MAIN_SPACING) - 5
+        draw_sprite(framebuffer, skull, skull_x, skull_y)
       end
 
       def render_skill_menu(framebuffer)
@@ -205,29 +235,30 @@ module Doom
         skill_items = [@m_jkill, @m_hurt, @m_rough, @m_ultra, @m_nmare]
         skill_items.each_with_index do |item, i|
           next unless item
-          draw_sprite(framebuffer, item, SKILL_X, SKILL_Y + i * SKILL_SPACING)
+
+          draw_sprite(framebuffer, item, SKILL_X, SKILL_Y + (i * SKILL_SPACING))
         end
 
         # Draw skull cursor
         skull = @skulls[@skull_frame]
-        if skull
-          skull_x = SKILL_X - 32
-          skull_y = SKILL_Y + @cursor * SKILL_SPACING - 5
-          draw_sprite(framebuffer, skull, skull_x, skull_y)
-        end
+        return unless skull
+
+        skull_x = SKILL_X - 32
+        skull_y = SKILL_Y + (@cursor * SKILL_SPACING) - 5
+        draw_sprite(framebuffer, skull, skull_x, skull_y)
       end
 
       def handle_main_key(key)
         case key
         when :up
-          @cursor = (@cursor - 1) % MAIN_ITEMS.size
+          @cursor = (@cursor - 1) % main_items.size
         when :down
-          @cursor = (@cursor + 1) % MAIN_ITEMS.size
+          @cursor = (@cursor + 1) % main_items.size
         when :enter
-          case MAIN_ITEMS[@cursor]
+          case main_items[@cursor]
           when :new_game
             @state = STATE_SKILL
-            @cursor = SKILL_MEDIUM  # Default to "Hurt me plenty"
+            @cursor = SKILL_MEDIUM # Default to "Hurt me plenty"
           when :options
             @state = STATE_OPTIONS
             @cursor = 0
@@ -266,76 +297,50 @@ module Doom
 
       def render_options_menu(framebuffer)
         # Draw title using font
-        @font&.draw_centered(framebuffer, "OPTIONS", 20)
+        @font&.draw_centered(framebuffer, 'OPTIONS', 20)
 
         # Draw each option with ON/OFF status
-        OPTIONS_ITEMS.each_with_index do |item, i|
-          y = OPTIONS_Y + i * OPTIONS_SPACING
+        options_items.each_with_index do |item, i|
+          y = OPTIONS_Y + (i * OPTIONS_SPACING)
           label = OPTIONS_LABELS[item]
-          value = @options[item] ? "ON" : "OFF"
+          value = @options[item] ? 'ON' : 'OFF'
           @font&.draw_text(framebuffer, label, OPTIONS_X, y)
           @font&.draw_text(framebuffer, value, 260, y)
         end
 
         # Draw skull cursor
         skull = @skulls[@skull_frame]
-        if skull
-          skull_x = OPTIONS_X - 32
-          skull_y = OPTIONS_Y + @cursor * OPTIONS_SPACING - 5
-          draw_sprite(framebuffer, skull, skull_x, skull_y)
-        end
+        return unless skull
+
+        skull_x = OPTIONS_X - 32
+        skull_y = OPTIONS_Y + (@cursor * OPTIONS_SPACING) - 5
+        draw_sprite(framebuffer, skull, skull_x, skull_y)
       end
 
       def handle_options_key(key)
         case key
         when :up
-          @cursor = (@cursor - 1) % OPTIONS_ITEMS.size
+          @cursor = (@cursor - 1) % options_items.size
         when :down
-          @cursor = (@cursor + 1) % OPTIONS_ITEMS.size
+          @cursor = (@cursor + 1) % options_items.size
         when :enter
-          item = OPTIONS_ITEMS[@cursor]
+          item = options_items[@cursor]
           @options[item] = !@options[item]
           return { action: :toggle_option, option: item, value: @options[item] }
         when :escape
           @state = STATE_MAIN
-          @cursor = 1  # Options is the second main menu item
+          @cursor = 1 # Options is the second main menu item
         end
         nil
       end
 
       def draw_fullscreen(framebuffer, sprite)
-        return unless sprite
-        # TITLEPIC is 320x200, our screen is 320x240
-        # Draw it centered vertically (offset by 20 pixels)
-        y_offset = 20
-        sprite.width.times do |x|
-          col = sprite.column_pixels(x)
-          next unless col
-          col.each_with_index do |color, y|
-            next unless color
-            screen_y = y + y_offset
-            next if screen_y < 0 || screen_y >= 240
-            framebuffer[screen_y * 320 + x] = color
-          end
-        end
+        # TITLEPIC is 320x200, our screen is 320x240: center it vertically.
+        blit_sprite(framebuffer, sprite, 0, 20)
       end
 
       def draw_sprite(framebuffer, sprite, x, y)
-        return unless sprite
-        sprite.width.times do |col_x|
-          screen_x = x + col_x
-          next if screen_x < 0 || screen_x >= 320
-
-          col = sprite.column_pixels(col_x)
-          next unless col
-
-          col.each_with_index do |color, col_y|
-            next unless color
-            screen_y = y + col_y
-            next if screen_y < 0 || screen_y >= 240
-            framebuffer[screen_y * 320 + screen_x] = color
-          end
-        end
+        blit_sprite(framebuffer, sprite, x, y)
       end
     end
   end