compression

Project.xml

@@ -4,7 +4,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="4.0.0" company="Glenside Helper Elf Society" />
+	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="4.2.0" company="Glenside Helper Elf Society" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
@@ -37,7 +37,7 @@
 	</section>
 
 	<section if="js||html5">
-		<assets path="assets" embed="true" exclude="*.gif"/>
+		<assets path="assets" embed="true" exclude="*.gif||*.aseprite"/>
 	</section>
 
 	<section if="offline">

assets/data/anims/general-anims.xml

@@ -82,4 +82,8 @@
 	<animSet image="lil-jimby">
 		<anim name="idle" fps="100ms">0t10</anim>
 	</animSet>
+
+	<animSet image="mallow">
+		<anim name="idle" fps="100ms">0t1,0h20,0t1,2t8</anim>
+	</animSet>
 </root>

assets/data/entries/npcs/test-npcs.xml

@@ -42,4 +42,13 @@
             <dlg>Go on now to your little sweet puff peasent treats, hon hon hon!</dlg>
         </state>
     </npc>
+    <npc name="mallow">
+        <state name="default">
+            <dlg>Shh... Dude... Keep it down!</dlg>
+            <dlg>Did you see what's going on out there? They're absolutely crazy.</dlg>
+            <dlg>They're doing the same thing every single day! Thousands of times!</dlg>
+            <dlg>Impaling cute lil marshmallows just like me on wooden stakes! Then eating them!</dlg>
+            <dlg>It's sick! But you wouldn't do that, would you?</dlg>
+        </state>
+    </npc>
 </root>

assets/data/levels/TankmasLand.ldtk

@@ -796,7 +796,7 @@
 			"__cHei": 1,
 			"identifier": "collision",
 			"uid": 19,
-			"relPath": "../../images/bgs/tiles/tile-collision.png",
+			"relPath": "../../images/levels/tiles/tile-collision.png",
 			"embedAtlas": null,
 			"pxWid": 64,
 			"pxHei": 32,
@@ -815,7 +815,7 @@
 	"worlds": [
 		{ "iid": "95f97851-73f0-11ef-9983-cda8b61095c5", "identifier": "outside_hotel", "defaultLevelWidth": 1920, "defaultLevelHeight": 1080, "worldGridWidth": 256, "worldGridHeight": 256, "worldLayout": "Free", "levels": [
 			{
-				"identifier": "hotel_courtyard_day1",
+				"identifier": "hotel_courtyard",
 				"iid": "95f99f60-73f0-11ef-9983-612730a885a0",
 				"uid": 0,
 				"worldX": 32,
@@ -826,13 +826,13 @@
 				"__bgColor": "#696A79",
 				"bgColor": null,
 				"useAutoIdentifier": false,
-				"bgRelPath": "../../images/bgs/day1/outside-hotel-background.png",
+				"bgRelPath": "../../images/levels/maps/courtyard/hotel-courtyard-background.jpg",
 				"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_day1.ldtkl",
+				"externalRelPath": "TankmasLand/hotel_courtyard.ldtkl",
 				"fieldInstances": [],
 				"layerInstances": null,
 				"__neighbours": []
@@ -856,7 +856,7 @@
 				"bgPivotX": 0.5,
 				"bgPivotY": 0.5,
 				"__smartColor": "#ADADB5",
-				"__bgPos": { "topLeftPx": [0,0], "scale": [1,1], "cropRect": [0,0,2048,2048] },
+				"__bgPos": null,
 				"externalRelPath": "TankmasLand/hotel_interior.ldtkl",
 				"fieldInstances": [],
 				"layerInstances": null,

assets/data/levels/TankmasLand/hotel_courtyard_day1.ldtkl → assets/data/levels/TankmasLand/hotel_courtyard.ldtkl

@@ -8,7 +8,7 @@
 		"appVersion": "1.5.4",
 		"url": "https://ldtk.io"
 	},
-	"identifier": "hotel_courtyard_day1",
+	"identifier": "hotel_courtyard",
 	"iid": "95f99f60-73f0-11ef-9983-612730a885a0",
 	"uid": 0,
 	"worldX": 32,
@@ -19,7 +19,7 @@
 	"__bgColor": "#696A79",
 	"bgColor": null,
 	"useAutoIdentifier": false,
-	"bgRelPath": "../../images/bgs/day1/outside-hotel-background.png",
+	"bgRelPath": "../../images/levels/maps/courtyard/hotel-courtyard-background.jpg",
 	"bgPos": "Cover",
 	"bgPivotX": 0.5,
 	"bgPivotY": 0.5,
@@ -38,7 +38,7 @@
 			"__pxTotalOffsetX": 0,
 			"__pxTotalOffsetY": 0,
 			"__tilesetDefUid": 19,
-			"__tilesetRelPath": "../../images/bgs/tiles/tile-collision.png",
+			"__tilesetRelPath": "../../images/levels/tiles/tile-collision.png",
 			"iid": "8b727cc0-9b00-11ef-bbae-3f6a064f9bb3",
 			"levelId": 0,
 			"layerDefUid": 20,
@@ -11108,6 +11108,25 @@
 					}] }],
 					"__worldX": 320,
 					"__worldY": 2384
