Merge pull request #1858 from hawkthorne/master

Hotfix 0.3.4
hawkthorne · Nov 1, 2013 · 4c55894 · 4c55894
2 parents e681860 + 115824d
commit 4c55894
Show file tree

Hide file tree

Showing 111 changed files with 342 additions and 273 deletions.
diff --git a/scripts/create_post.py b/scripts/create_post.py
@@ -25,7 +25,7 @@ def post_content():
                           'post'))
 
     template = jinja2.Template(open('templates/post.md').read())
-    return template.render(pull=pulls[0])
+    return template.render(pull=pulls[0], version=version.current_version())
 
 
 def commithash(version):

diff --git a/src/brewing.lua b/src/brewing.lua
@@ -19,7 +19,7 @@ bundle = {}
 
 --called once when the gamestate is initialized
 function state:init()
-    self.background = love.graphics.newImage('images/potion_menu.png')
+    self.background = love.graphics.newImage('images/potions/potion_menu.png')
 end
 
 --called when the player enters this gamestate

diff --git a/src/images/corn_circles.png → src/images/cutscenes/corn_circles.png b/src/images/corn_circles.png → src/images/cutscenes/corn_circles.png
diff --git a/src/images/cornelius_head.png → src/images/cutscenes/cornelius_head.png b/src/images/cornelius_head.png → src/images/cutscenes/cornelius_head.png
diff --git a/src/images/cornelius_sparkles.png → src/images/cutscenes/cornelius_sparkles.png b/src/images/cornelius_sparkles.png → src/images/cutscenes/cornelius_sparkles.png
diff --git a/src/images/lightning.png → src/images/cutscenes/lightning.png b/src/images/lightning.png → src/images/cutscenes/lightning.png
diff --git a/src/images/damage.png b/src/images/damage.png
diff --git a/src/images/gilbert_beam.png b/src/images/gilbert_beam.png
diff --git a/src/images/healthbar.png b/src/images/healthbar.png
diff --git a/src/images/dalmatian.png → src/images/hiddendoor/dalmatian.png b/src/images/dalmatian.png → src/images/hiddendoor/dalmatian.png
diff --git a/src/images/dean_closet.png → src/images/hiddendoor/dean_closet.png b/src/images/dean_closet.png → src/images/hiddendoor/dean_closet.png
diff --git a/src/images/fireplace.png → src/images/hiddendoor/fireplace.png b/src/images/fireplace.png → src/images/hiddendoor/fireplace.png
diff --git a/src/images/hide_greendale.png → src/images/hiddendoor/hide_greendale.png b/src/images/hide_greendale.png → src/images/hiddendoor/hide_greendale.png
diff --git a/src/images/painting.png → src/images/hiddendoor/painting.png b/src/images/painting.png → src/images/hiddendoor/painting.png
diff --git a/src/images/sandbarrier.png → src/images/hiddendoor/sandbarrier.png b/src/images/sandbarrier.png → src/images/hiddendoor/sandbarrier.png
diff --git a/src/images/skulltrigger.png → src/images/hiddendoor/skulltrigger.png b/src/images/skulltrigger.png → src/images/hiddendoor/skulltrigger.png
diff --git a/src/images/Note_image.png → src/images/info/note.png b/src/images/Note_image.png → src/images/info/note.png
diff --git a/src/images/ladder.png b/src/images/ladder.png
diff --git a/src/images/quicksand.png → src/images/liquid/quicksand.png b/src/images/quicksand.png → src/images/liquid/quicksand.png
diff --git a/src/images/water2.png → src/images/liquid/water2.png b/src/images/water2.png → src/images/liquid/water2.png
diff --git a/src/images/sandplatform.png → src/images/platforms/sandplatform.png b/src/images/sandplatform.png → src/images/platforms/sandplatform.png
diff --git a/src/images/sandplatformbreak.png → src/images/platforms/sandplatformbreak.png b/src/images/sandplatformbreak.png → src/images/platforms/sandplatformbreak.png
diff --git a/src/images/sandplatformdark.png → src/images/platforms/sandplatformdark.png b/src/images/sandplatformdark.png → src/images/platforms/sandplatformdark.png
diff --git a/src/images/sandplatformdarksingle.png → ...ages/platforms/sandplatformdarksingle.png b/src/images/sandplatformdarksingle.png → ...ages/platforms/sandplatformdarksingle.png
diff --git a/src/images/sandplatformdarktriple.png → ...ages/platforms/sandplatformdarktriple.png b/src/images/sandplatformdarktriple.png → ...ages/platforms/sandplatformdarktriple.png
diff --git a/src/images/cauldron.png → src/images/potions/cauldron.png b/src/images/cauldron.png → src/images/potions/cauldron.png
diff --git a/src/images/potion_menu.png → src/images/potions/potion_menu.png b/src/images/potion_menu.png → src/images/potions/potion_menu.png
diff --git a/src/images/seabluffwave2.png b/src/images/seabluffwave2.png
diff --git a/src/images/selected_ingredient.png b/src/images/selected_ingredient.png
diff --git a/src/images/ps_paint.png → src/images/sprites/greendale/ps_paint.png b/src/images/ps_paint.png → src/images/sprites/greendale/ps_paint.png
diff --git a/src/images/valleyplatform.png b/src/images/valleyplatform.png
diff --git a/src/images/water.png b/src/images/water.png
diff --git a/src/images/water3.png b/src/images/water3.png
diff --git a/src/images/web.png b/src/images/web.png
diff --git a/src/inventory.lua b/src/inventory.lua
@@ -445,9 +445,6 @@ function Inventory:drop()
 
         local height = item.image:getHeight() - 15
 
