chichilku3 14.0.3 → 15.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539d73ce0c1c0eaed978079c9e5236339a0a198a8f6696a94a535332ebb36712
-  data.tar.gz: db0db85ea83928af891accf3980119b4497fdb7803d459c06aa449801c671ce0
+  metadata.gz: 31045c6431444e15f1e7b4ae51bcbe4be2a3c9caeafa0807c99fa538ac098b5c
+  data.tar.gz: aa82eab01ecb488acd3c0526736eff6492eb9398bf7f2ee922225a8dc5b95690
 SHA512:
-  metadata.gz: fb24df32cc1113d2b9610c38208c0c786939bb93c0d7549159ee90b4b834d6841f61be66da07973e231e89ba920f306da6eb9f39a0e57bac46907f49a8c46a1a
-  data.tar.gz: 8f0ec76bf07d6be65c53c5a6d0935d068d51fc59c24aaa7acd201e48925f1c4ac272785c6faf3c33de7bf19d891747ae393c2041d963b156b3b82a5e3dc93759
+  metadata.gz: 7c2d2bba3f95541b65a3d07d1935c3d0911587df1f12e6bc13d797484a8045407fdac9ad3ee6682793d0c5860306f8a5b0bab9961e46a86d28235074e234a8f3
+  data.tar.gz: a902ddd4f25e47fa636c937e235534752e2e6b1b65fb63bc6f0f80ca0cd8aa32e480eb1f493289f10fb317e8bccbe4b02d166042620dfc60d05e20a29421f045

data/bin/chichilku3

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'client/chichilku3'

data/bin/chichilku3-server

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'server/chichilku3_server'

data/lib/client/chichilku3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gosu'
 require_relative 'client'
 require_relative '../share/console'
@@ -9,7 +11,7 @@ require_relative 'client_cfg'
 class Game
   def initialize
     console = Console.new
-    cfg = ClientCfg.new(console, "client.json")
+    cfg = ClientCfg.new(console, 'client.json')
     gui = Gui.new(cfg)
     gui.show
   end

data/lib/client/client.rb

@@ -1,22 +1,28 @@
+# frozen_string_literal: true
+
 require 'socket'
 require_relative '../share/network'
 require_relative '../share/player'
+require_relative '../share/game_map'
 
 STATE_ERROR = -2
 STATE_MENU = -1
 STATE_OFFLINE = 0
 STATE_CONNECTING = 1
-STATE_INGAME = 2
-STATE_REC_PLAYBACK = 3
+STATE_DOWNLOADING = 2
+STATE_INGAME = 3
+STATE_REC_PLAYBACK = 4
 
 # Networking part of the game clientside
 class Client
-  attr_reader :id, :state, :server_version
-  def initialize(console, cfg)
+  attr_reader :id, :state, :server_version, :game_map
+
+  def initialize(console, cfg, gui)
     @id = nil
     @tick = 0
     @state = STATE_MENU
     @cfg = cfg
+    @gui = gui
 
     @console = console
     @console.log "LOAD #{@s}"
@@ -25,39 +31,48 @@ class Client
 
     @recording_ticks = []
     @recording_ticks_len = 0
-    @recording_file = "autorec.txt"
+    @recording_file = 'autorec.txt'
     @is_recording = false
 
     @server_version = nil
 
+    @game_map = nil
+
+    # @force_send
+    # used by client to send data regardless of what the gui
+    # wanted to send
+    @force_send = nil
+
     # state variables
     @req_playerlist = Time.now - 8
 
     # return values
     @players = []
-    @flags = { skip: false, state: @state, gamestate: 'g',id: nil }
+    @flags = { skip: false, state: @state, gamestate: 'g', id: nil }
+    @extra = nil # currently only used for download progress array
   end
 
-  def reset()
+  def reset
     @id = nil
     @tick = 0
     @state = STATE_MENU
     @players = []
-    @flags = { skip: false, state: @state, gamestate: 'g',id: nil }
+    @flags = { skip: false, state: @state, gamestate: 'g', id: nil }
   end
 
   def connect(ip, port)
     reset
     @s = TCPSocket.open(ip, port)
     @s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) # nagle's algorithm-
-    @state = STATE_CONNECTING
-    start_recording() if @cfg.data['autorecord']
+    update_state(STATE_CONNECTING)
+    start_recording if @cfg.data['autorecord']
   end
 
-  def disconnect()
+  def disconnect
     return if @state == STATE_MENU
+    return if @s.nil?
 
-    @console.log "disconnecting from server."
+    @console.log 'disconnecting from server.'
     @s.close
     @s = nil
     reset
@@ -76,31 +91,27 @@ class Client
     @console.log "loaded recording containing #{@recording_ticks.size} ticks"
   end
 
-  def start_recording()
-    @recording_file = "autorec.txt"
+  def start_recording
+    @recording_file = 'autorec.txt'
     rec_file = "#{@cfg.chichilku3_dir}recordings/#{@recording_file}"
     @is_recording = true
