Changed trash text length to more likely be shorter

Author: EngoDev

src/game.rs

@@ -180,6 +180,29 @@ pub fn spawn_trash(
     mut previous_spawn_position: Local<f32>,
 ) {
 
+    static TRASH_WORD_LENGTH_CHANCES: [u8; 20] = [
+        2,
+        2,
+        3,
+        3,
+        3,
+        3,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        4,
+        5,
+        5,
+        6,
+        6,
+        7,
+        8,
+    ];
+
     static SPAWN_CHANCES: [TrashType; 9] = [
         TrashType::Bottle,
         TrashType::Pizza,
@@ -212,8 +235,10 @@ pub fn spawn_trash(
 
         let random_x = get_random_coordinate(max_x, *previous_spawn_position);
         *previous_spawn_position = random_x;
+
         let trash_type: TrashType = SPAWN_CHANCES[random.gen_range(0..SPAWN_CHANCES.len())].clone();
         let power_up: PowerUp = POWER_UP_CHANCES[random.gen_range(0..POWER_UP_CHANCES.len())].clone();
+        let word_length = TRASH_WORD_LENGTH_CHANCES[random.gen_range(0..TRASH_WORD_LENGTH_CHANCES.len())];
 
         // TODO: make sure the same word doesn't appear twice in a row
         // A solution might be to have search to search for a word as long as it's not in a list of
@@ -224,9 +249,8 @@ pub fn spawn_trash(
             trash.power_up = power_up;
         }
 
-        let word = get_random_word(&available_words);
         let trash_text = TrashBundle::create_text(
-            word.clone(),
+            get_random_word_with_length(&available_words, word_length),
             Anchor::Custom(Vec2::new(0.0, -2.0)),
             Color::GREEN,
             TextStyle {
@@ -369,6 +393,16 @@ fn delete_all_play_entities(
     }
 }
 
+fn get_random_word_with_length(available_words: &Res<AvailableWords>, length: u8) -> String {
+    let mut word = "".to_string();
+
+    while word.len() != length as usize {
+        word = get_random_word(available_words);
+    }
+
+    word
+}
+
 fn get_random_word(available_words: &Res<AvailableWords>) -> String {
     let mut random = rand::thread_rng();
     let mut random_words: Vec<String> = Vec::new();