hawkthorne · didory123 · Nov 11, 2013 · May 30, 2015 · Jun 4, 2015 · Jun 4, 2015
diff --git a/src/audio/music/mountains.ogg b/src/audio/music/mountains.ogg
diff --git a/src/audio/music/stonerspeak.ogg b/src/audio/music/stonerspeak.ogg
diff --git a/src/audio/sfx/acorn_bomb.ogg b/src/audio/sfx/acorn_bomb.ogg
diff --git a/src/audio/sfx/acorn_throw.ogg b/src/audio/sfx/acorn_throw.ogg
diff --git a/src/audio/sfx/hemp.ogg b/src/audio/sfx/hemp.ogg
diff --git a/src/audio/sfx/squeek.ogg b/src/audio/sfx/squeek.ogg
diff --git a/src/audio/sfx/squirrel_death.ogg b/src/audio/sfx/squirrel_death.ogg
diff --git a/src/audio/sfx/throw.ogg b/src/audio/sfx/throw.ogg
diff --git a/src/audio/sfx/throw2.ogg b/src/audio/sfx/throw2.ogg
diff --git a/src/hud.lua b/src/hud.lua
@@ -85,7 +85,7 @@ function HUD:questBadge( player )
     love.graphics.setColor( 255, 255, 255, 255 )
     love.graphics.print(quest, (x + 2), (y + 2), 0, 0.5, 0.5)
     love.graphics.push()
-    love.graphics.printf("for " .. questParent, (x + 2), (y + 15), (width + 8), "left", 0, 0.5, 0.5)
+    --love.graphics.printf("for " .. questParent, (x + 2), (y + 15), (width + 8), "left", 0, 0.5, 0.5)
     love.graphics.pop()
 
     love.graphics.setColor( 255, 255, 255, 255 )

