chichilku3 14.0.3 → 15.0.1

data/lib/share/player.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Player used by Client and Server
 require_relative 'console'
 require_relative 'network'
@@ -6,26 +8,29 @@ require_relative 'projectile'
 SPAWN_X = 512
 SPAWN_Y = 100
 
+# Player objects represent stick figures
 class Player
-  attr_accessor :x, :y, :dy, :dx, :id, :name, :score, :state, :dead, :dead_ticks, :was_crouching
-  attr_accessor :aimX, :aimY, :projectile, :fire_ticks
+  attr_accessor :x, :y, :dy, :dx, :id, :name, :score, :state, :dead, :dead_ticks,
+                :was_crouching, :wants_crouch, :aim_x, :aim_y,
+                :projectile, :fire_ticks, :map_download
   attr_reader :collide, :collide_str, :img_index, :version, :w, :h
 
   def initialize(id, score, x = nil, y = nil, name = 'def', version = nil, ip = nil)
     @id = id
     @x = x.nil? ? SPAWN_X : x
     @y = y.nil? ? SPAWN_Y : y
-    @w = TILE_SIZE / 2
-    @h = TILE_SIZE
-    @aimX = 0
-    @aimY = 0
+    @w = PLAYER_SIZE / 2
+    @h = PLAYER_SIZE
+    @aim_x = 0
+    @aim_y = 0
     @projectile = Projectile.new
     @dx = 0
     @dy = 0
     @health = 3
-    @collide = {up: false, down: false, right: false, left: false}
-    @state = {bleeding: false, crouching: false, fire: 0}
+    @collide = { up: false, down: false, right: false, left: false }
+    @state = { bleeding: false, crouching: false, fire: 0 }
     @was_crouching = false
+    @wants_crouch = false
     @name = name
     @score = score
     @dead = false # only used by server for now
@@ -41,6 +46,7 @@ class Player
     @not_changed_y = 0
 
     # used by server
+    @map_download = -2
     @version = version
     @ip = ip
   end
@@ -56,9 +62,8 @@ class Player
 
   def update_img
     return if @tick % 5 != 0
-    if @x != @last_x
-      new_x = true
-    end
+
+    new_x = true if @x != @last_x
     if @y != @last_y
       new_y = true
       @not_changed_y = 0
@@ -90,13 +95,13 @@ class Player
     players.find { |player| id == player.id }
   end
 
-  def self.update_player(players, id, x, y, score, aimX, aimY)
+  def self.update_player(players, id, x, y, score, aim_x, aim_y)
     player = get_player_by_id(players, id)
     player.x = x
     player.y = y
     player.score = score
-    player.aimX = aimX
-    player.aimY = aimY
+    player.aim_x = aim_x
+    player.aim_y = aim_y
     player
   end
 
@@ -104,42 +109,53 @@ class Player
   # server only #
   ###############
 
-  def set_name(name)
-    @name = name
-  end
-
   def tick
     move_x(@dx)
     move_y(@dy)
     @dx = normalize_zero(@dx)
-    @dy = normalize_zero(@dy)
-    check_out_of_world
-    if @bleed_ticks > 0
-      @bleed_ticks -= 1
-      self.state[:bleeding] = @bleed_ticks.zero? == false
-    end
+    # @dy = normalize_zero(@dy)
+    check_out_of_game_map
+    return unless @bleed_ticks.positive?
+
+    @bleed_ticks -= 1
+    state[:bleeding] = @bleed_ticks.zero? == false
+  end
+
+  def crouch!
+    @state[:crouching] = true
+    @w = PLAYER_SIZE
+    @h = PLAYER_SIZE / 2
+  end
+
+  def stop_crouch!
+    @state[:crouching] = false
+    @w = PLAYER_SIZE / 2
+    @h = PLAYER_SIZE
+  end
+
+  def crouching?
+    @state[:crouching]
   end
 
   def check_player_collide(other)
     # $console.log "x: #{@x} y: #{@y} ox: #{other.x} oy: #{other.y}"
     # x crash is more rare so make it the outer condition
