chingu 0.7.6 → 0.7.6.1

data/chingu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.6"
+  s.version = "0.7.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]

data/examples/example21.yml

@@ -2,7 +2,7 @@
 - CogWheel: 
     :x: 1088.0
     :y: 352.0
-    :angle: 298.109605765405
+    :angle: 244.888555657521
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -10,7 +10,7 @@
 - CogWheel: 
     :x: 448.0
     :y: 416.0
-    :angle: 177.337551080677
+    :angle: 230.558601188561
     :zorder: 88
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -156,16 +156,16 @@
     :y: 384.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 192.0
     :y: 384.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 1664.0
@@ -580,16 +580,16 @@
     :y: 384.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 32.0
     :y: 352.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 32.0
@@ -932,13 +932,13 @@
     :y: 64.0
     :angle: 0
     :zorder: 100
-    :factor_x: 1.15315315315315
-    :factor_y: 1.0738255033557
+    :factor_x: 1.44144144144144
+    :factor_y: 1.44144144144144
     :color: 4294967295
 - CogWheel: 
     :x: 1792.0
     :y: 320.0
-    :angle: 145.890953162857
+    :angle: 199.112003270741
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -954,7 +954,7 @@
 - CogWheel: 
     :x: 2464.0
     :y: 288.0
-    :angle: 50.762926311923
+    :angle: 357.54187620404
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -962,7 +962,7 @@
 - CogWheel: 
     :x: 2460.0
     :y: 960.0
-    :angle: 147.890953162857
+    :angle: 201.112003270741
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -1028,8 +1028,8 @@
     :y: 480.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.286995515695065
-    :factor_y: 0.286995515695065
+    :factor_x: 0.286995515695067
+    :factor_y: 0.286995515695067
     :color: 4294967295
 - Block: 
     :x: 448.0
@@ -1073,40 +1073,40 @@
     :color: 4294967295
 - Saw: 
     :x: 2304.0
-    :y: 42967.5567823335
-    :angle: 44.1388012618916
+    :y: 42973.9722397467
+    :angle: 244.651419558422
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :color: 4294967295
 - Saw: 
     :x: 2016.0
-    :y: 32169.4700553558
-    :angle: 197.109209864485
+    :y: 32173.9806240522
+    :angle: 130.22068444929
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :color: 4294967295
 - Saw: 
     :x: 1696.0
-    :y: 14500.872537504
-    :angle: 145.90474660443
+    :y: 14500.9946086338
+    :angle: 324.233721499835
     :zorder: 100
     :factor_x: 0.958395989974934
     :factor_y: 0.961002506265664
     :color: 4294967295
 - Saw: 
     :x: 1056.0
-    :y: 24035.3039924576
-    :angle: 281.3341716441
+    :y: 24036.9954416873
+    :angle: 193.151996227564
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
     :color: 4294967295
 - Saw: 
     :x: 1344.0
-    :y: 24035.3039924576
-    :angle: 284.334171644101
+    :y: 24036.9954416873
+    :angle: 196.151996227565
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1361,72 +1361,72 @@
     :color: 4294967295
 - Saw: 
     :x: 2176.0
-    :y: 42807.5567823335
-    :angle: 47.1388012618917
+    :y: 42813.9722397467
+    :angle: 247.651419558422
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :color: 4294967295
 - Saw: 
     :x: 1280.0
-    :y: 30820.830533382
-    :angle: 83.2044430122228
+    :y: 30824.098278027
+    :angle: 92.0967151668047
     :zorder: 100
     :factor_x: 0.47739348370927
     :factor_y: 0.48
     :color: 4294967295
 - Saw: 
     :x: 1055.0
-    :y: 91465.5416666965
-    :angle: 5.08502406874356
+    :y: 91481.6743590043
+    :angle: 202.536947145858
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :color: 4294967295
 - Saw: 
     :x: 960.0
-    :y: 91529.5416666966
-    :angle: 8.08502406874254
+    :y: 91545.6743590044
+    :angle: 205.536947145856
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :color: 4294967295
 - Saw: 
     :x: 1120.0
-    :y: 91529.5416666966
-    :angle: 8.08502406874254
+    :y: 91545.6743590044
+    :angle: 205.536947145856
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :color: 4294967295
 - Saw: 
     :x: 864.0
