- commit
- d4ea28b4263fa72330c688ccbfd73045dde50f3c
- parent
- e94ff6a0ae9f0bab7219651d7af5e8ed4823d3c7
- Author
- Tobias Bengfort <tobias.bengfort@posteo.de>
- Date
- 2023-02-19 18:48
small tweaks
Diffstat
| M | src/game.rs | 8 | +++++--- |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game.rs b/src/game.rs
@@ -201,13 +201,15 @@ impl Game {
201 201 for enemy in self.enemies.iter_mut() {
202 202 let dx = self.player.x - enemy.x;
203 203 let dy = self.player.y - enemy.y;
-1 204 let dx2 = dx * dx;
-1 205 let dy2 = dy * dy;
204 206
205 207 let size = enemy.t.size + self.player.size;
206 -1 if dx * dx + dy * 2.0 * dy * 2.0 < size * size {
-1 208 if dx2 + dy2 * 4.0 < size * size {
207 209 self.player.health -= enemy.t.power * dt;
208 210 }
209 211
210 -1 if dx * dx + dy * dy < self.player.damage_radius * self.player.damage_radius {
-1 212 if dx2 + dy2 < self.player.damage_radius * self.player.damage_radius {
211 213 enemy.health -= self.player.power * dt;
212 214 }
213 215 }
@@ -246,7 +248,6 @@ impl Game {
246 248 }
247 249
248 250 pub fn step(&mut self, dt: f32, width: f32, height: f32) {
249 -1 self.spawn_enemies(dt, width, height);
250 251 self.move_player(dt);
251 252 self.move_enemies(dt);
252 253 self.despawn_enemies(width, height);
@@ -256,6 +257,7 @@ impl Game {
256 257
257 258 self.player.recover(dt);
258 259 self.player.levelup(&mut self.rng);
-1 260 self.spawn_enemies(dt, width, height);
259 261 }
260 262
261 263 pub fn render(&mut self, win: &mut win::Window) {