-    if other.x + other.w > @x && other.x < @x + @w
-      if other.y + other.h > @y && other.y < @y + @h
-        # $console.log "collide!"
-        return @x < other.x ? -7 : 7
-      end
+    if other.x + other.w > @x && other.x < @x + @w && (other.y + other.h > @y && other.y < @y + @h)
+      # $console.log "collide!"
+      return @x < other.x ? -7 : 7
     end
-    return 0
+
+    0
   end
 
   def damage(attacker)
     @bleed_ticks = 3
     @health -= 1
-    $console.log "player='#{attacker.name}' damaged player='#{@name}'"
+    $console.log "'#{attacker.id}:#{attacker.name}' damaged '#{@id}:#{@name}'"
     die(attacker) if @health <= 0
   end
 
-  # def check_out_of_world #die
+  # def check_out_of_game_map #die
   #   # y
   #   if @y < 0
   #     die
@@ -153,15 +169,16 @@ class Player
   #     die
   #   end
   # end
-  def check_out_of_world # swap size
+  # swap size
+  def check_out_of_game_map
     # y
-    if @y < 0
+    if @y.negative?
       die
-    elsif @y > WINDOW_SIZE_Y
+    elsif @y >= WINDOW_SIZE_Y - TILE_SIZE
       die
     end
     # x ( comment me out to add the glitch feature agian )
-    if @x < 0
+    if @x.negative?
       @x = WINDOW_SIZE_X - @w - 2
     elsif @x > WINDOW_SIZE_X - @w - 1
       @x = 0
@@ -170,32 +187,76 @@ class Player
 
   def die(killer = nil)
     if killer.nil?
-      $console.log("[death] id=#{@id} name='#{@name}'")
+      $console.log("player ID=#{@id} name='#{@name}' died")
     else
-      if killer.id == self.id
-        killer.score = (killer.score - 1).clamp(0, NET_MAX_INT)
+      if killer.id == id
+        killer.score -= 1
       else
         killer.score += 1
       end
-      $console.log("[kill] id=#{@id} name='#{@name}' killer='#{killer.name}'")
+      killer.score = killer.score.clamp(0, NET_MAX_INT)
+      $console.log("player '#{@id}:#{@name}' was killed by '#{killer.id}:#{killer.name}'")
     end
     @x = SPAWN_X
     @y = SPAWN_Y
     @health = 3
   end
 
-  #TODO: check for collision before update
+  # TODO: check for collision before update
   # if move_left or move_right set u on a collided field
   # dont update the position or slow down speed
   # idk make sure to not get stuck in walls
-  def move_left
+
+  def check_move_left(game_map)
+    # left bottom
+    col = game_map.collision?(@x / TILE_SIZE, (@y + @h - 1) / TILE_SIZE)
+    if col
+      @x = (col[:x] + 1) * TILE_SIZE
+      @x += 1
+      do_collide(:left, true)
+    end
+
+    # left top
+    col = game_map.collision?(@x / TILE_SIZE, (@y + 1) / TILE_SIZE)
+    if col
+      @x = (col[:x] + 1) * TILE_SIZE
+      @x += 1
+      do_collide(:left, true)
+    end
+    nil
+  end
+
+  def check_move_right(game_map)
+    # right bottom
+    col = game_map.collision?((@x + @w) / TILE_SIZE, (@y + @h - 1) / TILE_SIZE)
+    if col
+      @x = col[:x] * TILE_SIZE
+      @x -= crouching? ? PLAYER_SIZE : PLAYER_SIZE / 2
+      @x -= 1
+      do_collide(:right, true)
+    end
+
+    # right top
+    col = game_map.collision?((@x + @w) / TILE_SIZE, (@y + 1) / TILE_SIZE)
+    if col
+      @x = col[:x] * TILE_SIZE
+      @x -= crouching? ? PLAYER_SIZE : PLAYER_SIZE / 2
+      @x -= 1
+      do_collide(:right, true)
+    end
+    nil
+  end
+
+  def move_left(game_map)
     # @dx = -8
