- commit
- 8769e417b5a2580865adad0bc89c0d16fac359dd
- parent
- a7144f7cc142db87ec665f0e7eca0d3868883604
- Author
- Tobias Bengfort <tobias.bengfort@posteo.de>
- Date
- 2023-02-18 20:48
make all enemies drop 1xp
Diffstat
| M | src/enemies.rs | 14 | -------------- |
| M | src/main.rs | 4 | +--- |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/enemies.rs b/src/enemies.rs
@@ -7,7 +7,6 @@ pub struct EnemyType {
7 7 pub size: f32,
8 8 pub health: f32,
9 9 pub power: f32,
10 -1 pub xp: u64,
11 10 pub sprite: &'static sprites::Sprite,
12 11 }
13 12
@@ -23,7 +22,6 @@ const SNAKE: EnemyType = EnemyType {
23 22 size: 8.0,
24 23 health: 5.0,
25 24 power: 5.0,
26 -1 xp: 1,
27 25 sprite: &sprites::SNAKE,
28 26 };
29 27
@@ -32,7 +30,6 @@ const SKELETON: EnemyType = EnemyType {
32 30 size: 9.0,
33 31 health: 10.0,
34 32 power: 10.0,
35 -1 xp: 2,
36 33 sprite: &sprites::SKELETON,
37 34 };
38 35
@@ -41,7 +38,6 @@ const SKELETON2: EnemyType = EnemyType {
41 38 size: 9.0,
42 39 health: 20.0,
43 40 power: 20.0,
44 -1 xp: 2,
45 41 sprite: &sprites::SKELETON2,
46 42 };
47 43
@@ -50,7 +46,6 @@ const BAT: EnemyType = EnemyType {
50 46 size: 8.0,
51 47 health: 4.0,
52 48 power: 4.0,
53 -1 xp: 1,
54 49 sprite: &sprites::BAT,
55 50 };
56 51
@@ -59,7 +54,6 @@ const BAT2: EnemyType = EnemyType {
59 54 size: 9.0,
60 55 health: 30.0,
61 56 power: 5.0,
62 -1 xp: 2,
63 57 sprite: &sprites::BAT2,
64 58 };
65 59
@@ -68,7 +62,6 @@ const ZOMBIE: EnemyType = EnemyType {
68 62 size: 9.0,
69 63 health: 30.0,
70 64 power: 20.0,
71 -1 xp: 1,
72 65 sprite: &sprites::ZOMBIE,
73 66 };
74 67
@@ -77,7 +70,6 @@ const EYE: EnemyType = EnemyType {
77 70 size: 7.0,
78 71 health: 20.0,
79 72 power: 20.0,
80 -1 xp: 2,
81 73 sprite: &sprites::EYE,
82 74 };
83 75
@@ -86,7 +78,6 @@ const GHOST: EnemyType = EnemyType {
86 78 size: 9.0,
87 79 health: 15.0,
88 80 power: 15.0,
89 -1 xp: 1,
90 81 sprite: &sprites::GHOST,
91 82 };
92 83
@@ -95,7 +86,6 @@ const MUMMY: EnemyType = EnemyType {
95 86 size: 9.0,
96 87 health: 30.0,
97 88 power: 25.0,
98 -1 xp: 1,
99 89 sprite: &sprites::MUMMY,
100 90 };
101 91
@@ -104,7 +94,6 @@ const HOOD: EnemyType = EnemyType {
104 94 size: 9.0,
105 95 health: 30.0,
106 96 power: 40.0,
107 -1 xp: 1,
108 97 sprite: &sprites::HOOD,
109 98 };
110 99
@@ -113,7 +102,6 @@ const PLANTGUY: EnemyType = EnemyType {
113 102 size: 9.0,
114 103 health: 50.0,
115 104 power: 30.0,
116 -1 xp: 1,
117 105 sprite: &sprites::PLANTGUY,
118 106 };
119 107
@@ -122,7 +110,6 @@ const CRAWL: EnemyType = EnemyType {
122 110 size: 9.0,
123 111 health: 60.0,
124 112 power: 40.0,
125 -1 xp: 3,
126 113 sprite: &sprites::CRAWL,
127 114 };
128 115
@@ -131,7 +118,6 @@ const SHADOW: EnemyType = EnemyType {
131 118 size: 9.0,
132 119 health: 50.0,
133 120 power: 50.0,
134 -1 xp: 2,
135 121 sprite: &sprites::SHADOW,
136 122 };
137 123
diff --git a/src/main.rs b/src/main.rs
@@ -99,7 +99,6 @@ fn bar(screen: &mut term::Screen, y: usize, value: f32, color: [u8; 3]) {
99 99 struct Diamond {
100 100 pub x: f32,
101 101 pub y: f32,
102 -1 pub xp: u64,
103 102 }
104 103
105 104 fn main() {
@@ -214,7 +213,7 @@ fn main() {
214 213 let dy = player_y - diamond.y;
215 214 let d = (dx * dx + dy * dy).sqrt();
216 215 if d < player_diamond_radius {
217 -1 player_xp += diamond.xp;
-1 216 player_xp += 1;
218 217 return false;
219 218 } else{
220 219 return true;
@@ -265,7 +264,6 @@ fn main() {
265 264 diamonds.push(Diamond {
266 265 x: enemy.x,
267 266 y: enemy.y,
268 -1 xp: enemy.t.xp,
269 267 });
270 268 }
271 269 }