-        itemProps.width = item.image:getWidth()
-        itemProps.height = item.image:getHeight() - 15
-
         itemProps.width = itemProps.width or item.image:getWidth()
         itemProps.height = itemProps.height or height
 

diff --git a/src/level.lua b/src/level.lua
@@ -394,7 +394,9 @@ function Level:update(dt)
     end
 
     for i,node in pairs(self.nodes) do
-        if node.update then node:update(dt, self.player) end
+        if self.state == 'active' and node.update then
+            node:update(dt, self.player)
+        end
     end
 
     self.collider:update(dt)

diff --git a/src/maps/black-caverns.tmx b/src/maps/black-caverns.tmx
@@ -2877,13 +2877,14 @@
   <object name="ember" type="material" x="2424" y="2088" width="24" height="24"/>
   <object name="ember" type="material" x="2736" y="1440" width="24" height="24"/>
   <object name="watermelon" type="consumable" x="324" y="1860" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="2520" y="2088" width="24" height="24">
+  <object type="info" x="2520" y="2088" width="24" height="24">
    <properties>
-    <property name="note" value="Max Health Potion Recipe = 2 peanuts + 1 frog + 2 arms + 1 ember"/>
+    <property name="info" value="Max Health Potion Recipe = | 2 peanuts + 1 frog + 2 arms + 1 ember"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#a4250c" name="block" width="170" height="90" visible="0">
+ <objectgroup color="#a4250c" name="block" width="170" height="90">
   <object x="0" y="1536" width="168" height="624"/>
   <object x="168" y="1896" width="408" height="264"/>
   <object x="576" y="1944" width="408" height="48"/>
@@ -2998,7 +2999,7 @@
   <object x="2520" y="720" width="216" height="96"/>
   <object x="936" y="1824" width="48" height="48"/>
  </objectgroup>
- <objectgroup color="#12a443" name="platform" width="170" height="90" visible="0">
+ <objectgroup color="#12a443" name="platform" width="170" height="90">
   <object x="168" y="1608" width="24" height="24"/>
   <object x="168" y="1704" width="24" height="24"/>
   <object x="168" y="1800" width="168" height="24"/>
@@ -3046,7 +3047,7 @@
   <object x="456" y="672" width="24" height="24"/>
   <object x="456" y="768" width="24" height="24"/>
  </objectgroup>
- <objectgroup color="#ddad4c" name="movement" width="170" height="90" visible="0">
+ <objectgroup color="#ddad4c" name="movement" width="170" height="90">
   <object name="drumsticks" x="3216" y="1032">
    <polyline points="0,0 0,792"/>
   </object>

diff --git a/src/maps/blacksmith-upstairs.tmx b/src/maps/blacksmith-upstairs.tmx
@@ -83,9 +83,10 @@
   <object name="pot" type="throwable" x="288" y="264" width="24" height="24"/>
   <object name="pot" type="throwable" x="299" y="276" width="24" height="24"/>
   <object name="duck" type="material" x="216" y="216" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="180" y="204" width="24" height="24">
+  <object type="info" x="180" y="204" width="24" height="24">
    <properties>
-    <property name="note" value="Health Potion Recipe = 2 leaves + 1 mushroom + 1 stick + 1 bone"/>
+    <property name="info" value="Health Potion Recipe = | 2 leaves + 1 mushroom + 1 stick + 1 bone"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>

diff --git a/src/maps/forest.tmx b/src/maps/forest.tmx
@@ -207,13 +207,6 @@
     <property name="spawnType" value="keypress"/>
    </properties>
   </object>
-  <object type="enemy" x="1776" y="96" width="24" height="24">
-   <properties>
-    <property name="direction" value="left"/>
-    <property name="displacement" value="48"/>
-    <property name="enemytype" value="monkey"/>
-   </properties>
-  </object>
   <object name="rock" type="material" x="3528" y="264" width="24" height="24"/>
   <object type="liquid" x="3840" y="360" width="96" height="168">
    <properties>
