+10

immediate_stats/src/modifier.rs

reviewed

··· 42 42 ..Self::default() 43 43 } 44 44 } 45 45 + 46 46 + /// Returns a new modifier scaled by a fraction. 47 47 + /// 48 48 + /// When the scale is zero, the bonus will be zero while the multiplier will be one. 49 49 + pub fn scaled(&self, fraction: f32) -> Self { 50 50 + Self { 51 51 + bonus: (self.bonus as f32 * fraction) as i32, 52 52 + multiplier: (1.0 - fraction) * 1.0 + fraction * self.multiplier, 53 53 + } 54 54 + } 45 55 } 46 56 47 57 impl Default for Modifier {

+3 -1

immediate_stats/src/stat.rs

reviewed

··· 80 80 self.multiplier *= modifier.multiplier; 81 81 } 82 82 83 83 - /// Scales and applies the [`Modifier`] values to the bonus and multiplier. 83 83 + /// [Scales](Modifier::scaled) and applies the [`Modifier`] values to the bonus and multiplier. 84 84 + /// 85 85 + /// When the scale is zero, the bonus will be zero while the multiplier will be one. 84 86 /// 85 87 /// This adds the bonuses, and multiplies the multipliers. 86 88 pub fn apply_scaled(&mut self, modifier: Modifier, fraction: f32) {

+15

immediate_stats/tests/modifier.rs

reviewed

··· 53 53 } 54 54 ); 55 55 } 56 56 + 57 57 + #[test] 58 58 + fn scaled() { 59 59 + let modifier = Modifier { 60 60 + bonus: 10, 61 61 + multiplier: 3.0, 62 62 + }; 63 63 + assert_eq!( 64 64 + modifier.scaled(0.5), 65 65 + Modifier { 66 66 + bonus: 5, 67 67 + multiplier: 2.0, 68 68 + } 69 69 + ); 70 70 + }