Dev branch merge.

.gitignore

@@ -1,2 +1,3 @@
 options.lua
 profile.lua
+src/assets/maps/*.lua

src/assets/maps/first_zone.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="903" height="256" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="83">
+<map version="1.5" tiledversion="1.7.1" orientation="orthogonal" renderorder="right-down" width="903" height="256" tilewidth="16" tileheight="16" infinite="0" nextlayerid="15" nextobjectid="86">
  <editorsettings>
   <export target="first_zone.lua" format="lua"/>
  </editorsettings>
@@ -59,6 +59,13 @@
  <objectgroup id="6" name="background_ground"/>
  <objectgroup id="9" name="background_tower"/>
  <objectgroup id="5" name="background_silhouettes"/>
+ <objectgroup id="14" name="BG effect layer">
+  <object id="84" name="backsnow" type="effect_snow" x="11829" y="15" width="64" height="48">
+   <properties>
+    <property name="parallax" type="float" value="4"/>
+   </properties>
+  </object>
+ </objectgroup>
  <layer id="10" name="BG Tile Layer" width="903" height="256" tintcolor="#a2a4ff">
   <properties>
    <property name="background" type="bool" value="true"/>
@@ -872,10 +879,9 @@
  </objectgroup>
  <objectgroup id="4" name="phys_objects"/>
  <objectgroup id="12" name="effect_layer">
-  <object id="70" name="snow" type="effect_snow" x="12096" y="0" width="64" height="48">
+  <object id="85" name="snow" type="effect_snow" x="11750" y="15.5" width="64" height="48">
    <properties>
-    <property name="destination" value="winter"/>
-    <property name="entry_point" value="winter_0"/>
+    <property name="parallax" type="float" value="1"/>
    </properties>
   </object>
  </objectgroup>

src/assets/maps/mountain_village.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="177" height="121" tilewidth="16" tileheight="16" infinite="0" nextlayerid="15" nextobjectid="40">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="177" height="121" tilewidth="16" tileheight="16" infinite="0" nextlayerid="15" nextobjectid="41">
  <editorsettings>
   <export target="mountain_village.lua" format="lua"/>
  </editorsettings>
@@ -629,6 +629,11 @@
     <property name="spriteset" value="char/hero/"/>
    </properties>
   </object>
+  <object id="40" name="lever" type="lever" x="752" y="784" width="32" height="32">
+   <properties>
+    <property name="interactable" type="bool" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="6" name="phys_objects"/>
  <layer id="2" name="fg_tile_layer" width="177" height="121" opacity="0.8">

src/assets/sequences/ms_00_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"Nice job!\"',
+        },
+    },
+}

src/assets/sequences/tut_00_int.lua

@@ -0,0 +1,14 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = {
+                '\"You can jump with the ',
+                {0, 0.4, 0.7, 1},
+                'Z',
+                {0, 0, 0, 1},
+                ' key\"',
+            }
+        },
+    },
+}

src/assets/sequences/tut_01_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"Watch out for traps.\"',
+        },
+    },
+}

src/assets/sequences/tut_02_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"Wow! I thought I was totally hidden!\"',
+        },
+    },
+}

src/assets/sequences/tut_03_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"Ah. A man of culture I see.\"',
+        },
+    },
+}

src/assets/sequences/tut_04_int.lua

@@ -0,0 +1,12 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"What a beautiful view.\"',
+        },
+        {
+            actor = 'player',
+            text  = '\"Be careful on your way down.\"',
+        },
+    },
+}

src/assets/sequences/tut_05_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"You can use grenades to get to out-of-reach places.\"',
+        },
+    },
+}

src/assets/sequences/tut_06_int.lua

@@ -0,0 +1,14 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = {
+                '\"You can pull out a grenade with the',
+                {0.5,0,0.5,1},
+                'X',
+                {0,0,0,1},
+                'key\"',
+            },
+        },
+    },
+}

src/assets/sequences/tut_07_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"Grenades will push you into the air.\"',
+        },
+    },
+}

src/assets/sequences/tut_08_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"You\'re almost at the exit. Just a little further.\"',
+        },
+    },
+}

src/assets/sequences/tut_09_int.lua

@@ -0,0 +1,8 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = '\"This elevator will take you down the the villiage.\"',
+        },
+    },
+}

src/assets/sequences/tut_10_int.lua

@@ -0,0 +1,14 @@
+return {
+    {
+        {
+            actor = 'player',
+            text  = {
+                '\"You can press ',
+                {0, 0.4, 0.7, 1},
+                'DOWN',
+                {0, 0, 0, 1},
+                ' to look down.\"'
+            },
+        },
+    },
+}

src/camera.lua

@@ -14,7 +14,7 @@ local camera = {
     focus_y = 0,
     panic_x = 0,
     panic_y = 0,
-    max_game_width = 320, -- maximum camera width in game coordinates
+    max_game_width = 500, -- maximum camera width in game coordinates
     focus_follow_enabled = true,
 
     focus_box = {
@@ -160,6 +160,17 @@ function camera.to_screenspace(x, y, w, h)
     return ((x - bounds.x) / bounds.w) * sx, ((y - bounds.y) / bounds.h) * sy, (w / bounds.w) * sx, (h / bounds.h) * sy
 end
 
+--- Convert window coordinates to world coordinates.
+-- @param x Input window x.
+-- @param y Input window y.
+-- @returns x, y in world coordinates.
+function camera.to_worldspace(x, y)
+    local bounds = camera.get_bounds()
+    local sx, sy = love.graphics.getDimensions()
+
+    return (x / sx) * bounds.w + bounds.x, (y / sy) * bounds.h + bounds.y
+end
+
 -- Animate the camera towards the focus point.
 -- @param dt Update time (seconds).
 function camera.update(dt)