pufferfish, started real map

This commit is contained in:
rsninja722 2021-04-26 14:51:37 -04:00
parent 53a746c551
commit 0a69b80b34
14 changed files with 264 additions and 15 deletions

Binary file not shown.

View File

@ -0,0 +1,50 @@
{ "frames": {
"pufferFish 0.aseprite": {
"frame": { "x": 0, "y": 0, "w": 39, "h": 25 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
"sourceSize": { "w": 39, "h": 25 },
"duration": 100
},
"pufferFish 1.aseprite": {
"frame": { "x": 39, "y": 0, "w": 39, "h": 25 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
"sourceSize": { "w": 39, "h": 25 },
"duration": 100
},
"pufferFish 2.aseprite": {
"frame": { "x": 78, "y": 0, "w": 39, "h": 25 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
"sourceSize": { "w": 39, "h": 25 },
"duration": 100
},
"pufferFish 3.aseprite": {
"frame": { "x": 117, "y": 0, "w": 39, "h": 25 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
"sourceSize": { "w": 39, "h": 25 },
"duration": 100
}
},
"meta": {
"app": "http://www.aseprite.org/",
"version": "1.2.27-x64",
"image": "pufferFishAttack.png",
"format": "RGBA8888",
"size": { "w": 156, "h": 25 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 974 B

View File

@ -0,0 +1,42 @@
{ "frames": {
"pufferFish 0.aseprite": {
"frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 1.aseprite": {
"frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 2.aseprite": {
"frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
}
},
"meta": {
"app": "http://www.aseprite.org/",
"version": "1.2.27-x64",
"image": "pufferFishBigIdle.png",
"format": "RGBA8888",
"size": { "w": 57, "h": 19 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

View File

@ -0,0 +1,50 @@
{ "frames": {
"pufferFish 0.aseprite": {
"frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 1.aseprite": {
"frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 2.aseprite": {
"frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 3.aseprite": {
"frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
}
},
"meta": {
"app": "http://www.aseprite.org/",
"version": "1.2.27-x64",
"image": "pufferFishExpand.png",
"format": "RGBA8888",
"size": { "w": 76, "h": 19 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 B

View File

@ -0,0 +1,66 @@
{ "frames": {
"pufferFish 0.aseprite": {
"frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 1.aseprite": {
"frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 2.aseprite": {
"frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 3.aseprite": {
"frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 4.aseprite": {
"frame": { "x": 76, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
},
"pufferFish 5.aseprite": {
"frame": { "x": 95, "y": 0, "w": 19, "h": 19 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
"sourceSize": { "w": 19, "h": 19 },
"duration": 100
}
},
"meta": {
"app": "http://www.aseprite.org/",
"version": "1.2.27-x64",
"image": "pufferFish.png",
"format": "RGBA8888",
"size": { "w": 114, "h": 19 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 323 KiB

File diff suppressed because one or more lines are too long

View File

@ -323,7 +323,7 @@ impl Screen for InGameScreen {
.world
.end_position
.distance_to(game_core.player.position)
<= 70.0
<= 40.0
{
return Some(GameState::WinGame);
}

View File

@ -18,7 +18,7 @@ pub fn update_player_movement(
) {
// Calculate DT
let dt = draw_handle.get_time() - game_core.last_frame_time;
// Handle player movement
let mouse_pose = draw_handle.get_mouse_position();
let mouse_world_pose = draw_handle.get_screen_to_world2D(mouse_pose, game_core.master_camera);
@ -80,6 +80,7 @@ pub fn update_player_movement(
game_core
.player
.begin_attack(&mut game_core.world, draw_handle.get_time());
println!("{{\"x\":{}, \"y\":{}}},",f32::round(game_core.player.position.x),f32::round(game_core.player.position.y));
}
// Move the player in their direction