petli 0.0.3 → 0.0.4

data/lib/petli.rb

@@ -1,9 +1,14 @@
 module Petli
-  autoload :Animator, "petli/animator"
-  autoload :HUD, "petli/hud"
   autoload :Pet, "petli/pet"
-  autoload :Poop, "petli/poop"
   autoload :Stages, "petli/Stages"
-  autoload :Watch, "petli/watch"
   autoload :VERSION, "petli/version"
+  autoload :Watch, "petli/watch"
+
+  def self.root
+    File.expand_path(File.join(__dir__, '..'))
+  end
+
+  def self.data_path(*filepaths)
+    File.join(root, 'data', *filepaths)
+  end
 end

data/lib/tatty/anim.rb

@@ -1,18 +1,60 @@
 module Tatty
   class Anim
-    def initialize(atlas, frame: 0, rate: 2)
+    attr_reader :width, :height, :loop, :rate, :name
+
+    def self.from_atlas(filepath, name: :default)
+      Atlas.new(filepath)[name]
+    end
+
+    def initialize(atlas, width:, height:, **kargs)
       @atlas = atlas
-      @frame = frame
-      @rate = rate
+      @rate = kargs[:speed] || 2
+      @loop = kargs[:loop] || false
+      if kargs[:loop_for].nil?
+        @loop_for = -1
+      else
+        @loop = false
+        @loop_for_start = kargs[:loop_for] || -1
+        @loop_for = @loop_for_start
+      end
+      @name = kargs[:name]
+      @width = width
+      @height = height
+      reset
+    end
+
+    def reset
+      @frame = 0
+      @loop_for = @loop_for_start if @loop_for == 0
     end
 
     def step
       @frame += 1
-      @frame = 0 if self.frame >= @atlas.count
-      @atlas[self.frame]
+      if rate_frame >= @atlas.count
+        reset if self.loop
+        @loop_for -= 1 if @loop_for > 0
+        true
+      else
+        false
+      end
+    end
+
+    def display
+      @atlas[rate_frame]
+    end
+
+    def next
+      step
+      display
     end
 
-    def frame
+    def loop
+      @loop || @loop_for > 0
+    end
+
+    private
+
+    def rate_frame
       (@frame/@rate).ceil
     end
   end

data/lib/tatty/atlas.rb

@@ -0,0 +1,74 @@
+require 'yaml'
+
+module Tatty
+  class Atlas
+    def initialize(filepath)
+      @filepath = File.expand_path(filepath)
+      @sheet = {}
+      parse_data
+    end
+
+    def [](name)
+      @sheet[name.to_sym]
+    end
+
+    private
+
+    def parse_data
+      chunks = File.read(@filepath).split(/^---.*$/)
+      shouldBeYaml = true
+      default_config = {name: :default}.merge(parse_yaml(chunks.first))
+      default_config.delete(:alias)
+      config = {}
+      chunks.each do |chunk|
+        if shouldBeYaml
+          config = default_config.merge(parse_yaml(chunk))
+        else
+          validate_config(config)
+          animation = Anim.new(parse_animation(chunk, config), **config)
+          ([config[:name]] + Array(config[:alias])).map(&:to_sym).each do |name|
+            @sheet[name] = animation
+          end
+        end
+        shouldBeYaml = !shouldBeYaml
+      end
+    end
+
+    def validate_config(config)
+      name = config[:name].to_sym
+      if name.nil?
+        raise "All animations in an atlas need to have a name attribute"
+      elsif !@sheet[name].nil?
+        raise "Duplicate animation name '#{name}'"
+      elsif config[:width].nil? || config[:height].nil?
+        raise "Animation '#{name}' does not have a width and/or height attribute"
+      end
+    end
+
+    def parse_yaml(chunk)
+      YAML.load(chunk).each_with_object({}) { |(k,v), h| h[k.to_sym] = v }
+    rescue
+      raise "unable to parse chunk #{chunk}"
+    end
+
+    def parse_animation(chunk, config)
+      width, height = config[:width], config[:height]
+      frames = []
+      frame_offset = 0
+      chunk.lines.each_slice(height+1).to_a.each do |frame_line|
+        frame_line.each do |line|
+          i = 0
+          while line.length > 1
+            frames[frame_offset+i] ||= []
+            frames[frame_offset+i] << line.slice!(0, width)
+            line.slice!(0, 1) # separator
+            i+=1
+          end
+        end
+        frame_offset = frames.count
+      end
+      frames.map {|f| f.join("\n") }
+    end
+  end
+end
+