-    :y: 91465.5416666965
-    :angle: 11.0850240687425
+    :y: 91481.6743590043
+    :angle: 208.536947145856
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :color: 4294967295
 - Saw: 
     :x: 1247.0
-    :y: 27752.6785714237
-    :angle: 97.6596930794382
+    :y: 27755.9489495749
+    :angle: 107.917046020636
     :zorder: 100
     :factor_x: 0.477192982456137
     :factor_y: 0.479799498746867
     :color: 4294967295
 - Saw: 
     :x: 1088.0
-    :y: 54664.7415254268
-    :angle: 173.117320205375
+    :y: 54674.3885593251
+    :angle: 248.721133764806
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
     :color: 4294967295
 - Saw: 
     :x: 960.0
-    :y: 54664.7415254268
-    :angle: 176.117320205376
+    :y: 54674.3885593251
+    :angle: 251.721133764807
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1545,88 +1545,88 @@
     :color: 4294967295
 - Saw: 
     :x: 2272.0
-    :y: 1366.68595873176
-    :angle: 2.68293910443271
+    :y: 1486.65953699044
+    :angle: 295.794413689238
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :color: 4294967295
 - Saw: 
     :x: 1792.0
-    :y: 1310.61523976901
-    :angle: 105.197715289755
+    :y: 1457.122269646
+    :angle: 247.355008787115
     :zorder: 100
     :factor_x: 0.79859649122807
     :factor_y: 0.801203007518797
     :color: 4294967295
 - Saw: 
     :x: 2112.0
-    :y: 1311.57883642494
-    :angle: 14.8788769068765
+    :y: 1515.61720067452
+    :angle: 57.317747058639
     :zorder: 100
     :factor_x: 0.237794486215539
     :factor_y: 0.240401002506266
     :color: 4294967295
 - Saw: 
     :x: 1504.0
-    :y: 1340.12806424344
-    :angle: 311.032544379301
+    :y: 1509.95012679627
+    :angle: 10.0118343201395
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 1344.0
-    :y: 1308.71639898564
-    :angle: 314.032544379302
+    :y: 1513.27726120035
+    :angle: 13.0118343201416
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 1152.0
-    :y: 1306.44378698225
-    :angle: 317.032544379301
+    :y: 1544.73245984785
+    :angle: 16.0118343201395
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :color: 4294967295
 - Saw: 
     :x: 992.0
-    :y: 1416.64048531289
-    :angle: 55.973814869388
+    :y: 1447.47254150702
+    :angle: 215.427837857925
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 800.0
-    :y: 1416.64048531289
-    :angle: 58.973814869388
+    :y: 1447.47254150702
+    :angle: 218.427837857925
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 1248.0
-    :y: 1361.92996845426
-    :angle: 80.1652055258717
+    :y: 1476.34100946372
+    :angle: 280.677823822402
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :color: 4294967295
 - Saw: 
     :x: 928.0
-    :y: 1448.6404853129
-    :angle: 61.973814869388
+    :y: 1415.77522349937
+    :angle: 221.427837857925
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :color: 4294967295
 - Saw: 
     :x: 672.0
-    :y: 1398.85057471266
-    :angle: 58.973814869388
+    :y: 1467.90102171139
+    :angle: 218.427837857925
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
@@ -2084,16 +2084,16 @@
     :y: 224.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 128.0
     :y: 224.0
     :angle: 0
     :zorder: 100
-    :factor_x: 0.071748878923767
-    :factor_y: 0.071748878923767
+    :factor_x: 0.0717488789237668
+    :factor_y: 0.0717488789237668
     :color: 4294967295
 - Block: 
     :x: 608.0

data/examples/example21_sidescroller_with_edit.rb

@@ -52,7 +52,7 @@ class Example21 < GameState
   end
   
   def save_player_position
-    @saved_x, @saved_y = @droid.x, @droid.y   if @droid.velocity_y >= 0 && @droid.collidable
+    @saved_x, @saved_y = @droid.x, @droid.y   if @droid.collidable && !@jumping
   end
 
   def update    
@@ -84,18 +84,10 @@ class Example21 < GameState
         
     self.viewport.center_around(@droid)
         
