Merge pull request #332 from randovania/offworld_model

Create generic offworld model for multiworld
randovania · May 6, 2024 · fd41e2c · fd41e2c
2 parents 8e99507 + 9f758d7
commit fd41e2c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/...pen_samus_returns_rando/files/romfs/actors/items/item_offworld/models/item_offworld.bcmdl b/...pen_samus_returns_rando/files/romfs/actors/items/item_offworld/models/item_offworld.bcmdl
diff --git a/src/open_samus_returns_rando/files/romfs/maps/textures/chozoartifactor_o.bctex b/src/open_samus_returns_rando/files/romfs/maps/textures/chozoartifactor_o.bctex
diff --git a/src/open_samus_returns_rando/files/schema.json b/src/open_samus_returns_rando/files/schema.json
@@ -584,7 +584,8 @@
                 "ITEM_RANDO_DNA_39",
                 "ITEM_RESERVE_TANK_LIFE",
                 "ITEM_RESERVE_TANK_MISSILE",
-                "ITEM_RESERVE_TANK_SPECIAL_ENERGY"
+                "ITEM_RESERVE_TANK_SPECIAL_ENERGY",
+                "ITEM_OFFWORLD"
             ]
         },
         "item": {

diff --git a/src/open_samus_returns_rando/pickups/model_data.py b/src/open_samus_returns_rando/pickups/model_data.py
@@ -291,6 +291,13 @@ class ModelData:
             "actors/items/powerup_missilelauncher/models/textures/missile_e.bctex",
         ),
     ),
+    "item_offworld": ModelData(
+        bcmdl_path="actors/items/item_offworld/models/item_offworld.bcmdl",
+        dependencies=(
+            "actors/items/item_offworld/models/item_offworld.bcmdl",
+            "maps/textures/chozoartifactor_o.bctex",
+        ),
+    ),
 }
 
 

diff --git a/tests/test_files/item_models_test.json b/tests/test_files/item_models_test.json
@@ -671,6 +671,25 @@
             "model": [
                 "powerup_missilelauncher"
             ]
+        },
+        {
+            "pickup_type": "actor",
+            "caption": "Sent [Item] to [Player].",
+            "resources": [
+                [
+                    {
+                        "item_id": "ITEM_OFFWORLD",
+                        "quantity": 1
+                    }
+                ]
+            ],
+            "pickup_actor": {
+                "scenario": "s000_surface",
+                "actor": "another_pickup34"
+            },
+            "model": [
+                "item_offworld"
+            ]
         }
     ],
     "energy_per_tank": 100,
@@ -1086,6 +1105,18 @@
                 "z": 0.0
             },
             "collision_camera_name": "collision_camera_000"
+        },
+        {
+            "new_actor": {
+                "actor": "another_pickup34",
+                "scenario": "s000_surface"
+            },
+            "location": {
+                "x": -7000.0,
+                "y": 2100.0,
+                "z": 0.0
+            },
+            "collision_camera_name": "collision_camera_000"
         }
     ],
     "hints": [],