rgss3 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5c1106c06327ffdfbb23dd66a62ce472a1be6e
-  data.tar.gz: 615feaa87d056a45c13a0fef50fb3357ce1cc198
+  metadata.gz: 139cb21454b86af111586ecdef898ccf17598221
+  data.tar.gz: 8abad362c2b9f1e5ed257f6111aff593dd54c2c0
 SHA512:
-  metadata.gz: 309bf1442812626385755d7a0b106f922f1e6711ac48f0edcbd96ebdc777db77edf65f589dc37ea487dc41f4c50ee72630e5101b8befc0304a1806595f3d3741
-  data.tar.gz: 753682b250cdcf4d8d6344a319bb006f7372ce2e239950e10a08ae483f0a49760a47415997417c640e43bf3406a61d5c64ba2beb1092428703955e75a99b9d8b
+  metadata.gz: 48467765ea9118bd6acb7a6cb8ebdc71d349d523963d572a606cbe4535dc364240988f584cb1188a0e5a8afb696a5acdf49b8a50c57f7cf72c79529560d631ff
+  data.tar.gz: 290e1826984ae211019d9f268007b372cbc822a0efb7f7918abc86c33392ec4af7013e786eb6316a326ece35988133f2be0989dab888652151f95e7119fd8714

data/README.md

@@ -4,7 +4,7 @@ An attempt to maintain https://github.com/CaptainJet/RM-Gosu.
 
 NOT READY TO USE!
 
-At least Ruby 2.3 is required.
+Ruby 2.3 or above is required.
 
 Depend on:
 * rmagick
