From 69fc2f6f8e4f5934496d514756e6c3f85999b68c Mon Sep 17 00:00:00 2001
From: MegaMech <7255464+MegaMech@users.noreply.github.com>
Date: Fri, 25 Apr 2025 08:09:39 -0600
Subject: [PATCH] Add new logo to hm intro

---
 src/engine/HM_Intro.cpp        | 21 ++++++++++++++++++---
 src/engine/HM_Intro.h          |  5 +++++
 src/port/ui/ContentBrowser.cpp |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/engine/HM_Intro.cpp b/src/engine/HM_Intro.cpp
index a81fe5daf..e27d5db0c 100644
--- a/src/engine/HM_Intro.cpp
+++ b/src/engine/HM_Intro.cpp
@@ -55,10 +55,16 @@ void HarbourMastersIntro::HM_InitIntro() {
     _hRot = IRotator(0, -45.0f, 0);
     _hScale = {2.0f, 2.0f, 2.0f};
 
+    lusPos = FVector(0, -400, -614); // 12, 190, -1000
+    lusRot = IRotator(0, 0, 0);
+    lusScale = FVector(1, 1, 1);
+
     ground_f3d_material_013_lights = gdSPDefLights1(
 	0x7F, 0x30, 0x80,
 	0x60, 20, 10, 0x49, 0x49, 0x49
     );
+
+    gEditor.AddObject("lus", &lusPos, &lusRot, &lusScale, nullptr, 1, Editor::GameObject::CollisionType::BOUNDING_BOX, 10, &DespawnValue, -1);
 }
 
 void HarbourMastersIntro::HM_TickIntro() {
@@ -72,9 +78,13 @@ void HarbourMastersIntro::HM_TickIntro() {
     HarbourMastersIntro::Bob(_ship2Pos, _ship2Rot, 1.2f, 0.06f, 1.6f, -0.04f, 1.1f, -0.04f);
 
     _pos.x += 9;
-    _camera.Pos.x -= 1;
+    if (lusPos.y < -60) {
+        lusPos.y += 3;
+    }
+    //_camera.Pos.x -= 1;
 
-    if (_pos.x >= 880) {
+    // SWITCH TO NEXT MENU LOGO_INTRO_MENU
+    if (_pos.x >= 1100) {
         gMenuFadeType = 0;
         gMenuSelection = LOGO_INTRO_MENU;
         gFadeModeSelection = FADE_MODE_LOGO;
@@ -132,11 +142,16 @@ void HarbourMastersIntro::HM_DrawIntro() {
     render_set_position(mtx_geo, 0);
 
     gSPDisplayList(gDisplayListHead++, ground_map_mesh);
-    gSPDisplayList(gDisplayListHead++, powered_Text_mesh);
+    //gSPDisplayList(gDisplayListHead++, powered_Text_mesh); // Replaced by poweredbylus
     gSPDisplayList(gDisplayListHead++, castle_map_002_mesh);
     gSPDisplayList(gDisplayListHead++, road_map_001_mesh);
     gSPDisplayList(gDisplayListHead++, water_water1_mesh);
 
+    Mat4 lusMtx;
+    ApplyMatrixTransformations(lusMtx, lusPos, lusRot, lusScale);
+    render_set_position(lusMtx, 0);
+    gSPDisplayList(gDisplayListHead++, (Gfx*)"__OTR__hmintro/poweredbylus");
+
     HarbourMastersIntro::Sync();
 }
 
diff --git a/src/engine/HM_Intro.h b/src/engine/HM_Intro.h
index 0bdf57b6c..24fe08e35 100644
--- a/src/engine/HM_Intro.h
+++ b/src/engine/HM_Intro.h
@@ -57,6 +57,11 @@ private:
     FVector _hPos;
     IRotator _hRot;
     FVector _hScale;
+
+    FVector lusPos;
+    IRotator lusRot;
+    FVector lusScale;
+    int32_t DespawnValue = 0;
 };
 
 extern "C" {
diff --git a/src/port/ui/ContentBrowser.cpp b/src/port/ui/ContentBrowser.cpp
index ac876ddca..92dda316f 100644
--- a/src/port/ui/ContentBrowser.cpp
+++ b/src/port/ui/ContentBrowser.cpp
@@ -261,7 +261,7 @@ namespace Editor {
     }
 
     void ContentBrowserWindow::FindContent() {
-        auto ptr = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->ListFiles({"*tracks/*","actors/*", "objects/*"}, {""});
+        auto ptr = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->ListFiles({"hmintro/*", "*tracks/*","actors/*", "objects/*"}, {""});
         if (ptr) {
             auto files = *ptr;
             for (const auto& file : files) {