diff --git a/src/images/buildings/town/house.png b/src/images/buildings/town/house.png
diff --git a/src/images/buildings/town/house_burned.png b/src/images/buildings/town/house_burned.png
diff --git a/src/images/buildings/town/tavern.png b/src/images/buildings/town/tavern.png
diff --git a/src/images/sprites/town/jumping_girl.png → src/images/buildings/town/tavern_burned.png b/src/images/sprites/town/jumping_girl.png → src/images/buildings/town/tavern_burned.png
diff --git a/src/images/enemies/acornBoss.png b/src/images/enemies/acornBoss.png
diff --git a/src/images/enemies/acornboss.png b/src/images/enemies/acornboss.png
diff --git a/src/images/enemies/acornpod.png b/src/images/enemies/acornpod.png
diff --git a/src/images/enemies/bird.png b/src/images/enemies/bird.png
diff --git a/src/images/enemies/bossHud/acornBoss.png b/src/images/enemies/bossHud/acornBoss.png
diff --git a/src/images/enemies/bossHud/acornBossRage.png b/src/images/enemies/bossHud/acornBossRage.png
diff --git a/src/images/enemies/bossHud/laserlotusBoss.png b/src/images/enemies/bossHud/laserlotusBoss.png
diff --git a/src/images/enemies/cannon.png b/src/images/enemies/cannon.png
diff --git a/src/images/enemies/dropbear.png b/src/images/enemies/dropbear.png
diff --git a/src/images/enemies/fish_horizontal.png b/src/images/enemies/fish_horizontal.png
diff --git a/src/images/enemies/giantacorn.png b/src/images/enemies/giantacorn.png
diff --git a/src/images/enemies/hemp.png b/src/images/enemies/hemp.png
diff --git a/src/images/enemies/hempleaf.png b/src/images/enemies/hempleaf.png
diff --git a/src/images/enemies/hippy-normal.png b/src/images/enemies/hippy-normal.png
diff --git a/src/images/enemies/hippy-ranged-vertical.png b/src/images/enemies/hippy-ranged-vertical.png
diff --git a/src/images/enemies/hippy-ranged.png b/src/images/enemies/hippy-ranged.png
diff --git a/src/images/enemies/jumpingacorn.png b/src/images/enemies/jumpingacorn.png
diff --git a/src/images/enemies/laserlotusBoss.png b/src/images/enemies/laserlotusBoss.png
diff --git a/src/images/enemies/squirrel.png b/src/images/enemies/squirrel.png
diff --git a/src/images/hiddendoor/acornpeak.png b/src/images/hiddendoor/acornpeak.png
diff --git a/src/images/hiddendoor/acorntrigger.png b/src/images/hiddendoor/acorntrigger.png
diff --git a/src/images/hiddendoor/tunnel.png b/src/images/hiddendoor/tunnel.png
diff --git a/src/images/hiddendoor/tunneltrigger.png b/src/images/hiddendoor/tunneltrigger.png
diff --git a/src/images/hiddendoor/village-forest-tunnel.png b/src/images/hiddendoor/village-forest-tunnel.png
diff --git a/src/images/keys/minecarts.png b/src/images/keys/minecarts.png
diff --git a/src/images/keys/mines.png b/src/images/keys/mines.png
diff --git a/src/images/keys/mines_weapons_room.png b/src/images/keys/mines_weapons_room.png
diff --git a/src/images/materials/berry.png b/src/images/materials/berry.png
diff --git a/src/images/materials/bluemushroom.png b/src/images/materials/bluemushroom.png
diff --git a/src/images/materials/buddhaAmber.png b/src/images/materials/buddhaAmber.png
diff --git a/src/images/materials/buddhaGarnet.png b/src/images/materials/buddhaGarnet.png
diff --git a/src/images/materials/buddhaJade.png b/src/images/materials/buddhaJade.png
diff --git a/src/images/materials/buddhaStone.png b/src/images/materials/buddhaStone.png
diff --git a/src/images/materials/buddhaTopaz.png b/src/images/materials/buddhaTopaz.png
diff --git a/src/images/materials/energonPod.png b/src/images/materials/energonPod.png
diff --git a/src/images/npc/hermit.png b/src/images/npc/hermit.png
diff --git a/src/images/npc/hermit_menu.png b/src/images/npc/hermit_menu.png
diff --git a/src/images/npc/jumpinggirl.png b/src/images/npc/jumpinggirl.png
diff --git a/src/images/npc/jumpinggirl_menu.png b/src/images/npc/jumpinggirl_menu.png
diff --git a/src/images/npc/laserlotus1.png b/src/images/npc/laserlotus1.png
diff --git a/src/images/npc/laserlotus1_menu.png b/src/images/npc/laserlotus1_menu.png
diff --git a/src/images/npc/laserlotus2.png b/src/images/npc/laserlotus2.png
diff --git a/src/images/npc/laserlotus2_menu.png b/src/images/npc/laserlotus2_menu.png
diff --git a/src/images/npc/tilda.png b/src/images/npc/tilda.png
diff --git a/src/images/npc/tilda_menu.png b/src/images/npc/tilda_menu.png
diff --git a/src/images/npc/townknight.png b/src/images/npc/townknight.png
diff --git a/src/images/platforms/minecart.png b/src/images/platforms/minecart.png
diff --git a/src/images/platforms/minesplatform.png b/src/images/platforms/minesplatform.png
diff --git a/src/images/platforms/tunnelcart.png b/src/images/platforms/tunnelcart.png
diff --git a/src/images/spiderweb.png b/src/images/spiderweb.png
diff --git a/src/images/steam.png b/src/images/steam.png
diff --git a/src/images/tilesets/mountains.png b/src/images/tilesets/mountains.png
diff --git a/src/images/tilesets/treeline.png b/src/images/tilesets/treeline.png
diff --git a/src/images/tilesets/village-forest-mountains.png b/src/images/tilesets/village-forest-mountains.png
diff --git a/src/images/weapons/acornBomb.png b/src/images/weapons/acornBomb.png
diff --git a/src/images/weapons/birdbomb.png b/src/images/weapons/birdbomb.png
diff --git a/src/images/weapons/bomb-longrange.png b/src/images/weapons/bomb-longrange.png
diff --git a/src/images/weapons/bomb.png b/src/images/weapons/bomb.png
diff --git a/src/images/weapons/cannon-bomb.png b/src/images/weapons/cannon-bomb.png
diff --git a/src/images/weapons/cloudbomb.png b/src/images/weapons/cloudbomb.png
diff --git a/src/images/weapons/cloudbomb_horizontal.png b/src/images/weapons/cloudbomb_horizontal.png
diff --git a/src/images/weapons/goo.png b/src/images/weapons/goo.png
diff --git a/src/images/weapons/laser.png b/src/images/weapons/laser.png
diff --git a/src/images/weapons/spike.png b/src/images/weapons/spike.png
diff --git a/src/items/keys/minecarts.lua b/src/items/keys/minecarts.lua
@@ -0,0 +1,10 @@
+return{
+    name = "minecarts",
+    description = "Mine Carts",
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 1,
+    quantity = 1,
+    info = "The key to reactivate the mine carts",
+    directory = 'keys/'
+}
diff --git a/src/items/keys/mines.lua b/src/items/keys/mines.lua
@@ -0,0 +1,10 @@
+return{
+    name = "mines",
+    description = "Mines Entrance",
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 5,
+    quantity = 1,
+    info = "the key to the abandoned mines in the mountains",
+    directory = 'keys/'
+}
diff --git a/src/items/keys/mines_weapons_room.lua b/src/items/keys/mines_weapons_room.lua
@@ -0,0 +1,9 @@
+return{
+    name = "mines_weapons_room",
+    description = "Weapons Room Key",
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 1,
+    quantity = 1,
+    directory = 'keys/'
+}
diff --git a/src/items/materials/berry.lua b/src/items/materials/berry.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'berry',
+  description = 'Berry',
+  type = 'material',
+  info = 'Looks psychotropic. Perfect for a Laser Floyd concert.',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/bluemushroom.lua b/src/items/materials/bluemushroom.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'bluemushroom',
+  description = 'Blue Mushroom',
+  type = 'material',
+  info = 'An invasive species of mushrooms',
+  MAX_ITEMS = 10,
+}
diff --git a/src/items/materials/buddhaAmber.lua b/src/items/materials/buddhaAmber.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'buddhaAmber',
+  description = 'Amber Buddha Statue',
+  type = 'material',
+  info = 'a statue of Buddha carved out of amber.  It sort of looks like a bong...',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/buddhaGarnet.lua b/src/items/materials/buddhaGarnet.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'buddhaGarnet',
+  description = 'Garnet Buddha Statue',
+  type = 'material',
+  info = 'a statue of Buddha carved out of garnet.  It sort of looks like a bong...',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/buddhaJade.lua b/src/items/materials/buddhaJade.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'buddhaJade',
+  description = 'Jade Buddha Statue',
+  type = 'material',
+  info = 'a statue of Buddha carved out of jade.  It sort of looks like a bong...',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/buddhaStone.lua b/src/items/materials/buddhaStone.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'buddhaStone',
+  description = 'Stone Buddha Statue',
+  type = 'material',
+  info = 'a stone Buddha statue.  It sort of looks like a bong...',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/buddhaTopaz.lua b/src/items/materials/buddhaTopaz.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'buddhaTopaz',
+  description = 'Topaz Buddha Statue',
+  type = 'material',
+  info = 'a statue of Buddha carved out of topaz.  It sort of looks like a bong...',
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/energonPod.lua b/src/items/materials/energonPod.lua
@@ -0,0 +1,7 @@
+return{
+  name = 'energonPod',
+  description = 'Energon Pod',
+  type = 'material',
+  info = 'Only through vaporization does the great Buddha gave us the gift of everlasting life.  Buy 1 get 1 free!',
+  MAX_ITEMS = 2,
+}
diff --git a/src/maps/forest-hidden.tmx b/src/maps/forest-hidden.tmx
@@ -41,7 +41,7 @@
  </layer>
  <layer name="foreground" width="70" height="50">
   <data encoding="base64" compression="zlib">
