petli 0.0.3 → 0.0.5

data/lib/petli/stages/base.rb

@@ -9,29 +9,54 @@ module Petli
       def initialize(pet:)
         super()
         @pet = pet
-        @poop = Poop.new
+        @poop = Tatty::Anim.from_atlas(Petli.data_path('poop.txtanim'))
+        @page = 0
       end
 
       def keypress(event)
-        exit if event.value == "q" || event.value == "\e" || event.value == "x"
+        key = event.value.downcase
+        exit if key == "q" || key == "\e" || key == "x"
         return if @pet.busy? || @pet.dead?
-        onkey(event)
+        @page -= 1 if event.key.name == :left && @page > 0
+        @page += 1 if event.key.name == :right && @page < action_pages.count - 1
+        keyact = self.actions.keys.find{|k| k[0].to_s.downcase == key}
+        if !keyact.nil?
+          actions[keyact].call
+        elsif !self.actions[:else].nil?
+          actions[:else].call
+        end
       end
 
-      def onkey(event)
+      def actions
+        {}
       end
 
-      def actions
-        %w()
+      def action_pages
+        pages = []
+        current_page = []
+        fmt_actions = self.actions.filter{|a,b| a != :else}.keys.map{|a| "[#{a[0].capitalize}]#{a[1..]}"}
+        fmt_actions.each do |action|
+          len = (current_page + [action]).join(" ").length
+          if len >= GAME_WIDTH-2
+            pages << [current_page, current_page.join(" ").length]
+            current_page = [action]
+          else
+            current_page << action
+          end
+        end
+        pages + [[current_page, current_page.join(" ").length]]
       end
 
       def action_bar
-        return "" if @pet.dead?
+        return "" if @pet.dead? || @pet.busy?
+        pages = action_pages
         p = Pastel.new
-        self.actions.map do |a|
-          key = p.bold("[#{a[0].capitalize}]")
-          "#{key}#{a[1..]}"
-        end.join(" ")
+        page, page_len = pages[@page]
+        bar = p.bold(@page > 0 ? "◀" : "◁")
+        bar += page.map {|a| "#{p.bold(a[0..2])}#{a[3..]}"}.join(" ")
+        bar += (' ' * (GAME_WIDTH-page_len-4))
+        bar += p.bold(pages.count > 1 && @page < pages.count - 1 ? "▶" : "▷")
+        bar
       end
 
       def left
@@ -55,9 +80,9 @@ module Petli
           top: top,
         )
 
-        poop = @poop.step
+        poop = @poop.next
         @pet.poops.each_with_index do |_, i|
-          x, y = Poop::LOCATIONS[i]
+          x, y = Pet::POOP_LOCATIONS[i]
           render_at(left+1+x, top+1+y, poop)
         end
 
@@ -67,7 +92,7 @@ module Petli
           render_at(left+11-sick, top+4, "[#{'!'*sick}SICK#{'!'*sick}]")
         end
 
-        render_at(left+1, top+1, "#{p.red("♥")*@pet.health}#{"♡"*(10-@pet.health)}      #{"☺"*(10-@pet.happiness)}#{p.green("☻")*@pet.happiness}")
+        render_at(left+1, top+1, "#{p.red("♥")*@pet.health}#{"♡"*(10-@pet.health)}  #{@pet.sick > 0 ? p.red("☠") : "☠"}#{@pet.lights_out ? "☼" : p.yellow("☀")}  #{"☺"*(10-@pet.happiness)}#{p.green("☻")*@pet.happiness}")
         render_at(left+1, top+GAME_HEIGHT-2, self.action_bar)
         render_at(left+GAME_WIDTH-2, top, p.bright_white.bold("[x]"))
       end

data/lib/petli/stages/dice.rb

@@ -10,7 +10,10 @@ module Petli
       end
 
       def actions
-        %w(higher lower)
+        {
+          higher: -> {pick("h")},
+          lower:  -> {pick("l")},
+        }
       end
 
       def enter
@@ -24,13 +27,12 @@ module Petli
       def roll
       end
 
-      def onkey(event)
-        return if event.value != "h" and event.value != "l"
-        @pickedhigher = event.value == "h"
+      def pick(dir)
         @pick = (1..6).to_a.sample
-        @won = (event.value == "h" && @pick > @value) || (event.value == "l" && @pick < @value)
+        @pickedhigher = dir == "h"
+        @won = (dir == "h" && @pick > @value) || (dir == "l" && @pick < @value)
         @won ? @pet.celebrate : @pet.embarass
-        @countdown = 20
+        @countdown = 10
       end
 
       def draw

data/lib/petli/stages/feed.rb

@@ -2,17 +2,17 @@ module Petli
   module Stages
     class Feed < Base
       def actions