-    @x -= state[:crouching] ? 4 : 8
+    @x -= crouching? ? 4 : 8
+    check_move_left(game_map)
   end
 
-  def move_right
+  def move_right(game_map)
     # @dx = 8
-    @x += state[:crouching] ? 4 : 8
+    @x += crouching? ? 4 : 8
+    check_move_right(game_map)
   end
 
   def apply_force(x, y)
@@ -204,13 +265,13 @@ class Player
   end
 
   def do_jump
-    return if !@collide[:down]
+    return unless @collide[:down]
 
-    if @dead 
-      @dy = -5
-    else
-      @dy = state[:crouching] ? -20 : -30
-    end
+    @dy = if @dead
+            -5
+          else
+            crouching? ? -15 : -20
+          end
   end
 
   def add_score(score = 1)
@@ -225,20 +286,20 @@ class Player
   end
 
   def do_collide(position, value)
-    if position == :right && @dx > 0
+    if position == :right && @dx.positive?
       @dx = 0
-    elsif position == :left && @dx < 0
+    elsif position == :left && @dx.negative?
       @dx = 0
-    elsif position == :down && @dy > 0
+    elsif position == :down && @dy.positive?
       @dy = 0
-    elsif position == :up && @dy < 0
+    elsif position == :up && @dy.negative?
       @dy = 0
     end
     @collide[position] = value
   end
 
   def reset_collide
-    @collide = {up: false, down: false, right: false, left: false}
+    @collide = { up: false, down: false, right: false, left: false }
   end
 
   ##
@@ -249,83 +310,84 @@ class Player
   # @return [String] partial network packet
 
   def to_n_pck
-    name = @name.ljust(NAME_LEN, '_')
+    name = @name.ljust(NAME_LEN, ' ')
     "#{@id.to_s(16)}#{net_pack_int(@score)}#{name}"
   end
 
   def to_s
-    pos="#{net_pack_bigint(@x, 2)}#{net_pack_bigint(@y, 2)}"
-    proj=@projectile.r.to_i.to_s # hack nil to "0"
-    fake_y = @projectile.y > 0 ? @projectile.y : 0
-    proj+="#{net_pack_bigint(@projectile.x, 2)}#{net_pack_bigint(fake_y, 2)}"
-    aim="#{net_pack_bigint(@aimX, 2)}#{net_pack_bigint(@aimY, 2)}"
-    "#{@id.to_s(16)}#{net_pack_int(@score)}#{state_to_net()}#{proj}#{aim}#{pos}"
+    pos = "#{net_pack_bigint(@x, 2)}#{net_pack_bigint(@y, 2)}"
+    proj = @projectile.r.to_i.to_s # HACK: nil to "0"
+    fake_y = @projectile.y.positive? ? @projectile.y : 0
+    proj += "#{net_pack_bigint(@projectile.x, 2)}#{net_pack_bigint(fake_y, 2)}"
+    aim = "#{net_pack_bigint(@aim_x, 2)}#{net_pack_bigint(@aim_y, 2)}"
+    "#{@id.to_s(16)}#{net_pack_int(@score)}#{state_to_net}#{proj}#{aim}#{pos}"
   end
 
   def state_to_net
-    @w = TILE_SIZE / 2
-    @h = TILE_SIZE
-    if @state[:bleeding] && @state[:crouching]
-      "s"
+    @w = PLAYER_SIZE / 2
+    @h = PLAYER_SIZE
+    if @state[:bleeding] && crouching?
+      's'
     elsif @state[:bleeding] && @state[:fire] == 1
-      "x"
+      'x'
     elsif @state[:bleeding] && @state[:fire] == 2
-      "y"
+      'y'
     elsif @state[:bleeding] && @state[:fire] == 3
-      "z"
+      'z'
     elsif @state[:bleeding]
-      "b"
-    elsif @state[:crouching]
-      @w = TILE_SIZE
-      @h = TILE_SIZE / 2
-      "c"
+      'b'
+    elsif crouching?
+      @w = PLAYER_SIZE
+      @h = PLAYER_SIZE / 2
+      'c'
     elsif @state[:fire] == 1
