Merge pull request #15 from amethyst/item-variety

Item variety
thetawavegame · Sep 25, 2019 · 444e146 · 444e146
2 parents d1af7f9 + 66692dc
commit 444e146
Show file tree

Hide file tree

Showing 63 changed files with 763 additions and 219 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies.amethyst]
 version = "0.12"
 default-features = false
-features = ["vulkan", "audio"]
+features = ["vulkan", "audio", "gltf"]
 
 [dependencies]
 rand = "0.6.5"

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This game was made with the [Amethyst](https://amethyst.rs/) engine. It is inspi
 
 In this game you control a spaceship. Your goal is to defend an objective from the incoming invasion of enemy spaceships while not letting your health deplete in the process. You can shoot the enemies with your spaceships blasters or ram into them with your barrel roll dealing damage to yourself in the process. How long can you last?
 
-![Alt text](https://giant.gfycat.com/GreenWindingAltiplanochinchillamouse.gif)
+![Alt text](assets/gifs/gameplay.gif)
 
 # To Run
 
@@ -41,11 +41,16 @@ Leave everything as is if running on Windows or Linux and enter `cargo run` in t
 |Name|Image|Description|
 |:---:|:---:|:---:|
 |Steel Barrel|![steel_barrel](assets/texture/portraits/steel_barrel_portrait.png)|Gives player collision damage immunity while barrel rolling.|
-|Plasma Blast|![plasma_blast](assets/texture/portraits/plasma_blast_portrait.png)|Increases fire rate and damage.|
+|Plasma Blasts|![plasma_blast](assets/texture/portraits/plasma_blast_portrait.png)|Increases fire rate and damage.|
 |Hazardous Reactor|![hazardous_reactor](assets/texture/portraits/hazardous_reactor_portrait.png)|Increases maximum speed.|
 |Warp Thruster|![warp_thruster](assets/texture/portraits/warp_thruster_portrait.png)|Increases acceleration and deceleration.|
+|Quadrupedal Tentaclover|![quadrupedal_tentaclover](assets/texture/portraits/quadrupedal_tentaclover_portrait.png)|Grants chance to critical hit.|
+|Defense Satellite|![defense_satellite](assets/texture/portraits/defense_satellite_portrait.png)|Increases maximum defense.|
+|Double Barrel|![double_barrel](assets/texture/portraits/double_barrel_portrait.png)|Grants double blasts.|
+|Yithian Plague|![yithian_plague](assets/texture/portraits/yithian_plague_portrait.png)|Grants chance to poison.|
+|Spice|![spice](assets/texture/portraits/spice_portrait.png)|Decreases barrel roll cooldown time.|
 
-# Pickups
+# Consumables
 
 |Name|Image|Description|
 |:---:|:---:|:---:|

diff --git a/assets/data/consumables.ron b/assets/data/consumables.ron
@@ -1,22 +1,22 @@
 {
     "defense": (
         defense_value: 70,
-        sprite_index: 14,
+        sprite_index: 1,
     ),
     "money_1": (
         width: 7,
         height: 7,
         hitbox_width: 6,
         hitbox_height: 6,
         money_value: 1,
-        sprite_index: 17,
+        sprite_index: 3,
     ),
     "money_5": (
         money_value: 5,
-        sprite_index: 16,
+        sprite_index: 2,
     ),
     "health": (
         health_value: 30,
-        sprite_index: 13,
+        sprite_index: 0,
     ),
 }
diff --git a/assets/data/enemies.ron b/assets/data/enemies.ron
@@ -1,7 +1,7 @@
 {
     "drone": (
         health: 60,
-        sprite_index: 2,
+        sprite_index: 0,
         fires: false,
         fire_speed: 3,
         fire_reset_timer: 0,
@@ -43,7 +43,7 @@
         height: 36,
         hitbox_height: 28,
         health: 220,
-        sprite_index: 15,
+        sprite_index: 2,
         fires: false,
         fire_speed: 3,
         fire_reset_timer: 1,

diff --git a/assets/data/items.ron b/assets/data/items.ron
@@ -5,36 +5,71 @@
             "damage": 5,
         },
         price: 15,
-        sprite_index: 6,
+        sprite_index: 1,
         name: "plasma_blasts",
     ),
     "warp_thruster": (
         stat_effects: {
             "deceleration": 1,
             "acceleration": 1,
         },
-        sprite_index: 8,
+        sprite_index: 3,
         name: "warp_thruster",
     ),
     "hazardous_reactor": (
         stat_effects: {
             "max_speed": 20,
         },
         price: 7,
-        sprite_index: 7,
+        sprite_index: 2,
         name: "hazardous_reactor",
     ),
     "steel_barrel": (
         bool_effects: {
             "barrel_immunity": true,
         },
         price: 9,
-        sprite_index: 5,
+        sprite_index: 0,
         name: "steel_barrel",
     ),
     "quadrupedal_tentaclover": (
+        stat_effects: {
+            "crit_chance": 0.05,
+        },
         price: 12,
-        sprite_index: 18,
+        sprite_index: 4,
         name: "quadrupedal_tentaclover",
     ),
+    "defense_satellite": (
+        stat_effects: {
+            "max_defense": 100,
+        },
+        price: 11,
+        sprite_index: 5,
+        name: "defense_satellite",
+    ),
+    "double_barrel": (
+        bool_effects: {
+            "double_blasts": true,
+        },
+        price: 18,
+        sprite_index: 6,
+        name: "double_barrel",
+    ),
+    "yithian_plague": (
+        stat_effects: {
+            "poison_chance": 0.10,
+        },
+        price: 14,
+        sprite_index: 7,
+        name: "yithian_plague",
+    ),
+    "spice": (
+        stat_effects: {
+            "barrel_cooldown": -0.5,
+        },
+        price: 8,
+        sprite_index: 8,
+        name: "spice",
+    ),
 }
diff --git a/assets/gifs/gameplay.gif b/assets/gifs/gameplay.gif
diff --git a/assets/mesh/earth_planet.glb b/assets/mesh/earth_planet.glb
diff --git a/assets/mesh/sol_star.glb b/assets/mesh/sol_star.glb
diff --git a/assets/texture/blasts_spritesheet.png b/assets/texture/blasts_spritesheet.png
diff --git a/assets/texture/blasts_spritesheet.ron b/assets/texture/blasts_spritesheet.ron
@@ -0,0 +1,30 @@
+(
+    texture_width: 16,
+    texture_height: 4,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 4,
+            height: 4,
+        ),
+        (
+            x: 4,
+            y: 0,
+            width: 4,
+            height: 4,
+        ),
+        (
+            x: 8,
+            y: 0,
+            width: 4,
+            height: 4,
+        ),
+        (
+            x: 12,
+            y: 0,
+            width: 4,
+            height: 4,
+        ),
+    ],
+)
diff --git a/assets/texture/consumables_spritesheet.png b/assets/texture/consumables_spritesheet.png
diff --git a/assets/texture/consumables_spritesheet.ron b/assets/texture/consumables_spritesheet.ron
@@ -0,0 +1,30 @@
+(
+    texture_width: 60,
+    texture_height: 12,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 12,
+            height: 12,
+        ),
+        (
+            x: 12,
+            y: 0,
+            width: 12,
+            height: 12,
+        ),
+        (
+            x: 24,
+            y: 0,
+            width: 12,
+            height: 12,
+        ),
+        (
+            x: 36,
+            y: 0,
+            width: 7,
+            height: 7,
+        ),
+    ],
+)
diff --git a/assets/texture/enemies_spritesheet.png b/assets/texture/enemies_spritesheet.png
diff --git a/assets/texture/enemies_spritesheet.ron b/assets/texture/enemies_spritesheet.ron
@@ -0,0 +1,30 @@
+(
+    texture_width: 180,
+    texture_height: 36,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 18,
+            height: 18,
+        ),
+        (
+            x: 18,
+            y: 0,
+            width: 18,
+            height: 18,
+        ),
+        (
+            x: 36,
+            y: 0,
+            width: 18,
+            height: 36,
+        ),
+        (
+            x: 54,
+            y: 0,
+            width: 20,
+            height: 26,
+        ),
+    ],
+)
diff --git a/assets/texture/explosions_spritesheet.png b/assets/texture/explosions_spritesheet.png
diff --git a/assets/texture/explosions_spritesheet.ron b/assets/texture/explosions_spritesheet.ron
@@ -0,0 +1,12 @@
+(
+    texture_width: 88,
+    texture_height: 22,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 22,
+            height: 22,
+        ),
+    ],
+)
diff --git a/assets/texture/items_spritesheet.png b/assets/texture/items_spritesheet.png
diff --git a/assets/texture/items_spritesheet.ron b/assets/texture/items_spritesheet.ron
@@ -0,0 +1,60 @@
+(
+    texture_width: 140,
+    texture_height: 14,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 14,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 28,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 42,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 56,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 70,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 84,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 98,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+        (
+            x: 112,
+            y: 0,
+            width: 14,
+            height: 14,
+        ),
+    ],
+)
diff --git a/assets/texture/player_spritesheet.png b/assets/texture/player_spritesheet.png
diff --git a/assets/texture/player_spritesheet.ron b/assets/texture/player_spritesheet.ron
@@ -0,0 +1,12 @@
+(
+    texture_width: 72,
+    texture_height: 18,
+    sprites: [
+        (
+            x: 0,
+            y: 0,
+            width: 18,
+            height: 18,
+        ),
+    ],
+)
diff --git a/assets/texture/portraits/defense_satellite_portrait.png b/assets/texture/portraits/defense_satellite_portrait.png
diff --git a/assets/texture/portraits/double_barrel_portrait.png b/assets/texture/portraits/double_barrel_portrait.png
diff --git a/assets/texture/portraits/quadrupedal_tentaclover_portrait.png b/assets/texture/portraits/quadrupedal_tentaclover_portrait.png
diff --git a/assets/texture/portraits/spice_portrait.png b/assets/texture/portraits/spice_portrait.png
diff --git a/assets/texture/portraits/yithian_plague_portrait.png b/assets/texture/portraits/yithian_plague_portrait.png
diff --git a/assets/texture/side_panel_metal_right.xcf b/assets/texture/side_panel_metal_right.xcf
diff --git a/assets/texture/spritesheet.png b/assets/texture/spritesheet.png