-   eJztmtF2gyAMhr3s5W7X43bn9hDd1j6aj+ajTVqypjHBCEGxI+fktCpQ/foTAtg0+e3QNP1BOP9y+5ytA8e0jtT2HmxNLu3ob0p/T3gmC1uTSzf6h9I/E57JwrbmMmpjGP1Sudx9PO7hWkvYbM3lON7bUTj/GriGzy+ILxevj6uPxwNuF3PTckExq28RZ60tiXlLY6PVeBTDxdfpqf5iftPK4d635OI1eOH0568//JdUUzm5QL+ifY/royHd5ogv3S1uDeAdYQdcrdks7XsxbafkMnNcUDlz3eT2GO2ALl2/CcV6VB76Y7TvgQvoRNIHtR9FmS/m3Bl9p7lGiVzaQCzOabG6W4tLCeb09Y2Of4TzzmLivwUXH2965JMxuwRbwseCC8r/wNV5IGaam+XJf2rGx624wJhG6q3Cp1Qu7bT8xHPy0fSnLbgw5VmPmZNF3Lc5F4gNLfNMOPcT7meOizo/Srh/cTxP4QLP1/H/dSPpRquXNeINHtdj5tac4XakuVoqlzX6E/c8VlwkN+DC9ie8ZkY9Vl9WXNAaoZiDC+s213rKfsTON9AzmOnLikuqhfgAj5NQ189dnQ/E+9h5WylcnLl5zdzaNGd4LRHca2VSF4+boTZL4pJidG3CaYjj4rUl6gjl3k/BhVqISygX4saPvXPB806pH0lcOJ1YcNnq3QHC4hpvQ+NfQEfJ8wCOQU4udE0Hx0ztejspP4m9KVzw/pXERdrjijFp/aGz4fIw1u2JC87XpLGbjOts3/HlGog7M7lh8VxaEifoWq2yjT8eEhO/BrQbLilGeYS0NDe3m+OC94Hpvi+9FnpPYw3D8zXHw+XS52kZ1d7s3vMXzqQ5lTPtnvAzcglZ5XI3/J6Hhsl/4RLzPkXlouOifddmT76UCcclpo1n9MqlcqlcKpfKpXIpwSmXXwjOqAU=
+   eJztmt12wiAMgHvp5W7n6XbX7SHc1Efro/loKwoa0wQCpJQ6ck6OtgIr3/JDoF23vOy6btwx999un8E+7hr34cbegpTk0k/6IdTPjDlpSEkuw6RfQv3OmJOGrM1lso3LpOfG5aHT9eh+6xGbtbnsp2fbM/ffPb/B+xHx5Wzt46rT9QWOC7mV4hIT82Jjo1Y+WoNLTMyLjY01c8H20APfxX9Tm4vzK+x7lI/67HaJ+DLc4tbF6YB81/r2LO7naqzvpYyds5YJcQHt1O1maU2xHWeXxm98sR60v9pNjm6Bi7MTzj6wHAVtfoh7J/AdrzVq5OLWBJx9LCWpdleKSw1i7OsXXB+Z+0ZS4r8GFxtvRqCznF2DxPDR4GLzzQj0qQ4JPOud6dIsD/ZTkh/X4uJyGupXhE+tXPp5+5kuyUfiT2twIdqTKvXFzOdW5+JiQ0/MCa79mOcJcRGvjzKen83nOVzc/Ab6f91xdiO1lxLxBuZ1rdoajsPVarlcSvgTNR8tLpwqcCH9CewdjFhT7UuLC9gjZNfgVK3g+gn9iKw3wBzU7GuNvTtKfHwcjwPT19auRi9Ix9S6rRYuRkxdE9qbpgTkkns/ayuzvjBv+sasiUuO4L0JY0MUF2tbrB2BtfdLcMHi4+JbC1H5Y+tcYN3J+RHHhbITDS5rvTuAWFzjrS//eewouw6gGCzJBe/pwJgp3W9H7WexN4cLPL/iuHBnXCnC7T8MOlyect2WuMD1Gpe7UV4nfce261zcCawNq+fSoziB92qFY9x5cEzsHtBmuOQI5uGzpVBtF+ICz4HxuS/+zfeeRgmB9ZrhYdbSp3kb0dns1tcvlHA1lRHpmfArcvFJ4/IQ+J6HhMl/4ZLyPkXjIuMifddmSxrLhOKSMsYrauPSuDQujUvj0rjUoJjLH/iDoos=
   </data>
  </layer>
  <layer name="Tile Layer 5" width="70" height="50">
