From 99518c4c9fa63a80b5e55dc1cce24fdb22777899 Mon Sep 17 00:00:00 2001 From: dyceron <38679103+dyceron@users.noreply.github.com> Date: Sun, 17 Sep 2023 11:47:46 -0400 Subject: [PATCH] Fix DNA textures --- open_samus_returns_rando/model_data.py | 85 +++++++++----------------- 1 file changed, 29 insertions(+), 56 deletions(-) diff --git a/open_samus_returns_rando/model_data.py b/open_samus_returns_rando/model_data.py index ca296e2..e8e5cab 100644 --- a/open_samus_returns_rando/model_data.py +++ b/open_samus_returns_rando/model_data.py @@ -28,90 +28,81 @@ class ModelData: "maps/textures/chozoartifactorbase_d.bctex" ), ), - "adn": ModelData( bcmdl_path="actors/items/adn/models/adn.bcmdl", dependencies=( "actors/items/adn/charclasses/adn.bmsad", "actors/items/adn/fx/adnleak.bcptl", "actors/items/adn/models/adn.bcmdl", - "actors/items/adn/models/textures/adn_d.bctex" + "actors/items/adn/models/textures/adn_d.bctex", + "system/fx/textures/steam.bctex", + "system/fx/textures/twistsmoke_l.bctex", ), ), - "babyhatchling": ModelData( bcmdl_path="actors/characters/babyhatchling/models/babyhatchlingsmall.bcmdl", dependencies=( "actors/characters/babyhatchling/charclasses/babyhatchling.bmsad", "actors/characters/babyhatchling/models/babyhatchlingsmall.bcmdl", - "actors/characters/babyhatchling/models/babyhatchling.bcmdl" + "actors/characters/babyhatchling/models/babyhatchling.bcmdl", ), ), - "powerup_wavebeam": ModelData( bcmdl_path="actors/items/powerup_wavebeam/models/powerup_wavebeam.bcmdl", dependencies=( "actors/items/powerup_wavebeam/charclasses/powerup_wavebeam.bmsad", "actors/items/powerup_wavebeam/models/powerup_wavebeam.bcmdl", "actors/items/powerup_wavebeam/models/textures/itemspherecoat.bctex", - "actors/items/powerup_wavebeam/models/textures/itemspherewavebeam_d.bctex" + "actors/items/powerup_wavebeam/models/textures/itemspherewavebeam_d.bctex", ), ), - "powerup_spazerbeam": ModelData( bcmdl_path="actors/items/powerup_spazerbeam/models/powerup_spazerbeam.bcmdl", dependencies=( "actors/items/powerup_spazerbeam/charclasses/powerup_spazerbeam.bmsad", "actors/items/powerup_spazerbeam/models/powerup_spazerbeam.bcmdl", - "actors/items/powerup_spazerbeam/models/textures/itemspazerbeam_d.bctex" + "actors/items/powerup_spazerbeam/models/textures/itemspazerbeam_d.bctex", ), ), - "powerup_plasmabeam": ModelData( bcmdl_path="actors/items/powerup_plasmabeam/models/powerup_plasmabeam.bcmdl", dependencies=( "actors/items/powerup_plasmabeam/charclasses/powerup_plasmabeam.bmsad", "actors/items/powerup_plasmabeam/models/powerup_plasmabeam.bcmdl", "actors/items/powerup_plasmabeam/models/textures/itemplasmabeam_d.bctex", - # "system/fx/textures/plasmabeamhead.bctex" ), ), - "powerup_chargebeam": ModelData( bcmdl_path="actors/items/powerup_chargebeam/models/powerup_chargebeam.bcmdl", dependencies=( "actors/items/powerup_chargebeam/charclasses/powerup_chargebeam.bmsad", "actors/items/powerup_chargebeam/models/powerup_chargebeam.bcmdl", - "actors/items/powerup_chargebeam/models/textures/itemspherechargebeam_d.bctex" + "actors/items/powerup_chargebeam/models/textures/itemspherechargebeam_d.bctex", ), ), - "powerup_icebeam": ModelData( bcmdl_path="actors/items/powerup_icebeam/models/powerup_icebeam.bcmdl", dependencies=( "actors/items/powerup_icebeam/charclasses/powerup_icebeam.bmsad", "actors/items/powerup_icebeam/models/powerup_icebeam.bcmdl", - "actors/items/powerup_icebeam/models/textures/itemsphereicebeam_d.bctex" + "actors/items/powerup_icebeam/models/textures/itemsphereicebeam_d.bctex", ), ), - "powerup_grapplebeam": ModelData( bcmdl_path="actors/items/powerup_grapplebeam/models/powerup_grapplebeam.bcmdl", dependencies=( "actors/items/powerup_grapplebeam/charclasses/powerup_grapplebeam.bmsad", "actors/items/powerup_grapplebeam/models/powerup_grapplebeam.bcmdl", - "actors/items/powerup_grapplebeam/models/textures/itemgrapplebeam_d.bctex" + "actors/items/powerup_grapplebeam/models/textures/itemgrapplebeam_d.bctex", ), ), - "powerup_supermissile": ModelData( bcmdl_path="actors/items/powerup_supermissile/models/powerup_supermissile.bcmdl", dependencies=( "actors/items/powerup_supermissile/charclasses/powerup_supermissile.bmsad", - "actors/items/powerup_supermissile/models/powerup_supermissile.bcmdl" + "actors/items/powerup_supermissile/models/powerup_supermissile.bcmdl", ), ), - "powerup_scanningpulse": ModelData( bcmdl_path="actors/items/powerup_scanningpulse/models/powerup_scanningpulse.bcmdl", dependencies=( @@ -123,9 +114,8 @@ class ModelData: "system/fx/textures/haloflame.bctex", "system/fx/textures/splat.bctex", "system/fx/textures/xflare_large.bctex", - ) + ), ), - "powerup_energyshield": ModelData( bcmdl_path="actors/items/powerup_energyshield/models/powerup_energyshield.bcmdl", dependencies=( @@ -138,9 +128,8 @@ class ModelData: "system/fx/textures/haloflame.bctex", "system/fx/textures/splat.bctex", "system/fx/textures/xflare_large.bctex", - ) + ), ), - "powerup_energywave": ModelData( bcmdl_path="actors/items/powerup_energywave/models/powerup_energywave.bcmdl", dependencies=( @@ -153,9 +142,8 @@ class ModelData: "system/fx/textures/haloflame.bctex", "system/fx/textures/splat.bctex", "system/fx/textures/xflare_large.bctex", - ) + ), ), - "powerup_phasedisplacement": ModelData( bcmdl_path="actors/items/powerup_phasedisplacement/models/powerup_phasedisplacement.bcmdl", dependencies=( @@ -168,92 +156,82 @@ class ModelData: "system/fx/textures/haloflame.bctex", "system/fx/textures/splat.bctex", "system/fx/textures/xflare_large.bctex", - ) + ), ), - "powerup_variasuit": ModelData( bcmdl_path="actors/items/powerup_variasuit/models/powerup_variasuit.bcmdl", dependencies=( "actors/items/powerup_variasuit/charclasses/powerup_variasuit.bmsad", "actors/items/powerup_variasuit/models/powerup_variasuit.bcmdl", "actors/items/powerup_variasuit/models/textures/itemspherecoat.bctex", - "actors/items/powerup_variasuit/models/textures/itemvariasuit_d.bctex" + "actors/items/powerup_variasuit/models/textures/itemvariasuit_d.bctex", ), ), - "powerup_gravitysuit": ModelData( bcmdl_path="actors/items/powerup_gravitysuit/models/powerup_gravitysuit.bcmdl", dependencies=( "actors/items/powerup_gravitysuit/charclasses/powerup_gravitysuit.bmsad", "actors/items/powerup_gravitysuit/models/powerup_gravitysuit.bcmdl", "actors/items/powerup_gravitysuit/models/textures/cubemetroids.bctex", - "actors/items/powerup_gravitysuit/models/textures/itemgravitysuit_d.bctex" + "actors/items/powerup_gravitysuit/models/textures/itemgravitysuit_d.bctex", ), ), - "powerup_morphball": ModelData( bcmdl_path="actors/items/powerup_morphball/models/powerup_morphball.bcmdl", dependencies=( "actors/items/powerup_morphball/charclasses/powerup_morphball.bmsad", "actors/items/powerup_morphball/models/powerup_morphball.bcmdl", - "actors/items/powerup_morphball/models/textures/powerup_morphball_d.bctex" + "actors/items/powerup_morphball/models/textures/powerup_morphball_d.bctex", ), ), - "powerup_bomb": ModelData( bcmdl_path="actors/items/powerup_bomb/models/powerup_bomb.bcmdl", dependencies=( "actors/items/powerup_bomb/charclasses/powerup_bomb.bmsad", "actors/items/powerup_bomb/models/powerup_bomb.bcmdl", - "actors/items/powerup_bomb/models/textures/powerup_bomb.bctex" + "actors/items/powerup_bomb/models/textures/powerup_bomb.bctex", ), ), - "powerup_springball": ModelData( bcmdl_path="actors/items/powerup_springball/models/powerup_springball.bcmdl", dependencies=( "actors/items/powerup_springball/charclasses/powerup_springball.bmsad", "actors/items/powerup_springball/models/powerup_springball.bcmdl", - "actors/items/powerup_springball/models/textures/itemspringball_d.bctex" + "actors/items/powerup_springball/models/textures/itemspringball_d.bctex", ), ), - "powerup_spiderball": ModelData( bcmdl_path="actors/items/powerup_spiderball/models/powerup_spiderball.bcmdl", dependencies=( "actors/items/powerup_spiderball/charclasses/powerup_spiderball.bmsad", "actors/items/powerup_spiderball/models/powerup_spiderball.bcmdl", - "actors/items/powerup_spiderball/models/textures/powerup_morphball_d.bctex" - ) + "actors/items/powerup_spiderball/models/textures/powerup_morphball_d.bctex", + ), ), - "powerup_highjumpboots": ModelData( bcmdl_path="actors/items/powerup_highjumpboots/models/powerup_highjumpboots.bcmdl", dependencies=( "actors/items/powerup_highjumpboots/charclasses/powerup_highjumpboots.bmsad", "actors/items/powerup_highjumpboots/models/powerup_highjumpboots.bcmdl", - "actors/items/powerup_highjumpboots/models/textures/itemspherehighjumpboots_d.bctex" + "actors/items/powerup_highjumpboots/models/textures/itemspherehighjumpboots_d.bctex", ), ), - "powerup_spacejump": ModelData( bcmdl_path="actors/items/powerup_spacejump/models/powerup_spacejump.bcmdl", dependencies=( "actors/items/powerup_spacejump/charclasses/powerup_spacejump.bmsad", "actors/items/powerup_spacejump/models/powerup_spacejump.bcmdl", - "actors/items/powerup_spacejump/models/textures/itemspacejump_d.bctex" + "actors/items/powerup_spacejump/models/textures/itemspacejump_d.bctex", ), ), - "powerup_screwattack": ModelData( bcmdl_path="actors/items/powerup_screwattack/models/powerup_screwattack.bcmdl", dependencies=( "actors/items/powerup_screwattack/charclasses/powerup_screwattack.bmsad", "actors/items/powerup_screwattack/models/powerup_screwattack.bcmdl", - "actors/items/powerup_screwattack/models/textures/itemscrewattack_d.bctex" + "actors/items/powerup_screwattack/models/textures/itemscrewattack_d.bctex", ), ), - "item_energytank": ModelData( bcmdl_path="actors/items/item_energytank/models/item_energytank.bcmdl", dependencies=( @@ -261,38 +239,34 @@ class ModelData: "actors/items/item_energytank/models/item_energytank.bcmdl", "actors/items/item_energytank/models/textures/energytank_d.bctex", "actors/items/item_energytank/models/textures/tankglow.bctex", - "actors/items/item_energytank/models/textures/weaponstank_d.bctex" + "actors/items/item_energytank/models/textures/weaponstank_d.bctex", ), ), - "item_senergytank": ModelData( bcmdl_path="actors/items/item_senergytank/models/item_senergytank.bcmdl", dependencies=( "actors/items/item_senergytank/charclasses/item_senergytank.bmsad", "actors/items/item_senergytank/models/item_senergytank.bcmdl", "actors/items/item_energytank/models/item_energytank.bcmdl", - "actors/items/item_senergytank/models/textures/spenergytank_d.bctex" + "actors/items/item_senergytank/models/textures/spenergytank_d.bctex", ), ), - "item_missiletank": ModelData( bcmdl_path="actors/items/item_missiletank/models/item_missiletank.bcmdl", dependencies=( "actors/items/item_missiletank/charclasses/item_missiletank.bmsad", "actors/items/item_missiletank/models/item_missiletank.bcmdl", - "actors/items/item_energytank/models/item_energytank.bcmdl" + "actors/items/item_energytank/models/item_energytank.bcmdl", ), ), - "item_supermissiletank": ModelData( bcmdl_path="actors/items/item_supermissiletank/models/item_supermissiletank.bcmdl", dependencies=( "actors/items/item_supermissiletank/charclasses/item_supermissiletank.bmsad", "actors/items/item_supermissiletank/models/item_supermissiletank.bcmdl", - "actors/items/item_energytank/models/item_energytank.bcmdl" + "actors/items/item_energytank/models/item_energytank.bcmdl", ), ), - "item_powerbombtank": ModelData( bcmdl_path="actors/items/item_powerbombtank/models/item_powerbombtank.bcmdl", dependencies=( @@ -303,13 +277,12 @@ class ModelData: "actors/weapons/powerbomb/models/textures/powerbomb_d.bctex", ), ), - "powerup_powerbomb": ModelData( bcmdl_path="actors/items/powerup_powerbomb/models/powerup_powerbomb.bcmdl", dependencies=( "actors/items/powerup_powerbomb/charclasses/powerup_powerbomb.bmsad", "actors/items/powerup_powerbomb/models/powerup_powerbomb.bcmdl", - "actors/items/powerup_powerbomb/models/textures/powerbomb_d.bctex" + "actors/items/powerup_powerbomb/models/textures/powerbomb_d.bctex", ), ), }