petli 0.0.3 → 0.0.4

data/data/sleep.txtanim

@@ -0,0 +1,16 @@
+width: 11
+height: 4
+loop: true
+name: sleep
+---
+           |           |        z  |
+           |       z   |           |
+    ‿ z    |    ‿ ‿    |    ‿ ‿    |
+     ‾     |     °     |     ‾     |
+---
+name: blink
+---
+           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |
+    . .    |    _ _    |    . .    |    _ _    |    . .    |    . .    |    . .    |    . .    |
+     ‾     |     ‾     |     ‾     |     ‾     |     ‾     |     ‾     |     ‾     |     ‾     |

data/data/teen/001_baloop.txtanim

@@ -0,0 +1,91 @@
+width: 11
+height: 4
+loop: true
+name: walk_great
+---
+           |           |           |           |
+           |ᕦ(O ‿ O )ᕡ |           |ᕦ( O ‿ O)ᕡ |
+ ᕠ(^ ▽ ^)ᕤ |           |ᕠ(^ ▽ ^)ᕤ  |           |
+           |           |           |           |
+---
+name: walk_happy
+---
+           |           |           |           |
+           |           |           |           |
+ ᕠ(O o O)ᕤ |ᕦ(o _ o )ᕡ |ᕠ(O o O)ᕤ  |ᕦ( o _ o)ᕡ |
+           |           |           |           |
+---
+name: walk_normal
+---
+           |           |           |           |
+           |           |           |           |
+ ᕠ(O . O)ᕤ |ᕦ(O _ O )ᕡ |ᕠ(O . O)ᕤ  |ᕦ( O _ O)ᕡ |
+           |           |           |           |
+---
+name: walk_annoyed
+---
+           |           |           |           |
+           |           |           |           |
+ ᕠ(⊜ _ ⊜)ᕤ |ᕦ(ಠ - ಠ )ᕡ |ᕠ(⊜ _ ⊜)ᕤ  |ᕦ( ಠ - ಠ)ᕡ |
+           |           |           |           |
+---
+name: walk_angry
+---
+           |           |           |           |
+           |           |           |           |
+ ᕠ(ಠ 益 ಠ)ᕤ |ᕦ(ಠ ෴ ಠ )ᕡ |ᕠ(ಠ 益 ಠ)ᕤ  |ᕦ( ಠ ෴ ಠ)ᕡ |
+           |           |           |           |
+---
+name: walk_sick
+---
+           |           |           |           |
+           |           |           |           |
+ _(ළ - ළ)_ |~(ತ . ತ )~ |_(ළ - ළ)_  |~( ತ . ತ)~ |
+           |           |           |           |
+---
+name: stand
+---
+           |           |
+           |           |
+ ᕠ(O . O)ᕤ | ᕦ(O _ O)ᕡ |
+           |           |
+---
+name: celebrate
+loop_for: 3
+---
+           |           |
+           |           |
+ ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ |
+           |           |
+---
+name: embarass
+loop_for: 3
+---
+           |           |
+           |           |
+ ᕠ(ಥ ◠ ಥ)ᕤ | ᕦ(ಥ - ಥ)ᕡ |
+           |           |
+---
+name: eat_bread
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ |
+    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |     =ʔ    |     =ʔ    |      ʔ    |      ʔ    |           |           |           |           |           |
+---
+name: eat_candy
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ |
+    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |     ☯◁    |     ☯◁    |      ◁    |      ◁    |           |           |           |           |           |
+---
+name: eat_medicine
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | \(O ▽ O)/ | _(ᗒ ‿ ᗕ)_ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ | ᕠ(☯ ᴥ ☯)ᕤ | ᕦ(✧ O ✧)ᕡ |
+    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |     ◻◗    |     ◻◗    |      ◗    |      ◗    |           |           |           |           |           |

data/data/teen/002_roboty.txtanim