@@ -362,9 +355,10 @@
     <property name="sprite" value="boulder.png"/>
    </properties>
   </object>
-  <object name="potion recipe" type="note" x="2040" y="144" width="24" height="24">
+  <object type="info" x="2040" y="144" width="24" height="24">
    <properties>
-    <property name="note" value="Invulnerability Potion Recipe = 2 boulder + 1 star + 3 ember + 3 fire "/>
+    <property name="info" value="Invulnerability Potion Recipe =| 2 boulders + 1 star + 3 embers + 3 fires"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
   <object type="enemy" x="2112" y="144" width="24" height="24">

diff --git a/src/maps/frozencave-2.tmx b/src/maps/frozencave-2.tmx
@@ -29,7 +29,7 @@
     <property name="drag" value="true"/>
     <property name="opacity" value="0.7"/>
     <property name="speed" value="0.2"/>
-    <property name="sprite" value="images/water2.png"/>
+    <property name="sprite" value="images/liquid/water2.png"/>
    </properties>
   </object>
   <object type="sprite" x="336" y="48" width="24" height="24">

diff --git a/src/maps/gay-island-2.tmx b/src/maps/gay-island-2.tmx
@@ -433,9 +433,10 @@
   <object name="mushroom" type="material" x="1104" y="696" width="24" height="24"/>
   <object name="mushroom" type="material" x="3408" y="648" width="24" height="24"/>
   <object name="peanut" type="material" x="1728" y="264" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="1440" y="360" width="24" height="24">
+  <object type="info" x="1440" y="360" width="24" height="24">
    <properties>
-    <property name="note" value="Speed Boost Potion Recipe = 2 bones + 1 mushroom + 2 ducks + 1 frog"/>
+    <property name="info" value="Speed Boost Potion Recipe = | 2 bones + 1 mushroom + 2 ducks + 1 frog"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>

diff --git a/src/maps/lab.tmx b/src/maps/lab.tmx
@@ -57,9 +57,10 @@
    </properties>
   </object>
   <object name="mushroom" type="material" x="384" y="240" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="204" y="252" width="24" height="24">
+  <object type="info" x="204" y="252" width="24" height="24">
    <properties>
-    <property name="note" value="Potion recipes are scattered throughout the world. To brew potions, find those recipes and follow their instructions.| Making a potion that doesn't follow the recipes will produce a black Dud Potion, which has unpredictable side effects when consumed."/>
+    <property name="info" value="Potion recipes are scattered throughout the world. To brew potions, find those recipes and follow their instructions.| Making a potion that doesn't follow the recipes will produce a black Dud Potion, which has unpredictable side effects when consumed."/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>

diff --git a/src/maps/treeline.tmx b/src/maps/treeline.tmx
@@ -157,9 +157,10 @@
   <object name="rock" type="material" x="1488" y="504" width="24" height="24"/>
   <object name="stick" type="material" x="1776" y="192" width="24" height="24"/>
   <object name="rock" type="material" x="2016" y="408" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="1104" y="120" width="24" height="24">
+  <object type="info" x="1104" y="120" width="24" height="24">
    <properties>
-    <property name="note" value="Punch Damage Potion Recipe = 1 stick + 2 rock + 2 leaf"/>
+    <property name="info" value="Punch Damage Potion Recipe = | 1 stick + 2 rocks + 2 leaves"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>

diff --git a/src/maps/valley-2.tmx b/src/maps/valley-2.tmx
@@ -126,8 +126,8 @@
   <object x="4272" y="456" width="72" height="24"/>
   <object x="4368" y="408" width="48" height="24"/>
   <object x="4441" y="335" width="53" height="20"/>
-  <object x="4521" y="302" width="149" height="16"/>
-  <object x="4736" y="230" width="63" height="20"/>
+  <object x="4512" y="312" width="168" height="24"/>
+  <object x="4728" y="240" width="72" height="24"/>
   <object x="1344" y="576">
    <polygon points="0,0 24,0 168,72 192,72 192,85 168,84 24,12 0,11"/>
   </object>
@@ -225,23 +225,23 @@
    <properties>
     <property name="line" value="platform_1"/>
     <property name="speed" value="3.3"/>
-    <property name="sprite" value="images/sandplatform.png"/>
+    <property name="sprite" value="images/platforms/sandplatform.png"/>
     <property name="start" value="1"/>
    </properties>
   </object>
   <object type="movingplatform" x="1992" y="720" width="48" height="24">
    <properties>
     <property name="line" value="platform_2"/>
     <property name="speed" value="3.3"/>
