chichilku3 5.0.0 → 14.0.4

data/lib/client/scoreboard.rb

@@ -1,5 +1,5 @@
 
-def draw_scoreboard(win_size_x, win_size_y, players, font)
+def draw_scoreboard(win_size_x, win_size_y, players, font, debug)
     # TODO: do not compute those every frame
     padX = win_size_x / 3
     sizeX = win_size_x / 3
@@ -19,7 +19,13 @@ def draw_scoreboard(win_size_x, win_size_y, players, font)
     end
     players.each_with_index do | player, i |
         score_offset = text_scale * 10 * player.score.to_s.length
-        font.draw_text(player.name, padX + 5, padY + (i * slot_height), 0, text_scale, text_scale)
-        font.draw_text(player.score, padX + sizeX - score_offset, padY + (i * slot_height), 0, text_scale, text_scale)
+        dbg = 0
+        if debug
+            dbg += 25
+            score_offset += 25
+            font.draw_text(player.id, padX + 5, padY + (i * slot_height), 0, text_scale, text_scale, 0xFF00FF00)
+        end
+        font.draw_text(player.name, dbg + padX + 5, padY + (i * slot_height), 0, text_scale, text_scale)
+        font.draw_text(player.score, dbg + padX + sizeX - score_offset, padY + (i * slot_height), 0, text_scale, text_scale)
     end
 end

data/lib/server/chichilku3_server.rb

@@ -34,8 +34,8 @@ class ServerCore
   def parse_client_version(data)
     return if data.nil?
 
-    id = data[0].to_i
-    version = data[1..-1]
+    id = data[0].to_i(16)
+    version = data[1..4]
     player = Player.get_player_by_id(@players, id)
     if player
       @console.log "name req id='#{id}' vrs='#{version}' name='#{player.name}'"
@@ -46,25 +46,20 @@ class ServerCore
     player
   end
 
-  def create_name_package(data)
+  def create_name_package(data, client)
+    if !client.nil? && !data.nil?
+      player = Player.get_player_by_id(@players, client[PLAYER_ID])
+      player.set_name(data)
+    end
+
     # protocol 3 name prot
-    # also includes client version
-    player = parse_client_version(data)
-    #                      gamestate
-    #                         |
-    pck = "3l#{@players.count}g"
-    # pck = format('3l%02d', @players.count) # old 2 digit player count
+    #                                   gamestate
+    #                                       |
+    pck = "3l#{net_pack_int(@players.count)}g"
     @players.each do |p|
       pck += p.to_n_pck
       @console.dbg "pname='#{p.name}'"
     end
-    unless player.nil?
-      if player.version.to_i < GAME_VERSION.to_i
-        return "0l#{NET_ERR_CLIENT_OUTDATED}#{GAME_VERSION}                   "
-      elsif player.version.to_i > GAME_VERSION.to_i
-        return "0l#{NET_ERR_SERVER_OUTDATED}#{GAME_VERSION}                   "
-      end
-    end
     pck.ljust(SERVER_PACKAGE_LEN, '0')
   end
 
@@ -79,67 +74,72 @@ class ServerCore
     -1
   end
 
-  def add_player(name, client, ip)
+  def add_player(name, version, client, ip)
     @current_id = get_free_id()
     return -1 if @current_id > MAX_CLIENTS || @current_id < 1
 
-    @console.log "Added player id='#{@current_id}' ip='#{ip}'"
-    @players << Player.new(@current_id, 0, nil, nil, name, ip)
+    @console.log "Added player id='#{@current_id}' version='#{version}' ip='#{ip}'"
+    @players << Player.new(@current_id, 0, nil, nil, name, version, ip)
     client[PLAYER_ID] = @current_id
     @current_id # implicit return
   end
 
   def delete_player(id)
-    @console.log "Deleted player id='#{id}'"
     @players.delete(Player.get_player_by_id(@players, id))
   end
 
   def players_to_packet
-    # old 2 digit player count
-    # packet = @players.empty? ? '00' : format('%02d', @players.count)
-    packet = @players.empty? ? '0' : @players.count.to_s
+    # player count
+    packet = net_pack_int(@players.empty? ? 0 : @players.count)
     packet += 'g' # gamestate
     @players.each do |player|
       packet += player.to_s
     end
