Skip to content

Commit

Permalink
mouse fix (credits was preventing it, same with scroll bounds breakin…
Browse files Browse the repository at this point in the history
…g,) tree/extra sign fixes
  • Loading branch information
chosencharacters committed Jan 7, 2025
1 parent aed138a commit 88b9f57
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 27 deletions.
Binary file removed .vscode.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- _________________________ Application Settings _________________________ -->

<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="32.0.1" company="Glenside Helper Elf Society" />
<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="32.0.2" 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"-->
Expand Down
19 changes: 0 additions & 19 deletions assets/data/levels/TankmasLand/hotel_courtyard.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -726,25 +726,6 @@
}] }],
"__worldX": 234,
"__worldY": 2095
},
{
"__identifier": "Decorations_MD",
"__grid": [2142,2445],
"__pivot": [0,0],
"__tags": ["Decoration"],
"__tile": { "tilesetUid": 61, "x": 1024, "y": 0, "w": 512, "h": 512 },
"__smartColor": "#733E39",
"iid": "5e1f52b0-c210-11ef-9981-c7791c3fe75c",
"width": 512,
"height": 512,
"defUid": 59,
"px": [2142,2445],
"fieldInstances": [{ "__identifier": "Tile", "__type": "Tile", "__value": { "tilesetUid": 61, "x": 1024, "y": 0, "w": 512, "h": 512 }, "__tile": { "tilesetUid": 61, "x": 1024, "y": 0, "w": 512, "h": 512 }, "defUid": 60, "realEditorValues": [{
"id": "V_String",
"params": ["1024,0,512,512"]
}] }],
"__worldX": 2142,
"__worldY": 2445
}
]
},
Expand Down
10 changes: 5 additions & 5 deletions assets/data/levels/TankmasLand/hotel_interior.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -2209,21 +2209,21 @@
},
{
"__identifier": "Misc",
"__grid": [59,77],
"__grid": [38,77],
"__pivot": [0,0],
"__tags": [],
"__tile": null,
"__smartColor": "#FFE600",
"iid": "37bd29f0-c210-11ef-b20b-d579f234162c",
"width": 1377,
"height": 2322,
"width": 2000,
"height": 2500,
"defUid": 49,
"px": [945,1234],
"px": [609,1234],
"fieldInstances": [{ "__identifier": "name", "__type": "String", "__value": "tankmas-tree", "__tile": null, "defUid": 50, "realEditorValues": [{
"id": "V_String",
"params": ["tankmas-tree"]
}] }],
"__worldX": 945,
"__worldX": 609,
"__worldY": 1234
},
{
Expand Down
7 changes: 5 additions & 2 deletions source/ui/credits/Credits.hx
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ class Credits extends FlxTypedGroupExt<FlxSprite>

public function mouse_is_over():Bool
{
if (FlxG.mouse.getScreenPosition().y < FlxG.height - 300)
return true;
// if (FlxG.mouse.getScreenPosition().y < FlxG.height - 300)
// return true;
return false;
}

Expand Down Expand Up @@ -220,6 +220,9 @@ class Credits extends FlxTypedGroupExt<FlxSprite>

function cam_manager()
{
if (!perch.isOnScreen())
return;

var in_view_area:Bool = PlayState.self.player.y < perch.y + FlxG.height;

var cam_max_y:Float = in_view_area ? perch.y + 1080 : perch.bottom_y;
Expand Down

0 comments on commit 88b9f57

Please sign in to comment.