-      "1"
+      '1'
     elsif @state[:fire] == 2
-      "2"
+      '2'
     elsif @state[:fire] == 3
-      "3"
+      '3'
     else
-      "0"
+      '0'
     end
   end
 
   def net_to_state(net)
-    if net == "b"
-      @state = {bleeding: true, crouching: false, fire: 0}
-    elsif net == "c"
-      @state = {bleeding: false, crouching: true, fire: 0}
-    elsif net == "s"
-      @state = {bleeding: true, crouching: true, fire: 0}
-    elsif net == "x"
-      @state = {bleeding: true, crouching: false, fire: 1}
-    elsif net == "y"
-      @state = {bleeding: true, crouching: false, fire: 2}
-    elsif net == "z"
-      @state = {bleeding: true, crouching: false, fire: 3}
-    elsif net == "1"
-      @state = {bleeding: false, crouching: false, fire: 1}
-    elsif net == "2"
-      @state = {bleeding: false, crouching: false, fire: 2}
-    elsif net == "3"
-      @state = {bleeding: false, crouching: false, fire: 3}
-    else
-      @state = {bleeding: false, crouching: false, fire: 0}
-    end
+    @state = case net
+             when 'b'
+               { bleeding: true, crouching: false, fire: 0 }
+             when 'c'
+               { bleeding: false, crouching: true, fire: 0 }
+             when 's'
+               { bleeding: true, crouching: true, fire: 0 }
+             when 'x'
+               { bleeding: true, crouching: false, fire: 1 }
+             when 'y'
+               { bleeding: true, crouching: false, fire: 2 }
+             when 'z'
+               { bleeding: true, crouching: false, fire: 3 }
+             when '1'
+               { bleeding: false, crouching: false, fire: 1 }
+             when '2'
+               { bleeding: false, crouching: false, fire: 2 }
+             when '3'
+               { bleeding: false, crouching: false, fire: 3 }
+             else
+               { bleeding: false, crouching: false, fire: 0 }
+             end
   end
 
   private
 
   def move_x(x)
-    return if x < 0 && @collide[:left]
-    return if x > 0 && @collide[:right]
+    return if x.negative? && @collide[:left]
+    return if x.positive? && @collide[:right]
 
     @x += x
   end
 
   def move_y(y)
-    return if y < 0 && @collide[:up]
-    return if y > 0 && @collide[:down]
+    return if y.negative? && @collide[:up]
+    return if y.positive? && @collide[:down]
 
     @y += y
   end
@@ -335,7 +397,8 @@ class Player
   def normalize_zero(x)
     return x if x.zero?
 
-    return x - 1 if x > 0
+    return x - 1 if x.positive?
+
     x + 1
   end
 end

data/lib/share/projectile.rb

@@ -1,115 +1,114 @@
+# frozen_string_literal: true
+
 require_relative 'console'
 
+# Projectile class handles arrow logic
 class Projectile
-    attr_accessor :x, :y, :dx, :dy, :r, :w, :h, :owner_id
+  attr_accessor :x, :y, :dx, :dy, :r, :w, :h, :owner_id
 
-    def initialize
-        @x = 0
-        @y = 0
-        @dx = 0
-        @dy = 0
-        @w = 16
-        @h = 16
-        @owner = nil
-        @left_owner = false
-        @flying = false
-        @tick = 0
-    end
+  def initialize
+    @x = 0
+    @y = 0
+    @dx = 0
+    @dy = 0
+    @w = 16
+    @h = 16
+    @owner = nil
+    @left_owner = false
+    @flying = false
+    @tick = 0
+  end
 
-    def fire(x, y, dx, dy, owner)
-        return if @flying
+  def fire(x, y, dx, dy, owner)
+    return if @flying
 
