chichilku3 5.0.1 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb2d898a5e9000e8d403b3095dc0f11b32ffcf6299636cce5f5ecbf0986e4d1
-  data.tar.gz: 65a511ba7ef525ca52f9ee961d9478bd2aa15b8a0ee0078bcd5e1535460a917e
+  metadata.gz: 0e76757297dc1c7f9103fc505a4e6dc4983489f71c568a7f494dcd510df87a6c
+  data.tar.gz: 48321cf98b07848de50e286a3367fa10669f6b00bd173ba414d54e9af5f8c243
 SHA512:
-  metadata.gz: 1f3c0294308be6d225b4a823d0cfffab0e669be8dab873da74517921bff83e453c1375d9dfe14ff254ff418109b45f4fe4a9d5d9ae88058258ff61a22c3eaddb
-  data.tar.gz: f83514aa1de0afdce1880e3ed72294aa2f79a5ff605de76627b70d6a87430bd973dddcf665ef19b5b1314f561d963a5adb00e7499297e455b22c87173e2bf839
+  metadata.gz: 04261a4e08b759e26e26a734295ab9d1d2a412fb548d027839a81371d896d3044148317c9e0596ea7209297162068de7b3a6ead2598f8a571f7ba007e0ff9ac6
+  data.tar.gz: 0d8d25f82fc2c97ffecedc148434bdae9e34d38fd8a3809f803845385460f7c09a1ead35d7387369fd30115842d7c81c06c6ee169f24371206f85549ea2ee89b

data/client.json

@@ -2,5 +2,6 @@
   "ip": "localhost",
   "port": 9900,
   "username": "00000000",
-  "fullscreen": false
+  "fullscreen": false,
+  "autorecord": false
 }

data/lib/client/client.rb

@@ -7,10 +7,11 @@ STATE_MENU = -1
 STATE_OFFLINE = 0
 STATE_CONNECTING = 1
 STATE_INGAME = 2
+STATE_REC_PLAYBACK = 3
 
 # Networking part of the game clientside
 class Client
-  attr_reader :id, :state
+  attr_reader :id, :state, :server_version
   def initialize(console, cfg)
     @id = nil
     @tick = 0
@@ -22,6 +23,13 @@ class Client
 
     @s = nil # network socket (set in connect() method)
 
+    @recording_ticks = []
+    @recording_ticks_len = 0
+    @recording_file = "autorec.txt"
+    @is_recording = false
+
+    @server_version = nil
+
     # state variables
     @req_playerlist = Time.now - 8
 
@@ -43,16 +51,65 @@ class Client
     @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']
   end
 
   def disconnect()
     return if @state == STATE_MENU
+
     @console.log "disconnecting from server."
     @s.close
     @s = nil
     reset
   end
 
+  def load_recording(recording_file)
+    recording_file = "#{@cfg.chichilku3_dir}recordings/#{recording_file}"
+    @recording_ticks = []
+    @tick = 0
+    update_state(STATE_REC_PLAYBACK)
+    File.readlines(recording_file).each do |data|
+      @recording_ticks << data[0..-2] # cut off newline
+    end
+    # TODO: check if this .length lookup eats performance in ruby
+    @recording_ticks_len = @recording_ticks.length
+    @console.log "loaded recording containing #{@recording_ticks.size} ticks"
+  end
+
+  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
+  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')
+  end
+
+  def recording_playback_tick()
+    if @recording_ticks_len <= @tick
+      @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
+
+    # save protocol and cut it off
+    msg = handle_protocol(data[0].to_i, data[1], data[2..-1])
+    [@players, @flags, msg, [@tick, @recording_ticks_len]]
+  end
+
   def tick(client_data, protocol, tick)
     return nil if @state == STATE_MENU
 
@@ -67,8 +124,7 @@ class Client
     data = fetch_server_data
     return nil if data.nil?
 
