webart
/
fyrox-platformer
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: webart:6ef12b6332a87cae87e94f9c52ba77d05329f74d
Branches Tags
webart:master
..
compare: webart:be60a4346e6cd044dc64ceb349cd29b0a83ab98e
Branches Tags
webart:master

No commits in common. "6ef12b6332a87cae87e94f9c52ba77d05329f74d" and "be60a4346e6cd044dc64ceb349cd29b0a83ab98e" have entirely different histories.
6ef12b6332 ... be60a4346e

4 changed files with 379 additions and 379 deletions
Show Stats Expand all files Collapse all files

6
game/src/enemy.rs
View File

@ -37,8 +37,8 @@ enum Animations {
const DISTANCE_TO_FIGHT: f32 = 0.5; const DISTANCE_TO_FIGHT: f32 = 0.5;
const DISTANCE_TO_VIEW: f32 = 5.0; const DISTANCE_TO_VIEW: f32 = 5.0;
const END_MAP_LEFT: f32 = -30.0; const END_MAP_LEFT: f32 = -25.0;
const END_MAP_RIGHT: f32 = 30.0; const END_MAP_RIGHT: f32 = 25.0;
#[derive(Visit, Reflect, Debug, Clone, Default)] #[derive(Visit, Reflect, Debug, Clone, Default)]
pub struct Enemy { pub struct Enemy {
@ -68,7 +68,7 @@ pub struct Enemy {
impl Enemy { impl Enemy {
fn init(&mut self) { fn init(&mut self) {
self.attack_damage = 100.0; self.attack_damage = 100.0;
self.attack_speed = 0.1; self.attack_speed = 0.2;
} }
fn round(&self, a: f32) -> i32 { fn round(&self, a: f32) -> i32 {

8
game/src/enemy_spawn.rs
View File

@ -56,7 +56,7 @@ impl EnemySpawn {
}); });
idle_animation.set_texture(Some(idle)); idle_animation.set_texture(Some(idle));
idle_animation.set_looping(true); idle_animation.set_looping(true);
idle_animation.set_speed(20.); idle_animation.set_speed(10.);
idle_animation.play(); idle_animation.play();
return idle_animation; return idle_animation;
} }
@ -145,9 +145,9 @@ impl EnemySpawn {
) )
.unwrap(); .unwrap();
let shape = ColliderShape::Capsule(CapsuleShape { let shape = ColliderShape::Capsule(CapsuleShape {
begin: Vector2::new(0.0, -0.80), begin: Vector2::new(0.0, 0.4),
end: Vector2::new(0.0, -0.40), end: Vector2::new(0.0, 0.0),
radius: 0.2, radius: 0.3,
}); });
let rb_transform = TransformBuilder::new() let rb_transform = TransformBuilder::new()
.with_local_position(Vector3::new(x, y, 0.0)) .with_local_position(Vector3::new(x, y, 0.0))

12
game/src/map.rs
View File

@ -230,15 +230,15 @@ fn build_air_island_block(resource_manager: &ResourceManager, graph: &mut Graph,
pub fn build_map(graph: &mut Graph, resource_manager: &ResourceManager) { pub fn build_map(graph: &mut Graph, resource_manager: &ResourceManager) {
let bottom_y: f32 = -5.0; let bottom_y: f32 = -5.0;
let left_x: i32 = -43; let left_x: i32 = -50;
let right_x: i32 = 43; let right_x: i32 = 50;
for x in left_x..right_x { for x in left_x..right_x {
build_ground_block(resource_manager, graph, x as f32, bottom_y); build_ground_block(resource_manager, graph, x as f32, bottom_y);
} }
build_mushroom_block(resource_manager, graph, 30.0, bottom_y); build_mushroom_block(resource_manager, graph, 25.0, bottom_y);
build_tree_block(resource_manager, graph, 35.0, bottom_y); build_tree_block(resource_manager, graph, 30.0, bottom_y);
build_stone_block(resource_manager, graph, -30.0, bottom_y); build_stone_block(resource_manager, graph, -25.0, bottom_y);
build_tree_block(resource_manager, graph, -35.0, bottom_y); build_tree_block(resource_manager, graph, -30.0, bottom_y);
build_box_block(resource_manager, graph, 10.0, bottom_y); build_box_block(resource_manager, graph, 10.0, bottom_y);
build_air_island_block(resource_manager, graph, 15.0, bottom_y + 2.5); build_air_island_block(resource_manager, graph, 15.0, bottom_y + 2.5);

732
settings.ron
View File

@ -322,211 +322,13 @@
), ),
node_infos: { node_infos: {
( (
index: 3, index: 93,
generation: 1,
): (
is_expanded: true,
),
(
index: 58,
generation: 1,
): (
is_expanded: true,
),
(
index: 4,
generation: 1,
): (
is_expanded: true,
),
(
index: 92,
generation: 1,
): (
is_expanded: true,
),
(
index: 36,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 90, index: 50,
generation: 1,
): (
is_expanded: false,
),
(
index: 75,
generation: 1,
): (
is_expanded: false,
),
(
index: 9,
generation: 1,
): (
is_expanded: false,
),
(
index: 81,
generation: 1,
): (
is_expanded: false,
),
(
index: 62,
generation: 1,
): (
is_expanded: true,
),
(
index: 27,
generation: 1,
): (
is_expanded: false,
),
(
index: 14,
generation: 1,
): (
is_expanded: true,
),
(
index: 10,
generation: 1,
): (
is_expanded: true,
),
(
index: 13,
generation: 1,
): (
is_expanded: true,
),
(
index: 5,
generation: 1,
): (
is_expanded: true,
),
(
index: 31,
generation: 1,
): (
is_expanded: true,
),
(
index: 95,
generation: 1,
): (
is_expanded: true,
),
(
index: 37,
generation: 1,
): (
is_expanded: false,
),
(
index: 30,
generation: 1,
): (
is_expanded: true,
),
(
index: 29,
generation: 1,
): (
is_expanded: true,
),
(
index: 72,
generation: 1,
): (
is_expanded: false,
),
(
index: 71,
generation: 1,
): (
is_expanded: true,
),
(
index: 46,
generation: 1,
): (
is_expanded: false,
),
(
index: 32,
generation: 1,
): (
is_expanded: true,
),
(
index: 69,
generation: 1,
): (
is_expanded: false,
),
(
index: 89,
generation: 1,
): (
is_expanded: true,
),
(
index: 74,
generation: 1,
): (
is_expanded: true,
),
(
index: 17,
generation: 1,
): (
is_expanded: false,
),
(
index: 20,
generation: 1,
): (
is_expanded: true,
),
(
index: 0,
generation: 1,
): (
is_expanded: true,
),
(
index: 24,
generation: 1,
): (
is_expanded: false,
),
(
index: 28,
generation: 1,
): (
is_expanded: false,
),
(
index: 60,
generation: 1,
): (
is_expanded: false,
),
(
index: 39,
generation: 1,
): (
is_expanded: false,
),
(
index: 34,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
@ -538,52 +340,46 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 22, index: 84,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 87, index: 34,
generation: 1,
): (
is_expanded: true,
),
(
index: 20,
generation: 1,
): (
is_expanded: true,
),
(
index: 19,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 83, index: 71,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
), ),
( (
index: 50, index: 28,
generation: 1,
): (
is_expanded: true,
),
(
index: 51,
generation: 1,
): (
is_expanded: true,
),
(
index: 11,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 77, index: 72,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: false,
),
(
index: 23,
generation: 1,
): (
is_expanded: true,
), ),
( (
index: 55, index: 55,
@ -592,65 +388,11 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 57, index: 81,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
(
index: 66,
generation: 1,
): (
is_expanded: false,
),
(
index: 48,
generation: 1,
): (
is_expanded: true,
),
(
index: 38,
generation: 1,
): (
is_expanded: true,
),
(
index: 86,
generation: 1,
): (
is_expanded: true,
),
(
index: 40,
generation: 1,
): (
is_expanded: true,
),
(
index: 18,
generation: 1,
): (
is_expanded: true,
),
(
index: 94,
generation: 1,
): (
is_expanded: true,
),
(
index: 56,
generation: 1,
): (
is_expanded: true,
),
(
index: 35,
generation: 1,
): (
is_expanded: true,
),
( (
index: 63, index: 63,
generation: 1, generation: 1,
@ -658,40 +400,46 @@
is_expanded: false, is_expanded: false,
), ),
( (
index: 33, index: 92,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
), ),
( (
index: 93, index: 37,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 78, index: 56,
generation: 1,
): (
is_expanded: true,
),
(
index: 47,
generation: 1,
): (
is_expanded: true,
),
(
index: 77,
generation: 1,
): (
is_expanded: true,
),
(
index: 66,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 26, index: 22,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: false,
),
(
index: 16,
generation: 1,
): (
is_expanded: true,
),
(
index: 41,
generation: 1,
): (
is_expanded: true,
), ),
( (
index: 44, index: 44,
@ -700,13 +448,19 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 8, index: 62,
generation: 1,
): (
is_expanded: true,
),
(
index: 42,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 2, index: 52,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
@ -718,85 +472,25 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 91, index: 83,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
), ),
( (
index: 1, index: 39,
generation: 1,
): (
is_expanded: true,
),
(
index: 80,
generation: 1,
): (
is_expanded: true,
),
(
index: 12,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 15, index: 17,
generation: 1,
): (
is_expanded: true,
),
(
index: 43,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 54, index: 38,
generation: 1,
): (
is_expanded: true,
),
(
index: 21,
generation: 1,
): (
is_expanded: false,
),
(
index: 6,
generation: 1,
): (
is_expanded: true,
),
(
index: 25,
generation: 1,
): (
is_expanded: false,
),
(
index: 47,
generation: 1,
): (
is_expanded: true,
),
(
index: 7,
generation: 1,
): (
is_expanded: true,
),
(
index: 53,
generation: 1,
): (
is_expanded: true,
),
(
index: 52,
generation: 1, generation: 1,
): ( ): (
is_expanded: true, is_expanded: true,
@ -808,19 +502,67 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 49, index: 21,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 19, index: 41,
generation: 1,
): (
is_expanded: true,
),
(
index: 5,
generation: 1,
): (
is_expanded: true,
),
(
index: 35,
generation: 1,
): (
is_expanded: true,
),
(
index: 26,
generation: 1,
): (
is_expanded: true,
),
(
index: 54,
generation: 1,
): (
is_expanded: true,
),
(
index: 46,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
), ),
( (
index: 42, index: 33,
generation: 1,
): (
is_expanded: true,
),
(
index: 78,
generation: 1,
): (
is_expanded: false,
),
(
index: 48,
generation: 1,
): (
is_expanded: true,
),
(
index: 43,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,
@ -832,7 +574,265 @@
is_expanded: true, is_expanded: true,
), ),
( (
index: 84, index: 53,
generation: 1,
): (
is_expanded: true,
),
(
index: 40,
generation: 1,
): (
is_expanded: true,
),
(
index: 13,
generation: 1,
): (
is_expanded: true,
),
(
index: 32,
generation: 1,
): (
is_expanded: true,
),
(
index: 16,
generation: 1,
): (
is_expanded: true,
),
(
index: 25,
generation: 1,
): (
is_expanded: false,
),
(
index: 7,
generation: 1,
): (
is_expanded: true,
),
(
index: 11,
generation: 1,
): (
is_expanded: false,
),
(
index: 74,
generation: 1,
): (
is_expanded: true,
),
(
index: 51,
generation: 1,
): (
is_expanded: true,
),
(
index: 36,
generation: 1,
): (
is_expanded: false,
),
(
index: 15,
generation: 1,
): (
is_expanded: true,
),
(
index: 49,
generation: 1,
): (
is_expanded: false,
),
(
index: 1,
generation: 1,
): (
is_expanded: true,
),
(
index: 9,
generation: 1,
): (
is_expanded: false,
),
(
index: 80,
generation: 1,
): (
is_expanded: true,
),
(
index: 18,
generation: 1,
): (
is_expanded: true,
),
(
index: 30,
generation: 1,
): (
is_expanded: true,
),
(
index: 3,
generation: 1,
): (
is_expanded: true,
),
(
index: 60,
generation: 1,
): (
is_expanded: false,
),
(
index: 94,
generation: 1,
): (
is_expanded: true,
),
(
index: 8,
generation: 1,
): (
is_expanded: false,
),
(
index: 0,
generation: 1,
): (
is_expanded: true,
),
(
index: 10,
generation: 1,
): (
is_expanded: true,
),
(
index: 75,
generation: 1,
): (
is_expanded: false,
),
(
index: 90,
generation: 1,
): (
is_expanded: false,
),
(
index: 31,
generation: 1,
): (
is_expanded: true,
),
(
index: 27,
generation: 1,
): (
is_expanded: false,
),
(
index: 6,
generation: 1,
): (
is_expanded: true,
),
(
index: 58,
generation: 1,
): (
is_expanded: true,
),
(
index: 14,
generation: 1,
): (
is_expanded: true,
),
(
index: 23,
generation: 1,
): (
is_expanded: true,
),
(
index: 12,
generation: 1,
): (
is_expanded: false,
),
(
index: 91,
generation: 1,
): (
is_expanded: true,
),
(
index: 95,
generation: 1,
): (
is_expanded: true,
),
(
index: 89,
generation: 1,
): (
is_expanded: true,
),
(
index: 87,
generation: 1,
): (
is_expanded: false,
),
(
index: 57,
generation: 1,
): (
is_expanded: false,
),
(
index: 29,
generation: 1,
): (
is_expanded: true,
),
(
index: 86,
generation: 1,
): (
is_expanded: true,
),
(
index: 24,
generation: 1,
): (
is_expanded: false,
),
(
index: 4,
generation: 1,
): (
is_expanded: true,
),
(
index: 2,
generation: 1,
): (
is_expanded: true,
),
(
index: 69,
generation: 1, generation: 1,
): ( ): (
is_expanded: false, is_expanded: false,