data/lib/tatty/stage.rb

@@ -19,6 +19,9 @@ module Tatty
       ::Tatty.goto(klass, **kargs)
     end
 
+    def keypress(evt)
+    end
+
     def screen_size
       TTY::Screen.size
     end

data/lib/tatty.rb

@@ -3,6 +3,7 @@ module Tatty
   require 'tty-cursor'
 
   autoload :Anim, "tatty/anim"
+  autoload :Atlas, "tatty/atlas"
   autoload :DB, "tatty/db"
   autoload :Stage, "tatty/stage"
 

data/petli.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   HERE
   s.metadata      = { "source_code_uri" => "https://github.com/tanema/petli" }
 
-  s.files         = Dir.glob('{bin/*,lib/**/*,data/*,[A-Z]*}')
+  s.files         = Dir.glob('{bin/*,lib/**/*,data/**/*,[A-Z]*}')
   s.bindir        = "bin"
   s.executables   = ["petli"]
   s.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tim Anema
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.0
 description: 'A virtual pet that will live in your command line!
 
-'
+  '
 email:
 - timanema@gmail.com
 executables:
@@ -123,14 +123,28 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/anim
+- bin/bootstrap.rb
 - bin/console
 - bin/petli
-- data/character.json
-- data/face_ref
+- data/adult/001_diddly.txtanim
+- data/adult/002_kirby.txtanim
+- data/adult/003_tama.txtanim
+- data/adult/004_big.txtanim
+- data/adult/005_angel.txtanim
+- data/death.txtanim
+- data/hatch.txtanim
+- data/infant/001_baby.txtanim
+- data/poop.txtanim
+- data/sleep.txtanim
+- data/teen/001_baloop.txtanim
+- data/teen/002_roboty.txtanim
 - lib/petli.rb
-- lib/petli/animator.rb
 - lib/petli/pet.rb
-- lib/petli/poop.rb
+- lib/petli/pet/animation.rb
+- lib/petli/pet/death.rb
+- lib/petli/pet/food.rb
+- lib/petli/pet/happy.rb
 - lib/petli/stages.rb
 - lib/petli/stages/base.rb
 - lib/petli/stages/dice.rb
@@ -142,6 +156,7 @@ files:
 - lib/petli/watch.rb
 - lib/tatty.rb
 - lib/tatty/anim.rb
+- lib/tatty/atlas.rb
 - lib/tatty/db.rb
 - lib/tatty/stage.rb
 - petli.gemspec
@@ -170,8 +185,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A little pet in your console
 test_files: []
+...

data/data/character.json

@@ -1,40 +0,0 @@
-{
-  "eyes": {
-    "default": ["O"],
-    "mezmerized": ["◉", "✧", "☯"],
-    "great": ["^", "O"],
-    "happy": ["O", "o"],
-    "tired": ["ළ", "ತ"],
-    "annoyed": ["⊜", "ಠ"],
-    "angry": ["ಠ"],
-    "embarassed": ["ಥ"],
-    "eating": ["O", ["ᗒ", "ᗕ"]],
-    "sick": [["⨴","⨵"],"ꔸ"]
-  },
-  "mouth": {
-    "default": ["_", "."],
-    "mezmerized": ["ᴥ", "O"],
-    "great": ["▽", "‿"],
-    "happy": ["o", "_"],
-    "tired": ["-", "."],
-    "annoyed": ["_", "-"],
-    "angry": ["益", "෴"],
-    "embarassed": ["◠", "-"],
-    "eating": ["▽", "‿"],
-    "sick": ["▱","﹃"]
-  },
-  "arms": {
-    "default": [["ᕠ", "ᕤ"], ["ᕦ", "ᕡ"]],
-    "plain": ["_", "~"],
-    "tired": ["_", "~"],
-    "embarassed": [["乁","ㄏ"], "_"],
-    "eating": [["\\", "/"], "_"],
-    "sick": ["_", "~"]
-  },
-  "head": {
-    "default": [["(", ")"]]
-  },
-  "bread": "ʕ=ʔ",
-  "candy": "▷☯◁",
-  "medicine": "◖◻◗"
-}