-    # only process the long packages and ignore ip packages here
-    return nil if data.length != SERVER_PACKAGE_LEN
+    recording_record_tick(data)
 
     # save protocol and cut it off
     msg = handle_protocol(data[0].to_i, data[1], data[2..-1])
@@ -129,24 +185,20 @@ class Client
     if @id.nil?
       # request id has priority
       # resend after 100 ticks if no respond
-      name = @cfg.data['username'].ljust(5, '-')
-      net_write("1l#{name}") if (@tick % 200).zero?
+      net_write("1l#{GAME_VERSION}XXXXX") if (@tick % 200).zero?
       return
     end
 
     # if no playerlist yet -> request one
     if @players == [] && @req_playerlist < Time.now - 4
-      net_write("3l#{id}#{GAME_VERSION}")
+      name = @cfg.data['username'].ljust(NAME_LEN, ' ')
+      net_write("3l#{name}")
       @console.log('requesting a playerlist')
       @req_playerlist = Time.now
       return
     end
 
-    # prefix data with id
-    # prot 2 = update pck
-    # prot updated to dynamic becuase we now also send cmds
-    # data = format("#{protocol}l%02d#{data.join('')}", @id) # old 2byte id
-    data = "#{protocol}l#{@id}#{data.join('')}" # new 1byte id
+    data = "#{protocol}l#{@id.to_s(16)}#{data.join('')}"
     net_write(data)
   end
 
@@ -163,10 +215,10 @@ class Client
 
   def grab_id(data)
     @console.log 'Trying to read id...'
-    @playercount = data[0..1]
-    id = data[2..3].to_i
+    @playercount = net_unpack_int(data[0..1])
+    id = data[2].to_i(16)
     set_id(id)
-    update_state(STATE_INGAME)
+    update_state(STATE_INGAME) unless @state == STATE_REC_PLAYBACK
   end
 
   def id_packet(data)
@@ -178,12 +230,20 @@ class Client
   end
 
   def get_server_version(data)
-    server_version = data[4..8]
-    @console.log "server version='#{server_version}'"
+    @server_version = data[4..7]
+    @console.log "server version='#{@server_version}'"
   end
 
   def fetch_server_data
-    server_data = save_read(@s, SERVER_PACKAGE_LEN)
+    server_data = save_read(@s, 3)
+    return nil if server_data == ''
+
+    if server_data[0] == "1"
+      len = net_unpack_int(server_data[2]) * PLAYER_PACKAGE_LEN
+      server_data += save_read(@s, len+1)
+    else
+      server_data += save_read(@s, SERVER_PACKAGE_LEN-3)
+    end
     return nil if server_data == ''
 
     @console.dbg "recived data: #{server_data}"
@@ -207,17 +267,18 @@ class Client
   # And its dependencies:
   def protocol_names(data)
     #     3 0          00 00000 00 00000 00 00000 000
-    playercount = data[0].to_i
+    playercount = net_unpack_int(data[0])
     @flags[:gamestate] = data[1]
     data = data[2..-1]
     p_strs = protocol_names_to_player_strs(playercount, data)
     protocol_names_strs_to_objs(p_strs)
   end
 
-  def protocol_names_to_player_strs(slots, data)
+  def protocol_names_to_player_strs(used_slots, data)
     players = []
-    slots.times do |index|
-      players[index] = data[index * 7..index * 7 + 6]
+    used_slots.times do |index|
+      size = NAME_LEN + 2 # id|score|name
+      players[index] = data[index * size..index * size + size-1]
     end
     players
   end
@@ -225,7 +286,7 @@ class Client
   def protocol_names_strs_to_objs(player_strs)
     players = []
     player_strs.each do |player_str|
-      id = player_str[0].to_i
+      id = player_str[0].to_i(16)
       score = net_unpack_int(player_str[1])
       name = player_str[2..-1]
       players << Player.new(id, 0, 0, score, name) unless id.zero?
