From 5b09a5963f789c85d4dc083db7c6aac6182dec24 Mon Sep 17 00:00:00 2001 From: leaf corcoran Date: Sun, 25 Aug 2013 16:10:21 -0700 Subject: [PATCH] pass satisfaction to upgrade --- feed.moon | 1 - main.moon | 6 ++++-- upgrade.moon | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/feed.moon b/feed.moon index 4808770..e61a285 100644 --- a/feed.moon +++ b/feed.moon @@ -187,7 +187,6 @@ class Head delta = math.abs 0.5 - random_normal! to_hide = math.floor delta / 0.09 - to_hide = 3 while to_hide > 0 not_hungry = pick_one unpack [k for k,v in pairs @hungry_for when v] diff --git a/main.moon b/main.moon index 53e088a..5f1ef7a 100644 --- a/main.moon +++ b/main.moon @@ -1,7 +1,7 @@ require "lovekit.all" require "lovekit.reloader" -{graphics: g} = love +{graphics: g, :keyboard} = love export p = (str, ...) -> g.print str\lower!, ... @@ -46,7 +46,7 @@ class Game } @sequence = Sequence -> - @current_stage = @stages[@stage_i] @ + @current_stage = @stages[@stage_i] @, @current_stage wait_until -> @current_stage\is_done! @stage_i = (@stage_i % #@stages) + 1 again! @@ -55,6 +55,8 @@ class Game update: (dt) => return if @paused + dt = dt * 10 if keyboard.isDown "return" + @sequence\update dt if @current_stage diff --git a/upgrade.moon b/upgrade.moon index 975bcc5..7f796fb 100644 --- a/upgrade.moon +++ b/upgrade.moon @@ -91,8 +91,8 @@ class UpgradeStage extends Stage name: "Upgrade Stage" money_earned: 0 - new: (...) => - super ... + new: (game, feed) => + super game u = (name) -> key = name\sub 1, 1 @@ -111,8 +111,10 @@ class UpgradeStage extends Stage u "organization" } - satisfation = 1.0 - + satisfation = if feed + feed.head.health + else + 1.0 @health = HorizBar 110, 6, satisfation @health.tween_speed = 0.15