diff --git a/assets/HamsterGame.tiled-project b/assets/HamsterGame.tiled-project
index a86263f..99ea060 100644
--- a/assets/HamsterGame.tiled-project
+++ b/assets/HamsterGame.tiled-project
@@ -71,6 +71,20 @@
],
"valuesAsFlags": false
},
+ {
+ "color": "#ff00ff00",
+ "drawFill": true,
+ "id": 7,
+ "members": [
+ ],
+ "name": "SpawnZone",
+ "type": "class",
+ "useAs": [
+ "property",
+ "object",
+ "project"
+ ]
+ },
{
"id": 1,
"name": "TerrainType",
diff --git a/assets/HamsterGame.tiled-session b/assets/HamsterGame.tiled-session
index 8e06925..27ab6b9 100644
--- a/assets/HamsterGame.tiled-session
+++ b/assets/HamsterGame.tiled-session
@@ -3,39 +3,64 @@
"height": 4300,
"width": 2
},
- "activeFile": "",
+ "activeFile": "StageI.tmx",
"expandedProjectPaths": [
+ "."
],
"file.lastUsedOpenFilter": "All Files (*)",
"fileStates": {
+ "StageI.tmx": {
+ "scale": 3,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 473.16666666666663,
+ "y": -1766.8333333333333
+ }
+ },
+ "Terrain.tsx": {
+ "dynamicWrapping": true,
+ "scaleInDock": 1,
+ "scaleInEditor": 5.5
+ },
"TestLevel.tmx": {
- "scale": 4,
+ "expandedObjectLayers": [
+ 6
+ ],
+ "scale": 1,
"selectedLayer": 2,
"viewCenter": {
- "x": 222.625,
- "y": 144.625
+ "x": 516.5,
+ "y": 578.5
}
},
"TreeTemplates.tmx": {
"scale": 3,
"selectedLayer": 0,
"viewCenter": {
- "x": 113.83333333333331,
- "y": 200.5
+ "x": 250.49999999999997,
+ "y": 104.5
}
}
},
"frame.defaultDuration": 200,
"last.imagePath": "C:/Users/sigon/source/repos/hamster/assets",
"last.objectTypesPath": "C:/Users/sigon/source/repos/hamster/assets/propertytypes.json",
+ "map.height": 100,
"map.lastUsedFormat": "tmx",
"map.tileHeight": 16,
"map.tileWidth": 16,
+ "map.width": 100,
"openFiles": [
+ "TestLevel.tmx",
+ "Terrain.tsx",
+ "StageI.tmx"
],
"project": "HamsterGame.tiled-project",
"property.type": "FacingDirection",
"recentFiles": [
+ "StageI.tmx",
+ "TestLevel.tmx",
+ "Terrain.tsx"
],
"tileset.lastUsedFormat": "tsx",
"tileset.tileSize": {
diff --git a/assets/StageI.tmx b/assets/StageI.tmx
new file mode 100644
index 0000000..ac50376
--- /dev/null
+++ b/assets/StageI.tmx
@@ -0,0 +1,3443 @@
+
+
diff --git a/assets/Terrain.tsx b/assets/Terrain.tsx
index 3156dc6..45732b6 100644
--- a/assets/Terrain.tsx
+++ b/assets/Terrain.tsx
@@ -5070,7 +5070,11 @@
-
+
+
+
+
+
@@ -5096,7 +5100,11 @@
-
+
+
+
+
+
@@ -5122,7 +5130,11 @@
-
+
+
+
+
+
@@ -5182,7 +5194,11 @@
-
+
+
+
+
+
@@ -5208,7 +5224,11 @@
-
+
+
+
+
+
@@ -5234,7 +5254,11 @@
-
+
+
+
+
+
@@ -5260,7 +5284,11 @@
-
+
+
+
+
+
@@ -5368,7 +5396,11 @@
-
+
+
+
+
+
@@ -5596,7 +5628,7 @@
-
+
@@ -5726,7 +5758,11 @@
-
+
+
+
+
+
@@ -5799,7 +5835,11 @@
-
+
+
+
+
+
@@ -5830,7 +5870,11 @@
-
+
+
+
+
+
@@ -6067,17 +6111,41 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6151,9 +6219,21 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6166,7 +6246,7 @@
-
+
@@ -6195,11 +6275,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -6209,12 +6297,12 @@
-
+
-
+
@@ -6285,32 +6373,32 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6389,25 +6477,41 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -6476,12 +6580,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -6580,12 +6696,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -6672,68 +6800,241 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/TreeTemplates.tmx b/assets/TreeTemplates.tmx
index ac28b42..90c592b 100644
--- a/assets/TreeTemplates.tmx
+++ b/assets/TreeTemplates.tmx
@@ -4,22 +4,22 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,0,0,0,1240,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,0,0,0,1268,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,0,0,0,1240,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,0,0,0,1268,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,0,0,0,1240,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,0,0,0,1268,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,0,0,0,1240,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,0,0,0,1268,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -29,23 +29,23 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,1245,1246,0,1240,1241,
+0,0,1247,1248,1247,1248,1247,1248,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,1273,1274,0,1268,1269,
+0,0,1275,1276,1275,1276,1275,1276,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,1301,1302,0,0,1241,
+0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,1245,1246,0,1240,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,1273,1274,0,1268,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,1301,1302,0,0,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,1245,1246,0,1240,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,1273,1274,0,1268,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,1301,1302,0,0,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,1247,1248,0,1245,1246,0,1240,1241,
+0,0,0,0,0,0,0,0,0,0,0,0,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,1275,1276,0,1273,1274,0,1268,1269,
+0,0,0,0,0,0,0,0,0,0,0,0,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,1303,1304,0,1301,1302,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -53,21 +53,21 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1245,1246,0,0,0,
+0,0,1247,1248,1247,1248,1247,1248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1273,1274,0,0,0,
+0,0,1275,1276,1275,1276,1275,1276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,0,0,
0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1245,1246,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1273,1274,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1245,1246,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1273,1274,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1240,1247,1248,1247,1248,1247,1248,1241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1268,1275,1276,1275,1276,1275,1276,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1303,1304,1303,1304,1303,1304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1245,1246,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1273,1274,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/assets/gametiles.png b/assets/gametiles.png
index 535b28d..27ebeb4 100644
Binary files a/assets/gametiles.png and b/assets/gametiles.png differ
diff --git a/assets/gametiles.xcf b/assets/gametiles.xcf
index 50ac492..07f7cba 100644
Binary files a/assets/gametiles.xcf and b/assets/gametiles.xcf differ
diff --git a/src/TODO.txt b/src/TODO.txt
index 6115882..1674e1b 100644
--- a/src/TODO.txt
+++ b/src/TODO.txt
@@ -99,6 +99,12 @@ Excited by this discovery (?) decided to share it with the rest of their hamster
A couple villain/scientist hamsters realize that this has become a stubby legs race with great potential and recruited world class hamsters to run and obtain these new orbs for research.
+Stage II - Branching
+
+Stage III - Swamp/Ice
+
+Stage IV - Hamster Jet
+
Hamsters are experimenting with new technologies to emphasize their running capabilities beyond what was originally thought possible.