+				},
+				{
+					"__identifier": "NPC",
+					"__grid": [187,195],
+					"__pivot": [0,0],
+					"__tags": [],
+					"__tile": null,
+					"__smartColor": "#FF00D0",
+					"iid": "8f69cf50-9b00-11ef-a64d-9b8df78d628e",
+					"width": 128,
+					"height": 128,
+					"defUid": 10,
+					"px": [2992,3120],
+					"fieldInstances": [{ "__identifier": "name", "__type": "String", "__value": "mallow", "__tile": null, "defUid": 11, "realEditorValues": [{
+						"id": "V_String",
+						"params": ["mallow"]
+					}] }],
+					"__worldX": 3024,
+					"__worldY": 3136
 				}
 			]
 		},

assets/data/levels/TankmasLand/hotel_interior.ldtkl

@@ -24,7 +24,7 @@
 	"bgPivotX": 0.5,
 	"bgPivotY": 0.5,
 	"__smartColor": "#ADADB5",
-	"__bgPos": { "topLeftPx": [0,0], "scale": [1,1], "cropRect": [0,0,2048,2048] },
+	"__bgPos": null,
 	"externalRelPath": null,
 	"fieldInstances": [],
 	"layerInstances": [
@@ -38,7 +38,7 @@
 			"__pxTotalOffsetX": 0,
 			"__pxTotalOffsetY": 0,
 			"__tilesetDefUid": 19,
-			"__tilesetRelPath": "../../images/bgs/tiles/tile-collision.png",
+			"__tilesetRelPath": "../../images/levels/tiles/tile-collision.png",
 			"iid": "8b727cc2-9b00-11ef-bbae-af41c0a3f814",
 			"levelId": 15,
 			"layerDefUid": 20,

source/levels/TankmasLevel.hx

@@ -40,7 +40,7 @@ class TankmasLevel extends LDTKLevel
 
 		PlayState.self.level_backgrounds.add(bg = new FlxSpriteExt(x, y, Paths.get(data.json.bgRelPath.split("/").last())));
 		if (LevelName.startsWith("hotel_courtyard"))
-			PlayState.self.level_backgrounds.add(fg = new FlxSpriteExt(x, y,
+			PlayState.self.level_foregrounds.add(fg = new FlxSpriteExt(x, y,
 				Paths.get("outside-hotel-foreground-day" + Main.get_current_bg(/**Date.now().getMonth() != 11 ? 32 : Date.now().getDate()**/ 1) + ".png")));
 
 		// col = new FlxTilemap();

source/states/PlayState.hx

@@ -1,6 +1,5 @@
 package states;
 
-import ui.popups.ServerNotificationMessagePopup;
 import activities.ActivityArea;
 import data.SaveManager;
 import entities.Interactable;
@@ -23,6 +22,7 @@ import net.tankmas.TankmasClient;
 import ui.DialogueBox;
 import ui.MainGameOverlay;
 import ui.TouchOverlay;
+import ui.popups.ServerNotificationMessagePopup;
 import ui.popups.StickerPackOpening;
 import ui.sheets.*;
 import ui.sheets.SheetMenu;
@@ -55,6 +55,8 @@ class PlayState extends BaseState
 
 	public var levels:FlxTypedGroup<TankmasLevel> = new FlxTypedGroup<TankmasLevel>();
 	public var level_backgrounds:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
+	public var level_foregrounds:FlxTypedGroup<FlxSprite> = new FlxTypedGroup<FlxSprite>();
+
 	public var level_collision:FlxTypedGroup<FlxTilemap> = new FlxTypedGroup<FlxTilemap>();
 
 	/**Do not add to state*/
@@ -126,6 +128,7 @@ class PlayState extends BaseState
 		add(presents);
 		add(objects);
 		add(thumbnails);
+		add(level_foregrounds);
 		add(stickers);
 		add(sticker_fx);
 		add(dialogues);