doom 0.5.0 → 0.8.0

data/lib/doom/render/weapon_renderer.rb

@@ -7,13 +7,12 @@ module Doom
       # Weapon is rendered above the status bar
       WEAPON_AREA_HEIGHT = SCREEN_HEIGHT - StatusBar::STATUS_BAR_HEIGHT
 
-      # DOOM positions weapon sprites using their built-in offsets:
-      #   x = SCREENWIDTH/2 - sprite.left_offset
-      #   y = WEAPONTOP + SCREENHEIGHT - 200 - sprite.top_offset
-      # WEAPONTOP = 32 in fixed-point = 32 pixels above the default position
-      # We scale for our 240px screen vs DOOM's 200px.
+      # Chocolate Doom R_DrawPSprite weapon positioning:
+      # centery = viewheight/2 (view area excluding status bar)
+      # texturemid = centery - (WEAPONTOP - spritetopoffset)
+      # dc_yl = centery - texturemid (first visible row)
       WEAPONTOP = 32
-      SCREEN_Y_OFFSET = SCREEN_HEIGHT - 200  # 40px offset for 240px screen
+      VIEW_CENTERY = (SCREEN_HEIGHT - StatusBar::STATUS_BAR_HEIGHT) / 2  # 104
 
       def initialize(hud_graphics, player_state)
         @gfx = hud_graphics
@@ -26,7 +25,7 @@ module Doom
         return unless weapon_data
 
         # Get the appropriate frame
-        sprite = if @player.attacking && weapon_data[:fire]
+        sprite = if @player.attacking && weapon_data[:fire]&.any?
                    frame = @player.attack_frame.clamp(0, weapon_data[:fire].length - 1)
                    weapon_data[:fire][frame]
                  else
@@ -39,11 +38,11 @@ module Doom
         bob_x = @player.attacking ? 0 : @player.weapon_bob_x.to_i
         bob_y = @player.attacking ? 0 : @player.weapon_bob_y.to_i
 
-        # DOOM's R_DrawPSprite: x1 = centerx + (psp->sx - centerx - spriteoffset)
-        # With psp->sx = 1 (default): x = 1 - left_offset
-        # Uses sprite's built-in offsets for both weapon and flash alignment
+        # Chocolate Doom on 200px: dc_yl = WEAPONTOP - topoffset
+        # Our view area is 208px (240-32 status bar) vs DOOM's 168px (200-32)
+        # Offset by half the extra height to keep weapon centered in view
         x = 1 - sprite.left_offset + bob_x
-        y = 1 - sprite.top_offset + SCREEN_Y_OFFSET + bob_y
+        y = WEAPONTOP - sprite.top_offset + 20 + bob_y
 
         draw_weapon_sprite(framebuffer, sprite, x, y)
 
@@ -90,7 +89,7 @@ module Doom
         # Flash uses same positioning as weapon sprite (built-in offsets)
         # Same positioning formula as weapon sprite
         flash_x = 1 - flash_sprite.left_offset
-        flash_y = 1 - flash_sprite.top_offset + SCREEN_Y_OFFSET
+        flash_y = WEAPONTOP - flash_sprite.top_offset + 20
 
         draw_weapon_sprite(framebuffer, flash_sprite, flash_x, flash_y)
       end

data/lib/doom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doom
-  VERSION = '0.5.0'
+  VERSION = '0.8.0'
 end

data/lib/doom/wad/reader.rb

@@ -45,8 +45,60 @@ module Doom
         @directory[start_idx + 1...end_idx]
       end
 
+      def pwad?
+        @type == PWAD
+      end
+
+      def iwad?
+        @type == IWAD
+      end
+
+      # Merge a PWAD on top of this IWAD.
+      # PWAD lumps override IWAD lumps with the same name.
+      # Map lumps (between map markers) are replaced as a group.
+      def merge_pwad(pwad)
+        raise Error, "Can only merge a PWAD" unless pwad.pwad?
+        @lump_cache.clear
+
+        pwad.directory.each do |pwad_entry|
+          # Check if this lump already exists in the IWAD
+          existing_idx = @directory.index { |e| e.name == pwad_entry.name }
+          if existing_idx
+            # Replace it -- but we need to read from the PWAD file
+            @directory[existing_idx] = pwad_entry
+          else
+            # Append new lump
+            @directory << pwad_entry
+          end
+        end
+
+        # Keep the PWAD file open for reading its lumps
+        @pwad_files ||= []
+        @pwad_files << pwad
+        @num_lumps = @directory.size
+      end
+
+      # Override read_lump_at to check if entry belongs to a PWAD file
+      def read_lump_at(entry)
+        # Try PWAD files first (they may own this entry)
+        (@pwad_files || []).each do |pwad|
+          if pwad.directory.include?(entry)
+            return pwad.read_lump_own(entry)
+          end
+        end
+        @file.seek(entry.offset)
+        @file.read(entry.size)
+      end
+
+      # Read a lump that belongs to this WAD's own file
+      def read_lump_own(entry)
+        @file.seek(entry.offset)
+        @file.read(entry.size)
+      end
+
       def close
         @file.close
