wip hitbox fuckery

chosencharacters · Dec 1, 2024 · fe25747 · fe25747
1 parent 03ec40c
commit fe25747
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/source/entities/base/BaseUser.hx b/source/entities/base/BaseUser.hx
@@ -76,7 +76,9 @@ class BaseUser extends NGSprite
 	public function new_costume(costume:CostumeDef)
 	{
 		loadGraphic(Paths.get('${costume.name}.png'));
-		original_size.set(width, height);
+		setSize(width, 50);
+		offset.set((width - graphic.width) / 2, -graphic.height);
+		original_size.set(graphic.width, graphic.height);
 	}
 
 	override function updateMotion(elapsed:Float)

diff --git a/source/entities/base/NGSprite.hx b/source/entities/base/NGSprite.hx
@@ -10,6 +10,7 @@ import flixel.system.FlxAssets.FlxGraphicAsset;
 class NGSprite extends FlxSpriteExt
 {
 	public var original_size:FlxPoint = new FlxPoint();
+	public var original_offset:FlxPoint = new FlxPoint();
 
 	var sprite_anim:SpriteAnimationController;
 
@@ -103,8 +104,8 @@ class SpriteAnimationController
 
 	function update_sprite()
 	{
-		sprite.offset.x = frame.x == null ? sprite.offset.x : -frame.x;
-		sprite.offset.y = frame.y == null ? sprite.offset.y : -frame.y;
+		sprite.offset.x = original_offset.x + (frame.x == null ? sprite.offset.x : -frame.x);
+		sprite.offset.y = original_offset.y + (frame.y == null ? sprite.offset.y : -frame.y);
 		sprite.scale.x = frame.width == null ? sprite.scale.x : frame.width;
 		sprite.scale.y = frame.height == null ? sprite.scale.y : frame.height;
 

diff --git a/source/net/tankmas/TankmasClient.hx b/source/net/tankmas/TankmasClient.hx
@@ -35,13 +35,15 @@ class TankmasClient
 		Client.post(url, event, on_complete);
 	}
 
-	public static function get_save(username:String, ?on_complete:Dynamic->Void) {
+	public static function get_save(username:String, ?on_complete:Dynamic->Void)
+	{
 		var url:String = '$address/saves/get';
 
 		Client.post(url, {username: username}, on_complete);
 	}
 
-	public static function post_save(username:String, save:String, ?on_complete:Dynamic->Void) {
+	public static function post_save(username:String, save:String, ?on_complete:Dynamic->Void)
+	{
 		var url:String = '$address/saves/post';
 
 		Client.post(url, {username: username, data: save}, on_complete);