From ad494f80aa1bfbda9a7f37fa7b99208cd2ff6eb1 Mon Sep 17 00:00:00 2001 From: toasterparty Date: Thu, 1 Feb 2024 13:01:28 -0800 Subject: [PATCH] Empty platform type --- schema/randomprime.schema.json | 5 +++-- src/add_modify_obj_patches.rs | 13 +++++++++++++ src/custom_assets.rs | 3 +++ src/patch_config.rs | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/schema/randomprime.schema.json b/schema/randomprime.schema.json index 40b9b2e9..b3611920 100644 --- a/schema/randomprime.schema.json +++ b/schema/randomprime.schema.json @@ -3008,12 +3008,13 @@ ] }, "type": { - "description": "Pick what type of platform.", + "description": "Pick what type of platform. Note that `\"Empty\"` is provided for creative scripting purposes such as moving around a pickup along a waypoint path.", "type": "string", "enum": [ "Metal", "Snow", - "BombBox" + "BombBox", + "Empty" ], "default": "Metal" }, diff --git a/src/add_modify_obj_patches.rs b/src/add_modify_obj_patches.rs index 3dcf3834..0687bd1b 100644 --- a/src/add_modify_obj_patches.rs +++ b/src/add_modify_obj_patches.rs @@ -1427,6 +1427,19 @@ pub fn patch_add_platform<'r>( ResId::invalid(), ) }, + PlatformType::Empty => { + ( + vec![ + // Magma Pool Jump Blocker (invis) + (0x3801DE98, b"CMDL"), + (0xB3048E27, b"TXTR"), + // Empty DCLN + (0xF4BEE243, b"DCLN"), + ], + ResId::::new(0x3801DE98), + ResId::::new(0xF4BEE243), + ) + }, } }; diff --git a/src/custom_assets.rs b/src/custom_assets.rs index d0f402ac..3bd2223f 100644 --- a/src/custom_assets.rs +++ b/src/custom_assets.rs @@ -1203,8 +1203,11 @@ pub fn collect_game_resources<'r>( let ghost_ball: Vec<(u32,FourCC)> = vec![ // used for lock on point model (0xBFE4DAA0, FourCC::from_bytes(b"CMDL")), + (0x3801DE98, FourCC::from_bytes(b"CMDL")), + (0xF4BEE243, FourCC::from_bytes(b"DCLN")), (0x57C7107D, FourCC::from_bytes(b"TXTR")), (0xE580D665, FourCC::from_bytes(b"TXTR")), + (0xB3048E27, FourCC::from_bytes(b"TXTR")), ]; looking_for.extend(ghost_ball); diff --git a/src/patch_config.rs b/src/patch_config.rs index 32599cce..00055975 100644 --- a/src/patch_config.rs +++ b/src/patch_config.rs @@ -206,6 +206,7 @@ pub enum PlatformType Metal, Snow, BombBox, + Empty, } #[derive(Serialize, Deserialize, Debug, Clone)]