From 036c245226fb26df65cce7de6cb8cd8e76712f8d Mon Sep 17 00:00:00 2001 From: chosencharacters Date: Sun, 1 Dec 2024 14:54:20 -0500 Subject: [PATCH] shmoods + user costume undefined error --- assets/data/entries/costume-sheets.json | 2 +- assets/data/entries/costumes.json | 7 +++++++ .../TankmasLand/hotel_courtyard_day1.ldtkl | 8 ++++---- assets/images/costumes/shmoods.png | Bin 0 -> 22861 bytes source/entities/NetUser.hx | 6 +++++- source/net/tankmas/OnlineLoop.hx | 12 ++++++++++++ source/states/PlayState.hx | 5 +++-- 7 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 assets/images/costumes/shmoods.png diff --git a/assets/data/entries/costume-sheets.json b/assets/data/entries/costume-sheets.json index e0a85d6f..bad8ecbf 100644 --- a/assets/data/entries/costume-sheets.json +++ b/assets/data/entries/costume-sheets.json @@ -60,7 +60,7 @@ "yOffset": -30 }, { - "name": "strawberry-clock", + "name": "shmoods", "angle": -10 } ] diff --git a/assets/data/entries/costumes.json b/assets/data/entries/costumes.json index 1de39f9b..a3f86eae 100644 --- a/assets/data/entries/costumes.json +++ b/assets/data/entries/costumes.json @@ -164,6 +164,13 @@ "desc": "B", "unlock": "USERNAME", "data": "coolboyman" + }, + { + "name": "shmoods", + "display": "Mr. Shmoods", + "desc": "Shmoods loves Tankmas and White Castle. He has never done hard drugs, only soft drugs. Only the fluffiest drugs for shmoods. You can join him sometime. It's an open invitation.", + "unlock": "USERNAME", + "data": "MrShmoods" } ] } \ No newline at end of file diff --git a/assets/data/levels/TankmasLand/hotel_courtyard_day1.ldtkl b/assets/data/levels/TankmasLand/hotel_courtyard_day1.ldtkl index 116df725..f4ea0902 100644 --- 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": [65,94], + "__grid": [99,49], "__pivot": [0,0], "__tags": [], "__tile": null, @@ -889,7 +889,7 @@ "width": 128, "height": 128, "defUid": 2, - "px": [1040,1504], + "px": [1584,784], "fieldInstances": [ { "__identifier": "username", "__type": "String", "__value": "cymbourine", "__tile": null, "defUid": 5, "realEditorValues": [{ "id": "V_String", @@ -897,8 +897,8 @@ }] }, { "__identifier": "day", "__type": "Int", "__value": 1, "__tile": null, "defUid": 6, "realEditorValues": [] } ], - "__worldX": 1072, - "__worldY": 1520 + "__worldX": 1616, + "__worldY": 800 }, { "__identifier": "NPC", diff --git a/assets/images/costumes/shmoods.png b/assets/images/costumes/shmoods.png new file mode 100644 index 0000000000000000000000000000000000000000..defd517f5ba5607ddf36e7b0275b490fe6061b74 GIT binary patch literal 22861 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 literal 0 HcmV?d00001 diff --git a/source/entities/NetUser.hx b/source/entities/NetUser.hx index 18259239..3b5fe6bb 100644 --- a/source/entities/NetUser.hx +++ b/source/entities/NetUser.hx @@ -1,5 +1,6 @@ package entities; +import data.JsonData; import data.types.TankmasDefs.CostumeDef; import entities.base.BaseUser; import flixel.math.FlxVelocity; @@ -25,6 +26,9 @@ class NetUser extends BaseUser super(X, Y, username); type = "net-user"; + if (costume == null) + costume = JsonData.get_costume(Main.default_costume); + new_costume(costume); move_to(X, Y, true); trace("NEW USER " + username); @@ -90,4 +94,4 @@ class NetUser extends BaseUser move_update(); } -} \ No newline at end of file +} diff --git a/source/net/tankmas/OnlineLoop.hx b/source/net/tankmas/OnlineLoop.hx index c463c5a0..950ad467 100644 --- a/source/net/tankmas/OnlineLoop.hx +++ b/source/net/tankmas/OnlineLoop.hx @@ -1,6 +1,7 @@ package net.tankmas; import data.JsonData; +import data.SaveManager; import data.types.TankmasDefs.CostumeDef; import entities.NetUser; import entities.Player; @@ -138,8 +139,15 @@ class OnlineLoop for (username in usernames) { + if (username.contains("temporary_random_username")) + continue; + var def:NetUserDef = Reflect.field(data.data, username); var costume:CostumeDef = JsonData.get_costume(def.costume); + + if (costume == null) + costume = JsonData.get_costume(Main.default_costume); + var user:BaseUser = BaseUser.get_user(username, function() { return new NetUser(def.x, def.y, username, costume); @@ -150,6 +158,10 @@ class OnlineLoop if (user.costume == null || user.costume.name != costume.name) user.new_costume(costume); } + + PlayState.self.users.remove(PlayState.self.player, true); + PlayState.self.users.add(PlayState.self.player); + rooms_get_tick_rate = data.tick_rate * rooms_get_tick_rate_multiplier; rooms_post_tick_rate = data.tick_rate * rooms_post_tick_rate_multiplier; diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx index cde355d8..eaccb069 100644 --- a/source/states/PlayState.hx +++ b/source/states/PlayState.hx @@ -102,6 +102,9 @@ class PlayState extends BaseState add(touch = new TouchOverlay()); add(shadows); + + add(misc_sprites); + add(minigames); add(npcs); add(presents); @@ -113,8 +116,6 @@ class PlayState extends BaseState add(sticker_fx); add(dialogues); - add(misc_sprites); - add(doors); add(ui_overlay);