-    $window.caption = "Haunted Factory. TAB toggles Edit. x/y: #{@droid.x.to_i}/#{@droid.y.to_i} - viewport x/y: #{self.viewport.x.to_i}/#{self.viewport.y.to_i} - FPS: #{$window.fps}"
+    $window.caption = "Haunted Factory. 'E' toggles Edit. x/y: #{@droid.x.to_i}/#{@droid.y.to_i} - viewport x/y: #{self.viewport.x.to_i}/#{self.viewport.y.to_i} - FPS: #{$window.fps}"
   end
 end
 
-#
-#
-class GameFinished < GameState
-  def setup
-    self.input
-    Text.create("MMMM... Battery ACID, YUM!")
-  end
-end
   
 #
 # DROID
@@ -104,11 +96,12 @@ class Droid < Chingu::GameObject
   trait :bounding_box, :scale => 0.80
   traits :timer, :collision_detection , :timer, :velocity
   
+  attr_reader :jumpign
+  
   def setup
     self.input = {  [:holding_left, :holding_a] => :holding_left, 
                     [:holding_right, :holding_d] => :holding_right,
                     [:up, :w] => :jump,
-                    :space => :fire
                   }
     
     # Load the full animation from tile-file media/droid.bmp
@@ -117,6 +110,7 @@ class Droid < Chingu::GameObject
     
     @animation = @animations[:scan]
     @speed = 3
+    @jumping = false
     
     self.zorder = 300
     self.factor = 3
@@ -152,7 +146,8 @@ class Droid < Chingu::GameObject
   end
 
   def jump
-    return if self.velocity_y < 0
+    return if @jumping
+    @jumping = true
     self.velocity_y = -10
     @animation = @animations[:up]
   end
@@ -173,6 +168,7 @@ class Droid < Chingu::GameObject
       else
         me.y = stone_wall.bb.top-1
       end
+      @jumping = false
     end
     
     @animation = @animations[:scan] unless moved?

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.7.6"
+  VERSION = "0.7.6.1"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_states/edit.rb

@@ -162,7 +162,7 @@ module Chingu
         
         super
         
-        @status_text.text = "#{self.mouse_x} / #{self.mouse_y}"
+        @status_text.text = "#{self.mouse_x.to_i} / #{self.mouse_y.to_i}"
         
         if s = @selected_game_object
           @text.text = "#{s.class.to_s} @ #{s.x.to_i} / #{s.y.to_i}"
@@ -265,7 +265,11 @@ module Chingu
             selected_game_objects.each { |object| object.options[:selected] = nil } unless holding?(:left_ctrl)
           end
           
-          @selected_game_object.options[:selected] = !@selected_game_object.options[:selected]
+          if holding?(:left_ctrl)
+            @selected_game_object.options[:selected] = !@selected_game_object.options[:selected]
+          else
+            @selected_game_object.options[:selected] = true
+          end
           
           #
           # Re-align all objects x/y offset in relevance to the cursor
@@ -319,7 +323,7 @@ module Chingu
       # Call destroy on all selected game objects
       #
       def destroy_selected_game_objects
-        selected_game_objects.each(&:destroy)
+        selected_game_objects.each { |game_object| game_object.destroy }
       end
 
       def deselect_selected_game_objects
@@ -484,13 +488,21 @@ module Chingu
         selected_game_objects.each { |game_object| game_object.factor_x += grid_factor_x_for(game_object) }
       end
       def scale_up_y
-        selected_game_objects.each { |game_object| game_object.factor_y += grid_factor_x_for(game_object) }
+        selected_game_objects.each { |game_object| game_object.factor_y +=  grid_factor_x_for(game_object) }
       end
       def scale_down_x
-        selected_game_objects.each { |game_object| game_object.factor_x -= grid_factor_y_for(game_object) }
+        selected_game_objects.each { |game_object| 
+          inc = grid_factor_x_for(game_object)
+          game_object.factor_x -= inc
+          game_object.factor_x = inc if game_object.factor_x <= 0.01
+        }
       end
       def scale_down_y
-        selected_game_objects.each { |game_object| game_object.factor_y -= grid_factor_y_for(game_object) }
+        selected_game_objects.each { |game_object| 
+          inc = grid_factor_y_for(game_object) 
+          game_object.factor_y -= inc
+          game_object.factor_y = inc if game_object.factor_y <= 0.01
+        }
       end
       
       def grid_factor_x_for(object)

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 109
   prerelease: false
   segments: 
   - 0
   - 7
   - 6
-  version: 0.7.6
+  - 1
+  version: 0.7.6.1
 platform: ruby
 authors: 
 - ippa