diff --git a/godot/Level 1.tscn b/godot/Level 1.tscn
index aaa0575..3e86c75 100644
--- a/godot/Level 1.tscn
+++ b/godot/Level 1.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://assets/backgrounds/mountains.png" type="Texture" id=1]
-[ext_resource path="res://levels/level01.tmx" type="PackedScene" id=3]
+[ext_resource path="res://assets/backgrounds/snow.png" type="Texture" id=1]
+[ext_resource path="res://levels/level02.tmx" type="PackedScene" id=2]
[ext_resource path="res://characters/player/Player.tscn" type="PackedScene" id=4]
[node name="Level 1" type="Node2D"]
@@ -39,4 +39,4 @@ centered = false
[node name="Map" type="Node2D" parent="."]
position = Vector2( 0, 18 )
-[node name="level01" parent="Map" instance=ExtResource( 3 )]
+[node name="level02" parent="Map" instance=ExtResource( 2 )]
diff --git a/godot/juego.tiled-session b/godot/juego.tiled-session
index 9b2b07d..eff2e9c 100644
--- a/godot/juego.tiled-session
+++ b/godot/juego.tiled-session
@@ -3,11 +3,11 @@
"height": 4300,
"width": 2
},
- "activeFile": "levels/level01.tmx",
+ "activeFile": "levels/level02.tmx",
"expandedProjectPaths": [
- "tilesets",
- "levels",
".",
+ "levels",
+ "tilesets",
"parallax"
],
"exportAsImage.useCurrentScale": false,
@@ -202,32 +202,48 @@
"scale": 0.75,
"selectedLayer": 1,
"viewCenter": {
- "x": 544,
- "y": 248
+ "x": 1135.3333333333333,
+ "y": 248.66666666666669
+ }
+ },
+ "levels/level02.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 2015.6666666666665,
+ "y": 339
}
},
"parallax/clouds.tmx": {
"scale": 0.9252604166666667,
"selectedLayer": 0,
"viewCenter": {
- "x": 264.790318041092,
- "y": 384.7565437658316
+ "x": 265.33070644525753,
+ "y": 384.2161553616662
}
},
"parallax/hills.tmx": {
"scale": 0.9252604166666667,
"selectedLayer": 0,
"viewCenter": {
- "x": 264.790318041092,
- "y": 384.7565437658316
+ "x": 265.33070644525753,
+ "y": 384.2161553616662
+ }
+ },
+ "parallax/mountains.tmx": {
+ "scale": 0.9714409722222221,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 264.0407470288625,
+ "y": 288.7463140023233
}
},
"parallax/snow.tmx": {
"scale": 0.9252604166666667,
"selectedLayer": 0,
"viewCenter": {
- "x": 264.790318041092,
- "y": 384.7565437658316
+ "x": 265.33070644525753,
+ "y": 384.2161553616662
}
},
"tilesets/backgrounds.tsx": {
@@ -235,11 +251,11 @@
"scaleInEditor": 4
},
"tilesets/tiles.tsx": {
- "scaleInDock": 2,
+ "scaleInDock": 1,
"scaleInEditor": 2
}
},
- "frame.defaultDuration": 300,
+ "frame.defaultDuration": 210,
"last.exportedFilePath": "/mnt/data/godot/projects/Platformer",
"last.imagePath": "/mnt/data/godot/projects/juego/godot/assets/backgrounds",
"lastUsedTilesetExportFilter": "Godot Tileset format (*.tres)",
@@ -247,31 +263,30 @@
"/home/cromer/projects/edx/games/project/maps/azaraka"
],
"map.fixedSize": true,
- "map.height": 12,
+ "map.height": 32,
"map.lastUsedExportFilter": "Godot Tilemap format (*.tscn)",
"map.lastUsedFormat": "tmx",
- "map.tileHeight": 24,
- "map.tileWidth": 24,
+ "map.tileHeight": 18,
+ "map.tileWidth": 18,
"map.width": 22,
"openFiles": [
- "tilesets/tiles.tsx",
- "levels/level01.tmx"
+ "levels/level02.tmx"
],
"project": "juego.tiled-project",
"property.type": "int",
"recentFiles": [
+ "levels/level02.tmx",
"tilesets/tiles.tsx",
"levels/level01.tmx",
- "tilesets/backgrounds.tsx",
"parallax/snow.tmx",
+ "parallax/mountains.tmx",
"parallax/hills.tmx",
+ "parallax/clouds.tmx",
+ "tilesets/backgrounds.tsx",
"/mnt/data/godot/projects/Azaraka/maps/worldmap.tsx",
"/mnt/data/godot/projects/Azaraka/maps/worldmap.tmx",
"/mnt/data/godot/projects/Platformer/asset/world1.tmx",
- "/mnt/data/godot/projects/Platformer/asset/spritesheet_ground.tsx",
- "/mnt/data/godot/projects/Platformer/asset/world.tmx",
- "/mnt/data/godot/projects/Azaraka/maps/dungeon1.tmx",
- "/mnt/data/projects/edx/games/azaraka/maps/outside_entrance.tmx"
+ "/mnt/data/godot/projects/Platformer/asset/spritesheet_ground.tsx"
],
"tileset.embedInMap": false,
"tileset.lastUsedFilter": "Tiled tileset files (*.tsx *.xml)",
diff --git a/godot/levels/level02.tmx b/godot/levels/level02.tmx
new file mode 100644
index 0000000..92e1c57
--- /dev/null
+++ b/godot/levels/level02.tmx
@@ -0,0 +1,112 @@
+
+
diff --git a/godot/levels/level02.tmx.import b/godot/levels/level02.tmx.import
new file mode 100644
index 0000000..b7b4cc6
--- /dev/null
+++ b/godot/levels/level02.tmx.import
@@ -0,0 +1,22 @@
+[remap]
+
+importer="vnen.tiled_importer"
+type="PackedScene"
+path="res://.import/level02.tmx-080f0f454d3030b26a814f52fc82f11c.scn"
+
+[deps]
+
+source_file="res://levels/level02.tmx"
+dest_files=[ "res://.import/level02.tmx-080f0f454d3030b26a814f52fc82f11c.scn" ]
+
+[params]
+
+custom_properties=true
+tile_metadata=false
+uv_clip=true
+image_flags=7
+collision_layer=1
+embed_internal_images=false
+save_tiled_properties=false
+add_background=true
+post_import_script=""
diff --git a/godot/tilesets/tiles.tsx b/godot/tilesets/tiles.tsx
index 7eb103a..0112499 100644
--- a/godot/tilesets/tiles.tsx
+++ b/godot/tilesets/tiles.tsx
@@ -51,6 +51,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -91,6 +103,12 @@
+
+
+
+
+
+
@@ -111,6 +129,12 @@
+
+
+
+
+
+
@@ -156,6 +180,12 @@
+
+
+
+
+
+
@@ -196,4 +226,10 @@
+
+
+
+
+
+