data/data/face_ref

@@ -1,73 +0,0 @@
-☠⚕
-(o . o)
-(o _ o)
-(o _ O)
-(O _ O)
-(* ^ *)
-(O _ o)
-(ʘ _ ʘ)
-(u _ u)
-(^ _ ^)
-(ಠ _ ಠ)
-(^ o ^)
-(◉ ᴥ ◉)
-(o  O  o)
-(o - o)
-(- _ -)
-(T _ T)
-(ಥ _ ಥ)
-(ಠ 益ಠ)
-(ಠ ෴ ಠ)
-(ᴗ □ ᴗ)
-☆ﾟ☆ﾟ☆ﾟ☆ﾟ
-(o ‿ o)
-(ᗒ o ᗕ)
-(⇀ - ↼)
-(⨴ _ ⨵)
-(ꔸ _ ꔸ)
-(ළ _ ළ) # tired
-(ತ _ ತ)
-(⊜ _ ⊜)
-(✧ _ ✧)
-(☯ _ ☯)
-
-\(⇀ O ↼)/  ʕ=ʔ
-_(O _ O)_   =ʔ
-\(⇀ O ↼)/   =ʔ
-_(O _ O)_    ʔ
-\(⇀ O ↼)/    ʔ
-_(O _ O)_
- (◉ ᴥ ◉)
- (o O o)
-
- ξꔸ ꔸ)
-
-☛(O _ O)☛
-☚(O _ O)☚
-乁(O _ O)ㄏ
-_(O _ O)_
-ᕠ(O _ O)ᕤ
-ᕦ(O _ O)ᕡ
-\(O _ O)/
-/(O _ O)\
-
-  ߍ೧
- ༼ºل͟º༽
-
-poop friend
-ı ┐ ┌ ┌ ı ı  ı ┌ ┐ ┐ ı ı
-༼ᵔ◡ᵔ༽ ༼ಠ益ಠ༽ ༼ᵔ◡ᵔ༽ ༼ಠ益ಠ༽
-
- ⚀ ⚁ ⚂ ⚃ ⚄ ⚅
-
-       _
-     (O O)
-      |-|
-
- ☠
-
- ┌───┐
- │ ☠ │
- │   │
-```````
-

data/lib/petli/animator.rb

@@ -1,137 +0,0 @@
-module Petli
-  require 'json'
-
-  class Animator
-    ANIMATIONS = {
-      egg: ["   _\n  / \\\n  \\_/", "   _\n((/ \\\n  \\_/))", "   _\n  / \\))\n((\\_/"]*5,
-      egg_crack: [" _\n/ \\\n\\_‚/"," _\n/ \\\n\\_¡/"," _\n/ \\\n\\_¦/"," _\n/ ¡\\\n\\_ϟ/"," _\n/ ¦\\\n\\_ϟ/"," _\n/ ϟ\\\n\\_ϟ/","\n/ ϟ\\\n\\_ϟ/"," ☁\n/ ϟ\\\n\\_ϟ/"],
-      stand: ["\n\nahe m eha\n", "\n\nahe m eha\n"],
-      left: ["\n\nahe m e ha\n", "\n\nahe m e ha\n"],
-      right: ["\n\nah e m eha\n", "\n\nah e m eha\n"],
-      item: ["\n\nahe m eha fff\n", "\n\nahe m eha fff\n", "\n\nahe m eha fff\n", "\n\nahe m eha fff\n"],
-      eat: ["\n\nahe m eha fff\n", "\n\nahe m eha  ff\n", "\n\nahe m eha  ff\n", "\n\nahe m eha   f\n", "\n\nahe m eha   f\n", "\n\nahe m eha\n"],
-      walk: ["\n\n ahe m eha\n", "\n\nahe m e ha\n", "\n\nahe m eha\n", "\n\nah e m eha\n"],
-      hop: ["\n\n ahe m eha\n", "\nahe m e ha\n\n", "\n\nahe m e ha\n", "\n\nahe m eha\n", "\nah e m eha\n\n", "\n\nah e m eha\n"],
-      death: ["  ┌───┐ \n  │ ☠ │ \n  │   │ \n ```````", "  ┌───┐ \n  │ ☠ │ \n  │   │ \n '''''''"],
-    }
-
-    attr_writer :mood
-    attr_reader :action
-
-    def initialize(hatching:, mood:, action: :walk)
-      @frame = 0
-      @food = :bread
-      @mood = mood
-      @action = action
-      if hatching
-        @mood_stack = [:mezmerized, :mezmerized, :mezmerized, :mezmerized]
-        @action_stack = [:egg, :egg_crack, :stand, :stand]
-      else
-        @mood_stack = []
-        @action_stack = []
-      end
-    end
-
-    def step
-      add_frame
-      leftarm, rightarm = getit(:arms, 2)
-      lefteye, righteye = getit(:eyes, 2)
-      mouth = getit(:mouth)
-      lefthead, righthead = getit(:head, 2)
-      [leftarm,lefthead,lefteye,mouth,righteye,righthead,rightarm]
-
-      food_peices = food.split('')
-
-      ANIMATIONS[action][frame]
-        .sub('a', leftarm.to_s).sub('a', rightarm.to_s)
-        .sub('h', lefthead).sub('h', righthead)
-        .sub('e', lefteye).sub('e', righteye)
-        .sub('m', mouth)
-        .reverse
-        .sub('f', food_peices[2]).sub('f', food_peices[1]).sub('f', food_peices[0])
-        .reverse
-    end
-
-    def eat(food: :bread, &block)
-      @busy = true
-      @frame = 0
-      @food = food
-      @action_stack = [:item, :eat, :stand, :stand, :stand, :stand]
-      @mood_stack = [:mezmerized, :eating, :eating, :mezmerized, :mezmerized]
-      @on_complete = block
-    end
-
-    def celebrate
-      @action_stack = [:stand, :stand, :stand, :stand]
-      @mood_stack = [:mezmerized, :mezmerized, :mezmerized, :mezmerized]
-      @frame = 0
-    end
-
-    def embarass
-      @action_stack = [:stand, :stand, :stand, :stand]
-      @mood_stack = [:embarassed, :embarassed, :embarassed, :embarassed]
-      @frame = 0
-    end
-
-    def busy?
-      @busy
-    end
-
-    def action=(act)
-      @action = act
-      @frame = 0
-    end
-
-    def action
-      @action_stack.count > 0 ? @action_stack[0] : @action
-    end
-
-    def mood
-      @mood_stack.count > 0 ? @mood_stack[0] : @mood
-    end
-
-    private
-
-    def add_frame
-      frame_count = ANIMATIONS[action].count
-      @frame += 1
-      if frame == frame_count
-        @frame = 0
-        @action_stack.shift if @action_stack.count > 0
-        @mood_stack.shift if @mood_stack.count > 0
-        if @action_stack.count == 0 && @mood_stack.count == 0
-          @busy = false
-          @on_complete.call unless @on_complete.nil?
-          @on_complete = nil
-        end
-      end
-    end
-
-    def food
-      data[@food]
-    end
-
-    def frame # to control framerate
-      (@frame/3).ceil
-    end
-
-    def getit(part, vals=1)
-      mood_part = data[part][mood] || data[part][:default]
-      part_frame = frame % mood_part.count
-      result = mood_part[part_frame]
-      if vals == 2 && result.is_a?(String)
-        [result, result]
-      else
-        result
-      end
-    end
-
-    def data
-      @data ||= JSON.parse(
-        File.read(File.expand_path('../../data/character.json', __dir__)),
-        {:symbolize_names => true}
-      )
-    end
-  end
-end
-

data/lib/petli/poop.rb

@@ -1,9 +0,0 @@
-module Petli
-  class Poop < Tatty::Anim
-    LOCATIONS = [[1,1], [1,4], [1,7], [11,1], [11,7], [20,1], [20,4], [20,7]]
-    ANIMATION = ["ı ı ı\n༼ᵔ◡ᵔ༽", "ϟ ϟ ϟ\n༼ಠ益ಠ༽"]
-    def initialize()
-      super(ANIMATION)
-    end
-  end
-end