-    <property name="sprite" value="images/sandplatform.png"/>
+    <property name="sprite" value="images/platforms/sandplatform.png"/>
     <property name="start" value="0"/>
    </properties>
   </object>
   <object type="movingplatform" x="1992" y="624" width="48" height="24">
    <properties>
     <property name="line" value="platform_3"/>
     <property name="speed" value="3.3"/>
-    <property name="sprite" value="images/sandplatform.png"/>
+    <property name="sprite" value="images/platforms/sandplatform.png"/>
     <property name="start" value="1"/>
    </properties>
   </object>
@@ -285,7 +285,7 @@
     <property name="to" value="next"/>
    </properties>
   </object>
-  <object type="door" x="4776" y="144" width="24" height="240">
+  <object type="door" x="4776" y="264" width="24" height="120">
    <properties>
     <property name="instant" value="true"/>
     <property name="level" value="valley-tacotown"/>
@@ -382,6 +382,15 @@
     <property name="spawnType" value="keypress"/>
    </properties>
   </object>
+  <object name="next-upper" type="door" x="4728" y="192" width="48" height="48"/>
+  <object type="door" x="4776" y="144" width="24" height="96">
+   <properties>
+    <property name="instant" value="true"/>
+    <property name="level" value="valley-tacotown"/>
+    <property name="sound" value="false"/>
+    <property name="to" value="main-upper"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="movement" width="200" height="42">
   <object name="platform_1" x="2017" y="828">

diff --git a/src/maps/valley-3.tmx b/src/maps/valley-3.tmx
@@ -535,15 +535,15 @@
    <properties>
     <property name="line" value="platform1"/>
     <property name="speed" value="4"/>
-    <property name="sprite" value="images/sandplatform.png"/>
+    <property name="sprite" value="images/platforms/sandplatform.png"/>
     <property name="start" value="1"/>
    </properties>
   </object>
   <object type="movingplatform" x="1344" y="240" width="48" height="24">
    <properties>
     <property name="line" value="platform2"/>
     <property name="speed" value="4"/>
-    <property name="sprite" value="images/sandplatform.png"/>
+    <property name="sprite" value="images/platforms/sandplatform.png"/>
     <property name="start" value="0"/>
    </properties>
   </object>
@@ -642,7 +642,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -652,7 +652,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -662,7 +662,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -672,7 +672,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -682,7 +682,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -692,7 +692,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -702,7 +702,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -712,7 +712,7 @@
    <properties>
     <property name="animation" value="1-4,1|1,2"/>
     <property name="height" value="24"/>
-    <property name="sheet" value="images/seabluffwave2.png"/>
+    <property name="sheet" value="images/sprites/castle/seabluffwave2.png"/>
     <property name="speed" value="0.15"/>
     <property name="width" value="24"/>
     <property name="window" value="5"/>
@@ -727,16 +727,6 @@
    </properties>
   </object>
   <object name="gayisland" type="door" x="5400" y="480" width="48" height="48"/>
-  <object type="note" x="1704" y="216" width="24" height="24">
-   <properties>
-    <property name="note" value="To dig, unequip your weapon so that you're barehanded, and press down + attack."/>
-   </properties>
-  </object>
-  <object type="note" x="1704" y="216" width="24" height="24">
-   <properties>
-    <property name="note" value="To dig, unequip your weapon so that you're barehanded, and press down + attack."/>
-   </properties>
-  </object>
  </objectgroup>
  <objectgroup name="movement" width="230" height="30">
   <object name="platform1" x="1104" y="240">

diff --git a/src/maps/valley-chili-fields-2.tmx b/src/maps/valley-chili-fields-2.tmx
@@ -151,7 +151,7 @@
    <properties>
     <property name="drag" value="true"/>
     <property name="drown" value="true"/>
-    <property name="sprite" value="images/quicksand.png"/>
+    <property name="sprite" value="images/liquid/quicksand.png"/>
    </properties>
   </object>
   <object name="main" type="door" x="48" y="768" width="48" height="48"/>

diff --git a/src/maps/valley-chili-fields.tmx b/src/maps/valley-chili-fields.tmx
@@ -410,9 +410,10 @@
   <object name="bone" type="material" x="1944" y="720" width="24" height="24"/>
   <object name="bone" type="material" x="2496" y="648" width="24" height="24"/>
   <object name="bone" type="material" x="2400" y="120" width="24" height="24"/>
-  <object name="potion recipe" type="note" x="2208" y="120" width="24" height="24">
+  <object type="info" x="2208" y="120" width="24" height="24">
    <properties>
-    <property name="note" value="Jump Boost Potion Recipe = 3 stones + 3 peanuts + 2 frogs + 4 eyes"/>
+    <property name="info" value="Jump Boost Potion Recipe = | 3 stones + 3 peanuts + 2 frogs + 4 eyes"/>
+    <property name="sprite" value="note"/>
    </properties>
   </object>
  </objectgroup>