-    File.delete(rec_file) if File.exists? rec_file
+    File.delete(rec_file) if File.exist? rec_file
   end
 
   def recording_record_tick(data)
     return unless @is_recording
 
     recording_file = "#{@cfg.chichilku3_dir}recordings/#{@recording_file}"
-    IO.write(recording_file, data + "\n", mode: 'a')
+    IO.write(recording_file, "#{data}\n", mode: 'a')
   end
 
-  def recording_playback_tick()
+  def recording_playback_tick
     if @recording_ticks_len <= @tick
-      @console.log "finished playing back recording"
+      @console.log 'finished playing back recording'
       update_state(STATE_MENU)
       return [[], @flags, nil]
     end
     data = @recording_ticks[@tick]
-    if data.length != SERVER_PACKAGE_LEN
-      @console.err "failed to parse recording data=#{data.length} server=#{SERVER_PACKAGE_LEN}"
-      return nil
-    end
 
     @tick += 1
     @flags[:skip] = false
@@ -128,7 +139,7 @@ class Client
 
     # save protocol and cut it off
     msg = handle_protocol(data[0].to_i, data[1], data[2..-1])
-    [@players, @flags, msg]
+    [@players, @flags, msg, @extra]
   end
 
   private
@@ -140,43 +151,75 @@ class Client
 
   def handle_protocol(protocol, p_status, data)
     @console.dbg "HANDLE PROTOCOL=#{protocol} status=#{p_status}"
-    if protocol == 0 # error packet
+    case protocol
+    when 0 # error packet
       code = data[0..2]
       error_msg = data[3..-1]
-      if code == NET_ERR_FULL
-        @console.log "server is full."
-      elsif code == NET_ERR_DISCONNECT
-        @console.log "disconnected by server."
-      elsif code == NET_ERR_KICK
-        @console.log "kicked by server."
-      elsif code == NET_ERR_BAN
-        @console.log "banned by server."
-      elsif code == NET_ERR_SERVER_OUTDATED
-        @console.log "failed to connect to server: server is outdated."
+      case code
+      when NET_ERR_FULL
+        @console.log 'server is full.'
+      when NET_ERR_DISCONNECT
+        @console.log 'disconnected by server.'
+      when NET_ERR_KICK
+        @console.log 'kicked by server.'
+      when NET_ERR_BAN
+        @console.log 'banned by server.'
+      when NET_ERR_SERVER_OUTDATED
+        @console.log 'failed to connect to server: server is outdated.'
         @console.log error_msg
-      elsif code == NET_ERR_CLIENT_OUTDATED
-        @console.log "failed to connect to server: your client is outdated."
+      when NET_ERR_CLIENT_OUTDATED
+        @console.log 'failed to connect to server: your client is outdated.'
       else
         @console.log "ERROR unkown error code code=#{code} data=#{data}"
         return
       end
+      disconnect
       @state = STATE_ERROR
       return [0, code, error_msg]
-    elsif protocol == 1 # update package
+    when 1 # update package
       server_package_to_player_array(data)
-    elsif protocol == 2 # id packet
+    when 2 # id packet
       if @id.nil?
         id_packet(data)
       else
         @console.log "WARNING got unexpected id packet=#{data}"
       end
-    elsif protocol == 3 # name packet
+    when 3 # name packet
       protocol_names(data)
-    elsif protocol == 4 # command respond
+    when 4 # command respond
       @console.log "server respond: #{data}"
       return [1, data]
+    when 5 # map info
+      checksum = data[0..39]
+      @game_map = GameMap.new(@console, @cfg, nil, method(:finished_download_callback), checksum)
+    when 6 # map download init
+      size = net_unpack_bigint(data[0..5])
+      mapname = data[6..-1].strip
+      @game_map.set_name(mapname)
+      @game_map.set_size(size)
+      accept = '0'
+      if @game_map.found?
+        @console.log "loading map name='#{mapname}'"
+        finished_download_callback(@game_map.dl_path)
+      else
+        @console.log "downloading map name='#{mapname}' size=#{size} ..."
+        update_state(STATE_DOWNLOADING)
+        @game_map.prepare_download
+        accept = '1'
+      end
+      @force_send = "5l#{@id.to_s(16)}#{accept}b641000"
+    when 7 # map download chunk
+      if @game_map.nil?
+        @console.wrn 'got unexpected map chunk from server (no map)'
+        @force_send = "5l#{@id.to_s(16)}0b641000"
+      elsif @state != STATE_DOWNLOADING
+        @console.wrn 'got unexpected map chunk from server (wrong client state)'
+        @force_send = "5l#{@id.to_s(16)}0b641000"
+      else
+        @extra = [@game_map.download(data), @game_map.size]
+      end
     else
-      @console.log "ERROR unkown protocol=#{protocol} data=#{data}"
+      @console.log "ERROR unkown protocol=#{protocol} data='#{data}'"
     end
     nil
   end
@@ -198,11 +241,16 @@ class Client
       return
     end
 