-    # fill with zeros if less than 3 players online
-    packet.ljust(SERVER_PACKAGE_LEN - 2, '0') # implicit return
+    packet
   end
 
   def update_pck(data, dt)
-    id = data[0].to_i
+    id = data[0].to_i(16)
     @console.dbg "got player with id: #{id}"
     @players = @gamelogic.handle_client_requests(data[1..-1], id, @players, dt)
     nil # defaults to normal update pck
   end
 
   def id_pck(data, client, ip)
-    name = data[0..5]
-    id = add_player(name, client, ip)
+    player_version = data[0..3]
+    id = add_player("(connecting)", player_version, client, ip)
     if id == -1
       @console.log "'#{name}' failed to connect (server full)"
       # protocol 0 (error) code=404 slot not found
       return "0l#{NET_ERR_FULL}                       "
     end
-    @console.log "id='#{id}' name='#{name}' joined the game"
+    if player_version.to_i < GAME_VERSION.to_i
+      @console.log "IP='#{ip}' failed to connect (client too old '#{player_version}' < '#{GAME_VERSION}')"
+      return "0l#{NET_ERR_CLIENT_OUTDATED}#{GAME_VERSION}".ljust(SERVER_PACKAGE_LEN, ' ')
+    elsif player_version.to_i > GAME_VERSION.to_i
+      @console.log "IP='#{ip}' failed to connect (client too new '#{player_version}' < '#{GAME_VERSION}')"
+      return "0l#{NET_ERR_SERVER_OUTDATED}#{GAME_VERSION}".ljust(SERVER_PACKAGE_LEN, ' ')
+    end
+    @console.log "id='#{id}' ip='#{ip}' joined the game"
     @global_pack = "true"
     # protocol 2 (id)
-    format('2l00%02d0000000000000000000000', id).to_s
+    "2l#{net_pack_int(@players.count)}#{net_pack_int(MAX_CLIENTS)}#{id.to_s(16)}X#{GAME_VERSION}".ljust(SERVER_PACKAGE_LEN, '0')
   end
 
   def command_package(data, client)
-    id = data[0..1].to_i
+    id = data[0..1].to_i(16)
     cmd = data[1..-1]
     @console.log "[chat] ID=#{id} command='#{cmd}'"
     msg = "server_recived_cmd: #{cmd}"
     msg = msg.ljust(SERVER_PACKAGE_LEN - 2, '0')
-    msg = msg[0..SERVER_PACKAGE_LEN - 3]
+    msg = msg[0..SERVER_PACKAGE_LEN - CMD_LEN]
     if cmd == "test"
       # return "0l#{NET_ERR_DISCONNECT}    SAMPLE MESSAGE     "
       msg = "id=#{client[PLAYER_ID]}"
     end
     msg = msg.ljust(SERVER_PACKAGE_LEN - 2, ' ')
-    msg = msg[0..SERVER_PACKAGE_LEN - 3]
+    msg = msg[0..SERVER_PACKAGE_LEN - 2]
+    # protocol 4 (chat command)
     "4l#{msg}"
   end
 
@@ -149,18 +149,18 @@ class ServerCore
       @console.log "Error pck=#{data}"
     elsif protocol == 1 # id pck
       return id_pck(data, client, ip)
+    elsif protocol == 3 # initial request names
+      return create_name_package(data, client)
     else
       # all other types require id
-      id = data[0].to_i
+      id = data[0].to_i(16)
       if id != client[PLAYER_ID]
         @console.log("id=#{client[PLAYER_ID]} tried to spoof id=#{id} ip=#{ip}")
-        disconnect_client(client, "0l#{NET_ERR_DISCONNECT}invalid player id      ")
+        disconnect_client(client, "0l#{NET_ERR_DISCONNECT}invalid player id                              ")
         return nil
       end
       if protocol == 2 # update pck
         return update_pck(data, dt)
-      elsif protocol == 3 # initial request names
-        return create_name_package(data)
       elsif protocol == 4 # command
         return command_package(data, client)
       else
@@ -178,8 +178,7 @@ class ServerCore
     return response unless response.nil?
 
     if (@tick % 100).zero?
-      # return '3l0301hello02x0x0x03hax0r000'
-      return create_name_package(nil)
+      return create_name_package(nil, nil)
     end
 
     # some debug suff for class vars