-        @x = x
-        @y = y
-        @dx = dx
-        @dy = dy
-        calc_rotation()
-        @owner = owner
-        @left_owner = false
-        @flying = true
-        $console.dbg "Projectile(x=#{x}, y=#{y}, dx=#{dx}, dy=#{dy})"
-    end
+    @x = x
+    @y = y
+    @dx = dx
+    @dy = dy
+    calc_rotation
+    @owner = owner
+    @left_owner = false
+    @flying = true
+    $console.dbg "Projectile(x=#{x}, y=#{y}, dx=#{dx}, dy=#{dy})"
+  end
 
-    def hit
-        @flying = false
-        @x = 0
-        @y = 0
-    end
+  def hit
+    @flying = false
+    @x = 0
+    @y = 0
+  end
 
-    def tick(players)
-        return unless @flying
+  def tick(players)
+    return unless @flying
 
-        @tick += 1
-        @x = @x + @dx
-        @y = @y + @dy
-        @dy += 1 if @tick % 3 == 0
-        calc_rotation()
-        check_hit(players)
-        hit if  @y > WINDOW_SIZE_Y
-        hit if  @x > WINDOW_SIZE_X
-        hit if @x < 0
-    end
+    @tick += 1
+    @x += @dx
+    @y += @dy
+    @dy += 1 if (@tick % 3).zero?
+    calc_rotation
+    check_hit(players)
+    hit if  @y > WINDOW_SIZE_Y
+    hit if  @x > WINDOW_SIZE_X
+    hit if @x.negative?
+  end
 
-    def check_hit(players)
-        owner_hit = false
-        players.each do |player|
-            if player.x + player.w > @x && player.x < @x + @w
-                if player.y + player.h > @y && player.y < @y + @h
-                    if @owner.id == player.id
-                        owner_hit = true
-                        if @left_owner
-                            player.damage(@owner)
-                            hit()
-                        end
-                    else
-                        player.damage(@owner)
-                        hit()
-                    end
-                end
-            end
-        end
-        if owner_hit == false
-            @left_owner = true
+  def check_hit(players)
+    owner_hit = false
+    players.each do |player|
+      next unless player.x + player.w > @x && player.x < @x + @w
+
+      if player.y + player.h > @y && player.y < @y + @h
+        if @owner.id == player.id
+          owner_hit = true
+          if @left_owner
+            player.damage(@owner)
+            hit
+          end
+        else
+          player.damage(@owner)
+          hit
         end
+      end
     end
+    @left_owner = true if owner_hit == false
+  end
 
-    # NETWORK ROTATION
-    # 0 ->     4 <-
+  # NETWORK ROTATION
+  # 0 ->     4 <-
 
-    #           ^
-    # 1 \      5 \
-    #    v
+  #           ^
+  # 1 \      5 \
+  #    v
 
-    #            ^
-    # 2 |      6 |
-    #   v
+  #            ^
+  # 2 |      6 |
+  #   v
 
-    #             ^
-    # 3 /      7 /
-    #  v
-    def calc_rotation
-        if @dy > -3 && @dy < 3
-            if @dx < 0
-                @r = 4
-            else
-                @r = 0
-            end
-        elsif @dy < 0
-            if @dx > -3 && @dx < 3
-                @r = 6
-            elsif @dx < 0
-                @r = 5
-            else
-                @r = 7
-            end
-        else
-            if @dx > -3 && @dx < 3
-                @r = 2
-            elsif @dx < 0
-                @r = 3
-            else
-                @r = 1
-            end
-        end
-    end
+  #             ^
+  # 3 /      7 /
+  #  v
+  def calc_rotation
+    @r = if @dy > -3 && @dy < 3
+           if @dx.negative?
+             4
+           else
+             0
+           end
+         elsif @dy.negative?
+           if @dx > -3 && @dx < 3
+             6
+           elsif @dx.negative?
+             5
+           else
+             7
+           end
+         elsif @dx > -3 && @dx < 3
+           2
+         elsif @dx.negative?
+           3
+         else
+           1
+         end
+  end
 end

data/lib/share/string.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# String color
+class String
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
+  def pink
+    colorize(35)
+  end
+end