@@ -0,0 +1,91 @@
+width: 11
+height: 4
+loop: true
+name: walk_great
+---
+           |           |           |           |
+           |_[▢ ‿ ▢ ]_ |           |_[ ▢ ‿ ▢]_ |
+ \[‾ ▽ ‾]/ |           |\[‾ ▽ ‾]/  |           |
+           |           |           |           |
+---
+name: walk_happy
+---
+           |           |           |           |
+           |           |           |           |
+ \[▢ ▫ ▢]/ |_[▢ _ ▢ ]_ |\[▢ ▫ ▢]/  |_[ ▢ _ ▢]_ |
+           |           |           |           |
+---
+name: walk_normal
+---
+           |           |           |           |
+           |           |           |           |
+ \[□ . □]/ |_[□ _ □ ]_ |\[□ . □]/  |_[ □ _ □]_ |
+           |           |           |           |
+---
+name: walk_annoyed
+---
+           |           |           |           |
+           |           |           |           |
+ \[⟥ _ ⟤]/ |_[⟥ - ⟤ ]_ |\[⟥ _ ⟤]/  |_[ ⟥ - ⟤]_ |
+           |           |           |           |
+---
+name: walk_angry
+---
+           |           |           |           |
+           |           |           |           |
+ \[⧅ ~ ⧅]/ |_[◫ ෴ ◫ ]_ |\[⧅ ~ ⧅]/  |_[ ◫ ෴ ◫]_ |
+           |           |           |           |
+---
+name: walk_sick
+---
+           |           |           |           |
+           |           |           |           |
+ _[▫ - ▫]_ |~[▪ . ▪ ]~ |_[▫ - ▫]_  |~[ ▪ . ▪]~ |
+           |           |           |           |
+---
+name: stand
+---
+           |           |
+           |           |
+ \[▢ ▫ ▢]/ | _[▢ _ ▢]_ |
+           |           |
+---
+name: celebrate
+loop_for: 3
+---
+           |           |
+           |           |
+ \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ |
+           |           |
+---
+name: embarass
+loop_for: 3
+---
+           |           |
+           |           |
+ \[ಥ ◠ ಥ]/ | _[ಥ - ಥ]_ |
+           |           |
+---
+name: eat_bread
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ |
+    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |    ʕ=ʔ    |     =ʔ    |     =ʔ    |      ʔ    |      ʔ    |           |           |           |           |           |
+---
+name: eat_candy
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ |
+    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |    ▷☯◁    |     ☯◁    |     ☯◁    |      ◁    |      ◁    |           |           |           |           |           |
+---
+name: eat_medicine
+loop: false
+---
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+           |           |           |           |           |           |           |           |           |           |           |           |           |           |
+ \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[▫ □ ▫]/ | _[ᗒ ‿ ᗕ]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ | \[⛋ - ⛋]/ | _[◰ ▢ ◰]_ |
+    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |    ◖◻◗    |     ◻◗    |     ◻◗    |      ◗    |      ◗    |           |           |           |           |           |

data/lib/petli/pet/animation.rb

@@ -0,0 +1,94 @@
+module Petli
+  class Pet
+    module Animation
+      extend Tatty::DB::Attributes
+      db_attr :phase, default: :infant
+      db_attr :phase_select, default: 0
+      db_attr :lights_out, default: false
+
+      def setup_animation
+        hatch if (Time.now - self.birth) < 10
+      end
+
+      def update_animation
+        reset if animation.step && !animation.loop
+        if phase == :infant && hours_since(birth) > 1
+          self.phase = :teen
+          self.phase_select = rand(0...avail_animations[phase].count)
+        elsif phase == :teen && days_since(birth) > 1
+          self.phase = :adult
+          self.phase_select = rand(0...avail_animations[phase].count)
+        end
+      end
+
+      def reset
+        @doing = nil
+      end
+
+      def busy?
+        !@doing.nil?
+      end
+
+      def celebrate
+        react(:celebrate)
+      end
+
+      def embarass
+        react(:embarass)
+      end
+
+      def hatch
+        @doing = avail_animations[:hatch]
+      end
+
+      def light_switch
+        self.lights_out = !lights_out
+        self.happiness = [1, self.happiness-1].max if self.lights_out && !sleeping?
+      end
+
+      def sleeping?
+        hour = Time.now.hour
+        hour >= 16 || hour <= 8
+      end
+
+      def react(action)
+        anim = atlas[action]
+        anim.reset
+        @doing = anim
+      end
+
+      def animation
+        if self.dead?
+          avail_animations[:death]
+        elsif !@doing.nil?
+          @doing
+        elsif self.lights_out
+          if sleeping?
+            avail_animations[:sleep][:sleep]
+          else
+            avail_animations[:sleep][:blink]
+          end
+        elsif self.sick > 0
+          atlas[:walk_sick]
+        else
+          atlas["walk_#{self.mood}"]
+        end
+      end
+
+      def atlas
+        avail_animations[phase][phase_select]
+      end
+
+      def avail_animations
+        @avail_animations ||= {
+          hatch: Tatty::Anim.from_atlas(Petli.data_path('hatch.txtanim')),
+          infant: Dir[Petli.data_path('infant',"*.txtanim")].map {|p| Tatty::Atlas.new(p) },
+          teen: Dir[Petli.data_path('teen',"*.txtanim")].map {|p| Tatty::Atlas.new(p) },
+          adult: Dir[Petli.data_path('adult',"*.txtanim")].map {|p| Tatty::Atlas.new(p) },
+          death: Tatty::Anim.from_atlas(Petli.data_path('death.txtanim')),
+          sleep: Tatty::Atlas.new(Petli.data_path('sleep.txtanim')),
+        }
+      end
+    end
+  end
+end