@@ -212,11 +211,10 @@ class ServerCore
       return
     end
 
-    @console.dbg "recv: #{client_data}"
+    @console.dbg "tick recv: '#{client_data}'"
     @last_alive_pck_by_client = Time.now
     port, ip = Socket.unpack_sockaddr_in(cli[NET_CLIENT].getpeername)
     server_response = handle_client_data(cli, client_data, ip, dt)
-    # server_response = '1l03011001010220020203300303'
     pck_type = server_response[0]
     if pck_type == SERVER_PCK_TYPE[:error]
       disconnect_client(cli, server_response)
@@ -251,9 +249,15 @@ class ServerCore
     loop do
       diff = 0 # TODO: unused lmao traced it through the half source
       t = Time.now
-      sleep $next_tick - t if $next_tick > t
-      @tick += 1
+      if $next_tick > t
+        sleep $next_tick - t
+      else
+        unless @tick.zero?
+          @console.log "[WARNING] tick took #{t - $next_tick} too long"
+        end
+      end
       $next_tick = Time.now + MAX_TICK_SPEED
+      @tick += 1
       @players = @gamelogic.tick(@players, diff)
       # there is no gurantee the client will tick here
       # there might be 2 gamelogic ticks and posticks
@@ -262,7 +266,7 @@ class ServerCore
       @clients.each do |client|
         begin
           client_tick(client, diff)
-        rescue Errno::ECONNRESET, EOFError, IOError
+        rescue Errno::ECONNRESET, Errno::ENOTCONN, EOFError, IOError
           disconnect_client(client)
         end
       end
@@ -280,10 +284,6 @@ class ServerCore
   end
 
   def net_write(data, cli)
-    if data.length != SERVER_PACKAGE_LEN
-      @console.log "ERROR pack len: #{data.length}/#{SERVER_PACKAGE_LEN} pck: #{data}"
-      exit
-    end
     @console.dbg("sending: #{data}")
     cli.write(data)
   end

data/lib/server/gamelogic.rb

@@ -21,6 +21,7 @@ class GameLogic
 
       gravity(player, dt)
       player.tick
+      player.projectile.tick(players)
       # player collsions works
       # but it eats performance and delays jumping
       check_collide(players, player)
@@ -52,18 +53,43 @@ class GameLogic
       player.x -= TILE_SIZE / 4 unless player.was_crouching
       player.was_crouching = true
     end
-    if data[1] == '1'
+    if data[1] == 'l'
       @console.dbg "player=#{id} wants to walk left"
       player.move_left
     end
-    if data[2] == '1'
+    if data[1] == 'r'
       @console.dbg "player=#{id} wants to walk right"
       player.move_right
     end
-    if data[3] == '1'
+    if data[2] == '1'
       @console.dbg "player=#{id} wants to jump"
       player.do_jump
     end
+    if data[3] == '1' && player.state[:crouching] == false
+      @console.dbg "player=#{id} wants to fire"
+      player.fire_ticks += 1
+      if player.fire_ticks > 29
+        player.state[:fire] = 3
+      elsif player.fire_ticks > 19
+        player.state[:fire] = 2
+      elsif player.fire_ticks > 9
+        player.state[:fire] = 1
+      end
+    else
+      if player.fire_ticks > 0
+        dx = (player.aimX - player.x).clamp(-200, 200) / 20
+        dy = (player.aimY - player.y).clamp(-200, 200) / 20
+        dx *= (player.fire_ticks / 10).clamp(1, 3)
+        dy *= (player.fire_ticks / 10).clamp(1, 3)
+        player.projectile.fire(player.x + TILE_SIZE/4, player.y + TILE_SIZE/2, dx, dy, player)
+      end
+      player.fire_ticks = 0
+      player.state[:fire] = 0
+    end
+    player.aimX = net_unpack_bigint(data[4..5])
+    player.aimY = net_unpack_bigint(data[6..7])
+    # player.projectile.x = player.aimX + 20
+    # player.projectile.y = player.aimY + 20
 
     player.check_out_of_world
 
@@ -92,7 +118,7 @@ class GameLogic
         player.die
       end
     else
