termfront 0.1.3 → 0.1.4

data/lib/termfront/network/wavesfight_client.rb

@@ -3,6 +3,9 @@
 module Termfront
   module Network
     class WavesfightClient
+      ALLOWED_WEAPONS = %w[pistol ar shock_pistol shock_rifle].freeze
+      ALLOWED_ENEMY_TYPES = %w[crawler executor].freeze
+
       def initialize(stdout)
         @stdout = stdout
         @conn = Connection.new
@@ -14,13 +17,14 @@ module Termfront
       def run(mission_id:, difficulty:)
         @queue_mission_id = mission_id
         @queue_difficulty = difficulty
-        addr = prompt_address
-        return unless addr
 
-        host, port = addr.include?(":") ? addr.split(":", 2).then { |h, p| [h, p.to_i] } : [addr, Config::PVP_PORT]
+        host, port = Config::PVP_DEFAULT_ADDRESS.split(":", 2).then { |h, p| [h, p.to_i] }
+        queue_msg = { t: "queue", mode: "wavesfight", mission_id: mission_id, difficulty: difficulty }
+        token = ENV["TERMFRONT_PVP_TOKEN"]
+        queue_msg[:token] = token if token && !token.empty?
         begin
-          @conn.connect(host, port)
-          @conn.send_msg({ t: "queue", mode: "wavesfight", mission_id: mission_id, difficulty: difficulty })
+          @conn.connect(host, port, ca_file: ENV["TERMFRONT_TLS_CA_FILE"])
+          @conn.send_msg(queue_msg)
         rescue StandardError => e
           show_error("Connection failed: #{e.message}")
           return
@@ -42,51 +46,6 @@ module Termfront
 
       private
 
-      def prompt_address
-        input = Config::PVP_DEFAULT_ADDRESS
-
-        STDIN.raw do |stdin|
-          loop do
-            rows, cols = @stdout.winsize
-            buf = TerminalOutput.begin_frame(home: true, clear: true)
-            lines = Array.new(rows) { " " * cols }
-
-            title = "Wavesfight Co-op - Enter Server Address"
-            tc = [(cols - title.size) / 2 + 1, 1].max
-            lines[rows / 2 - 3] = TerminalOutput.fit_ansi("#{" " * (tc - 1)}\e[1;96m#{title}\e[0m", cols)
-
-            pc = [(cols - input.size - 3) / 2 + 1, 1].max
-            lines[rows / 2 - 1] = TerminalOutput.fit_ansi("#{" " * (pc - 1)}\e[97m> #{input}\e[5m_\e[0m", cols)
-
-            hint = "(Enter to continue, ESC to cancel)"
-            hc = [(cols - hint.size) / 2 + 1, 1].max
-            lines[rows / 2 + 1] = TerminalOutput.fit_ansi("#{" " * (hc - 1)}\e[90m#{hint}\e[0m", cols)
-
-            lines.each_with_index do |line, index|
-              buf << line
-              buf << "\r\n" if index < rows - 1
-            end
-            buf << TerminalOutput.end_frame
-            TerminalOutput.write_all(@stdout, buf)
-
-            next unless IO.select([stdin], nil, nil, Config::FRAME_DT)
-
-            begin
-              data = stdin.read_nonblock(64)
-              data.each_byte do |b|
-                case b
-                when 27 then return nil
-                when 13, 10 then return input.empty? ? Config::PVP_DEFAULT_ADDRESS : input
-                when 127, 8 then input = input[0...-1] unless input.empty?
-                when 32..126 then input << b.chr
-                end
-              end
-            rescue IO::WaitReadable
-            end
-          end
-        end
-      end
-
       def wait_for_start
         STDIN.raw do |stdin|
           loop do
@@ -148,7 +107,10 @@ module Termfront
         end
         @enemies = []
         @projectiles = []
+        @drops = []
+        @server_drops = []
         @match_end = nil
+        @regen_active = false
       end
 
       def run_game_loop
@@ -192,6 +154,7 @@ module Termfront
 
       def handle_player_actions(keys)
         @player.swap_weapon if keys.include?(:t)
+        send_pickup_request if keys.include?(:e)
 
         return unless keys.include?(:space)
 
@@ -206,6 +169,28 @@ module Termfront
         @conn.send_msg({ t: "fire" })
       end
 