@@ -241,20 +302,20 @@ class Client
   def server_package_to_player_array(data)
     # /(?<count>\d{2})(?<player>(?<id>\d{2})(?<x>\d{3})(?<y>\d{3}))/
     # @console.log "data: #{data}"
-    slots = data[0].to_i # save occupado slots
+    used_slots = net_unpack_int(data[0]) # save occupado slots
     # gamestate = data[1].to_i # save gamestate
     @flags[:gamestate] = data[1]
     # @console.log "gamestate: " + @flags[:gamestate]
     data = data[2..-1] # cut slots and gamestate off
-    players = server_package_to_player_strs(slots, data)
+    players = server_package_to_player_strs(used_slots, data)
     # @console.log "players: \n#{players}"
     player_strs_to_objects(players)
   end
 
-  def server_package_to_player_strs(slots, data)
+  def server_package_to_player_strs(used_slots, data)
     players = []
-    slots.times do |index|
-      players[index] = data[index * 8..index * 8 + 7]
+    used_slots.times do |index|
+      players[index] = data[index * PLAYER_PACKAGE_LEN..index * PLAYER_PACKAGE_LEN + PLAYER_PACKAGE_LEN-1]
     end
     players
   end
@@ -262,13 +323,17 @@ class Client
   def player_strs_to_objects(player_strs)
     players = []
     player_strs.each do |player_str|
-      id = player_str[0].to_i
+      id = player_str[0].to_i(16)
       score = net_unpack_int(player_str[1])
-      unused = player_str[2]
-      net_state = player_str[3]
-      x = net_unpack_bigint(player_str[4..5])
-      y = net_unpack_bigint(player_str[6..7])
-      # puts "id: #{id} x: #{x} y: #{y}"
+      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])
+      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]}'"
       # players << Player.new(id, x, y) unless id.zero?
 
       @console.dbg "-- updt player id=#{id} score=#{score}--"
@@ -278,7 +343,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)
+      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.net_to_state(net_state)
       @players[Player.get_player_index_by_id(@players, id)] = new_player
     end

data/lib/client/client_cfg.rb

@@ -2,7 +2,7 @@ require 'json'
 require_relative '../share/network'
 require_relative '../share/config'
 
-# The client side repository usign JSON
+# The client side repository using JSON
 class ClientCfg < Config
   def sanitize_data(data)
     data = JSON.parse(File.read(@file))

data/lib/client/gui.rb

@@ -26,6 +26,8 @@ MENU_MAIN = 0
 MENU_CONNECT = 1
 MENU_USERNAME = 2
 
+MOUSE_RADIUS = 200
+
 $time_point=Time.now
 $time_buffer=0
 
@@ -42,10 +44,16 @@ class Gui < Gosu::Window
     self.caption = 'chichilku3'
     self.fullscreen = true if cfg.data['fullscreen']
     # images
+    @crosshair = Gosu::Image.new(img("crosshair128x128.png"))
     @background_image = Gosu::Image.new(img("battle1024x576.png"))
     @connecting_image = Gosu::Image.new(img("connecting1024x512.png"))
     @menu_image = Gosu::Image.new(img("menu1920x1080.png"))
-    @stick = Gosu::Image.new(img("stick128/stick0.png"))
+    @arrow_image = Gosu::Image.new(img("arrow64.png"))
+    @stick_arm_images = []
+    @stick_arm_images << Gosu::Image.new(img("stick128/arm64/arm0.png"))
+    @stick_arm_images << Gosu::Image.new(img("stick128/arm64/arm1.png"))
+    @stick_arm_images << Gosu::Image.new(img("stick128/arm64/arm2.png"))
+    @stick_arm_images << Gosu::Image.new(img("stick128/arm64/arm3.png"))
     @stick_crouching = []
     @stick_crouching << Gosu::Image.new(img("stick128/stick_crouching0.png"))
     @stick_crouching << Gosu::Image.new(img("stick128/stick_crouching1.png"))
