Add Speed Booster and Powergrip offworld models (#388)

* Powergrip * Speed Booster
randovania · Jun 25, 2024 · 65ba4c1 · 65ba4c1
1 parent f8efa74
commit 65ba4c1
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 3 deletions.
diff --git a/...s_returns_rando/files/romfs/actors/items/powerup_powergrip/models/powerup_powergrip.bcmdl b/...s_returns_rando/files/romfs/actors/items/powerup_powergrip/models/powerup_powergrip.bcmdl
diff --git a/...ns_rando/files/romfs/actors/items/powerup_powergrip/models/textures/itempowergrip_d.bctex b/...ns_rando/files/romfs/actors/items/powerup_powergrip/models/textures/itempowergrip_d.bctex
diff --git a/...rns_rando/files/romfs/actors/items/powerup_speedbooster/models/powerup_speedbooster.bcmdl b/...rns_rando/files/romfs/actors/items/powerup_speedbooster/models/powerup_speedbooster.bcmdl
diff --git a/src/open_samus_returns_rando/files/romfs/maps/textures/chozoartifactor_s.bctex b/src/open_samus_returns_rando/files/romfs/maps/textures/chozoartifactor_s.bctex
diff --git a/src/open_samus_returns_rando/files/schema.json b/src/open_samus_returns_rando/files/schema.json
@@ -670,7 +670,6 @@
                 "ITEM_RESERVE_TANK_LIFE",
                 "ITEM_RESERVE_TANK_MISSILE",
                 "ITEM_RESERVE_TANK_SPECIAL_ENERGY",
-                "ITEM_OFFWORLD",
                 "ITEM_WEAPON_ICE_MISSILE"
             ]
         },

diff --git a/src/open_samus_returns_rando/pickups/model_data.py b/src/open_samus_returns_rando/pickups/model_data.py
@@ -305,6 +305,20 @@ class ModelData:
             "actors/items/powerup_icemissile/models/textures/missile_d.bctex",
         ),
     ),
+    "powerup_powergrip": ModelData(
+        bcmdl_path="actors/items/powerup_powergrip/models/powerup_powergrip.bcmdl",
+        dependencies=(
+            "actors/items/powerup_powergrip/models/powerup_powergrip.bcmdl",
+            "actors/items/powerup_powergrip/models/textures/itempowergrip_d.bctex",
+        ),
+    ),
+    "powerup_speedbooster": ModelData(
+        bcmdl_path="actors/items/powerup_speedbooster/models/powerup_speedbooster.bcmdl",
+        dependencies=(
+            "actors/items/powerup_speedbooster/models/powerup_speedbooster.bcmdl",
+            "maps/textures/chozoartifactor_s.bctex",
+        ),
+    ),
 }
 
 

diff --git a/tests/test_files/item_models_test.json b/tests/test_files/item_models_test.json
@@ -697,8 +697,8 @@
             "resources": [
                 [
                     {
-                        "item_id": "ITEM_OFFWORLD",
-                        "quantity": 1
+                        "item_id": "ITEM_NONE",
+                        "quantity": 0
                     }
                 ]
             ],
@@ -709,6 +709,44 @@
             "model": [
                 "item_offworld"
             ]
+        },
+        {
+            "pickup_type": "actor",
+            "caption": "Sent Power Grip to meep.",
+            "resources": [
+                [
+                    {
+                        "item_id": "ITEM_NONE",
+                        "quantity": 0
+                    }
+                ]
+            ],
+            "pickup_actor": {
+                "scenario": "s000_surface",
+                "actor": "another_pickup36"
+            },
+            "model": [
+                "powerup_powergrip"
+            ]
+        },
+        {
+            "pickup_type": "actor",
+            "caption": "Sent Speed Booster to meep.",
+            "resources": [
+                [
+                    {
+                        "item_id": "ITEM_NONE",
+                        "quantity": 0
+                    }
+                ]
+            ],
+            "pickup_actor": {
+                "scenario": "s000_surface",
+                "actor": "another_pickup37"
+            },
+            "model": [
+                "powerup_speedbooster"
+            ]
         }
     ],
     "energy_per_tank": 100,
@@ -1148,6 +1186,30 @@
                 "z": 0.0
             },
             "collision_camera_name": "collision_camera_000"
+        },
+        {
+            "new_actor": {
+                "actor": "another_pickup36",
+                "scenario": "s000_surface"
+            },
+            "location": {
+                "x": -6800.0,
+                "y": 2100.0,
+                "z": 0.0
+            },
+            "collision_camera_name": "collision_camera_000"
+        },
+        {
+            "new_actor": {
+                "actor": "another_pickup37",
+                "scenario": "s000_surface"
+            },
+            "location": {
+                "x": -6700.0,
+                "y": 2100.0,
+                "z": 0.0
+            },
+            "collision_camera_name": "collision_camera_000"
         }
     ],
     "hints": [],