fantasy 0.1.5.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58bcb1e825d5cdf5185a26d5bd1dd972fb585ddeefa8fab964984e4ddd975584
-  data.tar.gz: eea7d4e258d2a3f949b97b187fd540e9e7702515fcac381c5ae53b244f06c546
+  metadata.gz: 5b920c99d05b572330432388e4cb4bae6ef5b814d8834bb3b05da16375f49bf6
+  data.tar.gz: 2a5d7c01b7f3e98b5c8928f70981f5bf3591badc844f33a1209f49f6883a426d
 SHA512:
-  metadata.gz: 9a4ec479708e117036d068ddcf3c5f33f0338a85e324ca7708bd1922c41c632804e90733fea5c3d2dc258f2d00e2b8fbf37e30d4cf4e0afec70e663af2125319
-  data.tar.gz: 2beeb1fdb476866e25db35ee12559c7571656e07a0ab9c112d832ec1a0fdffa520f471fc4054bc67a4e14154f445aa9e9b8d5e889d988f64920f04931c53bb01
+  metadata.gz: b791f6790eaa41e1c0cd49ef9faf514ef1fdacf9310f4dcf6cdfe6aeae2ebde28952d2f748c1e4f155dea6145dbbee7755599bf6a2555479b36a0d0390752bc0
+  data.tar.gz: e6be40d13c6b7a8c19e0e3604a1554eaa2f2efbc08ea7a9769e9b3db94407a1d8e3fd18c7ea0e08089ff6643e69e9c251d3de746720f464d6313b29baa288a50

data/README.md

@@ -219,12 +219,13 @@ Easy access to keyboard and mouse inputs on any part of the code. Specially in t
 - Remove "on_space_bar" when changing scene (TODO)
 - Detect when key/mouse button is pressed in the actual frame in any part of the code (TODO)
 
-### Tile Map (TODO)
+### Tilemap (TODO)
 
 For easy creation of:
 
-- Top-down map levels (TODO)
+- Top-down map levels
 - Platformer map levels (TODO)
+- Allow specific map keys like a=>actor_1, b=>actor_2 (TODO)
 
 ### Tweens (TODO)
 

data/lib/fantasy/actor.rb

@@ -54,7 +54,7 @@ class Actor
 
   def draw_debug
     Utils.draw_frame(position_in_camera.x, position_in_camera.y, width, height, 1, Gosu::Color::RED) if solid
-    Global.pixel_font.draw_text("#{@position.x.floor},#{@position.y.floor}", position_in_camera.x, position_in_camera.y - 20, 1)
+    Global.pixel_fonts["medium"].draw_text("#{@position.x.floor},#{@position.y.floor}", position_in_camera.x, position_in_camera.y - 20, 1)
   end
 
   def position_in_camera

data/lib/fantasy/clock.rb

@@ -1,5 +1,6 @@
 class Clock
   attr_accessor :persistent
+  attr_reader :thread
 
   def initialize(&block)
     @block = block

data/lib/fantasy/global.rb

@@ -15,7 +15,7 @@ module Global
 
     attr_accessor :game
     attr_reader :frame_time # delta_time
-    attr_reader :pixel_font
+    attr_reader :pixel_fonts
     attr_reader :references
     attr_reader :camera
     attr_reader :game_state
@@ -30,13 +30,21 @@ module Global
       @clocks = []
       @last_frame_at = Time.now
       @debug = false