@@ -54,12 +62,23 @@ class Gui < Gosu::Window
     @stick_crouching << Gosu::Image.new(img("stick128/stick_crouching4.png"))
     @stick_crouching << Gosu::Image.new(img("stick128/stick_crouching5.png"))
     @stick_images = []
-    @stick_images << Gosu::Image.new(img("stick128/stick0.png"))
-    @stick_images << Gosu::Image.new(img("stick128/stick1.png"))
-    @stick_images << Gosu::Image.new(img("stick128/stick2.png"))
-    @stick_images << Gosu::Image.new(img("stick128/stick3.png"))
-    @stick_images << Gosu::Image.new(img("stick128/stick4.png"))
-    @stick_images << Gosu::Image.new(img("stick128/stick5.png"))
+    @stick_images << Gosu::Image.new(img("stick128/stick_noarms.png"))
+    @stick_images << Gosu::Image.new(img("stick128/stick_noarms.png"))
+    @stick_images << Gosu::Image.new(img("stick128/stick_noarms.png"))
+    @stick_images << Gosu::Image.new(img("stick128/stick_noarms.png"))
+    @stick_images << Gosu::Image.new(img("stick128/stick_noarms.png"))
+    @bow_images = []
+    @bow_images << Gosu::Image.new(img("bow64/bow0.png"))
+    @bow_images << Gosu::Image.new(img("bow64/bow1.png"))
+    @bow_images << Gosu::Image.new(img("bow64/bow2.png"))
+    @bow_images << Gosu::Image.new(img("bow64/bow3.png"))
+    # TODO: add arms back in if no bow is in use
+    # @stick_images << Gosu::Image.new(img("stick128/stick0.png"))
+    # @stick_images << Gosu::Image.new(img("stick128/stick1.png"))
+    # @stick_images << Gosu::Image.new(img("stick128/stick2.png"))
+    # @stick_images << Gosu::Image.new(img("stick128/stick3.png"))
+    # @stick_images << Gosu::Image.new(img("stick128/stick4.png"))
+    # @stick_images << Gosu::Image.new(img("stick128/stick5.png"))
     @x = 0
     @y = 0
     @players = []
@@ -85,6 +104,7 @@ class Gui < Gosu::Window
     @menu_items = []
     @selected_menu_item = 0
     @menu_textfield = TextField.new(self, 60, 200)
+    @demo_ticks = [0,0]
     # @chat_inp_stream = nil #TextInput.new
     # @chat_inp_stream.text # didnt get it working <--- nobo xd
     
@@ -93,6 +113,11 @@ class Gui < Gosu::Window
     # depreciated ._.
     # @con_msg = Gosu::Image.from_text(self, "connecting to #{@cfg.data['ip']}:#{@cfg.data['port']}...", Gosu.default_font_name, 45)
     init_menu()
+
+    if ARGV.length > 0
+      port = ARGV.length > 1 ? ARGV[1].to_i : 9900
+      connect(ARGV[0], port)
+    end
   end
 
   def img(path)
@@ -187,7 +212,7 @@ class Gui < Gosu::Window
         ip = @menu_textfield.text.split(":")
         @cfg.data['ip'] = ip[0]
         @cfg.data['port'] = ip[1] if ip.length > 1
-        connect
+        connect(@cfg.data['ip'], @cfg.data['port'])
       end
     else
       @last_key = nil
@@ -221,17 +246,21 @@ class Gui < Gosu::Window
         @state = STATE_MENU
         @net_client.disconnect
         return
+      elsif @state == STATE_REC_PLAYBACK
+        @state = STATE_MENU
+        return
       end
     end
     net_request = '0000'.split('')
+    net_request << "!!!!"
     protocol = 2
 
     if @is_chat
       msg = chat_tick
       if !msg.nil?
         # @console.dbg "rawmsg: #{msg}"
