hawkthorne · danhp · Jul 5, 2013 · Apr 26, 2013 · Apr 29, 2013 · May 10, 2013
diff --git a/src/audio/music/sandpits.ogg b/src/audio/music/sandpits.ogg
diff --git a/src/audio/music/tacotown.ogg b/src/audio/music/tacotown.ogg
diff --git a/src/audio/music/valley.ogg b/src/audio/music/valley.ogg
diff --git a/src/audio/music/valley2.ogg b/src/audio/music/valley2.ogg
diff --git a/src/images/activenpcs/blacksmith_juan.png b/src/images/activenpcs/blacksmith_juan.png
diff --git a/src/images/activenpcs/telescope_juan.png b/src/images/activenpcs/telescope_juan.png
diff --git a/src/images/blocks/sand-block-dark.png b/src/images/blocks/sand-block-dark.png
diff --git a/src/images/blocks/sand-block.png b/src/images/blocks/sand-block.png
diff --git a/src/images/consumables/healthpot.png → src/images/consumables/healthpotion.png b/src/images/consumables/healthpot.png → src/images/consumables/healthpotion.png
diff --git a/src/images/consumables/superhealthpotion.png b/src/images/consumables/superhealthpotion.png
diff --git a/src/images/enemies/spider.png b/src/images/enemies/spider.png
diff --git a/src/images/mayorjuan.png b/src/images/mayorjuan.png
diff --git a/src/images/npc/juan1.png b/src/images/npc/juan1.png
diff --git a/src/images/npc/juan_menu1.png b/src/images/npc/juan_menu1.png
diff --git a/src/images/npc/juanita.png b/src/images/npc/juanita.png
diff --git a/src/images/npc/juanita_menu.png b/src/images/npc/juanita_menu.png
diff --git a/src/images/npc/mayorjuan.png b/src/images/npc/mayorjuan.png
diff --git a/src/images/npc/mayorjuan_menu.png b/src/images/npc/mayorjuan_menu.png
diff --git a/src/images/npc/mexicannpc.png b/src/images/npc/mexicannpc.png
diff --git a/src/images/npc/senorjuan.png b/src/images/npc/senorjuan.png
diff --git a/src/images/npc/senorjuan_menu.png b/src/images/npc/senorjuan_menu.png
diff --git a/src/images/quicksand.png b/src/images/quicksand.png
diff --git a/src/images/sandbarrier.png b/src/images/sandbarrier.png
diff --git a/src/images/sandplatform.png b/src/images/sandplatform.png
diff --git a/src/images/sandplatformbreak.png b/src/images/sandplatformbreak.png
diff --git a/src/images/sandplatformdark.png b/src/images/sandplatformdark.png
diff --git a/src/images/skulltrigger.png b/src/images/skulltrigger.png
diff --git a/src/images/tilesets/treeline.png b/src/images/tilesets/treeline.png
diff --git a/src/images/tilesets/valley.png b/src/images/tilesets/valley.png
diff --git a/src/images/weapons/bonebow.png b/src/images/weapons/bonebow.png
diff --git a/src/images/weapons/sword_3.png → src/images/weapons/crimson sword.png b/src/images/weapons/sword_3.png → src/images/weapons/crimson sword.png
diff --git a/src/items/consumables/healthpot.lua → src/items/consumables/healthpotion.lua b/src/items/consumables/healthpot.lua → src/items/consumables/healthpotion.lua
@@ -1,5 +1,5 @@
 return{
-    name = "healthpot",
+    name = "healthpotion",
     type = "consumable",
     MAX_ITEMS = 10,
     regen = 5,

diff --git a/src/items/consumables/superhealthpotion.lua b/src/items/consumables/superhealthpotion.lua
@@ -0,0 +1,13 @@
+return{
+    name = "superhealthpotion",
+    type = "consumable",
+    MAX_ITEMS = 10,
+    regen = 10,
+    use = function( consumable, player )
+    	if (player.health + consumable.props.regen) >= player.max_health then
+    		player.health = player.max_health
+    	else
+    		player.health = player.health + consumable.props.regen
+    	end
+	end
+}
diff --git a/src/items/weapons/crimson sword.lua b/src/items/weapons/crimson sword.lua
@@ -0,0 +1,11 @@
+-----------------------------------------------
+-- swordItem.lua
+-- The code for the sword, when it is in the player's inventory.
+-- Created by NimbusBP1729
+-----------------------------------------------
+
+return{
+    name = 'crimson sword',
+    type = 'weapon',
+    subtype = 'melee',
+}
diff --git a/src/maps/black-caverns-2.tmx b/src/maps/black-caverns-2.tmx
@@ -695,13 +695,6 @@
     <property name="velocityX" value="50"/>
    </properties>
   </object>
-  <object name="stick" type="spawn" x="1848" y="336" width="24" height="24">
-   <properties>
-    <property name="nodeType" value="material"/>
-    <property name="spawnMax" value="1"/>
-    <property name="spawnType" value="keypress"/>
-   </properties>
-  </object>
   <object name="main" type="door" x="24" y="144" width="24" height="48">
    <properties>
     <property name="level" value="black-caverns"/>

diff --git a/src/maps/gay-island.tmx b/src/maps/gay-island.tmx
@@ -248,7 +248,7 @@
   <object type="door" x="0" y="0" width="24" height="456">
    <properties>
     <property name="instant" value="true"/>
-    <property name="level" value="valley"/>
+    <property name="level" value="valley-3"/>
     <property name="sound" value="false"/>
     <property name="to" value="gayisland"/>
    </properties>

diff --git a/src/maps/valley-2.tmx b/src/maps/valley-2.tmx
diff --git a/src/maps/valley-3.tmx b/src/maps/valley-3.tmx
diff --git a/src/maps/valley-chili-fields-2.tmx b/src/maps/valley-chili-fields-2.tmx
diff --git a/src/maps/valley-chili-fields.tmx b/src/maps/valley-chili-fields.tmx
diff --git a/src/maps/valley-sandpits-2.tmx b/src/maps/valley-sandpits-2.tmx
diff --git a/src/maps/valley-sandpits-entrance.tmx b/src/maps/valley-sandpits-entrance.tmx
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="70" height="45" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="offset" value="31"/>
+  <property name="overworldName" value="valley_1"/>
+  <property name="soundtrack" value="valley"/>
+ </properties>
+ <tileset firstgid="1" name="valley" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/valley.png" width="288" height="2400"/>
+ </tileset>
+ <layer name="bg_filler" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJzt07EJwDAQBMF3x+pArRvHXmUGJzNwDSzczHf29R4zS5OkS9Ol6dJ0abo0XZouTZczXZouZ8+fli4AAAAAAAAAAPCbG0IuF9w=
+  </data>
+ </layer>
+ <layer name="background_walls" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJzt0EEKgCAQhtHxyNYFOnrmukWF0kTvg5/ZibxaYqsDt5Tore2OfPfr48KFCxcuXDKMCxcuXGa6HJcLlz+5xElv/ynDuHC5Y8CFCxcuXLhwyTEuXLhw4cIlw666SJIkSZIkPWkHE5Mbig==
+  </data>
+ </layer>
+ <layer name="leaves_bg" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJzt1tENgyAUQFHiJG7S/jMA63QUR+lohaSN1IClAu9JvCfhxzTx5QpWY4BydjJzWM4v7VnO5DatS7KNv9f980wSawnL/+YpNc9W3MXP8ojmXt7zNd9LoUl8372l1Sg3R+L61zOtaWX/6JKaTaLVkfm2rUobuUzzivufskvq/En0kOjSotGvLrZxD+kuQc2Zyp2nXl3Cknof9zhPvZqM1Eaji+R5kjTSntHQYN+IfNto6PXecZ2+3UeR20OJa5dtFBScvVl7Ri1H/kOviC776AIAAAAAAAAAAADUeQHHt4l1
+  </data>
+ </layer>
+ <layer name="leaves" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJztmM0RwiAQhRELsAAuueVuA1qSJaQUS0lphtEoQ4JhyS4b4/tm3mSGA/t4WfKDMQAAAGrirLl7tdb0mj7al49Yw3ij4edkPxqzGa7XhMdewoOvF/qIpZFN7MGvP+XPCeXiFnIZfdXsnyU/KX8lPZTaK8T62fXWQM2lxGdbsP6leyPdN0w+mzmf3HnU7BtOr5Jzz0nrXbUW6VxqPWu4QS46IBcAdPHfFqO0vWyJb98XYF+5XGxaAADwa9wOTwEAAAAAAABACPc5xxbOzs7Ht7rSOWrnMvyvdbwVp6zNxCOZS0nPBPd6IuIcHb06ndw1xpn4/qD0SLx+ai4ce0gCjl7JHY/Z47kwda/URPsdAqbk5PKP2Unm8gBUEUOp
+  </data>
+ </layer>
+ <layer name="filler" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJztmUFywjAMRUM4QA/Ahh2suUC75wA9AWzYlBv4KGx7i053PQq3qJ3Gg6qRZcWRkzCjP6MhTLCt/2LFTmgak8lkMplMJpPJZNLVZ6val9PrzWQymUwmUy19rGTxLNLIXdpuiVxS1++V2OdJGOE+uEBtXAx1kwPFecz5SPX10tLB9Y/6ccWGEpLW8tDawB5wO45HboyxbDgftXhQHuCY8HgoD01hX5zXkryo+S45F89zdVNLmMGmbbY7H5rr3Tfjhzs3p6ZY840LreCdiyUKrO9Pt0ecWkP3QkvYM80lyIqLufOEmiKv2Dc3zlLY1L5WxL6mG4d6xknlVJsTN452Dsyeruuf40LlppET1z/HZGTf2XUIjjOEi5Zy8/CwfoTimCIu8Vibi6T2YA1zc0GTT8m+JfWugJPkXYGEy8l/njL5as+dnEJulz6/HJcch9SzoGS+BC5nAZsSjeHJcZG8Pwryvtw5s47giPOFYvfeNrejf+b1n9sST5o1iL3D7ztBe+wv+vf+bikuqftuvEZH8D929Hlv/uK6+t8mhOf4tX8wcSGoXH9QSLngGpEoxQX6z3HB17hn080byCRyif7D7zaefwhJrhQXOMdgDtJ7BselNEL7UDu4jmF9Yy73/jx6B+hKuUBBLnvEaEpFJvh+EL6n7m0Hol6W8OyiKV8rb9RamOLSs2C5TL2+15CUS8k68wv6t/XG
+  </data>
+ </layer>
+ <layer name="floor" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJztmMtO4zAUhlO6p2yhLLKjW1ixoxKzGe47xEWCQYJBghmuD5BH4VH6aPwe+UiuObaPM0mczvhInyo1iXP85Th2XBQ5cuTIkSNHjhw5cuT43+JpsBj8Ar8H3Xl5HiwWnJ/lpeyF87OWvXyhrTGXul9d1VT2IqupEKlzzjSLitOl4mPfAY6VqXOMwehLqaiTP7Wxg3nIR1/dbCD38Twl/ivt/CV+mLZY7Pb7VD/UhxHy4lB+CLMfyH3masueL1xt6/Y5P1/a7tDH1OfDBa6bcbmr9lzzqLDdsu64omfmOo75v8I6oHpiuAE/gNHWNNaJfr4zrmbG2osvh7Ywa9v0Q7k8Cwjd48q4j8214HpJDk1j5xnjQ8qDx8tjon7HPus27rGIXlL5TzlGJNC3Veo8eohy4vxW70F+Sb24IE/XhiPMpVNax5vo9UHq/syxOiyKNbAZScgL8ai9KCeCb5Le+NiqScgHt6ZS6xGfm65raMw877o+Ql5865iHgBfLUeu1sRHR3+9gD+yDA4EXe93pyyPGSxe1oRiBlQbqxPYSs76SeqHzrX3T2k7Uvsu3YVHtAld/mvLTphcOwX6z874Yk8Udfm/BtsdNE35i5y+6X6wPbr6ktkJezP05GkdN92+9ofFn9kniI5T7uuFHf9dX3H4l9471hTp+CI7AMThx5DDRv+hTNXLUovSdLXkeUs+T4fx+E7ff6fOi98T+7JXYbs5wzjm4AJfGdeRdnWP4IBqpn7/F9oI+su8w2ws5sfdJTT+3OO8O/AT3YR/RXszabAPJe4DLybVPSH5ecN4reAPv+hqPj17VSx24WiEo8N6qNhk8Pv4JL65aoZjIHGQvQj4BIEyBlw==
+  </data>
+ </layer>
+ <layer name="foreground" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJztl7FOwzAQhi2LCSTYydKlzQzlAXgrYLMEzMADFHWDSIyFRwNGfqNataIkdmwntpP7pFPaJLLvvvoahzGCIAiCaGbDmYidgw+/2mfUwl65/5gYQ1SZe9FBLf9ufNll5uUGNd8i7lpq/8T5rwBeMIbAWCJ2L51azn+Pmh8Qjy21VwGcKN6R01tkL+cd8y9R62pf7xOOz4iXnl4uLH0dsUMeOfURQeTEJfpxHfA/jCD05wTRj62HtxD71iHn8cnPxctmv5cPuUdrY+cxj887h4sX7DHlXnMULxV3q0/e7/PO0eTFJgflZsheUmvSxY3Kz5W6lz79EeodsA19XbrM5bOe6176rIOx+sjVf0gvarwxarYhpVyG7o9cSeX3iUFhuO6z38sV6aQ03DNHL0vEinWvmY8ZepGsEVexk0gQUx8RBJEeJWfb4hALfF/Ur+nnpo6q+QzPt3oUDdem7qbLhynkelIxNU+FpQOLccTgyY5EabFObJmKF5OTVPhG/MROggjKCWfXx4iuY6i51HMi1Hg5o++pYudCEHPgD4//X7E=
+  </data>
+ </layer>
+ <layer name="shrubs" width="70" height="45">
+  <data encoding="base64" compression="zlib">
+   eJzt10EOgjAQBdAJB/AAulbWgvc/m924IRh1Wm1j3ku6ISnzk4EyRAAAAAAAAEScp4jLlNt7SO6rtZS6a7L2tWHmZ/c6JmvU9KK1Xr0dXba3wGvOnX3/fu7UfNOB943+rj3m4NFz8rmld4CNb8wbmed2Luu0c73XP+Eo88Za1q13iAHNvQMAzZl54Lfuly8Fyw==
+  </data>
+ </layer>
+ <objectgroup color="#44a489" name="block" width="70" height="45">
+  <object x="600" y="576" width="24" height="96"/>
+  <object x="624" y="648" width="168" height="24"/>
+  <object x="768" y="576" width="24" height="72"/>
+  <object x="816" y="912" width="24" height="120"/>
+  <object x="1056" y="816" width="48" height="192"/>
+  <object x="840" y="984" width="216" height="48"/>
+ </objectgroup>
+ <objectgroup color="#a4593f" name="platform" width="70" height="45">
+  <object x="0" y="672">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+   <polygon points="0,0 48,24 144,24 192,48 264,48 264,62 192,61 144,40 48,40 0,17"/>
+  </object>
+  <object x="48" y="816">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+   <polygon points="0,0 96,0 192,-48 288,-48 288,-29 193,-30 96,16 0,16"/>
+  </object>
+  <object x="1344" y="1008">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+   <polygon points="0,0 144,0 336,-96 336,72 0,72"/>
+  </object>
+  <object x="0" y="264">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+   <polygon points="0,0 1008,0 1152,72 1272,72 1368,120 1584,120 1584,138 1369,138 1272,96 1152,96 1008,24 0,24"/>
+  </object>
+  <object x="1608" y="384" width="72" height="19">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+  </object>
+  <object x="48" y="624">
+   <polygon points="0,0 24,0 24,16 0,16"/>
+  </object>
+  <object x="0" y="624" width="47" height="16">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+  </object>
+  <object x="1584" y="384" width="24" height="24"/>
+  <object x="792" y="576">
+   <polygon points="0,0 192,0 240,-24 888,-24 888,0 240,0 192,24 0,24"/>
+  </object>
+  <object x="0" y="888">
+   <properties>
+    <property name="drop" value="false"/>
+   </properties>
+   <polygon points="0,0 288,0 384,48 576,48 672,0 744,0 792,24 816,24 816,120 0,120"/>
+  </object>
+  <object x="399" y="214" width="48" height="15"/>
+  <object x="1104" y="816">
+   <polygon points="0,0 96,0 240,72 504,72 504,96 240,96 96,24 0,24"/>
+  </object>
+  <object x="1176" y="768">
+   <polygon points="0,0 120,0 216,-48 504,-48 504,-24 216,-24 120,24 0,24"/>
+  </object>
+  <object x="72" y="624">
+   <polygon points="0,0 24,0 168,-72 288,-72 336,-48 528,-48 528,-24 336,-24 288,-48 168,-48 24,24 0,24"/>
+  </object>
+ </objectgroup>
+ <objectgroup color="#000000" name="nodes" width="70" height="45">
+  <object name="main" type="door" x="504" y="216" width="24" height="48">
+   <properties>
+    <property name="level" value="valley-chili-fields-2"/>
+    <property name="sound" value="false"/>
+    <property name="to" value="sandbarrier"/>
+   </properties>
+  </object>
+  <object type="enemy" x="864" y="216" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="624" y="216" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="climbable" x="1584" y="384" width="24" height="168"/>
+  <object type="climbable" x="48" y="624" width="24" height="72"/>
+  <object type="enemy" x="312" y="216" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="744" y="216" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="168" y="216" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1440" y="336" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1200" y="288" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="trombonist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1392" y="504" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="840" y="528" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1512" y="504" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1224" y="504" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1056" y="504" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="480" y="522" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="192" y="840" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="guitarist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="480" y="888" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="guitarist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1440" y="672" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="guitarist"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1488" y="840" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="guitarist"/>
+   </properties>
+  </object>
+  <object type="liquid" x="624" y="600" width="144" height="48">
+   <properties>
+    <property name="drag" value="true"/>
+    <property name="drown" value="true"/>
+    <property name="sprite" value="images/quicksand.png"/>
+   </properties>
+  </object>
+  <object type="enemy" x="672" y="552" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="frog"/>
+   </properties>
+  </object>
+  <object type="movingplatform" x="1056" y="864" width="48" height="24">
+   <properties>
+    <property name="line" value="platform_2"/>
+    <property name="speed" value="5.5"/>
+    <property name="sprite" value="images/sandplatformdark.png"/>
+    <property name="start" value="0"/>
+   </properties>
+  </object>
+  <object type="killing_floor" x="840" y="966" width="216" height="17"/>
+  <object type="enemy" x="1050" y="224" width="14" height="25">
+   <properties>
+    <property name="enemytype" value="pinata"/>
+   </properties>
+  </object>
+  <object type="enemy" x="930" y="511" width="14" height="25">
+   <properties>
+    <property name="enemytype" value="pinata"/>
+   </properties>
+  </object>
+  <object type="enemy" x="568" y="897" width="14" height="25">
+   <properties>
+    <property name="enemytype" value="pinata"/>
+   </properties>
+  </object>
+  <object type="enemy" x="1527" y="657" width="14" height="25">
+   <properties>
+    <property name="enemytype" value="pinata"/>
+   </properties>
+  </object>
+  <object type="enemy" x="98" y="550" width="48" height="48">
+   <properties>
+    <property name="enemytype" value="violinist"/>
+   </properties>
+  </object>
+  <object name="next" type="door" x="1392" y="936" width="48" height="72">
+   <properties>
+    <property name="level" value="valley-sandpits"/>
+    <property name="sound" value="false"/>
+    <property name="to" value="main"/>
+   </properties>
+  </object>
+  <object name="bone" type="material" x="816" y="240" width="24" height="24"/>
+  <object name="bone" type="material" x="240" y="240" width="24" height="24"/>
+  <object name="bone" type="material" x="1632" y="360" width="24" height="24"/>
+  <object name="bone" type="material" x="1320" y="528" width="24" height="24"/>
+  <object name="bone" type="material" x="1416" y="696" width="24" height="24"/>
+  <object name="bone" type="material" x="888" y="552" width="24" height="24"/>
+  <object name="bone" type="material" x="432" y="552" width="24" height="24"/>
+  <object name="bone" type="material" x="264" y="864" width="24" height="24"/>
+  <object name="bone" type="material" x="1080" y="792" width="24" height="24"/>
+ </objectgroup>
+ <objectgroup name="movement" width="70" height="45">
+  <object name="platform_2" x="1024" y="876">
+   <polyline points="-8,0 64,0"/>
+  </object>
+ </objectgroup>
+</map>