+        (@pwad_files || []).each(&:close)
       end
 
       private

data/lib/doom/wad/sound.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+
+module Doom
+  module Wad
+    # Loads DOOM sound effects from WAD and converts to WAV for Gosu playback.
+    # DOOM sound format: 8-byte header (2 format, 2 sample_rate, 4 num_samples)
+    # followed by unsigned 8-bit PCM samples.
+    class SoundManager
+      def initialize(wad)
+        @wad = wad
+        @cache = {}  # name => Gosu::Sample
+        @temp_dir = File.join(Dir.tmpdir, "doom_rb_sounds_#{Process.pid}")
+        Dir.mkdir(@temp_dir) unless Dir.exist?(@temp_dir)
+      end
+
+      # Get or load a sound effect. Returns a Gosu::Sample or nil.
+      def [](name)
+        return @cache[name] if @cache.key?(name)
+
+        lump_name = name.start_with?('DS') ? name : "DS#{name}"
+        entry = @wad.find_lump(lump_name)
+        return @cache[name] = nil unless entry
+
+        data = @wad.read_lump_at(entry)
+        return @cache[name] = nil if data.size < 8
+
+        # Parse DOOM sound header
+        _format = data[0, 2].unpack1('v')
+        sample_rate = data[2, 2].unpack1('v')
+        num_samples = data[4, 4].unpack1('V')
+
+        # PCM data starts at offset 8, skip 16 padding bytes at start and end
+        pcm_start = 8 + 16
+        pcm_end = 8 + num_samples - 16
+        pcm_data = data[pcm_start...pcm_end]
+        return @cache[name] = nil unless pcm_data && pcm_data.size > 0
+
+        # Convert to WAV file for Gosu
+        wav_path = File.join(@temp_dir, "#{lump_name}.wav")
+        write_wav(wav_path, pcm_data, sample_rate) unless File.exist?(wav_path)
+
+        @cache[name] = Gosu::Sample.new(wav_path)
+      rescue => e
+        @cache[name] = nil
+      end
+
+      def cleanup
+        FileUtils.rm_rf(@temp_dir) if @temp_dir && Dir.exist?(@temp_dir)
+      end
+
+      private
+
+      # Write unsigned 8-bit PCM data as a WAV file
+      def write_wav(path, pcm_data, sample_rate)
+        num_samples = pcm_data.size
+        data_size = num_samples
+        file_size = 36 + data_size
+
+        File.open(path, 'wb') do |f|
+          # RIFF header
+          f.write("RIFF")
+          f.write([file_size].pack('V'))
+          f.write("WAVE")
+
+          # fmt chunk
+          f.write("fmt ")
+          f.write([16].pack('V'))          # chunk size
+          f.write([1].pack('v'))           # PCM format
+          f.write([1].pack('v'))           # mono
+          f.write([sample_rate].pack('V')) # sample rate
+          f.write([sample_rate].pack('V')) # byte rate (sample_rate * 1 * 1)
+          f.write([1].pack('v'))           # block align
+          f.write([8].pack('v'))           # bits per sample
+
+          # data chunk
+          f.write("data")
+          f.write([data_size].pack('V'))
+          f.write(pcm_data)
+        end
+      end
+    end
+  end
+end

data/lib/doom/wad/sprite.rb

@@ -120,6 +120,12 @@ module Doom
         48 => 'ELEC',   # Tall tech column
         35 => 'CBRA',   # Candelabra
 
+        # Dead bodies / gore decorations
+        10 => 'PLAY',   # Bloody mess
+        12 => 'PLAY',   # Bloody mess 2
+        15 => 'PLAY',   # Dead player
+        24 => 'POL5',   # Pool of blood and flesh
+
         # Barrels
         2035 => 'BAR1', # Exploding barrel
 
@@ -136,6 +142,17 @@ module Doom
         16 => 'CYBR',   # Cyberdemon
       }.freeze
 
+      # Things that use a specific frame instead of 'A'
+      # From DOOM info.h mobjinfo spawnstate:
+      # MT_MISC10 (type 10) -> S_PLAY_XDIE9 = PLAY W (gibbed mess)
+      # MT_MISC12 (type 12) -> S_PLAY_DIE7 = PLAY N (dead body)
+      # MT_MISC15 (type 15) -> S_PLAY_DIE7 = PLAY N (dead body)
+      THING_DEFAULT_FRAME = {
+        10 => 'W',   # Bloody mess (gibbed)
+        12 => 'N',   # Bloody mess 2 (dead body flat)
+        15 => 'N',   # Dead player (dead body flat)
+      }.freeze
+
       def initialize(wad)
         @wad = wad
         @cache = {}