-        msg = msg.ljust(4, '0')
-        net_request = msg[0..3].split('')
+        msg = msg.ljust(8, '0')
+        net_request = msg[0..CMD_LEN].split('')
         # @console.dbg "prepedmsg: #{net_request}"
         protocol = 4
       end
@@ -241,13 +270,13 @@ class Gui < Gosu::Window
         net_request[0] = '1'
       end
       if button_down?(KEY_A)
-        net_request[1] = '1'
+        net_request[1] = 'l'
       end
       if button_down?(KEY_D)
-        net_request[2] = '1'
+        net_request[1] = 'r'
       end
       if button_down?(Gosu::KB_SPACE)
-        net_request[3] = '1'
+        net_request[2] = '1'
       end
       if button_press?(KEY_M)
         @is_debug = !@is_debug
@@ -257,15 +286,27 @@ class Gui < Gosu::Window
         @is_chat = true
         @chat_msg = ""
       end
+      if button_down?(Gosu::MsLeft)
+        net_request[3] = '1'
+      end
+      # TODO: check for active window
+      # do not leak mouse movement in other applications than chichilku3
+      net_request[4] = net_pack_bigint(self.mouse_x.to_i.clamp(0, 8834), 2)
+      net_request[5] = net_pack_bigint(self.mouse_y.to_i.clamp(0, 8834), 2)
       @is_scoreboard = button_down?(Gosu::KB_TAB)
     end
 
-    # Networking
-    begin
-      net_data = @net_client.tick(net_request, protocol, @tick)
-    rescue Errno::ECONNRESET, Errno::EPIPE
-      net_data = [@players, @flags, [0, NET_ERR_DISCONNECT, "connection to server lost"]]
-      @net_client.disconnect
+    if @state == STATE_REC_PLAYBACK
+      net_data = @net_client.recording_playback_tick()
+      @demo_ticks = net_data[3] unless net_data.nil?
+    else
+      # Networking
+      begin
+        net_data = @net_client.tick(net_request, protocol, @tick)
+      rescue Errno::ECONNRESET, Errno::EPIPE
+        net_data = [@players, @flags, [0, NET_ERR_DISCONNECT, "connection to server lost"]]
+        @net_client.disconnect
+      end
     end
     return if net_data.nil?
 
@@ -353,6 +394,13 @@ class Gui < Gosu::Window
     @events[:blood] = bloods
   end
 
+  def draw_debug(x, y, s=1)
+    return unless @is_debug
+
+    draw_rect(x, y, 4*s, 4*s, 0xFFFF0000, 1)
+    draw_rect(x+1*s, y+1*s, 2*s, 2*s, 0xFF00FF00, 1)
+  end
+
   def draw
     # draw_quad(0, 0, 0xffff8888, WINDOW_SIZE_X, WINDOW_SIZE_Y, 0xffffffff, 0, 0, 0xffffffff, WINDOW_SIZE_X, WINDOW_SIZE_Y, 0xffffffff, 0)
     if @state == STATE_MENU
@@ -369,22 +417,61 @@ class Gui < Gosu::Window
       end
     elsif @state == STATE_CONNECTING
       @connecting_image.draw(0, 0, 0)
-      @font.draw_text("connecting to #{@cfg.data['ip']}:#{@cfg.data['port']}...", 20, 20, 0, 2, 5)
+      @font.draw_text("connecting to #{@cfg.data['ip']}:#{@cfg.data['port']}...", 20, 20, 0, 3, 3)
       # @con_msg.draw(100,200,0)
-    elsif @state == STATE_INGAME
+    elsif @state == STATE_INGAME || @state == STATE_REC_PLAYBACK
       @background_image.draw(0, 0, 0)