-      if player.y > 320 # too far down --> die
+      if player.y + player.h > 384 # too far down --> die
         player.dead = true
         player.dead_ticks = 0
       end

data/lib/share/config.rb

@@ -4,24 +4,25 @@ require 'fileutils'
 
 # chichilku3 config base used by client and server
 class Config
-  attr_reader :data
+  attr_reader :data, :chichilku3_dir
 
   def initialize(console, file)
-    chichilku3_dir = ""
+    @chichilku3_dir = ""
     if OS.linux?
-      chichilku3_dir = "#{ENV['HOME']}/.chichilku/chichilku3/"
+      @chichilku3_dir = "#{ENV['HOME']}/.chichilku/chichilku3/"
     elsif OS.mac?
-      chichilku3_dir = "#{ENV['HOME']}/Library/Application Support/chichilku/chichilku3/"
+      @chichilku3_dir = "#{ENV['HOME']}/Library/Application Support/chichilku/chichilku3/"
     # elsif OS.windows?
-    #   chichilku3_dir = "%APPDATA%\\chichilku\\chichilku3\\"
+    #   @chichilku3_dir = "%APPDATA%\\chichilku\\chichilku3\\"
     else
       puts "os not supported."
       exit
     end
-    puts "path: " + chichilku3_dir
-    FileUtils.mkdir_p chichilku3_dir
-    create_default_cfg(file, "#{chichilku3_dir}/#{file}")
-    @file = chichilku3_dir + file
+    puts "path: " + @chichilku3_dir
+    FileUtils.mkdir_p @chichilku3_dir
+    FileUtils.mkdir_p "#{@chichilku3_dir}recordings"
+    create_default_cfg(file, "#{@chichilku3_dir}/#{file}")
+    @file = @chichilku3_dir + file
     @console = console
     @data = load
   end

data/lib/share/console.rb

@@ -4,14 +4,19 @@ DEBUG = false
 class Console
   def log(message)
     t = Time.now
-    puts "[#{t.hour}:#{t.min}:#{t.sec}][log] #{message}"
+    puts format("[%02d:%02d:%02d][log] %s", t.hour, t.min, t.sec, message)
+  end
+
+  def err(message)
+    t = Time.now
+    puts format("[%02d:%02d:%02d][error] %s", t.hour, t.min, t.sec, message)
   end
 
   def dbg(message)
     return unless DEBUG
 
     t = Time.now
-    puts "[#{t.hour}:#{t.min}:#{t.sec}][debug] #{message}"
+    puts format("[%02d:%02d:%02d][debug] %s", t.hour, t.min, t.sec, message)
   end
 end
 

data/lib/share/network.rb

@@ -2,7 +2,7 @@ require 'socket'
 # check doc_network.rb for documentation
 
 # update GAME_VERSION on network protocol changes
-GAME_VERSION = '0005'
+GAME_VERSION = '0014'
 
 # game
 
@@ -15,10 +15,12 @@ SPEED = TILE_SIZE
 
 # networking
 
-NAME_LEN = 5
-MAX_CLIENTS = 3
-CLIENT_PACKAGE_LEN = 7                    # used by server
-SERVER_PACKAGE_LEN = MAX_CLIENTS * 8 + 4  # used by client
+CMD_LEN = 7
+NAME_LEN = 9
+MAX_CLIENTS = 12
+PLAYER_PACKAGE_LEN = 16
+CLIENT_PACKAGE_LEN = 11 # used by server
+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

data/lib/share/player.rb

@@ -1,29 +1,37 @@
 # Player used by Client and Server
 require_relative 'console'
 require_relative 'network'
+require_relative 'projectile'
 
 SPAWN_X = 512
 SPAWN_Y = 100
 
 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_reader :collide, :collide_str, :img_index, :version, :w, :h
 
-  def initialize(id, score, x = nil, y = nil, name = 'def', ip = nil)
+  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
+    @projectile = Projectile.new
     @dx = 0
     @dy = 0
+    @health = 3
     @collide = {up: false, down: false, right: false, left: false}
-    @state = {bleeding: false, crouching: false}
+    @state = {bleeding: false, crouching: false, fire: 0}
     @was_crouching = false
     @name = name
     @score = score
     @dead = false # only used by server for now
     @dead_ticks = 0
