chichilku3 14.0.4 → 15.0.0

data/lib/share/network.rb

@@ -1,22 +1,28 @@
+# frozen_string_literal: true
+
 require 'socket'
 # check doc_network.rb for documentation
 
 # update GAME_VERSION on network protocol changes
-GAME_VERSION = '0014'
+GAME_VERSION = '0015'
 
 # game
 
 TILE_SIZE = 64
-WINDOW_SIZE_X = TILE_SIZE * 16
-WINDOW_SIZE_Y = TILE_SIZE * 9
+PLAYER_SIZE = TILE_SIZE - 2
+MAP_WIDTH = 16
+MAP_HEIGHT = 9
+WINDOW_SIZE_X = TILE_SIZE * MAP_WIDTH
+WINDOW_SIZE_Y = TILE_SIZE * MAP_HEIGHT
 FULLHD_X = 1920
-UI_SCALE = WINDOW_SIZE_X.to_f / FULLHD_X.to_f
+UI_SCALE = WINDOW_SIZE_X.to_f / FULLHD_X
 SPEED = TILE_SIZE
 
 # networking
 
 CMD_LEN = 7
 NAME_LEN = 9
+MAX_MAPNAME_LEN = 43
 MAX_CLIENTS = 12
 PLAYER_PACKAGE_LEN = 16
 CLIENT_PACKAGE_LEN = 11 # used by server
@@ -24,40 +30,41 @@ SERVER_PACKAGE_LEN = MAX_CLIENTS * PLAYER_PACKAGE_LEN + 4 # used by client
 
 MAX_TIMEOUT = 5
 MAX_TICK_SPEED = 0.01 # the lower the faster client and server tick
+# MAX_TICK_SPEED = 0.07
 # MAX_TICK_SPEED = 0.005
 
-NET_ERR_FULL = "404"
-NET_ERR_DISCONNECT = "001"
-NET_ERR_KICK = "002"
-NET_ERR_BAN = "003"
-NET_ERR_SERVER_OUTDATED = "004"
-NET_ERR_CLIENT_OUTDATED = "005"
+NET_ERR_FULL = '404'
+NET_ERR_DISCONNECT = '001'
+NET_ERR_KICK = '002'
+NET_ERR_BAN = '003'
+NET_ERR_SERVER_OUTDATED = '004'
+NET_ERR_CLIENT_OUTDATED = '005'
 
 NET_ERR = {
-  "404" => "SERVER FULL",
-  "001" => "DISCONNECTED",
-  "002" => "KICKED",
-  "003" => "BANNED",
-  "004" => "SERVER OUTDATED",
-  "005" => "CLIENT OUTDATED"
-}
+  '404' => 'SERVER FULL',
+  '001' => 'DISCONNECTED',
+  '002' => 'KICKED',
+  '003' => 'BANNED',
+  '004' => 'SERVER OUTDATED',
+  '005' => 'CLIENT OUTDATED'
+}.freeze
 
 CLIENT_PCK_TYPE = {
-  :error => "0",
-  :join => "1",
-  :move => "2",
-  :info => "3",
-  :cmd => "4"
-}
+  error: '0',
+  join: '1',
+  move: '2',
+  info: '3',
+  cmd: '4'
+}.freeze
 
 SERVER_PCK_TYPE = {
-  :error => "0",
-  :update => "1",
+  error: '0',
+  update: '1',
   # TODO: find a good name here
-  :info => "3",
-  :cmd => "4",
-  :event => "5"
-}
+  info: '3',
+  cmd: '4',
+  event: '5'
+}.freeze
 
 NET_INT_OFFSET = 33
 NET_INT_BASE = 93
@@ -70,13 +77,13 @@ NET_MIN_INT = 0
 # the base of the network is NET_INT_BASE
 # so the number 93 is the last single character number represented as '~'
 #
-# @param [Integer, #chr] int decimal based number 
+# @param [Integer, #chr] int decimal based number
 # @return [String] the int converted to base NET_INT_BASE
 
 def net_pack_int(int)
   net_error "#{__method__}: '#{int}' is too low allowed range #{NET_MIN_INT}-#{NET_MAX_INT}" if int < NET_MIN_INT
   net_error "#{__method__}: '#{int}' is too high allowed range #{NET_MIN_INT}-#{NET_MAX_INT}" if int > NET_MAX_INT
-  int = int + NET_INT_OFFSET
+  int += NET_INT_OFFSET
   int.chr
 end
 
@@ -101,17 +108,18 @@ end
 # @return [String] the int converted to base NET_INT_BASE
 
 def net_pack_bigint(int, size)
-  sum = ""
+  sum = ''
   div = size - 1
   (size - 1).times do
-    buf = int / ((NET_MAX_INT+1) ** div)
+    buf = int / ((NET_MAX_INT + 1)**div)
     sum += net_pack_int(buf)
-    int = int % ((NET_MAX_INT+1) ** div)
+    int = int % ((NET_MAX_INT + 1)**div)
+    div -= 1
   end
   sum += net_pack_int(int)
   # TODO: check reminder and so on
   # throw and error when int is too big for size
-  int = int / NET_MAX_INT
+  int /= NET_MAX_INT
   sum
 end
 
@@ -127,21 +135,18 @@ def net_unpack_bigint(net_int)
     if i.zero?
       sum = net_unpack_int(c)
     else
-      sum += net_unpack_int(c) * i * (NET_MAX_INT+1)
+      sum += net_unpack_int(c) * (NET_MAX_INT + 1)**i
     end
   end
   sum
 end
 
 def save_read(socket, size)
-  begin
-    return socket.read_nonblock(size)
-  rescue IO::WaitReadable
-    return ''
-  end
+  socket.read_nonblock(size)
+rescue IO::WaitReadable
+  ''
 end
 
 def net_error(err)
   raise "NetError: #{err}"
-  exit 1
 end

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