chichilku3 15.0.2 → 15.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13aef9c6c22c8ded3b9c9857f4e9c50a9e4ce83efb7067f1f4fe8ca82635a35d
-  data.tar.gz: 80ed6e70c0ab3d6daf7f44a540b209a6a418e7960d10259ce54530059b829713
+  metadata.gz: f68501431c234014c55d50ecf62ad13d9cc923354d4a5389d06f6172bcccaf27
+  data.tar.gz: 9e1f59900648b0cabf586a002ac1ea132592e000e50722d4d2add2545d811cd0
 SHA512:
-  metadata.gz: 7112fcb7ac6b3dd34f4724a5079898583e47fb613450d4b0773db48831974881e5f8f1eb2b3bfdcb744b47ac5de9bbbd494a25158ba7c22b483850b933bbe101
-  data.tar.gz: fc5c6371d73ed88ef6dfa2d7a0e1d4881e9746fb644564705743c3724fb56129f692f89feb990f826a393d99ece0a3edf064f5b9939ccb3ca730a3af182a93a9
+  metadata.gz: e588e44b4a93cc846ecf4d3b9eac59ddb265ea8501792a105bf2a1b68d586d0022c798a72d523e123ce29c93b5e42b64be3c528e1ddff9cbfc8dfa93d02b6b99
+  data.tar.gz: 542b61fc91fd62af1dd92c71a3b046b2558ded0f5edfd59a2ad5710c814b82c869e63af7f3a4524864ce1e400db6be83f862176ed133f9a15b9bc8c545f6372e

data/lib/client/client.rb

@@ -95,14 +95,14 @@ class Client
     @recording_file = 'autorec.txt'
     rec_file = "#{@cfg.chichilku3_dir}recordings/#{@recording_file}"
     @is_recording = true
-    File.delete(rec_file) if File.exist? rec_file
+    FileUtils.rm_rf(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')
+    File.write(recording_file, "#{data}\n", mode: 'a')
   end
 
   def recording_playback_tick
@@ -117,7 +117,7 @@ class Client
     @flags[:skip] = false
 
     # save protocol and cut it off
-    msg = handle_protocol(data[0].to_i, data[1], data[2..-1])
+    msg = handle_protocol(data[0].to_i, data[1], data[2..])
     [@players, @flags, msg, [@tick, @recording_ticks_len]]
   end
 
@@ -138,7 +138,7 @@ class Client
     recording_record_tick(data)
 
     # save protocol and cut it off
-    msg = handle_protocol(data[0].to_i, data[1], data[2..-1])
+    msg = handle_protocol(data[0].to_i, data[1], data[2..])
     [@players, @flags, msg, @extra]
   end
 
@@ -154,7 +154,7 @@ class Client
     case protocol
     when 0 # error packet
       code = data[0..2]
-      error_msg = data[3..-1]
+      error_msg = data[3..]
       case code
       when NET_ERR_FULL
         @console.log 'server is full.'
@@ -194,7 +194,7 @@ class Client
       @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
+      mapname = data[6..].strip
       @game_map.set_name(mapname)
       @game_map.set_size(size)
       accept = '0'
@@ -246,7 +246,7 @@ class Client
       @force_send = nil
     end
 
-    data = "#{protocol}l#{@id.to_s(16)}#{data.join('')}"
+    data = "#{protocol}l#{@id.to_s(16)}#{data.join}"
     net_write(data)
   end
 
@@ -322,7 +322,7 @@ class Client
     #     3 0          00 00000 00 00000 00 00000 000
     playercount = net_unpack_int(data[0])
     @flags[:gamestate] = data[1]
-    data = data[2..-1]
+    data = data[2..]
     p_strs = protocol_names_to_player_strs(playercount, data)
     protocol_names_strs_to_objs(p_strs)
   end
@@ -331,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
@@ -341,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].strip
+      name = player_str[2..].strip
       players << Player.new(id, 0, 0, score, name) unless id.zero?
     end
     # debug
@@ -359,7 +359,7 @@ class Client
     # 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
+    data = data[2..] # cut slots and gamestate off
     players = server_package_to_player_strs(used_slots, data)
     # @console.log "players: \n#{players}"
     player_strs_to_objects(players)
@@ -368,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

data/lib/client/gui.rb

@@ -250,7 +250,7 @@ class Gui < Gosu::Window
         return
       end
     end
-    net_request = '0000'.split('')
+    net_request = '0000'.chars
     net_request << '!!!!'
     protocol = 2
 
@@ -259,7 +259,7 @@ class Gui < Gosu::Window
       unless msg.nil?
         # @console.dbg "rawmsg: #{msg}"
         msg = msg.ljust(8, ' ')
