From: Clyne Sullivan <clyne@bitgloo.com>
Date: Sat, 9 May 2020 13:40:59 +0000 (-0400)
Subject: Merge branch 'audio'
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=f461087223a80cd06619517e355690654f406d63;p=clyne%2Fgamedev2.git

Merge branch 'audio'
---

f461087223a80cd06619517e355690654f406d63
diff --cc Scripts/init.lua
index dc5093b,96e031a..572f722
--- a/Scripts/init.lua
+++ b/Scripts/init.lua
@@@ -80,40 -85,11 +85,43 @@@ ball = 
              self.Velocity.x = math.random(-1, 1);
          end
      end,
+     Audio = {
+         file = "Assets/boing.wav"
+     },
  }
  
 +npc = {
 +    Position = {
 +        x = 30,
 +        y = 75
 +    },
 +    Velocity = {
 +        x = 0.0,
 +        y = 0.0
 +    },
 +    Physics = 0,
 +    Name = "Paul",
 +    Render = {
 +        texture = "Assets/cat.png",
 +        visible = true
 +    },
 +    Light = {
 +        r = 1.0,
 +        g = 1.0,
 +        b = 1.0,
 +        strength = 0.5
 +    },
 +    Idle = function(self)
 +		if (self.visibleTick == 0) then
 +			self.visibleTick = math.random(40, 60)
 +			self.Velocity.x = math.random(-1, 1) * 1.0
 +        else
 +            self.visibleTick = self.visibleTick - 1
 +        end
 +    end,
 +    visibleTick = 0
 +}
 +
  -- Create the world
  dofile("Scripts/world.lua")