+      @crosshair.draw(self.mouse_x-16, self.mouse_y-16, 0, 0.25, 0.25)
+      # useless mouse trap
+      # since its buggo and your character moves maybe keep it free
+      # mouse players should go fullscreen
+      # self.mouse_x = (WINDOW_SIZE_X / 2) + MOUSE_RADIUS - 1 if self.mouse_x > (WINDOW_SIZE_X / 2) + MOUSE_RADIUS
+      # self.mouse_x = (WINDOW_SIZE_X / 2) - MOUSE_RADIUS + 1 if self.mouse_x < (WINDOW_SIZE_X / 2) - MOUSE_RADIUS
+      # self.mouse_y = (WINDOW_SIZE_Y / 2) + MOUSE_RADIUS - 1 if self.mouse_y > (WINDOW_SIZE_Y / 2) + MOUSE_RADIUS
+      # self.mouse_y = (WINDOW_SIZE_Y / 2) - MOUSE_RADIUS + 1 if self.mouse_y < (WINDOW_SIZE_Y / 2) - MOUSE_RADIUS
       @players.each do |player|
         event_blood(player.x, player.y) if player.state[:bleeding]
         player.draw_tick
         @console.dbg "drawing player id=#{player.id} pos=#{player.x}/#{player.y}"
         # draw_rect(player.x, player.y, TILE_SIZE, TILE_SIZE, Gosu::Color::WHITE)
-        # @stick.draw(player.x, player.y, 0)
         if player.state[:crouching]
           @stick_crouching[player.img_index].draw(player.x, player.y, 0, 0.5, 0.5)
         else
           @stick_images[player.img_index].draw(player.x, player.y, 0, 0.5, 0.5)
+          x = player.aimX - player.x
+          y = player.aimY - player.y
+          rot = Math.atan2(x, y) * 180 / Math::PI * -1 + 90 * -1
+          rot2 = Math.atan2(x, y) * 180 / Math::PI * -1 + 270 * -1
+          stick_center_x = player.x + TILE_SIZE/4
+          stick_center_y = player.y + TILE_SIZE/2
+          d = -8
+          d += player.state[:fire] * 3
+          arr_x = stick_center_x + (d * Math.cos((rot2 + 180) / 180 * Math::PI))
+          arr_y = stick_center_y + (d * Math.sin((rot2 + 180) / 180 * Math::PI))
+          @bow_images[player.state[:fire]].draw_rot(stick_center_x, stick_center_y, 0, rot, 0.5, 0.5, 0.5, 0.5)
+          @stick_arm_images[player.state[:fire]].draw_rot(stick_center_x, stick_center_y, 0, rot, 0.5, 0.5, 0.5, 0.5)
+          if player.projectile.x == 0 and player.projectile.y == 0
+            @arrow_image.draw_rot(arr_x, arr_y, 0, rot2, 0.5, 0.5, 0.5, 0.5)
+          end
+          if @is_debug
+            draw_debug(arr_x, arr_y, 2)
+            draw_debug(stick_center_x, stick_center_y, 1)
+            draw_line(arr_x, arr_y, 0xFFFF0000, stick_center_x, stick_center_y, 0xFF000000)
+            @font.draw_text("rot=#{rot.to_i} rot2=#{rot2.to_i}", player.x - 60, player.y - 100, 0, 1, 1, 0xFF000000)
+            @font.draw_text("d=#{d} (#{stick_center_x}/#{stick_center_y}) -> (#{arr_x.to_i}/#{arr_y.to_i})", player.x - 80, player.y - 80, 0, 1, 1, 0xFF000000)
+          end
+        end
+        unless player.projectile.x == 0 or player.projectile.y == 0
+          rot = player.projectile.r.to_i * 45
+          @arrow_image.draw_rot(player.projectile.x, player.projectile.y, 0, rot, 0.5, 0.5, 0.5, 0.5)
         end
         if @is_debug # print id
