Merge pull request #26 from thetawavegame/repeater_boss

Repeater Boss, Mob Segments

Cargo.toml

@@ -4,21 +4,26 @@ version = "0.1.7"
 edition = "2021"
 
 [dependencies]
-bevy = "0.8.1"
-bevy_rapier2d = { version = "0.16.2", features = ["simd-stable"] }
-bevy-inspector-egui = "0.12.1"
-bevy_egui = "0.16.1"
-serde = "1.0.127"
-ron = "0.6.4"
-rand = "0.8.4"
-strum = "0.21.0"
-strum_macros = "0.21"
+bevy = { version = "0.9.1", features = ["serialize"]}
+bevy_rapier2d = { version = "0.19.0", features = ["simd-stable"] }
+bevy-inspector-egui = "0.14.0"
+bevy_egui = "0.17.1"
+bevy_asset_loader = { version = "0.14.1", features = [
+    "2d",
+    "3d",
+    "standard_dynamic_assets",
+] }
+serde = "1.0.147"
+ron = "0.8.0"
+rand = "0.8.5"
+strum = "0.24.1"
+strum_macros = "0.24.3"
 console_error_panic_hook = "0.1.7"
-bevy_kira_audio = { version = "0.12.0", features = ["mp3", "wav"] }
+bevy_kira_audio = { version = "0.13.0", features = ["mp3", "wav"] }
 
 # bevy_framespace currently does not support wasm
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy_framepace = "0.7.0"
+bevy_framepace = "0.9.1"
 
 # optimize dev packages as we don't need them in debug version
 [profile.dev.package."*"]

assets/consumable_assets.assets

@@ -0,0 +1,37 @@
+({
+    "health_wrench": TextureAtlas (
+        path: "texture/health_wrench_spritesheet.png",
+        tile_size_x: 12.,
+        tile_size_y: 12.,
+        columns: 1,
+        rows: 1,  
+    ),
+    "defense_wrench": TextureAtlas (
+        path: "texture/defense_wrench_spritesheet.png",
+        tile_size_x: 12.,
+        tile_size_y: 12.,
+        columns: 1,
+        rows: 1,  
+    ),
+    "money3": TextureAtlas (
+        path: "texture/money5_spritesheet.png",
+        tile_size_x: 12.,
+        tile_size_y: 12.,
+        columns: 1,
+        rows: 1,  
+    ),
+    "money1": TextureAtlas (
+        path: "texture/money1_spritesheet.png",
+        tile_size_x: 7.,
+        tile_size_y: 7.,
+        columns: 1,
+        rows: 1,  
+    ),
+    "armor": TextureAtlas (
+        path: "texture/armor_spritesheet.png",
+        tile_size_x: 12.,
+        tile_size_y: 12.,
+        columns: 1,
+        rows: 1,  
+    ),
+})

assets/data/behavior_sequences.ron

@@ -0,0 +1,32 @@
+(
+    sequences: {
+        Repeater: (
+            behaviors: [
+                (
+                    time: 10.0,
+                    spawnable_behaviors: [MoveToPosition((0,175))],
+                    mob_behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth],
+                    control_behaviors: [RepeaterAttack],
+                ),
+                (
+                    time: 20.0,
+                    spawnable_behaviors: [MoveToPosition((175, 150))],
+                    mob_behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth, SpawnMob("mobs-left")],
+                    control_behaviors: [RepeaterProtectHead],
+                ),
+                (
+                    time: 10.0,
+                    spawnable_behaviors: [MoveToPosition((0,175))],
+                    mob_behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth],
+                    control_behaviors: [RepeaterAttack],
+                ),
+                (
+                    time: 20.0,
+                    spawnable_behaviors: [MoveToPosition((-175, 150))],
+                    mob_behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth, SpawnMob("mobs-right")],
+                    control_behaviors: [RepeaterProtectHead],
+                ),
+            ]
+        ),
+    }
+)

data/characters.ron → assets/data/characters.ron

@@ -6,7 +6,7 @@
 			speed: (250.0, 250.0),
 			collider_dimensions: (2.0 , 4.0),
 			collider_density: 2.0,
-			sprite_path: "player.png",
+			character_type: Juggernaut,
 			projectile_type: Blast(Ally),
 			projectile_despawn_time: 0.75,
 			projectile_velocity: (0.0, 500.0),

data/consumables.ron → assets/data/consumables.ron