data/lib/petli/pet/death.rb

@@ -0,0 +1,21 @@
+module Petli
+  class Pet
+    module Death
+      extend Tatty::DB::Attributes
+      db_attr :birth, default: Time.now, readonly: true
+      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)
+      end
+
+      def dead?
+        !self.died_at.nil?
+      end
+    end
+  end
+end

data/lib/petli/pet/food.rb

@@ -0,0 +1,42 @@
+module Petli
+  class Pet
+    module Food
+      extend Tatty::DB::Attributes
+
+      POOP_LOCATIONS = [[1,1], [1,4], [1,7], [11,1], [11,7], [20,1], [20,4], [20,7]]
+
+      db_attr :health, default: 5
+      db_attr :last_meal, default: Time.now
+      db_attr :sick, default: 0
+      db_attr :poops, default: []
+
+      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
+        end
+      end
+
+      def feed(food: :bread)
+        return self.embarass if ((food == :medicine && self.sick <= 0) || (self.health == 10 && food != :medicine))
+        self.last_meal = Time.now unless food == :medicine
+        react("eat_#{food}")
+        self.feed!(food: food)
+      end
+
+      def feed!(food: :bread)
+        self.health = [10, self.health+2].min unless food == :medicine
+        self.happiness = [10, self.happiness+2].min if food == :candy
+        self.sick = [0, self.sick - 1].max if food == :medicine
+      end
+
+      def clean
+        self.poops = []
+      end
+    end
+  end
+end

data/lib/petli/pet/happy.rb

@@ -0,0 +1,34 @@
+module Petli
+  class Pet
+    module Happy
+      extend Tatty::DB::Attributes
+      MOOD_SCALE = %i(angry annoyed normal happy great)
+
+      db_attr :mood, default: :normal
+      db_attr :last_play, default: Time.now
+      db_attr :happiness, default: 5
+
+      def update_happiness
+        for_hours_since(last_play) do |i|
+          self.last_play = Time.now
+          next if rand <= 0.3
+          self.happiness = [[1, self.happiness-1].max, self.health <= 3 ? 5 : 10].min
+        end
+        self.mood = MOOD_SCALE[((self.happiness.to_f/10.0)*(MOOD_SCALE.count - 1)).floor]
+      end
+
+      def play(game: :dice)
+        self.last_play = Time.now
+        react(:stand)
+      end
+
+      def win
+        self.happiness = [10, self.happiness+1].min
+      end
+
+      def lose
+        # todo I dont really want it to become more unhappy if they lose
+      end
+    end
+  end
+end

data/lib/petli/pet.rb

@@ -1,131 +1,33 @@
 module Petli
   class Pet
-    include Watch
-    extend Tatty::DB::Attributes
-
-    MOOD_SCALE = [:angry, :annoyed, :normal, :happy, :great]
+    autoload :Food, "petli/pet/food"
+    autoload :Happy, "petli/pet/happy"
+    autoload :Death, "petli/pet/death"
+    autoload :Animation, "petli/pet/animation"
 
-    db_attr :birth, default: Time.now, readonly: true
-    db_attr :health, default: 5
-    db_attr :mood, default: :normal
-    db_attr :happiness, default: 5
-    db_attr :sick, default: 0
-    db_attr :died_at
-    db_attr :last_play, default: Time.now
-    db_attr :last_meal, default: Time.now
-    db_attr :poops, default: []
+    extend Tatty::DB::Attributes
+    include Animation
+    include Death
+    include Food
+    include Happy
+    include Watch
 
     def initialize
       super()