-        %w(bread snack med)
+        acts = {
+          bread: -> {feed(:bread)},
+          snack: -> {feed(:candy)},
+          else:  -> {goto(Main, pet: @pet)},
+        }
+        acts[:med] = -> {feed(:medicine)} if @pet.sick?
+        acts
       end
 
-      def onkey(event)
-        if event.value == "b"
-          @pet.feed(food: :bread)
-        elsif event.value == "s"
-          @pet.feed(food: :candy)
-        elsif event.value == "m"
-          @pet.feed(food: :medicine)
-        end
+      def feed(food)
+        @pet.feed(food: food)
         goto(Main, pet: @pet)
       end
     end

data/lib/petli/stages/guess.rb

@@ -8,7 +8,10 @@ module Petli
       end
 
       def actions
-        %w(left right)
+        {
+          left:  -> {pick("l")},
+          right: -> {pick("r")},
+        }
       end
 
       def enter
@@ -19,12 +22,11 @@ module Petli
         @pet.reset
       end
 
-      def onkey(event)
-        return if event.value != "l" and event.value != "r"
+      def pick(dir)
         @petpickedleft = rand(1..2) == 1
-        @pickedleft = event.value == "l"
+        @pickedleft = dir == "l"
         (@petpickedleft == @pickedleft) ? @pet.celebrate : @pet.embarass
-        @countdown = 20
+        @countdown = 10
       end
 
       def draw

data/lib/petli/stages/main.rb

@@ -2,16 +2,15 @@ module Petli
   module Stages
     class Main < Base
       def actions
-        acts = %w(play feed)
-        acts << "clean" if @pet.poops.count > 0
+        return {light: -> {@pet.light_switch}} if @pet.lights_out
+        acts = {
+          play: -> {goto(Play, pet: @pet)},
+          feed: -> {goto(Feed, pet: @pet)},
+          light: -> {@pet.light_switch},
+        }
+        acts[:clean] = -> {@pet.clean} if @pet.poops.count > 0
         acts
       end
-
-      def onkey(event)
-        return goto(Feed, pet: @pet) if event.value == "f"
-        return @pet.clean if event.value == "c"
-        return goto(Play, pet: @pet) if event.value == "p"
-      end
     end
   end
 end

data/lib/petli/stages/play.rb

@@ -2,13 +2,11 @@ module Petli
   module Stages
     class Play < Base
       def actions
-        %w(guess dice)
-      end
-
-      def onkey(event)
-        return goto(Dice, pet: @pet) if event.value == "d"
-        return goto(Guess, pet: @pet) if event.value == "g"
-        goto(Main, pet: @pet)
+        {
+          guess: -> {goto(Guess, pet: @pet)},
+          dice: -> {goto(Dice, pet: @pet)},
+          else: -> {goto(Main, pet: @pet)},
+        }
       end
     end
   end

data/lib/petli/version.rb

@@ -1,3 +1,3 @@
 module Petli
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/petli/watch.rb

@@ -15,6 +15,11 @@ module Petli
       time_elapsed(last, HOURS_DIV)
     end
 
+    def for_hours_since(last)
+      hours_past = hours_since(last)
+      (0...hours_past).each { |i| yield(i, hours_ago(i)) } if hours_past > 1
+    end
+
     def hours_ago(hrs)
       Time.now - (hrs * 3600)
     end

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,78 @@
+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
+
+    def names
+      @sheet.keys
+    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,15 +3,14 @@ module Tatty
   require 'tty-cursor'
 
   autoload :Anim, "tatty/anim"
+  autoload :Atlas, "tatty/atlas"
   autoload :DB, "tatty/db"
   autoload :Stage, "tatty/stage"
 
   def self.run(klass, **kargs)
     self.goto(klass, **kargs)
-    @reader = TTY::Reader.new
-    @reader.on(:keypress) do |event|
-      self.stage.keypress(event)
-    end
+    @reader = TTY::Reader.new(track_history: false)
+    @reader.on(:keypress){|e| self.stage.keypress(e)}
 
     begin
       TTY::Cursor.invisible do

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']
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("pastel", "~> 0.8.0")
   s.add_dependency("tty-cursor", "~> 0.7.1")
-  s.add_dependency("tty-screen", "~> 0.8.1")
+  s.add_dependency("tty-screen", "~> 0.8.2")
   s.add_dependency("tty-reader", "~> 0.9.0")
   s.add_dependency("tty-color", "~> 0.6.0")
   s.add_dependency("tty-box", "~> 0.7.0")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: petli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Tim Anema
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -44,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: tty-reader
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +109,7 @@ dependencies:
         version: 0.3.0
 description: 'A virtual pet that will live in your command line!
 
-'
+  '
 email:
 - timanema@gmail.com
 executables:
@@ -123,14 +122,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 +155,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 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.7
 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)
-      |-|
-
- ☠
-
- ┌───┐
- │ ☠ │
- │   │
-```````
-