+    @bleed_ticks = 0
+    @fire_ticks = 0
 
     # used by client
     @img_index = 0
@@ -33,7 +41,7 @@ class Player
     @not_changed_y = 0
 
     # used by server
-    @version = nil
+    @version = version
     @ip = ip
   end
 
@@ -82,11 +90,13 @@ class Player
     players.find { |player| id == player.id }
   end
 
-  def self.update_player(players, id, x, y, score)
+  def self.update_player(players, id, x, y, score, aimX, aimY)
     player = get_player_by_id(players, id)
     player.x = x
     player.y = y
     player.score = score
+    player.aimX = aimX
+    player.aimY = aimY
     player
   end
 
@@ -94,8 +104,8 @@ class Player
   # server only #
   ###############
 
-  def set_version(version)
-    @version = version
+  def set_name(name)
+    @name = name
   end
 
   def tick
@@ -104,6 +114,10 @@ class Player
     @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
   end
 
   def check_player_collide(other)
@@ -118,6 +132,13 @@ class Player
     return 0
   end
 
+  def damage(attacker)
+    @bleed_ticks = 3
+    @health -= 1
+    $console.log "player='#{attacker.name}' damaged player='#{@name}'"
+    die(attacker) if @health <= 0
+  end
+
   # def check_out_of_world #die
   #   # y
   #   if @y < 0
@@ -147,10 +168,20 @@ class Player
     end
   end
 
-  def die
-    $console.log("[death] id=#{@id} name='#{@name}'")
+  def die(killer = nil)
+    if killer.nil?
+      $console.log("[death] id=#{@id} name='#{@name}'")
+    else
+      if killer.id == self.id
+        killer.score = (killer.score - 1).clamp(0, NET_MAX_INT)
+      else
+        killer.score += 1
+      end
+      $console.log("[kill] id=#{@id} name='#{@name}' killer='#{killer.name}'")
+    end
     @x = SPAWN_X
     @y = SPAWN_Y
+    @health = 3
   end
 
   #TODO: check for collision before update
@@ -218,17 +249,17 @@ class Player
   # @return [String] partial network packet
 
   def to_n_pck
-    name = @name.ljust(5, '_')
-    # format("%02d#{name}", @id) # old 2 char ids
-    "#{@id}#{net_pack_int(@score)}#{name}" # new 1 char id
+    name = @name.ljust(NAME_LEN, '_')
+    "#{@id.to_s(16)}#{net_pack_int(@score)}#{name}"
   end
 
   def to_s
-    # "#{'%02d' % @id}#{'%03d' % @x}#{'%03d' % @y}" # old 2 char ids
-    # "#{@id}#{net_pack_int(@score)}#{'%03d' % @x}#{'%03d' % @y}" # old 3 char coords
-    #                            unused
-    #                             V
-    "#{@id}#{net_pack_int(@score)}0#{state_to_net()}#{net_pack_bigint(@x, 2)}#{net_pack_bigint(@y, 2)}" # new 2 char coords
+    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}"
   end
 
   def state_to_net
@@ -236,12 +267,24 @@ class Player
     @h = TILE_SIZE
     if @state[:bleeding] && @state[:crouching]
       "s"
+    elsif @state[:bleeding] && @state[:fire] == 1
+      "x"
+    elsif @state[:bleeding] && @state[:fire] == 2
+      "y"
+    elsif @state[:bleeding] && @state[:fire] == 3
+      "z"
     elsif @state[:bleeding]
       "b"
     elsif @state[:crouching]
       @w = TILE_SIZE
       @h = TILE_SIZE / 2
       "c"
+    elsif @state[:fire] == 1
+      "1"
+    elsif @state[:fire] == 2
+      "2"
+    elsif @state[:fire] == 3
+      "3"
     else
       "0"
     end
@@ -249,13 +292,25 @@ class Player
 
   def net_to_state(net)
     if net == "b"
-      @state = {bleeding: true, crouching: false}
+      @state = {bleeding: true, crouching: false, fire: 0}
     elsif net == "c"
-      @state = {bleeding: false, crouching: true}
+      @state = {bleeding: false, crouching: true, fire: 0}
     elsif net == "s"
-      @state = {bleeding: true, crouching: true}
+      @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}
+      @state = {bleeding: false, crouching: false, fire: 0}
     end
   end