@@ -61,7 +61,7 @@
  </layer>
  <layer name="collision" width="70" height="50">
   <data encoding="base64" compression="zlib">
-   eJztmF0OwyAIgHv/Q/Uce9wRlp1g68OyxSACAsLkS0x/bK39hmh3HMUOnMyyC5x33dkLFh+7e/ndb493YZRDJF6eTdHok0bRZEW8WDwng5cbUHrP1ELSJjX+PONFO/Ytx573WiZjnpf0mZuLI+ZbSp8z4O0mi5cLz1jL5EWKxI+GF2i+bufsCHD8rI6XFbk1spfeusrDj7cX6vgZvbu1H0r7K+KFs/60xMoL5n1UR23fEqtvpbPZcuso7a/Kx1peeu5nvEivl6LthXuNhheLbylNL5I1OLX/0hy12sssM956dRHiRQvJOLCKT2g/O1Iv2vN0NEZesPso5zLBGUfYvVBdNqTzH3Qee0ZEOGt0znxPzSHRvPR+9/Ly3WLvQ5nXKeNr1I8ocNYwlDY056isUPPwgZyn1meCO7ZGbUH0/uPnlIhQ48ArXi5PD6dnYcx40YiVSHHD/Sb93PPvSN6xvNDueR/f/6iI10I7xIuE8gJTXmDKC0x5gSkvMOUFpvXyArZKqko=
+   eJztmG0OwiAMhnf/Q3kOf3oE4wnUH8ZlKfC2a2k7+iRkHwy2PZbC3LZiBW7Msgqcd13ZSy8+Vvey3z8er8Ioh3h44eY8j9zo5SV6nxZe7kRp3VMLSZ9o/HmMI4s+tcfe7LVMxjwveebXrqD3iJZvkWfOwGw3Wbx8mRlrmbxIkfjR8ELN18c5OwIcP97x4pFbI3tpratm+JntBR0/o3e39oP07xEvnPWnJVZeet5HdWj/llh9K90OW24d0r9XPtby0nJ/xov0einaXrjXaHix+JbS9CJZg6PPL81R3l7OcsZbqy5CvGghGQdW8UntZ0fqRXuejsbIS68dci4TnHHUa0vVZUM6/1Hne/eICGeNzpnv0RwSzUvrdy8v/23vfZB5HRlfo+eIAmcNg/ShOUdlBc3DW+c8Wp8J7tga9UXR+o+fUyKCxsGsePl6ek66V48zXjRiJVLccL9Jf22ujuQdywvW5nP8uFARr4VWiBcJ5YWmvNCUF5ryQlNeaMoLzdHLG/awpoI=
   </data>
  </layer>
  <objectgroup color="#000000" name="nodes" width="70" height="50">
