chichilku3 14.0.2 → 15.0.0

data/lib/share/projectile.rb

@@ -1,115 +1,114 @@
+# frozen_string_literal: true
+
 require_relative 'console'
 
+# Projectile class handles arrow logic
 class Projectile
-    attr_accessor :x, :y, :dx, :dy, :r, :w, :h, :owner_id
+  attr_accessor :x, :y, :dx, :dy, :r, :w, :h, :owner_id
 
-    def initialize
-        @x = 0
-        @y = 0
-        @dx = 0
-        @dy = 0
-        @w = 16
-        @h = 16
-        @owner = nil
-        @left_owner = false
-        @flying = false
-        @tick = 0
-    end
+  def initialize
+    @x = 0
+    @y = 0
+    @dx = 0
+    @dy = 0
+    @w = 16
+    @h = 16
+    @owner = nil
+    @left_owner = false
+    @flying = false
+    @tick = 0
+  end
 
-    def fire(x, y, dx, dy, owner)
-        return if @flying
+  def fire(x, y, dx, dy, owner)
+    return if @flying
 
-        @x = x
-        @y = y
-        @dx = dx
-        @dy = dy
-        calc_rotation()
-        @owner = owner
-        @left_owner = false
-        @flying = true
-        $console.dbg "Projectile(x=#{x}, y=#{y}, dx=#{dx}, dy=#{dy})"
-    end
+    @x = x
+    @y = y
+    @dx = dx
+    @dy = dy
+    calc_rotation
+    @owner = owner
+    @left_owner = false
+    @flying = true
+    $console.dbg "Projectile(x=#{x}, y=#{y}, dx=#{dx}, dy=#{dy})"
+  end
 
-    def hit
-        @flying = false
-        @x = 0
-        @y = 0
-    end
+  def hit
+    @flying = false
+    @x = 0
+    @y = 0
+  end
 
-    def tick(players)
-        return unless @flying
+  def tick(players)
+    return unless @flying
 
-        @tick += 1
-        @x = @x + @dx
-        @y = @y + @dy
-        @dy += 1 if @tick % 3 == 0
-        calc_rotation()
-        check_hit(players)
-        hit if  @y > WINDOW_SIZE_Y
-        hit if  @x > WINDOW_SIZE_X
-        hit if @x < 0
-    end
+    @tick += 1
+    @x += @dx
+    @y += @dy
+    @dy += 1 if (@tick % 3).zero?
+    calc_rotation
+    check_hit(players)
+    hit if  @y > WINDOW_SIZE_Y
+    hit if  @x > WINDOW_SIZE_X
+    hit if @x.negative?
+  end
 
-    def check_hit(players)
-        owner_hit = false
-        players.each do |player|
-            if player.x + player.w > @x && player.x < @x + @w
-                if player.y + player.h > @y && player.y < @y + @h
-                    if @owner.id == player.id
-                        owner_hit = true
-                        if @left_owner
-                            player.damage(@owner)
-                            hit()
-                        end
-                    else
-                        player.damage(@owner)
-                        hit()
-                    end
-                end
-            end
-        end
-        if owner_hit == false
-            @left_owner = true
+  def check_hit(players)
+    owner_hit = false
+    players.each do |player|
+      next unless player.x + player.w > @x && player.x < @x + @w
+
+      if player.y + player.h > @y && player.y < @y + @h
+        if @owner.id == player.id
+          owner_hit = true
+          if @left_owner
+            player.damage(@owner)
+            hit
+          end
+        else
+          player.damage(@owner)
+          hit
         end
+      end
     end
+    @left_owner = true if owner_hit == false
+  end
 
-    # NETWORK ROTATION
-    # 0 ->     4 <-
+  # NETWORK ROTATION
+  # 0 ->     4 <-
 
-    #           ^
-    # 1 \      5 \
-    #    v
+  #           ^
+  # 1 \      5 \
+  #    v
 
-    #            ^
-    # 2 |      6 |
-    #   v
+  #            ^
+  # 2 |      6 |
+  #   v
 
