From 4f217958abba905f69fa706b6a719e8a15da3862 Mon Sep 17 00:00:00 2001 From: Carlo Supina Date: Wed, 28 Aug 2019 10:10:35 -0400 Subject: [PATCH] finish repeater and polyp art, add 1 and 5 currency --- assets/texture/receiver_boss.png | Bin 3139 -> 0 bytes assets/texture/repeater_boss.png | Bin 0 -> 3886 bytes assets/texture/spritesheet.png | Bin 3229 -> 3711 bytes assets/texture/spritesheet.ron | 6 ++++++ src/entities/enemy_spawner.rs | 35 ++++++++++++++++++++++++------- 5 files changed, 33 insertions(+), 8 deletions(-) delete mode 100644 assets/texture/receiver_boss.png create mode 100644 assets/texture/repeater_boss.png diff --git a/assets/texture/receiver_boss.png b/assets/texture/receiver_boss.png deleted file mode 100644 index 901d61b471127eb44328a2bde622923afbfba36e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3139 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 diff --git a/assets/texture/repeater_boss.png b/assets/texture/repeater_boss.png new file mode 100644 index 0000000000000000000000000000000000000000..b07759864ecd72320ec223d60f73522d33ae9a78 GIT binary patch literal 3886 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 literal 0 HcmV?d00001 diff --git a/assets/texture/spritesheet.png b/assets/texture/spritesheet.png index 1013c80ee76986fc3255d35e5658b847caaacb49..55cd741bbfaee8ad69598cc19e29bcc8bb664c0d 100644 GIT binary patch literal 3711 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 delta 3226 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 M07*qoM6N<$g26^UBLDyZ diff --git a/assets/texture/spritesheet.ron b/assets/texture/spritesheet.ron index 8cc2670..c3ee827 100644 --- a/assets/texture/spritesheet.ron +++ b/assets/texture/spritesheet.ron @@ -104,5 +104,11 @@ width: 12, height: 12, ), + ( + x: 56, + y: 47, + width: 7, + height: 7, + ), ], ) \ No newline at end of file diff --git a/src/entities/enemy_spawner.rs b/src/entities/enemy_spawner.rs index 9db0dbf..ad82ab8 100644 --- a/src/entities/enemy_spawner.rs +++ b/src/entities/enemy_spawner.rs @@ -26,7 +26,8 @@ const CONSUMABLE_SPEED: f32 = 35.0; const CONSUMABLE_HEALTH_RATIO: usize = 22; const CONSUMABLE_DEFENSE_RATIO: usize = 3; -const CONSUMABLE_MONEY_RATIO: usize = 75; +const CONSUMABLE_MONEY_1_RATIO: usize = 70; +const CONSUMABLE_MONEY_5_RATIO: usize = 5; const ENEMY_HEIGHT: f32 = 18.0; const ENEMY_WIDTH: f32 = 18.0; @@ -58,7 +59,9 @@ const HAULER_SPRITE_INDEX: usize = 15; const HEALTH_CONSUMABLE_SPRITE_INDEX: usize = 13; const DEFENSE_CONSUMABLE_SPRITE_INDEX: usize = 14; -const MONEY_CONSUMABLE_SPRITE_INDEX: usize = 16; +const MONEY_1_CONSUMABLE_SPRITE_INDEX: usize = 17; +const MONEY_5_CONSUMABLE_SPRITE_INDEX: usize = 16; + const SPAWNER_Y_OFFSET: f32 = 20.0; @@ -74,8 +77,11 @@ pub fn initialise_enemy_spawner(world: &mut World) { for _ in 0..CONSUMABLE_DEFENSE_RATIO { consumables_list.push("defense".to_string()); } - for _ in 0..CONSUMABLE_MONEY_RATIO { - consumables_list.push("money".to_string()); + for _ in 0..CONSUMABLE_MONEY_1_RATIO { + consumables_list.push("money_1".to_string()); + } + for _ in 0..CONSUMABLE_MONEY_5_RATIO { + consumables_list.push("money_5".to_string()); } let health_consumable = Consumable { @@ -102,22 +108,35 @@ pub fn initialise_enemy_spawner(world: &mut World) { speed: CONSUMABLE_SPEED, }; - let money_consumable = Consumable { + let money_1_consumable = Consumable { + width: 7.0, + height: 7.0, + hitbox_width: 6.0, + hitbox_height: 6.0, + health_value: 0.0, + defense_value: 0.0, + money_value: 1, + sprite_index: MONEY_1_CONSUMABLE_SPRITE_INDEX, + speed: CONSUMABLE_SPEED, + }; + + let money_5_consumable = Consumable { width: CONSUMABLE_WIDTH, height: CONSUMABLE_HEIGHT, hitbox_width: CONSUMABLE_HITBOX_WIDTH, hitbox_height: CONSUMABLE_HITBOX_HEIGHT, health_value: 0.0, defense_value: 0.0, - money_value: 1, - sprite_index: MONEY_CONSUMABLE_SPRITE_INDEX, + money_value: 5, + sprite_index: MONEY_5_CONSUMABLE_SPRITE_INDEX, speed: CONSUMABLE_SPEED, }; let mut consumables = HashMap::new(); consumables.insert("health".to_string(), health_consumable); consumables.insert("defense".to_string(), defense_consumable); - consumables.insert("money".to_string(), money_consumable); + consumables.insert("money_1".to_string(), money_1_consumable); + consumables.insert("money_5".to_string(), money_5_consumable); //create consumable pools for enemies let standard_pool = Pool {