+      def send_pickup_request
+        nearest = nearest_drop_in_range
+        return unless nearest
+
+        @conn.send_msg({ t: "pickup", id: nearest[:id] })
+      end
+
+      def nearest_drop_in_range
+        best = nil
+        best_d2 = Config::PICKUP_RADIUS**2
+        @server_drops.each do |drop|
+          dx = drop[:x] - @player.x
+          dy = drop[:y] - @player.y
+          d2 = dx * dx + dy * dy
+          if d2 < best_d2
+            best = drop
+            best_d2 = d2
+          end
+        end
+        best
+      end
+
       def update_local(dt)
         @player.game_time += dt
 
@@ -278,9 +263,12 @@ module Termfront
 
         msg[:players].each do |entry|
           if entry[:id] == @player_id
+            prev_shield = @player.shield
             @player.shield = entry[:s]
             @player.health = entry[:h]
             @player.dead = !entry[:alive]
+            sync_own_weapon(entry)
+            update_regen_audio(prev_shield)
           else
             remote = @remote_players[entry[:id]]
             next unless remote
@@ -290,7 +278,8 @@ module Termfront
             remote.angle = entry[:a]
             remote.shield = entry[:s]
             remote.health = entry[:h]
-            remote.weapon = entry[:w]&.to_sym
+            weapon = safe_weapon(entry[:w])
+            remote.weapon = weapon if weapon
             remote.ammo = entry[:am]
             remote.fire_flash = entry[:ff] || 0
           end
@@ -299,19 +288,79 @@ module Termfront
         @enemies = msg[:enemies].filter_map do |enemy|
           next unless enemy[:alive]
 
+          sprite = safe_enemy_type(enemy[:type])
+          next unless sprite
+
           RemoteEnemy.new(
             id: enemy[:id],
             x: enemy[:x],
             y: enemy[:y],
-            sprite_id: enemy[:type].to_sym,
+            sprite_id: sprite,
             hp: enemy[:hp],
             max_hp: enemy[:max_hp],
             alive: true
           )
         end
 
-        @projectiles = msg[:projectiles].map do |projectile|
-          Projectile.new(x: projectile[:x], y: projectile[:y], vx: 0.0, vy: 0.0, type: projectile[:type].to_sym)
+        @projectiles = msg[:projectiles].filter_map do |projectile|
+          type = safe_enemy_type(projectile[:type])
+          next unless type
+
+          Projectile.new(x: projectile[:x], y: projectile[:y], vx: 0.0, vy: 0.0, type: type)
+        end
+
+        @server_drops = (msg[:drops] || []).filter_map do |raw|
+          drop_type = safe_weapon(raw[:type])
+          next unless drop_type
+          next unless raw[:id].is_a?(Numeric)
+
+          { id: raw[:id], x: raw[:x].to_f, y: raw[:y].to_f, type: drop_type, ammo: raw[:am].to_i }
+        end
+        @drops = @server_drops.map do |drop|
+          DropItem::Weapon.new(x: drop[:x], y: drop[:y], type: drop[:type], ammo: drop[:ammo])
+        end
+      end
+
+      def sync_own_weapon(entry)
+        weapon_sym = safe_weapon(entry[:w])
+        return unless weapon_sym
+
+        current = @player.current_weapon
+        if current.type_id != weapon_sym
+          @player.weapons[@player.weapon_idx] = Weapon::Base.build(weapon_sym, entry[:am])
+        elsif entry.key?(:am) && current.respond_to?(:ammo=)
+          current.ammo = entry[:am]
+        end
+      end
+
+      def safe_weapon(value)
+        return nil unless value.is_a?(String) || value.is_a?(Symbol)
+
+        name = value.to_s
+        return nil unless ALLOWED_WEAPONS.include?(name)
+
+        name.to_sym
+      end
+
+      def safe_enemy_type(value)
+        return nil unless value.is_a?(String) || value.is_a?(Symbol)
+
+        name = value.to_s
+        return nil unless ALLOWED_ENEMY_TYPES.include?(name)
+
+        name.to_sym
+      end
+
+      def update_regen_audio(prev_shield)
+        regen_now = !@player.dead && @player.shield > prev_shield && @player.shield < Config::SHIELD_MAX
+        if regen_now
+          unless @regen_active
+            @audio.play_loop_se(:shield_regen)
+            @regen_active = true
+          end
+        elsif @regen_active
+          @audio.stop_loop_se(:shield_regen)
+          @regen_active = false
         end
       end
 
@@ -323,7 +372,7 @@ module Termfront
           map: @map,
           enemies: @enemies,
           projectiles: @projectiles,
-          drops: [],
+          drops: @drops,
           terminals: [],
           status_line: status,
           allies: allies

data/lib/termfront/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Termfront
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termfront
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - S-H-GAMELINKS