petli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ee40f22dc44aa081835578e98eb98f7da356f8c6b9c507310312340ce058df
-  data.tar.gz: b269134dbac6547026821802c5ac0e21320c5c84094fa3d0fa2813256b7226e2
+  metadata.gz: 05a633461e7b8d56e725df4c11e7e46cfd4877d5cd269289c10a466cea5c4c42
+  data.tar.gz: 2f39e13184061908e8f337e1283b7b8f798ee0203a1edc82ad487707cc59cb2c
 SHA512:
-  metadata.gz: 5d8b52d56d5745735a8b387f24c62afe477ccbf2bea4143d9f93a3c439d1de2a1e4e3569ad375654694384506538a9bd774f6aca70039c8d192ec409e7a6ecec
-  data.tar.gz: def5941f8c6ec9bacdeb63d3b20c906d35298ee0c72d09d05429172ee69c4ae390f6a09924dad86c0cbef4a01471b459e12aa2c472bdc5a85e37b8596cc91578
+  metadata.gz: fb7341dee8c0668b1ffdd2251e97501cd79251d39346c26d28103a1481409a30a0ba55e9d692fbfc991ec0dbaf33ccfff4b4b3a76363d808c64d5f2dc88adfae
+  data.tar.gz: 251b601b1e23126c8e6c60ddb34b36c73f9c81b4c14befe724b383e32d28e92948f700164004e6b6c2997b5df8cc6f6289350269c6666a279628a586feadbbf3

data/Gemfile.lock

@@ -8,7 +8,7 @@ PATH
       tty-cursor (~> 0.7.1)
       tty-platform (~> 0.3.0)
       tty-reader (~> 0.9.0)
-      tty-screen (~> 0.8.1)
+      tty-screen (~> 0.8.2)
 
 GEM
   remote: https://rubygems.org/
@@ -31,17 +31,18 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     wisper (2.0.1)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-25
   x86_64-darwin-20
 
 DEPENDENCIES
   petli!
 
 BUNDLED WITH
-   2.2.3
+  4.0.12

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Tim Anema
+Copyright 2026 Tim Anema
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/bin/anim

@@ -16,14 +16,9 @@ class Animate < Tatty::Stage
     done = @animation.step
     @animation.reset if !@animation.loop and done
     render_at(0, 0, @animation.display)
+    render_at(0, 5, "Animation: #{@animation.name}")
   end
 end
 
-filepath = ARGV[0]
-name = ARGV[1] || :default
-animation = Tatty::Anim.from_atlas(filepath, name: name)
-if animation.nil?
-  puts "Cannot find animation '#{name}'"
-else
-  Tatty.run(Animate, animation: animation)
-end
+atlas = Tatty::Atlas.new(ARGV[0])
+Tatty.run(Animate, animation: atlas[ARGV[1] || :default] || atlas[atlas.names.first])

data/bin/petli

@@ -7,10 +7,9 @@ OptionParser.new do |opts|
   opts.banner = "Usage: petli [options]"
   opts.on("-r", "--reset", "Reset button to start over again") {|v| options[:reset] = v }
   opts.on("-s", "--status", "Dump pet status") {|v| options[:status] = v}
-  opts.on("-b", "--bread", "Feed your pet bread without viewing") {|v| options[:bread] = v}
-  opts.on("-c", "--candy", "Feed your pet candy without viewing") {|v| options[:candy] = v}
-  opts.on("-m", "--medicine", "Feed your pet candy without viewing") {|v| options[:medicine] = v}
-  opts.on("-l", "--clean", "Clean up any 'dirt' without viewing") {|v| options[:clean] = v}
+  opts.on("-f FOOD", "--feed=FOOD", "Feed your pet bread without viewing") {|v| options[:feed] = v}
+  opts.on("-c", "--clean", "Clean up any 'dirt' without viewing") {|v| options[:clean] = v}
+  opts.on("-l", "--light", "Hit the lightswitch") {|v| options[:light] = v}
   opts.on("-p", "--path [PATH]", "path to your pet data (defaults to system config dir)") do |v|
     $tattydboverridepath = v
   end
@@ -18,18 +17,22 @@ end.parse!
 
 pet = Petli::Pet.new
 pet.display # force pet to update first
+FOOD_OPTIONS = [:bread, :candy, :medicine]
 
 if options[:reset]
   Tatty::DB.clear
   puts "Goodbye. I hope you love your next pet!"
 elsif options[:status]
   puts Tatty::DB.dump