+    unless @force_send.nil?
+      net_write(@force_send)
+      @force_send = nil
+    end
+
     data = "#{protocol}l#{@id.to_s(16)}#{data.join('')}"
     net_write(data)
   end
 
-  def set_id(id)
+  def update_id(id)
     if id > MAX_CLIENTS || id < 1
       @console.log "Errornous id=#{id}"
       return false
@@ -217,8 +265,7 @@ class Client
     @console.log 'Trying to read id...'
     @playercount = net_unpack_int(data[0..1])
     id = data[2].to_i(16)
-    set_id(id)
-    update_state(STATE_INGAME) unless @state == STATE_REC_PLAYBACK
+    update_id(id)
   end
 
   def id_packet(data)
@@ -238,11 +285,11 @@ class Client
     server_data = save_read(@s, 3)
     return nil if server_data == ''
 
-    if server_data[0] == "1"
+    if server_data[0] == '1'
       len = net_unpack_int(server_data[2]) * PLAYER_PACKAGE_LEN
-      server_data += save_read(@s, len+1)
+      server_data += save_read(@s, len + 1)
     else
-      server_data += save_read(@s, SERVER_PACKAGE_LEN-3)
+      server_data += save_read(@s, SERVER_PACKAGE_LEN - 3)
     end
     return nil if server_data == ''
 
@@ -259,6 +306,12 @@ class Client
     @console.dbg "sent: #{data}"
   end
 
+  def finished_download_callback(map_dir)
+    update_state(STATE_INGAME) unless @state == STATE_REC_PLAYBACK
+    @gui.load_background_image(map_dir)
+    @game_map.load_data(map_dir)
+  end
+
   # TODO: add protocol class for this
   # TODO: protocol_names should create the player objects
   # AND: server_package_to_player_array should update the objs
@@ -278,7 +331,7 @@ class Client
     players = []
     used_slots.times do |index|
       size = NAME_LEN + 2 # id|score|name
-      players[index] = data[index * size..index * size + size-1]
+      players[index] = data[index * size..index * size + size - 1]
     end
     players
   end
@@ -288,7 +341,7 @@ class Client
     player_strs.each do |player_str|
       id = player_str[0].to_i(16)
       score = net_unpack_int(player_str[1])
-      name = player_str[2..-1]
+      name = player_str[2..-1].strip
       players << Player.new(id, 0, 0, score, name) unless id.zero?
     end
     # debug
@@ -315,7 +368,7 @@ class Client
   def server_package_to_player_strs(used_slots, data)
     players = []
     used_slots.times do |index|
-      players[index] = data[index * PLAYER_PACKAGE_LEN..index * PLAYER_PACKAGE_LEN + PLAYER_PACKAGE_LEN-1]
+      players[index] = data[index * PLAYER_PACKAGE_LEN..index * PLAYER_PACKAGE_LEN + PLAYER_PACKAGE_LEN - 1]
     end
     players
   end
@@ -326,11 +379,11 @@ class Client
       id = player_str[0].to_i(16)
       score = net_unpack_int(player_str[1])
       net_state = player_str[2]
-      projR = player_str[3]
-      projX = net_unpack_bigint(player_str[4..5])
-      projY = net_unpack_bigint(player_str[6..7])
-      aimX = net_unpack_bigint(player_str[8..9])
-      aimY = net_unpack_bigint(player_str[10..11])
+      proj_r = player_str[3]
+      proj_x = net_unpack_bigint(player_str[4..5])
+      proj_y = net_unpack_bigint(player_str[6..7])
+      aim_x = net_unpack_bigint(player_str[8..9])
+      aim_y = net_unpack_bigint(player_str[10..11])
       x = net_unpack_bigint(player_str[12..13])
       y = net_unpack_bigint(player_str[14..15])
       # puts "'#{player_str}' id: #{id} x: #{x} '#{player_str[12..13]}' y: #{y} '#{player_str[14..15]}'"
@@ -343,10 +396,10 @@ class Client
       next if p_index.nil?
 
       @console.dbg "got player: #{@players[p_index]}"
-      new_player = Player.update_player(@players, id, x, y, score, aimX, aimY)
-      new_player.projectile.r = projR
-      new_player.projectile.x = projX
-      new_player.projectile.y = projY
+      new_player = Player.update_player(@players, id, x, y, score, aim_x, aim_y)
+      new_player.projectile.r = proj_r
+      new_player.projectile.x = proj_x
+      new_player.projectile.y = proj_y
       new_player.net_to_state(net_state)
       @players[Player.get_player_index_by_id(@players, id)] = new_player
     end

data/lib/client/client_cfg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require_relative '../share/network'
 require_relative '../share/config'
@@ -5,7 +7,6 @@ require_relative '../share/config'
 # The client side repository using JSON
 class ClientCfg < Config
   def sanitize_data(data)
-    data = JSON.parse(File.read(@file))
     if data['username'].length > NAME_LEN
       data['username'] = data['username'][0..NAME_LEN - 1]
       @console.log "username to long chopped to '#{data['username']}'"