+          # aim
+          draw_rect(player.aimX - 2, player.aimY - 16, 4, 32, 0xCC33FF33)
+          draw_rect(player.aimX - 16, player.aimY - 2, 32, 4, 0xCC33FF33)
+          draw_rect(player.aimX, player.aimY - 15, 1, 30, 0xAA000000)
+          draw_rect(player.aimX - 15, player.aimY, 30, 1, 0xAA000000)
+          # text background
           draw_rect(player.x - 2, player.y - 60, 32, 20, 0xAA000000)
           @font.draw_text("#{player.id}:#{player.score}", player.x, player.y - 60, 0, 1, 1)
           # @font.draw_text("#{player.id}:#{player.img_index}", player.x, player.y - TILE_SIZE * 2, 0, 1, 1)
@@ -393,7 +480,9 @@ class Gui < Gosu::Window
           else
             draw_rect(player.x, player.y, TILE_SIZE/2, TILE_SIZE, 0xAA00EE00)
           end
-          else
+          unless player.projectile.x == 0 or player.projectile.y == 0
+            draw_rect(player.projectile.x, player.projectile.y, player.projectile.w, player.projectile.h, 0xAA00EE00)
+          end
         end
         @font.draw_text(player.name, player.x - (TILE_SIZE/6), player.y - TILE_SIZE / 2, 0, 1, 1, 0xff_000000)
       end
@@ -411,10 +500,12 @@ class Gui < Gosu::Window
       if @is_debug
         player = Player.get_player_by_id(@players, @flags[:id])
         unless player.nil?
-          draw_rect(5, 10, 295, 75, 0xAA000000)
+          draw_rect(5, 10, 290, 85, 0xAA000000)
           @font.draw_text("Press m to deactivate debug mode", 10, 10, 0, 1, 1)
           @font.draw_text("x: #{player.x} y: #{player.y}", 10, 30, 0, 1, 1)
+          @font.draw_text("aimX: #{player.aimX} aimY: #{player.aimY}", 10, 45, 0, 1, 1)
           @font.draw_text("gamestate: #{@flags[:gamestate]}", 10, 60, 0 , 1, 1)
+          @font.draw_text("server version: #{@net_client.server_version}", 10, 75, 0 , 1, 1)
           # thats useless because collide/delta speed is not sent over the network
           # @font.draw_text("dx: #{player.dx} dy: #{player.dy}", 10, 50, 0, 1, 1)
           # @font.draw_text(player.collide_string, 10, 70, 0, 1, 1)
@@ -424,7 +515,10 @@ class Gui < Gosu::Window
       draw_events()
 
       if @is_scoreboard
-        draw_scoreboard(WINDOW_SIZE_X, WINDOW_SIZE_Y, @players, @font)
+        draw_scoreboard(WINDOW_SIZE_X, WINDOW_SIZE_Y, @players, @font, @is_debug)
+      end
+      if @state == STATE_REC_PLAYBACK && !(@demo_ticks.nil?)
+        @font.draw_text("#{@demo_ticks[0]}/#{@demo_ticks[1]}", 10, WINDOW_SIZE_Y - 20, 0)
       end
     elsif @state == STATE_ERROR
       net_err_code = @net_err[0]
@@ -445,9 +539,10 @@ class Gui < Gosu::Window
 
   private
 
-  def connect()
+  def connect(ip, port)
+    @console.log "connecting to server '#{ip}:#{port}' ..."
     begin
-      @net_client.connect(@cfg.data['ip'], @cfg.data['port'])
+      @net_client.connect(ip, port)
       @state = STATE_CONNECTING;
       @menu_page = MENU_MAIN
     rescue Errno::ECONNREFUSED
@@ -482,11 +577,17 @@ class Gui < Gosu::Window
     end
   end
 
+  def play_recording()
+    @net_client.load_recording('autorec.txt')
+    @state = STATE_REC_PLAYBACK
+  end
+
   def init_menu()
     @menu_items = []
     add_menu_item("[c]onnect", Proc.new { connect_menu() })
     add_menu_item("username", Proc.new { username_page() })
     add_menu_item("fullscreen", Proc.new { toggle_fullscreen() })
+    add_menu_item("recording", Proc.new { play_recording() })
     add_menu_item("[q]uit", Proc.new { exit() })
   end