@@ -154,8 +171,9 @@ module Doom
         prefix = THING_SPRITES[thing_type]
         return nil unless prefix
 
-        sprite = load_sprite_frame(prefix, 'A', 0) ||
-                 load_sprite_frame(prefix, 'A', 1)
+        frame = THING_DEFAULT_FRAME[thing_type] || 'A'
+        sprite = load_sprite_frame(prefix, frame, 0) ||
+                 load_sprite_frame(prefix, frame, 1)
 
         @cache[thing_type] = sprite
         sprite
@@ -173,18 +191,21 @@ module Doom
         prefix = THING_SPRITES[thing_type]
         return nil unless prefix
 
+        frame = THING_DEFAULT_FRAME[thing_type] || 'A'
+
         # Check for rotation 0 (all angles) sprite first
-        sprite = load_sprite_frame(prefix, 'A', 0)
+        sprite = load_sprite_frame(prefix, frame, 0)
         return sprite if sprite
 
         # Calculate rotation frame (1-8)
-        # Doom rotations: 1=front, 2=front-right, 3=right, etc. (clockwise)
-        angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0)
+        # DOOM: rot = (R_PointToAngle(thing) - thing->angle + ANG45/2*9) >> 29
+        # Rotation 1=front (viewer faces monster's front), 5=back
+        angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0) + Math::PI
         angle_diff = angle_diff % (2 * Math::PI)
         angle_diff += 2 * Math::PI if angle_diff < 0
         rotation = ((angle_diff + Math::PI / 8) / (Math::PI / 4)).to_i % 8 + 1
 
-        load_sprite_frame(prefix, 'A', rotation) || @cache[thing_type]
+        load_sprite_frame(prefix, frame, rotation) || @cache[thing_type]
       end
 
       # Get a specific frame (for death animations, etc.)
@@ -196,8 +217,8 @@ module Doom
         sprite = load_sprite_frame(prefix, frame_letter, 0)
         return sprite if sprite
 
-        # Try with calculated rotation
-        angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0)
+        # Try with calculated rotation (same formula as get_rotated)
+        angle_diff = viewer_angle - (thing_angle * Math::PI / 180.0) + Math::PI
         angle_diff = angle_diff % (2 * Math::PI)
         angle_diff += 2 * Math::PI if angle_diff < 0
         rotation = ((angle_diff + Math::PI / 8) / (Math::PI / 4)).to_i % 8 + 1
@@ -205,6 +226,11 @@ module Doom
         load_sprite_frame(prefix, frame_letter, rotation)
       end
 
+      # Get a frame by explicit prefix (for barrel explosions where prefix differs from thing type)
+      def get_frame_by_prefix(prefix, frame_letter)
+        load_sprite_frame(prefix, frame_letter, 0)
+      end
+
       private
 
       def build_sprite_index

data/lib/doom/wad/texture.rb

@@ -148,7 +148,7 @@ module Doom
       def precompute_columns
         @width.times do |x|
           posts = @columns[x]
-          pixels = Array.new(@height, 0)
+          pixels = Array.new(@height)  # nil = transparent
           posts.each do |post|
             td = post.top_delta
             post.pixels.each_with_index do |color, i|

data/lib/doom/wad_downloader.rb

@@ -66,7 +66,16 @@ module Doom
       uri = URI.parse(SHAREWARE_URL)
       downloaded = 0
 
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      ssl_opts = { use_ssl: uri.scheme == 'https' }
+      # Workaround for SSL certificate issues on some systems
+      begin
+        Net::HTTP.start(uri.host, uri.port, **ssl_opts) { |h| h.head(uri) }
+      rescue OpenSSL::SSL::SSLError
+        puts "SSL certificate verification failed, retrying without verification..."
+        ssl_opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      Net::HTTP.start(uri.host, uri.port, **ssl_opts) do |http|
         request = Net::HTTP::Get.new(uri)
 
         http.request(request) do |response|

data/lib/doom.rb

@@ -17,7 +17,14 @@ require_relative 'doom/game/animations'
 require_relative 'doom/game/item_pickup'
 require_relative 'doom/game/combat'
 require_relative 'doom/game/sector_effects'
+require_relative 'doom/game/monster_ai'
+require_relative 'doom/game/menu'
+require_relative 'doom/game/intermission'
+require_relative 'doom/wad/sound'
+require_relative 'doom/game/sound_engine'
+require_relative 'doom/render/font'
 require_relative 'doom/render/renderer'
+require_relative 'doom/render/screen_melt'
 require_relative 'doom/render/status_bar'
 require_relative 'doom/render/weapon_renderer'
 require_relative 'doom/platform/gosu_window'
