From 74fa394bd79e8e0878dd3ef185b4cb907bcd6af8 Mon Sep 17 00:00:00 2001 From: Lwmte <3331699+Lwmte@users.noreply.github.com> Date: Tue, 11 Mar 2025 23:52:11 +0100 Subject: [PATCH] Update enums and documentation --- Documentation/doc/4 enums/Objects.ObjID.html | 12 +++++++++ Documentation/generate_objectlist.ps1 | 5 ++-- .../Internal/TEN/Objects/ObjectIDs.h | 26 +++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Documentation/doc/4 enums/Objects.ObjID.html b/Documentation/doc/4 enums/Objects.ObjID.html index ad84d4d32..e25106e81 100644 --- a/Documentation/doc/4 enums/Objects.ObjID.html +++ b/Documentation/doc/4 enums/Objects.ObjID.html @@ -512,6 +512,11 @@ DAMOCLES_SWORD ELECTRIC_CLEANER SLAMMING_DOORS SWINGING_BLADE +ELECTRIC_BALL +ELECTRIC_BALL_IMPACT_POINT +THOR_HAMMER_HANDLE +THOR_HAMMER_HEAD +MOVING_LASER PUZZLE_ITEM1 PUZZLE_ITEM2 PUZZLE_ITEM3 @@ -946,6 +951,7 @@ FISHTANK DOPPELGANGER_ORIGIN CORPSE WRAITH_TRAP +WATERFALL_EMITTER MESHSWAP1 MESHSWAP2 MESHSWAP3 @@ -1125,10 +1131,13 @@ HEALTH_BAR_TEXTURE AIR_BAR_TEXTURE DASH_BAR_TEXTURE SFX_BAR_TEXTURE +WATERFALL_SPRITES CROSSHAIR_GRAPHICS SPEEDOMETER_GRAPHICS CUSTOM_BAR_GRAPHICS CUSTOM_AMMO_GRAPHICS +DIARY_SPRITES +DIARY_ENTRY_SPRITES @@ -1400,10 +1409,13 @@ HEALTH_BAR_TEXTURE AIR_BAR_TEXTURE DASH_BAR_TEXTURE SFX_BAR_TEXTURE +WATERFALL_SPRITES CROSSHAIR_GRAPHICS SPEEDOMETER_GRAPHICS CUSTOM_BAR_GRAPHICS CUSTOM_AMMO_GRAPHICS +DIARY_SPRITES +DIARY_ENTRY_SPRITES diff --git a/Documentation/generate_objectlist.ps1 b/Documentation/generate_objectlist.ps1 index c1c45b354..d86cd5c4e 100644 --- a/Documentation/generate_objectlist.ps1 +++ b/Documentation/generate_objectlist.ps1 @@ -66,7 +66,8 @@ if ($enumValues.Count -gt 0) { $enumValues = $enumValues[1..($enumValues.Count - $header = @" #pragma once -// Last generated on $(Get-Date -Format "dd/MM/yyyy") +// This file is generated automatically, do not edit it. +// Last generated on $(Get-Date -Format "dd/MM/yyyy"). #include #include @@ -121,7 +122,7 @@ $spriteFooter = @" "@ # Map definition. -$mapHeader = "static const std::unordered_map kObjIDs {" +$mapHeader = "static const std::unordered_map GAME_OBJECT_IDS {" $mapBody = ($enumValues | ForEach-Object { "`t" + '{ "' + "$_" + '", ID_' + "$_" + ' }' }) -join ",`r`n" $mapFooter = "};" diff --git a/TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h b/TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h index ac4294029..b302b21c0 100644 --- a/TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h +++ b/TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h @@ -1,6 +1,7 @@ #pragma once -// Last generated on 11/03/2025 +// This file is generated automatically, do not edit it. +// Last generated on 11/03/2025. #include #include @@ -374,6 +375,11 @@ The following constants are inside ObjID. ELECTRIC_CLEANER SLAMMING_DOORS SWINGING_BLADE + ELECTRIC_BALL + ELECTRIC_BALL_IMPACT_POINT + THOR_HAMMER_HANDLE + THOR_HAMMER_HEAD + MOVING_LASER PUZZLE_ITEM1 PUZZLE_ITEM2 PUZZLE_ITEM3 @@ -808,6 +814,7 @@ The following constants are inside ObjID. DOPPELGANGER_ORIGIN CORPSE WRAITH_TRAP + WATERFALL_EMITTER MESHSWAP1 MESHSWAP2 MESHSWAP3 @@ -987,10 +994,13 @@ The following constants are inside ObjID. AIR_BAR_TEXTURE DASH_BAR_TEXTURE SFX_BAR_TEXTURE + WATERFALL_SPRITES CROSSHAIR_GRAPHICS SPEEDOMETER_GRAPHICS CUSTOM_BAR_GRAPHICS CUSTOM_AMMO_GRAPHICS + DIARY_SPRITES + DIARY_ENTRY_SPRITES @table Members */ @@ -1234,10 +1244,13 @@ The following ObjID members refer to sprites. AIR_BAR_TEXTURE DASH_BAR_TEXTURE SFX_BAR_TEXTURE + WATERFALL_SPRITES CROSSHAIR_GRAPHICS SPEEDOMETER_GRAPHICS CUSTOM_BAR_GRAPHICS CUSTOM_AMMO_GRAPHICS + DIARY_SPRITES + DIARY_ENTRY_SPRITES @table SpriteConstants */ static const std::unordered_map GAME_OBJECT_IDS { @@ -1599,6 +1612,11 @@ static const std::unordered_map GAME_OBJECT_IDS { { "ELECTRIC_CLEANER", ID_ELECTRIC_CLEANER }, { "SLAMMING_DOORS", ID_SLAMMING_DOORS }, { "SWINGING_BLADE", ID_SWINGING_BLADE }, + { "ELECTRIC_BALL", ID_ELECTRIC_BALL }, + { "ELECTRIC_BALL_IMPACT_POINT", ID_ELECTRIC_BALL_IMPACT_POINT }, + { "THOR_HAMMER_HANDLE", ID_THOR_HAMMER_HANDLE }, + { "THOR_HAMMER_HEAD", ID_THOR_HAMMER_HEAD }, + { "MOVING_LASER", ID_MOVING_LASER }, { "PUZZLE_ITEM1", ID_PUZZLE_ITEM1 }, { "PUZZLE_ITEM2", ID_PUZZLE_ITEM2 }, { "PUZZLE_ITEM3", ID_PUZZLE_ITEM3 }, @@ -2033,6 +2051,7 @@ static const std::unordered_map GAME_OBJECT_IDS { { "DOPPELGANGER_ORIGIN", ID_DOPPELGANGER_ORIGIN }, { "CORPSE", ID_CORPSE }, { "WRAITH_TRAP", ID_WRAITH_TRAP }, + { "WATERFALL_EMITTER", ID_WATERFALL_EMITTER }, { "MESHSWAP1", ID_MESHSWAP1 }, { "MESHSWAP2", ID_MESHSWAP2 }, { "MESHSWAP3", ID_MESHSWAP3 }, @@ -2212,8 +2231,11 @@ static const std::unordered_map GAME_OBJECT_IDS { { "AIR_BAR_TEXTURE", ID_AIR_BAR_TEXTURE }, { "DASH_BAR_TEXTURE", ID_DASH_BAR_TEXTURE }, { "SFX_BAR_TEXTURE", ID_SFX_BAR_TEXTURE }, + { "WATERFALL_SPRITES", ID_WATERFALL_SPRITES }, { "CROSSHAIR_GRAPHICS", ID_CROSSHAIR_GRAPHICS }, { "SPEEDOMETER_GRAPHICS", ID_SPEEDOMETER_GRAPHICS }, { "CUSTOM_BAR_GRAPHICS", ID_CUSTOM_BAR_GRAPHICS }, - { "CUSTOM_AMMO_GRAPHICS", ID_CUSTOM_AMMO_GRAPHICS } + { "CUSTOM_AMMO_GRAPHICS", ID_CUSTOM_AMMO_GRAPHICS }, + { "DIARY_SPRITES", ID_DIARY_SPRITES }, + { "DIARY_ENTRY_SPRITES", ID_DIARY_ENTRY_SPRITES } };