@@ -30,7 +30,8 @@ end
 Or with more options:
 ```ruby
 require 'rgss3'
-RGSS3.run(width: 544, height: 416, frame_rate: 60, title: "Game") do
+RGSS3::RTP.path = 'path/to/RTP'
+RGSS3.run(width: 544, height: 416, frame_rate: 60, title: 'Game', rtp: 'path/to/rtp') do
   # TODO: Add your code here
   # loop { Graphics.update }
 end

data/lib/rgss3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rgss3/version"
 
 require 'gosu'
@@ -24,6 +25,7 @@ require_relative 'rgss3/tilemap'
 require_relative 'rgss3/tone'
 require_relative 'rgss3/viewport'
 require_relative 'rgss3/window'
+require_relative 'rgss3/rtp'
 
 module RGSS3
   class << self

data/lib/rgss3/audio.rb

@@ -1,21 +1,20 @@
+# frozen_string_literal: true
 module Audio
 
-  module_function
-
-  def setup_midi
+  def self.setup_midi
   end
 
-  def bgm_play(filename, volume = 100, pitch = 100, pos = 0)
+  def self.bgm_play(filename, volume = 100, pitch = 100, pos = 0)
     bgm_stop
-    @bgm = Gosu::Sample.new(filename).play(volume / 100.0, pitch / 100.0, true)
+    @bgm = new_sample(filename).play(volume / 100.0, pitch / 100.0, true)
     @bgm_volume = volume / 100.0
   end
 
-  def bgm_stop
+  def self.bgm_stop
     @bgm.stop if @bgm
   end
 
-  def bgm_fade(time)
+  def self.bgm_fade(time)
     bgm_stop
     # return unless @bgm
     # Thread.new {
@@ -29,21 +28,21 @@ module Audio
     # }
   end
 
-  def bgm_pos
+  def self.bgm_pos
     0 # Incapable of integration at the time
   end
 
-  def bgs_play(filename, volume = 100, pitch = 100, pos = 0)
+  def self.bgs_play(filename, volume = 100, pitch = 100, pos = 0)
     bgs_stop
-    @bgs = Gosu::Sample.new(filename).play(volume / 100.0, pitch / 100.0, true)
+    @bgs = new_sample.play(volume / 100.0, pitch / 100.0, true)
     @bgs_volume = volume / 100.0
   end
 
-  def bgs_stop
+  def self.bgs_stop
     @bgs.stop if @bgs
   end
 
-  def bgs_fade(time)
+  def self.bgs_fade(time)
     bgs_stop
     # return unless @bgs
     # Thread.new {
@@ -57,23 +56,23 @@ module Audio
     # }
   end
 
-  def bgs_pos
+  def self.bgs_pos
     0 # Incapable of integration at the time
   end
 
-  def me_play(filename, volume = 100, pitch = 100)
+  def self.me_play(filename, volume = 100, pitch = 100)
     me_stop
     @bgm.pause if @bgm
-    @me = Gosu::Sample.new(filename).play(volume / 100.0, pitch / 100.0, false)
+    @me = new_sample.play(volume / 100.0, pitch / 100.0, false)
     @me_volume = volume / 100.0
   end
 
-  def me_stop
+  def self.me_stop
     @me.stop if @me
     @bgm.resume if @bgm && @bgm.paused?
   end
 
-  def me_fade(time)
+  def self.me_fade(time)
     me_stop
     # return unless @me
     # Thread.new {
@@ -87,10 +86,17 @@ module Audio
     # }
   end
 
-  def se_play(filename, volume = 100, pitch = 100)
-    Gosu::Sample.new(filename).play(volume / 100.0, pitch / 100.0, false)
+  def self.se_play(filename, volume = 100, pitch = 100)
+    new_sample(filename).play(volume / 100.0, pitch / 100.0, false)
+  end
+
+  def self.se_stop
   end
 
-  def se_stop
+  private
+
+  def self.new_sample(filename)
+    filename = RGSS3::RTP.find!(filename, ['', '.ogg', '.wav', '.mp3', '.midi'])
+    Gosu::Sample.new(filename)
   end
 end

data/lib/rgss3/bitmap.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 class Bitmap
 
   attr_reader :rect, :gosu_image
@@ -8,14 +8,8 @@ class Bitmap
     case args.size
     when 1
       basename, = args
-      basename = basename.to_str  # raise error if argument is not string compatible
-      ["".freeze, ".png".freeze, ".jpg".freeze].each do |ext|
-        filename = basename + ext
-        if File.exist?(filename)
-          return initialize_with_gosu_image(Gosu::Image.new(filename))
-        end
-      end
-      raise "File not found: #{basename}"
+      filename = RGSS3::RTP.find!(basename, ['', '.png', 'jpg'])
+      initialize_with_gosu_image Gosu::Image.new(filename)
     when 2
       initialize_with_rmagick_image Magick::Image.new(*args) { self.background_color = 'none' }
     else
@@ -157,7 +151,7 @@ class Bitmap
   end
 
   def blur
-    self.rmagick_image = rmagick_image.blur_image
+    # self.rmagick_image = rmagick_image.blur_image
   end
 
   def radial_blur(angle, division)
@@ -185,6 +179,8 @@ class Bitmap
       string.prepend("<i>") << "</i>"
     end
     text_image = Gosu::Image.from_text(string, @font.size, font: @font.first_existant_name)
+    x += (width - text_image.width) * (align || 0) / 2
+    y += (height - text_image.height)  / 2
     text_image = Bitmap.gosu_to_rmagick(text_image)
     image = text_image.dup
     font_pixel = @font.color.to_pixel

data/lib/rgss3/color.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Color
 
   attr_accessor :gosu_color

data/lib/rgss3/container.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 module RGSS3
   # common methods for Plane, Sprite and Window
   module Container
@@ -14,6 +14,7 @@ module RGSS3
       @ox = 0
       @oy = 0
       @opacity = 255
+      @tone = Tone.new
       Graphics.add_container(self)
     end
 

data/lib/rgss3/font.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 class Font
-  
+
   class << self
-    
+
     attr_accessor :default_name, :default_size, :default_bold
     attr_accessor :default_italic, :default_shadow, :default_outline
     attr_accessor :default_color, :default_out_color
-    
+
     def exist?(name)
       f = (Gosu::Font.new(Graphics.gosu_window, "./Fonts/#{name}.ttf", 8) rescue false)
       Gosu::Font.new(Graphics.gosu_window, name, 8) unless f
@@ -14,7 +15,7 @@ class Font
       return false
     end
   end
-  
+
   self.default_name = ["Verdana", "Arial", "Courier New"]
   self.default_size = 24
   self.default_bold = false
@@ -23,9 +24,9 @@ class Font
   self.default_outline = true
   self.default_color = Color.new(255, 255, 255, 255)
   self.default_out_color = Color.new(0, 0, 0, 128)
-  
+
   attr_accessor :name, :size, :bold, :italic, :shadow, :outline, :color, :out_color
-  
+
   def initialize(name = Font.default_name, size = Font.default_size)
     @name = name.dup
     @size = size
@@ -36,9 +37,9 @@ class Font
     @color = Font.default_color.dup
     @out_color = Font.default_out_color.dup
   end
-  
+
   # NEW
-  
+
   def first_existant_name
     if @name.is_a?(Array)
       @name.each {|a| return a if Font.exist?(a) }
@@ -47,4 +48,4 @@ class Font
     end
     return "Verdana"
   end
-end
+end

data/lib/rgss3/game_window.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+require 'fiber'
 module RGSS3
   class GameWindow < Gosu::Window
     attr_reader :frame_rate
-    def initialize(width: 544, height: 416, full_screen: false, frame_rate: 60, title: "Game")
+    def initialize(width: 544, height: 416, full_screen: false, frame_rate: 60, title: "Game", rtp: nil)
       @frame_rate = frame_rate
+      RTP.path = rtp if rtp
       super(width, height, full_screen, 1000.0 / frame_rate)
       self.caption = title
     end

data/lib/rgss3/graphics.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 require 'set'
 module Graphics
 

data/lib/rgss3/input.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 # Usage:
 # Input.trigger?(2)
 # Input.trigger?(:DOWN)

data/lib/rgss3/kernel_ext.rb

@@ -1,4 +1,5 @@
-module Kernel
+# frozen_string_literal: true
+module ::Kernel
 
   def rgss_main#(&block)
     begin
@@ -13,23 +14,19 @@ module Kernel
   end
 
   def load_data(filename)
-    RGSSAD.files {|a|
-      if a.filename == filename
-        return Marshal.load(a)
-      end
-    }
+    # RGSSAD.files {|a|
+    #   if a.filename == filename
+    #     return Marshal.load(a)
+    #   end
+    # }
     File.open(filename, "rb") { |f|
       Marshal.load(f)
     }
   end
 
   def save_data(obj, filename)
-    if RGSSAD.files.size != 0
-      RGSSAD.add_file(Marshal.dump(obj), filename)
-    else
-      File.open(filename, "wb") { |f|
-        Marshal.dump(obj, f)
-      }
+    File.open(filename, "wb") do |f|
+      Marshal.dump(obj, f)
     end
   end
 

data/lib/rgss3/plane.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 require_relative 'sprite_container'
 class Plane
   include RGSS3::SpriteContainer

data/lib/rgss3/rect.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Rect
 
   attr_accessor :x, :y, :width, :height

data/lib/rgss3/rgss_error.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class RGSSError < StandardError
-end
+end

data/lib/rgss3/rgss_reset.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class RGSSReset < Exception
-end
+end

data/lib/rgss3/rpg.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RPG; end
 
 class RPG::AudioFile
@@ -11,7 +12,7 @@ class RPG::AudioFile
   attr_accessor :pitch
 end
 
- 
+
 class RPG::BGM < RPG::AudioFile
   @@last = RPG::BGM.new
   def play(pos = 0)
@@ -119,7 +120,7 @@ class RPG::Tileset
   attr_accessor :tileset_names
   attr_accessor :flags
   attr_accessor :note
-end  
+end
 class RPG::Map
   def initialize(width, height)
     @display_name = ''
@@ -994,4 +995,4 @@ class RPG::System::TestBattler
   attr_accessor :actor_id
   attr_accessor :level
   attr_accessor :equips
-end
+end

data/lib/rgss3/rtp.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module RGSS3
+  module RTP
+    class << self
+      # The RTP path
+      attr_accessor :path
+    end
+
+    # find file in current directory and RTP directory
+    def self.find(basename, extnames)
+      basename = basename.to_str
+      extnames.each do |ext|
+        filename = basename + ext
+        if File.exist?(filename)
+          return filename
+        elsif @path && File.exist?(filename = File.absolute_path(filename, @path))
+          return filename
+        end
+      end
+      nil
+    end
+
+    # same as find, except that find! raise error when not found
+    def self.find!(basename, extnames)
+      result = find(basename, extnames)
+      if result
+        result
+      else
+        raise "File not found: #{basename}"
+      end
+    end
+  end
+end

data/lib/rgss3/sprite.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 require_relative 'sprite_container'
 class Sprite
 
@@ -52,6 +52,6 @@ class Sprite
 
   def draw
     return if !@visible || @opacity == 0 || @bitmap == nil
-    @bitmap.gosu_image.draw_rot(@x, @y, @z, @angle, 0.0, 0.0, @zoom_x * (@mirror ? -1 : 1), @zoom_y, 0xffffffff, BLEND[@blend_type])
+    @bitmap.gosu_image.draw_rot(@x, @y, @z, @angle, ox.fdiv(width), oy.fdiv(height), @zoom_x * (@mirror ? -1 : 1), @zoom_y, 0xffffffff, BLEND[@blend_type])
   end
 end

data/lib/rgss3/sprite_container.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'container'
 module RGSS3
   # common methods for Plane and Sprite

data/lib/rgss3/table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Table
 
   attr_accessor :data

data/lib/rgss3/tilemap.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 class Tilemap
-  
+
   TILESIZE = 32
 
   attr_accessor :bitmaps
@@ -10,7 +11,7 @@ class Tilemap
   attr_accessor :visible
   attr_reader   :ox
   attr_reader   :oy
-  
+
   def initialize(viewport = nil)
     @bitmaps = []
     @viewport = viewport
@@ -43,12 +44,12 @@ class Tilemap
   def disposed?
     @disposed
   end
-  
+
   def update
     @anim_count = (@anim_count + 1) % (@animated_layer.size * 30)
     @layers[0].bitmap = @animated_layer[@anim_count/30]
   end
-  
+
   def refresh
     return if @map_data.nil? || @flags.nil?
     for layer in @layers
@@ -57,7 +58,7 @@ class Tilemap
     draw_animated_layer
     draw_upper_layers
   end
-  
+
   def draw_animated_layer
     bitmap = Bitmap.new(@map_data.xsize * TILESIZE, @map_data.ysize * TILESIZE)
     if need_animated_layer?
@@ -82,14 +83,14 @@ class Tilemap
       end
     end
   end
-  
+
   def bitmap_for_autotile(autotile)
     return 0 if autotile.between?(0,15)
     return 1 if autotile.between?(16,47)
     return 2 if autotile.between?(48,79)
     return 3 if autotile.between?(80,127)
   end
-  
+
   A1 = [
     [13,14,17,18], [2,14,17,18],  [13,3,17,18],  [2,3,17,18],
     [13,14,17,7],  [2,14,17,7],   [13,3,17,7],   [2,3,17,7],
@@ -104,14 +105,14 @@ class Tilemap
     [16,17,20,21], [16,3,20,21],  [8,11,12,15],  [8,9,20,21],
     [16,19,20,23], [10,11,22,23], [8,11,20,23],  [0,1,4,5]
   ]
-  
+
   A1POS = [
   [0,0],[0,TILESIZE*3],[TILESIZE*6,0],[TILESIZE*6,TILESIZE*3],
   [TILESIZE*8,0],[TILESIZE*14,0],[TILESIZE*8,TILESIZE*3],[TILESIZE*14,TILESIZE*3],
   [0,TILESIZE*6],[TILESIZE*6,TILESIZE*6],[0,TILESIZE*9],[TILESIZE*6,TILESIZE*9],
   [TILESIZE*8,TILESIZE*6],[TILESIZE*14,TILESIZE*6],[TILESIZE*8,TILESIZE*9],[TILESIZE*14,TILESIZE*9]
   ]
-  
+
   def draw_A1tile(x,y,id,animated = false)
     autotile = (id - 2048) / 48
     return draw_waterfalltile(x,y,id) if [5,7,9,11,13,15].include?(autotile)
@@ -149,11 +150,11 @@ class Tilemap
       x2 += TILESIZE * 2 if animated && ![2,3].include?(autotile)
     end
   end
-  
+
   A1E = [
   [0,1,6,7],[0,1,4,5],[2,3,6,7],[1,2,5,6]
   ]
-  
+
   def draw_waterfalltile(x,y,id)
     autotile = (id - 2048) / 48
     index = (id - 2048) % 48
@@ -178,18 +179,18 @@ class Tilemap
       y2 += TILESIZE
     end
   end
-  
+
   def draw_A2tile(x,y,id)
     draw_A1tile(x,y,id)
   end
-  
+
   A3 = [
     [5,6,9,10],    [4,5,8,9],    [1,2,5,6],   [0,1,4,5],
     [6,7,10,11],   [4,7,8,11],   [2,3,6,7],   [0,3,4,7],
     [9,10,13,14],  [8,9,12,13],  [1,2,13,14], [0,1,12,13],
     [10,11,14,15], [8,11,12,13], [2,3,14,15], [0,3,12,15]
   ]
-  
+
   def draw_A3tile(x,y,id)
     autotile = (id - 2048) / 48
     index = (id - 2048) % 48
@@ -230,7 +231,7 @@ class Tilemap
       end
     end
   end
-  
+
   def draw_A4tile(x,y,id)
     autotile = (id - 2048) / 48
     case autotile
@@ -244,7 +245,7 @@ class Tilemap
       draw_A3tile(x,y,id)
     end
   end
-  
+
   def draw_A5tile(x,y,id)
     id -= 1536
     rect = Rect.new(TILESIZE * (id % 8),TILESIZE * ((id % 128) / 8),TILESIZE,TILESIZE)
@@ -252,7 +253,7 @@ class Tilemap
       layer.blt(x * TILESIZE, y * TILESIZE,@bitmaps[4],rect)
     end
   end
-  
+
   def need_animated_layer?
     for x in 0..@map_data.xsize - 1
       for y in 0..@map_data.ysize - 1
@@ -263,7 +264,7 @@ class Tilemap
     end
     return false
   end
-  
+
   def draw_upper_layers
     bitmap = Bitmap.new(@map_data.xsize * TILESIZE, @map_data.ysize * TILESIZE)
     @layers[1].bitmap = bitmap
@@ -282,29 +283,29 @@ class Tilemap
       end
     end
   end
-  
+
   def map_data=(data)
     return if @map_data == data
     @map_data = data
     refresh
   end
-  
+
   def flags=(data)
     @flags = data
     refresh
   end
-  
+
   def ox=(value)
     @ox = value
     for layer in @layers
       layer.ox = @ox
     end
   end
-  
+
   def oy=(value)
     @oy = value
     for layer in @layers
       layer.oy = @oy
     end
   end
-end
+end

data/lib/rgss3/tone.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 class Tone
-  
+
   attr_reader :red, :green, :blue, :gray
-  
+
   def initialize(*args)
     case args.size
     when 0
@@ -15,7 +16,7 @@ class Tone
       raise ArgumentError
     end
   end
-  
+
   def set(*args)
     case args.size
     when 1
@@ -36,34 +37,34 @@ class Tone
       raise ArgumentError
     end
   end
-  
+
   def red=(int)
     @red = [[255, int].min, -255].max.to_f
   end
-  
+
   def green=(int)
     @green = [[255, int].min, -255].max.to_f
   end
-  
+
   def blue=(int)
     @blue = [[255, int].min, -255].max.to_f
   end
-  
+
   def gray=(int)
     @gray = [[255, int].min, 0].max.to_f
   end
-  
+
   def _dump(d = 0)
     [@red, @green, @blue, @gray].pack('d4')
   end
-   
+
   def self._load(s)
     Tone.new(*s.unpack('d4'))
   end
-  
+
   # NEW
-  
+
   def to_a
     [red, green, blue, gray]
   end
-end
+end

data/lib/rgss3/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RGSS3
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/rgss3/viewport.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 class Viewport
-  
+
   attr_accessor :color, :tone, :rect, :visible, :z, :ox, :oy
-  
+
   def initialize(*args)
     case args.size
     when 0
@@ -22,22 +23,22 @@ class Viewport
     @ox = 0
     @oy = 0
   end
-  
+
   def dispose
     @disposed = true
   end
-  
+
   def disposed?
     @disposed
   end
-  
+
   def flash(color, duration)
     @flash_color = color || Color.new(0, 0, 0, 0)
     @flash_duration = duration
   end
-  
+
   def update
     @flash_duration = [@flash_duration - 1, 0].max
     @flash_color = nil if @flash_duration == 0
   end
-end
+end

data/lib/rgss3/window.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'container'
 class Window
 
@@ -19,7 +20,7 @@ class Window
   attr_accessor :opacity
   attr_accessor :back_opacity
   attr_accessor :contents_opacity
-  attr_accessor :openness
+  attr_reader :openness
 
   def initialize(*args)
     case args.size
@@ -31,6 +32,14 @@ class Window
     when 4
       @x, @y, @width, @height = args
     end
+    @contents = Bitmap.new(1, 1)
+    @cursor_rect = Rect.new
+    @padding = 12
+    @padding_bottom = 8
+    @pause = false
+    @arrows_visible = true
+    @active = true
+    @openness = 255
     super()
   end
 
@@ -45,11 +54,15 @@ class Window
   end
 
   def open?
-    openness == 255
+    @openness == 255
   end
 
   def close?
-    openness == 0
+    @openness == 0
+  end
+
+  def openness=(value)
+    @openness = [[value, 0].max, 255].min
   end
 
   def draw

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgss3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - taroxd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -96,6 +96,7 @@ files:
 - lib/rgss3/rgss_error.rb
 - lib/rgss3/rgss_reset.rb
 - lib/rgss3/rpg.rb
+- lib/rgss3/rtp.rb
 - lib/rgss3/sprite.rb
 - lib/rgss3/sprite_container.rb
 - lib/rgss3/table.rb