No longer frame locked, should run smoother with varied fps, fixed logger, now using texplay and ashton for RubyGems instead of source.

Author: cyberarm

.gitignore

@@ -9,3 +9,4 @@ pkg
 inkscape/*
 assets/scal/*
 assets/pencil/*
+lib/planet-wars/logs/*

Gemfile

@@ -4,14 +4,15 @@ gem "humanize"
 gem "gosu"
 gem "chingu", "0.9rc9"
 gem "rake", "0.9.2.2"
-gem "texplay", github: "banister/texplay"
-gem "ashton", github: "Spooner/ashton"
+gem "texplay", "~> 0.4.4.pre"
+gem "ashton"
 gem "chroma"
 gem "oj"
 gem "excon"
 gem "launchy"
 
 group :package do
+  # gem "libxml-ruby", '~> 2.7.0'
   # gem "releasy" # Uncomment when building executable
 end
 

Gemfile.lock

@@ -1,42 +1,35 @@
-GIT
-  remote: git://github.com/Spooner/ashton.git
-  revision: 313673d8b1b3e1082c9d24e4a166396d1f471634
-  specs:
-    ashton (0.1.5)
-      gosu (~> 0.7)
-      opengl (~> 0.9.0)
-
-GIT
-  remote: git://github.com/banister/texplay.git
-  revision: a7055d39aee332b6ef98327bf6463a10ee1098cb
-  specs:
-    texplay (0.4.4.pre)
-      gosu (>= 0.7.25)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
+    ashton (0.1.6)
+      gosu (~> 0.7)
+      opengl (~> 0.9.0)
     chingu (0.9rc9)
       gosu (>= 0.7.45)
     chroma (0.0.1)
-    excon (0.45.4)
-    gosu (0.10.4)
-    gosu (0.10.4-x86-mingw32)
-    humanize (1.1.0)
+    excon (0.49.0)
+    gosu (0.10.6)
+    gosu (0.10.6-x64-mingw32)
+    gosu (0.10.6-x86-mingw32)
+    humanize (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    oj (2.14.3)
+    oj (2.15.0)
     opengl (0.9.2)
+    opengl (0.9.2-x64-mingw32)
     opengl (0.9.2-x86-mingw32)
     rake (0.9.2.2)
+    texplay (0.4.4.pre)
+      gosu (>= 0.7.25)
 
 PLATFORMS
   ruby
+  x64-mingw32
   x86-mingw32
 
 DEPENDENCIES
-  ashton!
+  ashton
   chingu (= 0.9rc9)
   chroma
   excon
@@ -45,7 +38,7 @@ DEPENDENCIES
   launchy
   oj
   rake (= 0.9.2.2)
-  texplay!
+  texplay (~> 0.4.4.pre)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

lib/planet-wars/ai/ai.rb

@@ -5,8 +5,8 @@ class AI
   attr_accessor :game_object, :state, :tick
   def initialize(game_object)
     @game_object = game_object
-    @tick  = 0
     @state = :nil
+    @last_fired_at = Engine.now
     setup
   end
 
@@ -19,6 +19,7 @@ def update
   end
 
   def move(object)
+    speed = game_object.speed*Engine.dt
     # TODO: Flock behavior
 
     game_object.dx = object.x - game_object.x
@@ -27,8 +28,8 @@ def move(object)
     length = Math.sqrt( game_object.dx*game_object.dx + game_object.dy*game_object.dy )
     game_object.dx /= length; game_object.dy /= length
 
-    game_object.dx *= game_object.speed
-    game_object.dy *= game_object.speed
+    game_object.dx *= speed
+    game_object.dy *= speed
 
     game_object.x += game_object.dx
     game_object.y += game_object.dy

lib/planet-wars/ai/enemy_ai.rb

@@ -4,8 +4,6 @@ def setup
   end
 
   def update
-    @tick+=1
-
     case state
     when :seek
       seek
@@ -35,12 +33,10 @@ def seek
   def attack
     move(game_object.target)
 
-    if @tick >= 60
-      @tick = 0
-      game_object.fire_bullet!
+    if (Engine.now-@last_fired_at) >= 1000.0
+      @last_fired_at = Engine.now
+      game_object.fire_bullet! if game_object.target_area.in_range
     end
-
-    @tick += 1
   end
 
   def retreat
@@ -57,12 +53,11 @@ def retreat
       Logger.log("#{e} - #{game_object.x}|#{game_object.y}", self)
     end
 
-    if @tick >= 60
-      @tick = 0
+    if (Engine.now-@last_fired_at) >= 1000.0
+      @last_fired_at = Engine.now
       game_object.fire_bullet! if game_object.target_area.in_range
     end
 
-    @tick += 1
     move(@portal)
   end
 end

lib/planet-wars/dev_stats/build.dat

@@ -1 +1 @@
-3483
+3546

lib/planet-wars/game/data/config.yml

@@ -1,9 +1,9 @@
 ---
 config:
-  update_check: 2016-01-06 20:13:21 UTC
+  update_check: 2016-04-08 22:52:33 UTC
   asset_pack: default
-  music: true
-  sounds: true
+  music: false
+  sounds: false
   hazards: true
   screen:
     width: max

lib/planet-wars/game/engine.rb

@@ -1,15 +1,23 @@
 class Engine < Chingu::Window
   attr_accessor :show_cursor
 
-  def initialize
+  def self.now
+    Gosu.milliseconds
+  end
+
+  def self.dt
+    $window.dt/1000.0
+  end
+
+  def initialize(width = 800, height = 600, fullscreen = false, update_interval = 1000.0/60)
     @show_cursor = false
     width = Gosu.screen_width if ConfigManager.config["screen"]["width"] == 'max'
     width = ConfigManager.config["screen"]["width"] if ConfigManager.config["screen"]["width"].is_a?(Integer)
 
     height= Gosu.screen_height if ConfigManager.config["screen"]["height"] == 'max'
     height= ConfigManager.config["screen"]["height"] if ConfigManager.config["screen"]["height"].is_a?(Integer)
 
-    super(width, height, ConfigManager.config["screen"]["fullscreen"])
+    super(width, height, ConfigManager.config["screen"]["fullscreen"], update_interval)
     self.caption = "#{GameInfo::NAME} #{GameInfo::VERSION} [build: #{BUILD}] #{Gosu.language}"
     AssetManager.preload_assets if ARGV.join.include?('--debug')
 
@@ -31,6 +39,8 @@ def initialize
     Chingu::Input::CONSTANT_TO_SYMBOL[Gosu::GpButton14] = [:gp_14]
     Chingu::Input::CONSTANT_TO_SYMBOL[Gosu::GpButton15] = [:gp_15]
 
+    Logger.log("Window: width: #{width}, height: #{height}, fullscreen: #{fullscreen}, update_interval: #{update_interval}", self)
+
     push_game_state(Boot) unless ARGV.join.include?('--debug')
     push_game_state(Game) if ARGV.join.include?('--debug')
   end

lib/planet-wars/game/state/game.rb

@@ -19,7 +19,7 @@ def setup
       [:enter, :return, :gp_3] => :enter,
       [:escape, :gp_6] => :escape,
       [:p, :gp_4] => :pause_game,
-      [:gp_2] => :upgrades_menu,
+      [:u, :gp_2] => :upgrades_menu,
       [:c] => :debugging_waves
     }
 

lib/planet-wars/game/state/helpers/game/game_hud.rb

@@ -36,7 +36,7 @@ def draw
   def update
     @clock_counter+=1
     if @clock_counter <= 60
-      @clock_time+=0.01667
+      @clock_time+=$window.dt/1000.0
       @clock_counter=0
     end
     @time = Time.at((@clock_time)).gmtime

lib/planet-wars/logger.rb

@@ -1,19 +1,27 @@
 module Logger
   # Includable
   def log(string, klass)
-    write_log("#{Time.now.utc.strftime('%H:%M %d/%m/%Y %Z')} | #{klass.class} wrote> #{string}")
+    write_log("#{Time.now.utc.strftime('%H:%M:%S %d/%m/%Y %Z')} | #{klass.class} wrote> #{string}")
   end
 
   def write_log(string)
-    open("./lib/planet-wars/logs/#{Time.now.utc.strftime('%d_%Y')}_log.txt", "a") {|f| f.write(string)}
+    unless File.exists?("./lib/planet-wars/logs") && File.directory?("./lib/planet-wars/logs")
+      Dir.mkdir("./lib/planet-wars/logs")
+    end
+
+    open("./lib/planet-wars/logs/#{Time.now.utc.strftime('%d_%Y')}_log.txt", "a+") {|f| f.write(string+"\n")}
   end
 
   # Not includable
   def self.log(string, klass)
-    write_log("#{Time.now.utc.strftime('%H:%M %d/%m/%Y %Z')} | #{klass.class} wrote> #{string}")
+    write_log("#{Time.now.utc.strftime('%H:%M:%S %d/%m/%Y %Z')} | #{klass.class} wrote> #{string}")
   end
 
   def self.write_log(string)
-    open("./lib/planet-wars/logs/#{Time.now.utc.strftime('%d_%Y')}_log.txt", "a") {|f| f.write(string)}
+    unless File.exists?("./lib/planet-wars/logs") && File.directory?("./lib/planet-wars/logs")
+      Dir.mkdir("./lib/planet-wars/logs")
+    end
+
+    open("./lib/planet-wars/logs/#{Time.now.utc.strftime('%d_%Y')}_log.txt", "a+") {|f| f.write(string+"\n")}
   end
 end

lib/planet-wars/objects/asteroid.rb

@@ -12,7 +12,7 @@ def setup
     @image = Gosu::Image["#{AssetManager.asteroids_path}/#{File.basename(asteroid_images[random])}"]
     trait_options[:bounding_circle][:scale] = 0.8
     @health= 200
-    @speed = 5
+    @speed = 5*60
     @damage= 50
     @rotation = rand(-5..5)
     self.zorder = 300
@@ -22,8 +22,10 @@ def setup
   end
 
   def update
-    rotate(@rotation)
+    rotation = (@rotation*60)*Engine.dt
+    rotate(rotation)
     check_for_collisions
+    update_velocity
     destroy_self?
   end
 
@@ -62,13 +64,18 @@ def destroy_self?
   end
 
   def set_velocity
-      @dx = rand(-1500..1500) - self.x
-      @dy = rand(-1500..1500) - self.y
-      length = Math.sqrt( @dx*@dx + @dy*@dy )
-      @dx /= length; @dy /= length
-      @dx *= @speed; @dy *= @speed
-      self.velocity_x += @dx
-      self.velocity_y += @dy
+    @dx = rand(-1500..1500) - self.x
+    @dy = rand(-1500..1500) - self.y
+    length = Math.sqrt( @dx*@dx + @dy*@dy )
+    @dx /= length; @dy /= length
+  end
+
+  def update_velocity
+    dx, dy = @dx, @dy
+    speed = @speed*Engine.dt
+    dx *= speed; dy *= speed
+    self.velocity_x = dx
+    self.velocity_y = dy
   end
 
   def hit(damage, bullet)