-      @animation = Animator.new(
-        hatching: (Time.now - self.birth) < 10,
-        mood: self.mood,
-        action: self.died_at.nil? ? :walk : :death
-      )
-    end
-
-    def reset
-      @animation.action = :walk
+      setup_animation
     end
 
     def display
-      return @animation.step if self.dead?
-
-      if hours_since(self.last_meal) > 1
-        hours_past = hours_since(self.last_meal)
-        self.last_meal = Time.now
-        (0...hours_past).each do |i|
-          next if rand <= 0.3
-          self.health = [1, self.health-1].max
-          self.happiness = [1, self.happiness-1].max
-          self.poops << hours_ago(i) if rand <= 0.8 && self.poops.count < Poop::LOCATIONS.count
-        end
-        self.sick = self.poops.filter{|poop| hours_since(poop) > 1 }.count
-      end
-
-      if hours_since(self.last_play) > 1
-        hours_past = hours_since(self.last_play)
-        self.last_play = Time.now
-        (0...hours_past).each do
-          next if rand <= 0.3
-          self.happiness = [1, self.happiness-1].max
-        end
-      end
-
-      self.happiness = [self.happiness, 5].min if self.health <= 3
-      self.mood = MOOD_SCALE[((self.happiness.to_f/10.0)*(MOOD_SCALE.count - 1)).floor ]
-
-      self.check_if_dead
-
-      @animation.mood = self.sick > 0 ? :sick : self.mood
-      @animation.step
-    end
-
-    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
-
-      if not_happy && not_healthy && (is_sick || too_much_time)
-        self.died_at = Time.now
-        @animation.action = :death
-      end
-    end
-
-    def feed(food: :bread)
-      return self.embarass if ((food == :medicine && self.sick <= 0) || (self.health == 10 && food != :medicine))
-      self.last_meal = Time.now unless food == :medicine
-      @animation.eat(food: food) do
-        self.feed!(food: food)
-      end
-    end
-
-    def feed!(food: :bread)
-      self.health = [10, self.health+1].min unless food == :medicine
-      self.happiness = [10, self.happiness+1].min if food == :candy
-      self.sick = [0, self.sick - 1].max if food == :medicine
-    end
-
-    def win
-      self.happiness = [10, self.happiness+1].min
-    end
-
-    def lose
-      # todo I dont really want it to become more unhappy if they lose
-    end
-
-    def play(game: :dice)
-      self.last_play = Time.now
-      @animation.action = :stand
-    end
-
-    def clean
-      self.poops = []
-    end
-
-    def busy?
-      @animation.busy?
-    end
-
-    def dead?
-      @animation.action == :death
-    end
-
-    def celebrate
-      @animation.celebrate
-    end
-
-    def embarass
-      @animation.embarass
+      return animation.next if self.dead?
+      update_hunger
+      update_happiness
+      check_if_dead
+      update_animation
+      animation.display
     end
 
     def lifetime
-      if self.died_at.nil?
-        days_since(self.birth).to_i
-      else
-        days_since(self.birth, self.died_at).to_i
-      end
+      (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

@@ -9,29 +9,48 @@ 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"
         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)
       end
 
-      def onkey(event)
-      end
-
       def actions
         %w()
       end
 
+      def action_pages
+        pages = []
+        current_page = []
+        fmt_actions = self.actions.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 +74,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 +86,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

@@ -30,7 +30,7 @@ module Petli
         @pick = (1..6).to_a.sample
         @won = (event.value == "h" && @pick > @value) || (event.value == "l" && @pick < @value)
         @won ? @pet.celebrate : @pet.embarass
-        @countdown = 20
+        @countdown = 10
       end
 
       def draw

data/lib/petli/stages/guess.rb

@@ -24,7 +24,7 @@ module Petli
         @petpickedleft = rand(1..2) == 1
         @pickedleft = event.value == "l"
         (@petpickedleft == @pickedleft) ? @pet.celebrate : @pet.embarass
-        @countdown = 20
+        @countdown = 10
       end
 
       def draw

data/lib/petli/stages/main.rb

@@ -2,12 +2,15 @@ module Petli
   module Stages
     class Main < Base
       def actions
-        acts = %w(play feed)
+        return %w(light) if @pet.lights_out
+        acts = %w(play feed light)
         acts << "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"

data/lib/petli/version.rb

@@ -1,3 +1,3 @@
 module Petli
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 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