changeset 677:082c39d7d1c3

Use a struct for difficulty coeffs, so that we can impl Default on it.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Thu, 15 Aug 2019 21:32:54 +0200
parents 826c16e5f909
children 1d81a449c436
files src/th06/enemy.rs
diffstat 1 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/th06/enemy.rs	Thu Aug 15 21:31:08 2019 +0200
+++ b/src/th06/enemy.rs	Thu Aug 15 21:32:54 2019 +0200
@@ -113,6 +113,29 @@
 }
 
 #[derive(PartialEq)]
+pub(crate) struct DifficultyCoeffs {
+    pub(crate) speed_a: f32,
+    pub(crate) speed_b: f32,
+    pub(crate) nb_a: u16,
+    pub(crate) nb_b: u16,
+    pub(crate) shots_a: u16,
+    pub(crate) shots_b: u16,
+}
+
+impl Default for DifficultyCoeffs {
+    fn default() -> DifficultyCoeffs {
+        DifficultyCoeffs {
+            speed_a: -0.5,
+            speed_b: 0.5,
+            nb_a: 0,
+            nb_b: 0,
+            shots_a: 0,
+            shots_b: 0,
+        }
+    }
+}
+
+#[derive(PartialEq)]
 pub(crate) enum Direction {
     Left,
     Center,
@@ -170,7 +193,7 @@
     pub(crate) delay_attack: bool,
 
     // Tuples.
-    pub(crate) difficulty_coeffs: (f32, f32, u32, u32, u32, u32),
+    pub(crate) difficulty_coeffs: DifficultyCoeffs,
     pub(crate) extended_bullet_attributes: Option<(u32, u32, u32, u32, f32, f32, f32, f32)>,
     pub(crate) bullet_attributes: Option<(i16, i16, u32, u32, u32, f32, f32, f32, f32, u32)>,
     pub(crate) bullet_launch_offset: Offset,
@@ -217,7 +240,6 @@
             touchable: true,
             collidable: true,
             damageable: true,
-            difficulty_coeffs: (-0.5, 0.5, 0, 0, 0, 0),
             ..Default::default()
         };
         let enemy = Rc::new(RefCell::new(enemy));