@@ -202,7 +202,6 @@
   <object name="rock" type="material" x="672" y="120" width="24" height="24"/>
   <object name="rock" type="material" x="1128" y="192" width="24" height="24"/>
   <object name="stick" type="material" x="912" y="720" width="24" height="24"/>
-  <object name="rusted_brass" type="key" x="120" y="120" width="24" height="24"/>
   <object type="breakable_block" x="1272" y="144" width="48" height="48">
    <properties>
     <property name="crack" value="false"/>
@@ -222,5 +221,10 @@
    </properties>
   </object>
   <object name="mushroom" type="material" x="1008" y="192" width="24" height="24"/>
+  <object name="rusted_brass" type="key" x="288" y="168" width="24" height="24">
+   <properties>
+    <property name="info" value="It's a {{orange}}rusted brass key{{white}}! Wonder what it opens..."/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/src/maps/forest.tmx b/src/maps/forest.tmx
@@ -372,22 +372,22 @@
     <property name="enemytype" value="acorn"/>
    </properties>
   </object>
-  <object type="tutorial" x="2376" y="408" width="24" height="24">
+  <object type="tutorial" x="2325" y="431" width="24" height="24">
    <properties>
     <property name="type" value="climbing"/>
    </properties>
   </object>
-  <object type="tutorial" x="2784" y="96" width="24" height="24">
+  <object type="tutorial" x="2796" y="106" width="24" height="24">
    <properties>
     <property name="type" value="dropping"/>
    </properties>
   </object>
-  <object type="tutorial" x="2808" y="264" width="24" height="24">
+  <object type="tutorial" x="2795" y="275" width="24" height="24">
    <properties>
     <property name="type" value="crawling"/>
    </properties>
   </object>
-  <object type="tutorial" x="2568" y="336" width="24" height="24">
+  <object type="tutorial" x="2595" y="342" width="24" height="24">
    <properties>
     <property name="type" value="digging"/>
    </properties>

diff --git a/src/maps/mountain_pass.tmx b/src/maps/mountain_pass.tmx