@@ -26,11 +33,26 @@ module Doom
   class Error < StandardError; end
 
   class << self
-    def run(wad_path, map_name: 'E1M1')
+    def run(wad_path, map_name: 'E1M1', rubykaigi: false)
       puts "Loading WAD: #{wad_path}"
       wad = Wad::Reader.new(wad_path)
       puts "  #{wad.type}: #{wad.num_lumps} lumps"
 
+      # If it's a PWAD, we need a base IWAD for resources (palette, textures, etc.)
+      if wad.pwad?
+        iwad_path = find_iwad
+        raise Error, "PWAD requires a base IWAD (doom1.wad). Place it in the current directory or ~/.doom/" unless iwad_path
+        puts "  PWAD detected, loading base IWAD: #{iwad_path}"
+        base_wad = Wad::Reader.new(iwad_path)
+        base_wad.merge_pwad(wad)
+        wad = base_wad
+
+        # Auto-detect map name from PWAD lumps
+        pwad_map = wad.directory.find { |e| e.name =~ /^(E\dM\d|MAP\d\d)$/ }
+        map_name = pwad_map.name if pwad_map
+        puts "  Using map: #{map_name}"
+      end
+
       puts 'Loading palette...'
       palette = Wad::Palette.load(wad)
 
@@ -77,14 +99,36 @@ module Doom
       player_state = Game::PlayerState.new
       status_bar = Render::StatusBar.new(hud_graphics, player_state)
       weapon_renderer = Render::WeaponRenderer.new(hud_graphics, player_state)
-      sector_actions = Game::SectorActions.new(map)
+      sound_mgr = Wad::SoundManager.new(wad)
+      sound_engine = Game::SoundEngine.new(sound_mgr)
+      sector_actions = Game::SectorActions.new(map, sound_engine)
       sector_effects = Game::SectorEffects.new(map)
       item_pickup = Game::ItemPickup.new(map, player_state)
-      combat = Game::Combat.new(map, player_state, sprites)
+      combat = Game::Combat.new(map, player_state, sprites, {}, sound_engine)
+      monster_ai = Game::MonsterAI.new(map, combat, player_state, sprites, {}, sound_engine)
+      doom_font = Render::Font.new(wad, hud_graphics)
+      menu = Game::Menu.new(wad, hud_graphics, doom_font)
+
+      # RubyKaigi mode: god mode, no aggression, benchmark HUD
+      if rubykaigi
+        menu.options[:rubykaigi_mode] = true
+        menu.options[:god_mode] = true
+      end
 
       puts 'Starting game window...'
-      window = Platform::GosuWindow.new(renderer, palette, map, player_state, status_bar, weapon_renderer, sector_actions, animations, sector_effects, item_pickup, combat)
+      window = Platform::GosuWindow.new(renderer, palette, map, player_state, status_bar, weapon_renderer, sector_actions, animations, sector_effects, item_pickup, combat, monster_ai, menu, sound_engine)
       window.show
     end
+
+    private
+
+    def find_iwad
+      candidates = [
+        File.join(Dir.pwd, 'doom1.wad'),
+        File.join(Dir.pwd, 'doom.wad'),
+        File.join(Dir.home, '.doom', 'doom1.wad'),
+      ]
+      candidates.find { |p| File.exist?(p) }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doom
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Hasinski
@@ -65,13 +65,19 @@ files:
 - lib/doom.rb
 - lib/doom/game/animations.rb
 - lib/doom/game/combat.rb
+- lib/doom/game/intermission.rb
 - lib/doom/game/item_pickup.rb
+- lib/doom/game/menu.rb
+- lib/doom/game/monster_ai.rb
 - lib/doom/game/player_state.rb
 - lib/doom/game/sector_actions.rb
 - lib/doom/game/sector_effects.rb
+- lib/doom/game/sound_engine.rb
 - lib/doom/map/data.rb
 - lib/doom/platform/gosu_window.rb
+- lib/doom/render/font.rb
 - lib/doom/render/renderer.rb
+- lib/doom/render/screen_melt.rb
 - lib/doom/render/status_bar.rb
 - lib/doom/render/weapon_renderer.rb
 - lib/doom/version.rb
@@ -81,10 +87,11 @@ files:
 - lib/doom/wad/palette.rb
 - lib/doom/wad/patch.rb
 - lib/doom/wad/reader.rb
+- lib/doom/wad/sound.rb
 - lib/doom/wad/sprite.rb
 - lib/doom/wad/texture.rb
 - lib/doom/wad_downloader.rb
-homepage: https://github.com/khasinski/doom-rb
+homepage: https://github.com/khasinski/doom
 licenses:
 - GPL-2.0
 metadata: {}
@@ -102,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Doom engine port in pure Ruby
 test_files: []