-    #             ^
-    # 3 /      7 /
-    #  v
-    def calc_rotation
-        if @dy > -3 && @dy < 3
-            if @dx < 0
-                @r = 4
-            else
-                @r = 0
-            end
-        elsif @dy < 0
-            if @dx > -3 && @dx < 3
-                @r = 6
-            elsif @dx < 0
-                @r = 5
-            else
-                @r = 7
-            end
-        else
-            if @dx > -3 && @dx < 3
-                @r = 2
-            elsif @dx < 0
-                @r = 3
-            else
-                @r = 1
-            end
-        end
-    end
+  #             ^
+  # 3 /      7 /
+  #  v
+  def calc_rotation
+    @r = if @dy > -3 && @dy < 3
+           if @dx.negative?
+             4
+           else
+             0
+           end
+         elsif @dy.negative?
+           if @dx > -3 && @dx < 3
+             6
+           elsif @dx.negative?
+             5
+           else
+             7
+           end
+         elsif @dx > -3 && @dx < 3
+           2
+         elsif @dx.negative?
+           3
+         else
+           1
+         end
+  end
 end

data/lib/share/string.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# String color
+class String
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
+  def pink
+    colorize(35)
+  end
+end

data/server.json

@@ -1,4 +1,5 @@
 {
-    "port": 9900
+    "port": 9900,
+    "max_clients_per_ip": 2,
+    "map": ""
 }
-  

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chichilku3
 version: !ruby/object:Gem::Version
-  version: 14.0.2
+  version: 15.0.0
 platform: ruby
 authors:
 - ChillerDragon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -39,36 +53,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: fileutils
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
-description: Simple 2d online multiplayer stick figure battle game using the gosu
-  (SDL2 based) gem for client side graphics. The network protocol is tcp based and
-  only using ASCII printable characters.
+        version: 2.3.0
+description: |2
+    Simple 2d online multiplayer stick figure battle game using the gosu (SDL2 based) gem for client side graphics.
+    The network protocol is tcp based and only using ASCII printable characters.
 email: ChillerDragon@gmail.com
 executables:
 - chichilku3
@@ -85,16 +99,24 @@ files:
 - lib/client/gui.rb
 - lib/client/img/arrow64.png
 - lib/client/img/background1024x512.png
-- lib/client/img/battle1024x576.png
 - lib/client/img/bow64/bow0.png
 - lib/client/img/bow64/bow1.png
 - lib/client/img/bow64/bow2.png
 - lib/client/img/bow64/bow3.png
 - lib/client/img/connecting1024x512.png
 - lib/client/img/crosshair128x128.png
-- lib/client/img/grass1024x512.png
 - lib/client/img/grey128.png
 - lib/client/img/menu1920x1080.png
+- lib/client/img/stick128/arm64/arm0.png
+- lib/client/img/stick128/arm64/arm1.png
+- lib/client/img/stick128/arm64/arm2.png
+- lib/client/img/stick128/arm64/arm3.png
+- lib/client/img/stick128/noarms/stick0.png
+- lib/client/img/stick128/noarms/stick1.png
+- lib/client/img/stick128/noarms/stick2.png
+- lib/client/img/stick128/noarms/stick3.png
+- lib/client/img/stick128/noarms/stick4.png
+- lib/client/img/stick128/noarms/stick5.png
 - lib/client/img/stick128/stick0.png
 - lib/client/img/stick128/stick1.png
 - lib/client/img/stick128/stick2.png
@@ -107,18 +129,20 @@ files:
 - lib/client/img/stick128/stick_crouching3.png
 - lib/client/img/stick128/stick_crouching4.png
 - lib/client/img/stick128/stick_crouching5.png
-- lib/client/img/stick128/stick_noarms.png
+- lib/client/keys.rb
+- lib/client/particles.rb
 - lib/client/scoreboard.rb
-- lib/client/test.rb
-- lib/client/text.rb
 - lib/server/chichilku3_server.rb
 - lib/server/gamelogic.rb
 - lib/server/server_cfg.rb
 - lib/share/config.rb
 - lib/share/console.rb
+- lib/share/game_map.rb
+- lib/share/math.rb
 - lib/share/network.rb
 - lib/share/player.rb
 - lib/share/projectile.rb
+- lib/share/string.rb
 - server.json
 homepage: https://github.com/chichilku/chichilku3
 licenses:
@@ -132,14 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Stick battle game

data/lib/client/test.rb