@@ -13,14 +13,10 @@
             random_linvel: Some(((-100, 50),(100, 100))),
             random_angvel: Some((-3.0, 3.0)),
         ),
-        texture: (
-			path: "texture/health_wrench_spritesheet.png",
-			dimensions: (12.0, 12.0),
-			cols: 1,
-			rows: 1,
-			frame_duration: 1.0,
-			animation_direction: None,
-		),
+        animation: (
+            frame_duration: 1.0,
+			direction: None,
+        ),
     ),
     DefenseWrench: (
         consumable_type: DefenseWrench,
@@ -36,20 +32,16 @@
             random_linvel: Some(((-100, 50),(100, 100))),
             random_angvel: Some((-3.0, 3.0)),
         ),
-        texture: (
-			path: "texture/defense_wrench_spritesheet.png",
-			dimensions: (12.0, 12.0),
-			cols: 1,
-			rows: 1,
-			frame_duration: 1.0,
-			animation_direction: None,
-		),
+        animation: (
+            frame_duration: 1.0,
+			direction: None,
+        ),
     ),
-    Money5: (
-        consumable_type: Money5,
+    Money3: (
+        consumable_type: Money3,
         collider_dimensions: (3.0, 3.0),
         spawnable_behaviors: [BrakeHorizontal, MoveDown],
-        consumable_effects: [GainMoney(5)],
+        consumable_effects: [GainMoney(3)],
         consumable_behaviors: [ApplyEffectsOnImpact, AttractToPlayer],
         acceleration: (0.0, 2.0),
         deceleration: (0.5, 1.0),
@@ -59,14 +51,10 @@
             random_linvel: Some(((-100, 50),(100, 100))),
             random_angvel: Some((-3.0, 3.0)),
         ),
-        texture: (
-			path: "texture/money5_spritesheet.png",
-			dimensions: (12.0, 12.0),
-			cols: 1,
-			rows: 1,
-			frame_duration: 1.0,
-			animation_direction: None,
-		),
+        animation: (
+            frame_duration: 1.0,
+			direction: None,
+        ),
     ),
     Money1: (
         consumable_type: Money1,
@@ -82,14 +70,10 @@
             random_linvel: Some(((-120, 50),(120, 120))),
             random_angvel: Some((-5.0, 5.0)),
         ),
-        texture: (
-			path: "texture/money1_spritesheet.png",
-			dimensions: (7.0, 7.0),
-			cols: 1,
-			rows: 1,
-			frame_duration: 1.0,
-			animation_direction: None,
-		),
+        animation: (
+            frame_duration: 1.0,
+			direction: None,
+        ),
     ),
     Armor: (
         consumable_type: Armor,
@@ -105,13 +89,9 @@
             random_linvel: Some(((-100, 50),(100, 100))),
             random_angvel: Some((-3.0, 3.0)),
         ),
-        texture: (
-			path: "texture/armor_spritesheet.png",
-			dimensions: (12.0, 12.0),
-			cols: 1,
-			rows: 1,
-			frame_duration: 1.0,
-			animation_direction: None,
-		),
+        animation: (
+            frame_duration: 1.0,
+			direction: None,
+        ),
     ),
 }

assets/data/effects.ron

@@ -0,0 +1,65 @@
+{
+	AllyBlastExplosion: (
+		effect_type: AllyBlastExplosion,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: 10.0,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.1,
+		),
+	),
+	EnemyBlastExplosion: (
+		effect_type: EnemyBlastExplosion,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: 10.5,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.1,
+		),
+	),
+	AllyBlastDespawn: (
+		effect_type: AllyBlastDespawn,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: 9.0,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.1,
+		),
+	),
+	EnemyBlastDespawn: (
+		effect_type: EnemyBlastDespawn,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: 9.0,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.1,
+		),
+	),
+	MobExplosion: (
+		effect_type: MobExplosion,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: -5.0,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.1,
+		),
+	),
+	ConsumableDespawn: (
+		effect_type: ConsumableDespawn,
+		effect_behaviors: [DespawnAfterAnimation],
+		z_level: 9.0,
+		animation: (
+			direction: Forward,
+			frame_duration: 0.05,
+		),
+	),
+	BarrierGlow: (
+		effect_type: BarrierGlow,
+		effect_behaviors: [],
+		z_level: 25.0,
+		animation: (
+			direction: PingPong(Forward),
+			frame_duration: 0.2,
+		),
+	),
+}