-        net_request = msg[0..CMD_LEN].split('')
+        net_request = msg[0..CMD_LEN].chars
         # @console.dbg "prepedmsg: #{net_request}"
         protocol = 4
       end
@@ -305,7 +305,7 @@ class Gui < Gosu::Window
       type = msg[0]
       case type
       when 0
-        @net_err = msg[1..-1]
+        @net_err = msg[1..]
         @state = STATE_ERROR
       when 1
         @server_chat_msg = msg[1]
@@ -384,7 +384,7 @@ class Gui < Gosu::Window
     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)
+    draw_rect(x + (1 * s), y + (1 * s), 2 * s, 2 * s, 0xFF00FF00, 1)
   end
 
   def draw_debug_gametiles
@@ -449,10 +449,10 @@ class Gui < Gosu::Window
           @stick_images[player.img_index].draw(player.x, player.y, 0, 0.5, 0.5)
           x = player.aim_x - player.x
           y = player.aim_y - 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
+          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))
@@ -497,7 +497,7 @@ class Gui < Gosu::Window
         next unless @net_client.game_map&.ready
 
         unless @net_client.game_map.grass?(player.x / TILE_SIZE, player.y / TILE_SIZE)
-          @font.draw_text(player.name, player.x - (TILE_SIZE / 6), player.y - TILE_SIZE / 2, 0, 1, 1, 0xff_000000)
+          @font.draw_text(player.name, player.x - (TILE_SIZE / 6), player.y - (TILE_SIZE / 2), 0, 1, 1, 0xff_000000)
         end
       end
 
@@ -538,6 +538,11 @@ class Gui < Gosu::Window
 
       draw_events
 
+      if @flags[:gamestate] == 'e'
+        @font.draw_text('GAME OVER', (WINDOW_SIZE_X / 2) - 160, 20, 0, 3, 3)
+        @is_scoreboard = true
+      end
+
       draw_scoreboard(WINDOW_SIZE_X, WINDOW_SIZE_Y, @players, @font, @is_debug) if @is_scoreboard
       if @state == STATE_REC_PLAYBACK && !@demo_ticks.nil?
         @font.draw_text("#{@demo_ticks[0]}/#{@demo_ticks[1]}", 10, WINDOW_SIZE_Y - 20, 0)
@@ -548,7 +553,7 @@ class Gui < Gosu::Window
       @connecting_image.draw(0, 0, 0)
       if [NET_ERR_SERVER_OUTDATED, NET_ERR_CLIENT_OUTDATED].include?(net_err_code)
         server_version = net_err_msg[0..4]
-        net_err_msg = net_err_msg[5..-1]
+        net_err_msg = net_err_msg[5..]
         @font.draw_text("Server version: #{server_version} Your version: #{GAME_VERSION}", 50, 150, 0, 2, 2)
       end
       @font.draw_text((NET_ERR[net_err_code]).to_s, 50, 30, 0, 5, 5)

data/lib/client/scoreboard.rb

@@ -18,6 +18,7 @@ def draw_scoreboard(win_size_x, win_size_y, players, font, debug)
     # row borders
     draw_rect(pad_x + 3, pad_y + (i * slot_height), size_x - 6, 3, 0xaa000000)
   end
+  players.sort_by! { |player| -player.score }
   players.each_with_index do |player, i|
     score_offset = text_scale * 10 * player.score.to_s.length
     dbg = 0

data/lib/external/gosu/text.rb

@@ -45,9 +45,10 @@ class TextField < Gosu::TextInput
               INACTIVE_COLOR
             end
     # ChillerDragon's epic shadow to at least have edited the stolen sample a lil bit
-    Gosu.draw_rect (x - PADDING) + 5, (y - PADDING) + 5, WIDTH + 2 * PADDING, height + 2 * PADDING, INACTIVE_COLOR, z
-    Gosu.draw_rect x - PADDING, y - PADDING, WIDTH + 2 * PADDING, height + 2 * PADDING, color, z
-    Gosu.draw_rect x - PADDING, y - PADDING, WIDTH + 2 * PADDING, height + 2 * PADDING, color, z
+    Gosu.draw_rect (x - PADDING) + 5, (y - PADDING) + 5, WIDTH + (2 * PADDING), height + (2 * PADDING), INACTIVE_COLOR,
+                   z
+    Gosu.draw_rect x - PADDING, y - PADDING, WIDTH + (2 * PADDING), height + (2 * PADDING), color, z
+    Gosu.draw_rect x - PADDING, y - PADDING, WIDTH + (2 * PADDING), height + (2 * PADDING), color, z
 
     # Calculate the position of the caret and the selection start.
     pos_x = x + FONT.text_width(text[0...caret_pos])

data/lib/server/chichilku3_server.rb

