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

fix bugs with enemy

This commit is contained in:
artem 2024-02-22 09:10:58 +03:00
parent 7d3c3ec092
commit b217bf05bf
5 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
executor-wasm/pkg/executor_wasm.js
View File

@ -1593,68 +1593,68 @@ function __wbg_get_imports() {
const ret = wasm.memory; const ret = wasm.memory;
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11171 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_32);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper11172 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11172 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_32); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_32);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11173 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11173 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_32); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_32);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11174 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11174 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_39); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_32);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11175 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11175 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_32); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_39);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11176 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11176 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_44); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_32);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper11180 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11177 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 9448, __wbg_adapter_32); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_44);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper30833 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper11181 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26017, __wbg_adapter_49); const ret = makeMutClosure(arg0, arg1, 9449, __wbg_adapter_32);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32251 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper30834 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_52); const ret = makeMutClosure(arg0, arg1, 26018, __wbg_adapter_49);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32252 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32252 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_52);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32253 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32253 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32254 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32254 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32255 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32255 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32256 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32256 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper32257 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32257 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 26736, __wbg_adapter_55); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper37803 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper32258 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 30132, __wbg_adapter_68); const ret = makeMutClosure(arg0, arg1, 26737, __wbg_adapter_55);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper37804 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 30133, __wbg_adapter_68);
return addHeapObject(ret); return addHeapObject(ret);
}; };

BIN
executor-wasm/pkg/executor_wasm_bg.wasm
View File

Binary file not shown.

20
game/src/enemy.rs
View File

@ -82,6 +82,9 @@ impl Enemy {
} }
fn intersections_box(&self, graph: &mut Graph) -> bool { fn intersections_box(&self, graph: &mut Graph) -> bool {
if self.dead {
return false;
}
let self_node = match graph.try_get(self.handle) { let self_node = match graph.try_get(self.handle) {
Some(node) => node, Some(node) => node,
None => return false, None => return false,
@ -94,8 +97,8 @@ impl Enemy {
graph.physics2d.cast_ray( graph.physics2d.cast_ray(
RayCastOptions { RayCastOptions {
ray_origin: Point2::new(self_position.x, self_position.y), ray_origin: Point2::new(self_position.x, self_position.y),
ray_direction: Vector2::new(0.0, 2.0), ray_direction: Vector2::new(0.0, 1.0),
max_len: 0.8, max_len: 0.5,
groups: InteractionGroups::default(), groups: InteractionGroups::default(),
// Sort the results by distance // Sort the results by distance
sort_results: true, sort_results: true,
@ -125,6 +128,9 @@ impl Enemy {
} }
fn intersections_player(&self, graph: &mut Graph, max_len: f32) -> Option<Vec<Intersection>> { fn intersections_player(&self, graph: &mut Graph, max_len: f32) -> Option<Vec<Intersection>> {
if self.dead {
return None;
}
// Get *this* node instance // Get *this* node instance
let self_node = match graph.try_get(self.handle) { let self_node = match graph.try_get(self.handle) {
Some(node) => node, Some(node) => node,
@ -171,6 +177,9 @@ impl Enemy {
} }
fn attack_player(&mut self, graph: &mut Graph) { fn attack_player(&mut self, graph: &mut Graph) {
if self.win {
return;
}
let collaider = self.intersections_player(graph, 1.); let collaider = self.intersections_player(graph, 1.);
if let Some(collaider_data) = collaider { if let Some(collaider_data) = collaider {
for i in 0..collaider_data.len() { for i in 0..collaider_data.len() {
@ -257,10 +266,10 @@ impl Enemy {
} }
if distance > DISTANCE_TO_FIGHT { if distance > DISTANCE_TO_FIGHT {
return 2.0; return 3.1;
} }
if distance < DISTANCE_TO_FIGHT * -1.0 { if distance < DISTANCE_TO_FIGHT * -1.0 {
return -2.0; return -3.1;
} }
return 0.0; return 0.0;
} }
@ -303,6 +312,9 @@ impl Enemy {
fn animate_choose(&mut self, context: &mut ScriptContext) { fn animate_choose(&mut self, context: &mut ScriptContext) {
self.current_animation = Animations::Idle; self.current_animation = Animations::Idle;
if self.win {
return;
}
if self.block { if self.block {
self.current_animation = Animations::Block; self.current_animation = Animations::Block;
return; return;

2
game/src/enemy_spawn.rs
View File

@ -197,7 +197,7 @@ impl EnemySpawn {
.with_local_transform(rb_transform) .with_local_transform(rb_transform)
.with_script(Script::new(enemy)), .with_script(Script::new(enemy)),
) )
.with_mass(10.0) .with_mass(100.0)
// Turn off gravity for tile // Turn off gravity for tile
.with_gravity_scale(1.) .with_gravity_scale(1.)
.with_lin_damping(0.0) .with_lin_damping(0.0)

2
game/src/map.rs
View File

@ -161,7 +161,7 @@ fn build_right_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f
fn build_tree_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f32, y: f32) { fn build_tree_block(resource_manager: &ResourceManager, graph: &mut Graph, x: f32, y: f32) {
let tree_shape = ColliderShape::Cuboid(CuboidShape { let tree_shape = ColliderShape::Cuboid(CuboidShape {
half_extents: Vector2::new(0.5, 1.0), half_extents: Vector2::new(0.5, 0.5),
}); });
build_block( build_block(