@@ -1,39 +0,0 @@
-require_relative '../share/player'
-
-def server_package_to_player_strs(slots, data)
-  players = []
-  slots.times do |index|
-    players[index] = data[index * 8..index * 8 + 7]
-  end
-  players
-end
-
-def player_strs_to_objects(player_strs)
-  players = []
-  player_strs.each do |player_str|
-    id = player_str[0..1].to_i
-    x = player_str[2..4].to_i
-    y = player_str[5..7].to_i
-    # puts "id: #{id} x: #{x} y: #{y}"
-    players << Player.new(id, x, y) unless id.zero?
-  end
-  players
-end
-
-def server_package_to_player_array(data)
-  # /(?<count>\d{2})(?<player>(?<id>\d{2})(?<x>\d{3})(?<y>\d{3}))/
-  slots = data[0..1].to_i # save slots
-  data = data[2..-1] # cut slots off
-  players = server_package_to_player_strs(slots, data)
-  # puts players
-  player_strs_to_objects(players)
-end
-
-# 3 players
-pl3 = '03011001010220020203300303'
-p server_package_to_player_array(pl3)
-p server_package_to_player_array(pl3).count
-# 2 players (first has id 00 -> offline)
-pl2 = '03001001010220020203300303'
-p server_package_to_player_array(pl2)
-p server_package_to_player_array(pl2).count

data/lib/client/text.rb

@@ -1,86 +0,0 @@
-# https://github.com/gosu/gosu-examples/blob/master/examples/text_input.rb
-require "gosu"
-
-class TextField < Gosu::TextInput
-  FONT = Gosu::Font.new(60)
-  WIDTH = 800
-  LENGTH_LIMIT = 20
-  PADDING = 5
-  
-  INACTIVE_COLOR  = 0xcc_666666
-  ACTIVE_COLOR    = 0xcc_555555
-  SELECTION_COLOR = 0xcc_444444
-  CARET_COLOR     = 0xff_ffffff
-  
-  attr_reader :x, :y
-  
-  def initialize(window, x, y)
-    # It's important to call the inherited constructor.
-    super()
-    
-    @window, @x, @y = window, x, y
-    
-    # Start with a self-explanatory text in each field.
-    self.text = "Click to edit"
-  end
-  
-  # In this example, we use the filter method to prevent the user from entering a text that exceeds
-  # the length limit. However, you can also use this to blacklist certain characters, etc.
-  def filter new_text
-    allowed_length = [LENGTH_LIMIT - text.length, 0].max
-    new_text[0, allowed_length]
-  end
-  
-  def draw(z)
-    # Change the background colour if this is the currently selected text field.
-    if @window.text_input == self
-      color = ACTIVE_COLOR
-    else
-      color = 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
-    
-    # Calculate the position of the caret and the selection start.
-    pos_x = x + FONT.text_width(self.text[0...self.caret_pos])
-    sel_x = x + FONT.text_width(self.text[0...self.selection_start])
-    sel_w = pos_x - sel_x
-    
-    # Draw the selection background, if any. (If not, sel_x and pos_x will be
-    # the same value, making this a no-op call.)
-    Gosu.draw_rect sel_x, y, sel_w, height, SELECTION_COLOR, z
-
-    # Draw the caret if this is the currently selected field.
-    if @window.text_input == self
-      Gosu.draw_line pos_x, y, CARET_COLOR, pos_x, y + height, CARET_COLOR, z
-    end
-
-    # Finally, draw the text itself!
-    FONT.draw_text self.text, x, y, z
-  end
-  
-  def height
-    FONT.height
-  end
-
-  # Hit-test for selecting a text field with the mouse.
-  def under_mouse?
-    @window.mouse_x > x - PADDING and @window.mouse_x < x + WIDTH + PADDING and
-      @window.mouse_y > y - PADDING and @window.mouse_y < y + height + PADDING
-  end
-  
-  # Tries to move the caret to the position specifies by mouse_x
-  def move_caret_to_mouse
-    # Test character by character
-    1.upto(self.text.length) do |i|
-      if @window.mouse_x < x + FONT.text_width(text[0...i])
-        self.caret_pos = self.selection_start = i - 1;
-        return
-      end
-    end
-    # Default case: user must have clicked the right edge
-    self.caret_pos = self.selection_start = self.text.length
-  end
-end