@@ -66,9 +66,7 @@ class ServerCore
     end
 
     # protocol 3 name prot
-    #                                   gamestate
-    #                                       |
-    pck = "3l#{net_pack_int(@players.count)}g"
+    pck = "3l#{net_pack_int(@players.count)}#{@gamelogic.gamestate}"
     @players.each do |p|
       pck += p.to_n_pck
     end
@@ -103,7 +101,7 @@ class ServerCore
   def players_to_packet
     # player count
     packet = net_pack_int(@players.empty? ? 0 : @players.count)
-    packet += 'g' # gamestate
+    packet += @gamelogic.gamestate
     @players.each do |player|
       packet += player.to_s
     end
@@ -113,7 +111,7 @@ class ServerCore
   def update_pck(data, dt)
     id = data[0].to_i(16)
     @console.dbg "[UPDATE] got player with id: #{id}"
-    @players = @gamelogic.handle_client_requests(@game_map, data[1..-1], id, @players, dt)
+    @players = @gamelogic.handle_client_requests(@game_map, data[1..], id, @players, dt)
     nil # defaults to normal update pck
   end
 
@@ -162,7 +160,7 @@ class ServerCore
 
   def command_package(data, client)
     id = data[0..1].to_i(16)
-    cmd = data[1..-1].strip
+    cmd = data[1..].strip
     @console.log "[chat] ID=#{id} command='#{cmd}'"
     msg = "server_recived_cmd: #{cmd}"
     msg = msg.ljust(SERVER_PACKAGE_LEN - 2, '0')
@@ -243,7 +241,7 @@ class ServerCore
   end
 
   def handle_client_data(client, data, ip, dt)
-    response = handle_protocol(client, data[0].to_i, data[1], data[2..-1], ip, dt)
+    response = handle_protocol(client, data[0].to_i, data[1], data[2..], ip, dt)
     # the response is a direct respond to an protocol
     # everything above this could override important responds
     # like id assignment

data/lib/server/gamelogic.rb

@@ -4,9 +4,14 @@ require_relative '../share/math'
 
 # high level game logic
 class GameLogic
+  attr_reader :gamestate
+
   def initialize(console)
     @console = console
     @alive_players = 0
+    @scorelimit = 10
+    @gamestate = 'g'
+    @ticks_till_new_round = 0
   end
 
   def on_player_connect(client, players)
@@ -34,7 +39,27 @@ class GameLogic
     end
   end
 
+  def start_round(players)
+    @gamestate = 'g'
+    players.each do |player|
+      player.score = 0
+      player.die
+    end
+  end
+
+  def end_round
+    @console.log 'round end'
+    @gamestate = 'e'
+    @ticks_till_new_round = (5 / MAX_TICK_SPEED).to_i
+  end
+
   def tick(game_map, players, dt, tick)
+    if @gamestate == 'e'
+      @ticks_till_new_round -= 1
+      return players if @ticks_till_new_round.positive?
+
+      start_round(players)
+    end
     players.each do |player|
       # reset values (should stay first)
       player.reset_collide
@@ -51,7 +76,10 @@ class GameLogic
       # player collsions works
       # but it eats performance and delays jumping
       check_collide(players, player)
+
+      end_round if player.score >= @scorelimit
     end
+    players
   end
 
   def game_map_collision_vertical(game_map, player)
@@ -153,7 +181,7 @@ class GameLogic
         dy = (player.aim_y - 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)
+        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

data/lib/share/config.rb

@@ -11,9 +11,9 @@ class Config
   def initialize(console, file)
     @chichilku3_dir = ''
     if OS.linux?
-      @chichilku3_dir = "#{ENV['HOME']}/.chichilku/chichilku3/"
+      @chichilku3_dir = "#{Dir.home}/.chichilku/chichilku3/"
     elsif OS.mac?
-      @chichilku3_dir = "#{ENV['HOME']}/Library/Application Support/chichilku/chichilku3/"
+      @chichilku3_dir = "#{Dir.home}/Library/Application Support/chichilku/chichilku3/"
     # elsif OS.windows?
     #   @chichilku3_dir = "%APPDATA%\\chichilku\\chichilku3\\"
     else
@@ -44,9 +44,7 @@ class Config
     return if File.file?(to)
 
     tmp = JSON.parse(File.read(from))
-    File.open(to, 'w') do |f|
-      f.write(tmp.to_json)
-    end
+    File.write(to, tmp.to_json)
   end
 
   def sanitize_data(data)
@@ -61,8 +59,6 @@ class Config
   end
 
   def save
-    File.open(@file, 'w') do |f|
-      f.write(JSON.pretty_generate(data))
-    end
+    File.write(@file, JSON.pretty_generate(data))
   end
 end

