Merge pull request #36 from chosencharacters/datetime

time locked gifts, datetime is now a dependency
chosencharacters · Dec 4, 2024 · 86b5692 · 86b5692
2 parents 99e024e + afcfcec
commit 86b5692
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 852 deletions.
diff --git a/Project.xml b/Project.xml
@@ -63,6 +63,7 @@
 	<haxelib name="gif" if="gif"/>
 	<haxelib name="json2object" />
 	<haxelib name="ldtk-haxe-api"/>
+	<haxelib name="datetime" />
 
 	<!--Follow instructions in scripts! This needs core-haxe-->
 	<haxelib name="http" />

diff --git a/assets/data/levels/TankmasLand.ldtk b/assets/data/levels/TankmasLand.ldtk
@@ -836,52 +836,6 @@
 				"fieldInstances": [],
 				"layerInstances": null,
 				"__neighbours": []
-			},
-			{
-				"identifier": "windows_bliss",
-				"iid": "2ccc0570-9b00-11ef-afb8-5fdaf55d6f34",
-				"uid": 13,
-				"worldX": 4416,
-				"worldY": 2176,
-				"worldDepth": 0,
-				"pxWid": 1920,
-				"pxHei": 1200,
-				"__bgColor": "#696A79",
-				"bgColor": null,
-				"useAutoIdentifier": false,
-				"bgRelPath": "../../images/bgs/temp/bliss.png",
-				"bgPos": "Cover",
-				"bgPivotX": 0.5,
-				"bgPivotY": 0.5,
-				"__smartColor": "#ADADB5",
-				"__bgPos": { "topLeftPx": [0,0], "scale": [1,1], "cropRect": [0,0,1920,1200] },
-				"externalRelPath": "TankmasLand/windows_bliss.ldtkl",
-				"fieldInstances": [],
-				"layerInstances": null,
-				"__neighbours": []
-			},
-			{
-				"identifier": "hotel_courtyard_day2",
-				"iid": "3041d7a0-9b00-11ef-88ab-d120aeb565f2",
-				"uid": 28,
-				"worldX": 64,
-				"worldY": 4032,
-				"worldDepth": 0,
-				"pxWid": 3284,
-				"pxHei": 3450,
-				"__bgColor": "#696A79",
-				"bgColor": null,
-				"useAutoIdentifier": false,
-				"bgRelPath": "../../images/bgs/day1/outside-hotel-background.png",
-				"bgPos": "Cover",
-				"bgPivotX": 0.5,
-				"bgPivotY": 0.5,
-				"__smartColor": "#ADADB5",
-				"__bgPos": { "topLeftPx": [0,0], "scale": [1,1], "cropRect": [0,0,3284,3450] },
-				"externalRelPath": "TankmasLand/hotel_courtyard_day2.ldtkl",
-				"fieldInstances": [],
-				"layerInstances": null,
-				"__neighbours": []
 			}
 		] },
 		{ "iid": "0b13d4d0-9b00-11ef-9354-a71a8f29f283", "identifier": "hotel_interior", "defaultLevelWidth": 256, "defaultLevelHeight": 256, "worldGridWidth": 256, "worldGridHeight": 256, "worldLayout": "Free", "levels": [

diff --git a/assets/data/levels/TankmasLand/hotel_courtyard_day1.ldtkl b/assets/data/levels/TankmasLand/hotel_courtyard_day1.ldtkl
@@ -880,7 +880,7 @@
 				},
 				{
 					"__identifier": "Present",
-					"__grid": [101,41],
+					"__grid": [78,32],
 					"__pivot": [0,0],
 					"__tags": [],
 					"__tile": null,
@@ -889,16 +889,16 @@
 					"width": 128,
 					"height": 128,
 					"defUid": 2,
-					"px": [1616,656],
+					"px": [1248,512],
 					"fieldInstances": [
 						{ "__identifier": "username", "__type": "String", "__value": "cymbourine", "__tile": null, "defUid": 5, "realEditorValues": [{
 							"id": "V_String",
 							"params": ["cymbourine"]
 						}] },
 						{ "__identifier": "day", "__type": "Int", "__value": 1, "__tile": null, "defUid": 6, "realEditorValues": [] }
 					],
-					"__worldX": 1648,
-					"__worldY": 672
+					"__worldX": 1280,
+					"__worldY": 528
 				},
 				{
 					"__identifier": "NPC",
@@ -959,7 +959,7 @@
 				},
 				{
 					"__identifier": "Present",
-					"__grid": [77,54],
+					"__grid": [54,54],
 					"__pivot": [0,0],
 					"__tags": [],
 					"__tile": null,
@@ -968,20 +968,20 @@
 					"width": 128,
 					"height": 128,
 					"defUid": 2,
-					"px": [1244,872],
+					"px": [876,872],
 					"fieldInstances": [
 						{ "__identifier": "username", "__type": "String", "__value": "sevi", "__tile": null, "defUid": 5, "realEditorValues": [{
 							"id": "V_String",
 							"params": ["sevi"]
 						}] },
 						{ "__identifier": "day", "__type": "Int", "__value": 2, "__tile": null, "defUid": 6, "realEditorValues": [{ "id": "V_Int", "params": [2] }] }
 					],
-					"__worldX": 1276,
+					"__worldX": 908,
 					"__worldY": 888
 				},
 				{
 					"__identifier": "Present",
-					"__grid": [123,54],
+					"__grid": [130,48],
 					"__pivot": [0,0],
 					"__tags": [],
 					"__tile": null,
@@ -990,16 +990,16 @@
 					"width": 128,
 					"height": 128,
 					"defUid": 2,
-					"px": [1982,867],
+					"px": [2094,771],
 					"fieldInstances": [
 						{ "__identifier": "username", "__type": "String", "__value": "midgetsausage", "__tile": null, "defUid": 5, "realEditorValues": [{
 							"id": "V_String",
 							"params": ["midgetsausage"]
 						}] },
 						{ "__identifier": "day", "__type": "Int", "__value": 3, "__tile": null, "defUid": 6, "realEditorValues": [{ "id": "V_Int", "params": [3] }] }
 					],
-					"__worldX": 2014,
-					"__worldY": 883
+					"__worldX": 2126,
+					"__worldY": 787
 				},
 				{
 					"__identifier": "NPC",
@@ -1019,6 +1019,28 @@
 					}] }],
 					"__worldX": 561,
 					"__worldY": 2224
+				},
+				{
+					"__identifier": "Present",
+					"__grid": [101,65],
+					"__pivot": [0,0],
+					"__tags": [],
+					"__tile": null,
+					"__smartColor": "#D74343",
+					"iid": "c9df8b40-9b00-11ef-9d63-41d0375142ab",
+					"width": 128,
+					"height": 128,
+					"defUid": 2,
+					"px": [1616,1040],
+					"fieldInstances": [
+						{ "__identifier": "username", "__type": "String", "__value": "sirlenward", "__tile": null, "defUid": 5, "realEditorValues": [{
+							"id": "V_String",
+							"params": ["sirlenward"]
+						}] },
+						{ "__identifier": "day", "__type": "Int", "__value": 4, "__tile": null, "defUid": 6, "realEditorValues": [{ "id": "V_Int", "params": [4] }] }
+					],
+					"__worldX": 1648,
+					"__worldY": 1056
 				}
 			]
 		},