-elsif options[:bread]
-  pet.feed!(food: :bread)
-elsif options[:candy]
-  pet.feed!(food: :candy)
-elsif options[:medicine]
-  pet.feed!(food: :medicine)
+elsif options[:feed]
+  if [:bread, :candy, :medicine].include?(options[:feed].to_sym)
+    pet.feed!(food: options[:feed].to_sym)
+  else
+    puts "Unknown food #{options[:feed]}, only accepts #{FOOD_OPTIONS.join(", ")}"
+    exit 1
+  end
+elsif options[:light]
+  pet.light_switch
 elsif options[:clean]
   pet.clean
 else

data/data/poop.txtanim

@@ -2,5 +2,5 @@ width: 5
 height: 2
 loop: true
 ---
-ı ı ı|ϟ ϟ ϟ
-༼ᵔ◡ᵔ༽|༼ಠ益ಠ༽
+ı ı ı|ϟ ϟ ϟ|
+༼ᵔ◡ᵔ༽|༼ಠ益ಠ༽|

data/lib/petli/pet/death.rb

@@ -6,16 +6,40 @@ module Petli
       db_attr :died_at
 
       def check_if_dead
-        not_happy = self.happiness <= 1
-        not_healthy = self.health <= 1
-        is_sick = self.sick > 2
-        too_much_time = days_since(self.last_meal) >= 1
-        self.died_at = Time.now if not_happy && not_healthy && (is_sick || too_much_time)
+        die! if unhappy? && unhealthy? && (too_sick? || too_hungry?)
+      end
+
+      def die!
+        self.died_at = Time.now
+      end
+
+      def sick?
+        self.sick > 0
+      end
+
+      def too_sick?
+        self.sick > 2
+      end
+
+      def too_hungry?
+        days_since(self.last_meal) >= 1
+      end
+
+      def unhappy?
+        self.happiness <= 1
+      end
+
+      def unhealthy?
+        self.health <= 1
       end
 
       def dead?
         !self.died_at.nil?
       end
+
+      def lifetime
+        (self.died_at.nil? ? days_since(self.birth) : days_since(self.birth, self.died_at)).to_i
+      end
     end
   end
 end

data/lib/petli/pet/food.rb

@@ -12,12 +12,7 @@ module Petli
 
       def update_hunger
         for_hours_since(last_meal) do |i, hr_ago|
-          self.last_meal = Time.now
-          next if rand <= 0.3
-          self.health = [1, self.health-1].max
-          self.happiness = [1, self.happiness-1].max
-          self.poops << hr_ago if rand <= 0.8 && self.poops.count < POOP_LOCATIONS.count
-          self.sick = self.poops.filter{|poop| hours_since(poop) > 1 }.count
+          hunger(hr_ago) if rand >= 0.3
         end
       end
 
@@ -34,6 +29,14 @@ module Petli
         self.sick = [0, self.sick - 1].max if food == :medicine
       end
 
+      def hunger(hr_ago=hours_ago(1))
+        self.health = [1, self.health-1].max
+        self.happiness = [1, self.happiness-1].max
+        self.poops = self.poops + [hr_ago] if rand <= 0.4 && self.poops.count < POOP_LOCATIONS.count
+        self.sick = [self.poops.filter{|poop| hours_since(poop) > 1 }.count, 3].min
+        self.last_meal = Time.now
+      end
+
       def clean
         self.poops = []
       end

data/lib/petli/pet.rb

@@ -25,9 +25,5 @@ module Petli
       update_animation
       animation.display
     end
-
-    def lifetime
-      (self.died_at.nil? ? days_since(self.birth) : days_since(self.birth, self.died_at)).to_i
-    end
   end
 end

data/lib/petli/stages/base.rb

@@ -14,21 +14,27 @@ module Petli
       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?
         @page -= 1 if event.key.name == :left && @page > 0
         @page += 1 if event.key.name == :right && @page < action_pages.count - 1
-        onkey(event)
+        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 actions
-        %w()
+        {}
       end
 
       def action_pages
         pages = []
         current_page = []
-        fmt_actions = self.actions.map{|a| "[#{a[0].capitalize}]#{a[1..]}"}
+        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

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,11 +27,10 @@ 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 = 10
       end

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,10 +22,9 @@ 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 = 10
       end

data/lib/petli/stages/main.rb

@@ -2,19 +2,15 @@ module Petli
   module Stages
     class Main < Base
       def actions
-        return %w(light) if @pet.lights_out
-        acts = %w(play feed light)
-        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 @pet.light_switch if event.value == "l"
-        return if @pet.lights_out
-        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.4"
+  VERSION = "0.0.5"
 end

data/lib/tatty/atlas.rb

@@ -12,6 +12,10 @@ module Tatty
       @sheet[name.to_sym]
     end
 
+    def names
+      @sheet.keys
+    end
+
     private
 
     def parse_data

data/lib/tatty.rb

@@ -9,10 +9,8 @@ module Tatty
 
   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

@@ -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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tim Anema
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-02 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
@@ -185,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A little pet in your console
 test_files: []