-      @pixel_font = Gosu::Font.new(20, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+
+      @pixel_fonts = {}
+      @pixel_fonts["small"] = Gosu::Font.new(20, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+      @pixel_fonts["medium"] = Gosu::Font.new(40, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+      @pixel_fonts["big"] = Gosu::Font.new(60, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+      @pixel_fonts["huge"] = Gosu::Font.new(100, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+
       @d_key_pressed = false
       @references = OpenStruct.new
       @camera = Camera.new(position: Coordinates.zero)
       @game_state = Global.presentation_proc.nil? ? "game" : "presentation"
       @scene_started_at = Time.now
 
+      @background = Color.new(r: 0, g: 0, b: 0)
+
       if @presentation_proc.nil?
         on_presentation { Global.default_on_presentation  }
       end
@@ -108,7 +116,11 @@ module Global
       @hud_images.clear
       @backgrounds.clear
       @tile_maps.clear
-      @clocks.reject(&:persistent?).each(&:stop)
+
+      @clocks.reject(&:persistent?).each do |clock|
+        clock.stop unless clock.thread == Thread.current # no stop current Thread
+      end
+
       @background = Color.new(r: 0, g: 0, b: 0)
     end
 

data/lib/fantasy/hud_text.rb

@@ -1,5 +1,5 @@
 class HudText
-  attr_accessor :text, :size, :color, :visible, :layer, :in_world
+  attr_accessor :text, :size, :color, :visible, :layer, :in_world, :position
 
   def initialize(position:, text: "")
     @position = position
@@ -17,14 +17,22 @@ class HudText
 
   def draw
     if visible
-      Global.pixel_font.draw_markup(text, screen_position.x + scale, screen_position.y - 20 + scale, 1, scale, scale, Gosu::Color::BLACK)
-      Global.pixel_font.draw_markup(text, screen_position.x, screen_position.y - 20, 1, scale, scale, color)
+      font.draw_markup(text, screen_position.x + shadow_offset, screen_position.y - 20 + shadow_offset, 1, 1, 1, Gosu::Color::BLACK)
+      font.draw_markup(text, screen_position.x, screen_position.y - 20, 1, 1, 1, color)
     end
 
     draw_debug if Global.debug
   end
 
-  def scale
+  def font
+    found_font = Global.pixel_fonts[@size]
+    if found_font.nil?
+      raise "HudText.size not valid '#{@size}'. Valid sizes: 'small, medium, big, huge'"
+    end
+    found_font
+  end
+
+  def shadow_offset
     case @size
     when "small"
       1
@@ -52,6 +60,6 @@ class HudText
   end
 
   def draw_debug
-    Global.pixel_font.draw_text("#{@position.x.floor},#{@position.y.floor}", @position.x, @position.y, 1)
+    Global.pixel_fonts["medium"].draw_text("#{@position.x.floor},#{@position.y.floor}", @position.x, @position.y, 1)
   end
 end

data/lib/fantasy/{tile_map.rb → tilemap.rb}

@@ -1,4 +1,4 @@
-class TileMap
+class Tilemap
   attr_accessor :position
 
   def initialize(map_name:, tiles:, tile_size: nil, tile_width: nil, tile_height: nil)
@@ -13,7 +13,7 @@ class TileMap
     @tiles = tiles
     @position = Coordinates.zero
 
-    @grid = TileMap.load_grid(@map_name)
+    @grid = Tilemap.load_grid(@map_name)
   end
 
   def width
@@ -32,7 +32,13 @@ class TileMap
 
       line.each do |tile_index|
         if !tile_index.nil?
-          actor = @tiles[tile_index].clone
+          actor_template = @tiles[tile_index]
+
+          if actor_template.nil?
+            raise "Tilemap config error. Not found Tile for index '#{tile_index}'"
+          end
+
+          actor = actor_template.clone
           actor.position.x = @position.x + (tile_position.x * @tile_width)
           actor.position.y = @position.y + (tile_position.y * @tile_height)
         end
@@ -50,7 +56,7 @@ class TileMap
     @@maps = {}
 
     def load_grid(map_name)
-      File.readlines(TileMap.locate_map(map_name), chomp: true).map do |line|
+      File.readlines(Tilemap.locate_map(map_name), chomp: true).map do |line|
         line.each_char.map do |char|
           char == " " ? nil : char.to_i
         end

data/lib/fantasy/utils.rb

@@ -27,4 +27,9 @@ module Utils
     Gosu.draw_rect(x, y + (height - stroke), width, stroke, color)
     Gosu.draw_rect(x, y, stroke, height, color)
   end
+
+  def self.remap(value:, from_ini:, from_end:, to_ini:, to_end:)
+    result = to_ini + (value - from_ini) * (to_end - to_ini) / (from_end - from_ini);
+    result
+  end
 end

data/lib/fantasy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fantasy
-  VERSION = "0.1.5.1"
+  VERSION = "0.1.7"
 end

data/lib/fantasy.rb

@@ -18,5 +18,5 @@ require_relative "fantasy/background"
 require_relative "fantasy/sound"
 require_relative "fantasy/camera"
 require_relative "fantasy/image"
-require_relative "fantasy/tile_map"
+require_relative "fantasy/tilemap"
 require_relative "fantasy/base"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fantasy
 version: !ruby/object:Gem::Version
-  version: 0.1.5.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Fernando Guillen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -72,7 +72,7 @@ files:
 - lib/fantasy/includes/move_by_cursors.rb
 - lib/fantasy/loop.rb
 - lib/fantasy/sound.rb
-- lib/fantasy/tile_map.rb
+- lib/fantasy/tilemap.rb
 - lib/fantasy/tween.rb
 - lib/fantasy/utils.rb
 - lib/fantasy/version.rb