data/lib/share/console.rb

@@ -32,7 +32,7 @@ class Console
                 hour: t.hour,
                 min: t.min,
                 sec: t.sec,
-                type: type,
+                type:,
                 msg: message)
   end
 end

data/lib/share/game_map.rb

@@ -103,8 +103,8 @@ class GameMap
       x = 0
       gamerow.chars.each do |tile|
         if tile == 'i'
-          grass[:x2] = x * TILE_SIZE + TILE_SIZE
-          grass[:y] = y * TILE_SIZE + TILE_SIZE / 2 + 2
+          grass[:x2] = (x * TILE_SIZE) + TILE_SIZE
+          grass[:y] = (y * TILE_SIZE) + (TILE_SIZE / 2) + 2
           grass[:x1] = x * TILE_SIZE if grass[:x1].nil?
         else
           @grass_rows.push(grass) unless grass == {}
@@ -140,15 +140,15 @@ class GameMap
   end
 
   def death?(x, y)
-    { x: x, y: y } if @gametiles[y][x] == 'X'
+    { x:, y: } if @gametiles[y][x] == 'X'
   end
 
   def collision?(x, y)
-    { x: x, y: y } if @gametiles[y][x] == 'O'
+    { x:, y: } if @gametiles[y][x] == 'O'
   end
 
   def grass?(x, y)
-    { x: x, y: y } if @gametiles[y][x] == 'i'
+    { x:, y: } if @gametiles[y][x] == 'i'
   end
 
   # SERVER
@@ -177,7 +177,7 @@ class GameMap
   def zip
     map_dir = "#{@cfg.chichilku3_dir}maps/#{@mapname}"
     map_zip = "#{@cfg.chichilku3_dir}maps/#{@mapname}.zip"
-    File.delete map_zip if File.exist? map_zip
+    FileUtils.rm_rf map_zip
 
     @console.log "archiving map '#{map_zip}' ..."
     Zip::File.open(map_zip, Zip::File::CREATE) do |zipfile|
@@ -213,7 +213,7 @@ class GameMap
     return nil if @mapname == '' || @mapname.nil?
 
     if offset + size > @b64_size
-      @b64_data[offset..-1].ljust(size, ' ')
+      @b64_data[offset..].ljust(size, ' ')
     else
       @b64_data[offset...offset + size]
     end
@@ -227,14 +227,14 @@ class GameMap
 
   def prepare_download
     @tmpfile = "#{@cfg.chichilku3_dir}tmp/#{@mapname}"
-    File.delete @tmpfile if File.exist? @tmpfile
+    FileUtils.rm_rf @tmpfile
   end
 
   def download(data)
     data.strip!
     @progress += data.size
     @console.dbg "downloading #{@progress} / #{@b64_size} ..."
-    IO.write(@tmpfile, data, mode: 'a')
+    File.write(@tmpfile, data, mode: 'a')
     if @progress >= @b64_size
       @console.log 'finished download'
       @callback.call(load)
@@ -260,7 +260,7 @@ class GameMap
         end
       end
     end
-    File.delete map_archive if File.exist? map_archive
+    FileUtils.rm_rf map_archive
     map_dir
   end
 
@@ -268,11 +268,7 @@ class GameMap
     outfile = "#{dl_path}.zip"
     @console.log 'converting downloaded map ...'
     File.open(@tmpfile, 'rb') do |map_encoded|
-      File.open(outfile, 'wb') do |map_png|
-        map_png.write(
-          Base64.decode64(map_encoded.read)
-        )
-      end
+      File.binwrite(outfile, Base64.decode64(map_encoded.read))
     end
     unzip
   end

data/lib/share/network.rb

@@ -26,7 +26,7 @@ MAX_MAPNAME_LEN = 43
 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
+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
@@ -135,7 +135,7 @@ def net_unpack_bigint(net_int)
     if i.zero?
       sum = net_unpack_int(c)
     else
-      sum += net_unpack_int(c) * (NET_MAX_INT + 1)**i
+      sum += net_unpack_int(c) * ((NET_MAX_INT + 1)**i)
     end
   end
   sum

data/lib/share/player.rb

@@ -64,11 +64,11 @@ class Player
     return if @tick % 5 != 0
 
     new_x = true if @x != @last_x
-    if @y != @last_y
+    if @y == @last_y
+      @not_changed_y += 1
+    else
       new_y = true
       @not_changed_y = 0
-    else
-      @not_changed_y += 1
     end
 
     if new_x || new_y

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chichilku3
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 15.0.3
 platform: ruby
 authors:
 - ChillerDragon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,8 @@ files:
 homepage: https://github.com/chichilku/chichilku3
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -159,14 +160,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Stick battle game