Better island time rules

Author: kiwi515

src/core/CosmeticMgr.cpp

@@ -13,7 +13,6 @@ const char* CosmeticMgr::PATH = "cosmetic.bin";
 
 /**
  * @brief Constructor
- *
  */
 CosmeticMgr::CosmeticMgr() {
     Clear();
@@ -58,16 +57,26 @@ void CosmeticMgr::Clear() {
 void CosmeticMgr::Debug() {
     kiwi::Random r;
 
+    mRandomBgmFlag = true;
     for (int i = 0; i < K_LENGTHOF(mRandomBgmMapping); i++) {
         mRandomBgmMapping[i] = i;
     }
-
     kiwi::Shuffle(mRandomBgmMapping, K_LENGTHOF(mRandomBgmMapping));
-    mRandomBgmFlag = r.CoinFlip();
 
-    mRandomTimeFlag = r.CoinFlip();
+    mRandomTimeFlag = true;
     for (int i = 0; i < LENGTHOF(mRandomTimeMapping); i++) {
-        mRandomTimeMapping[i] = static_cast<RPSysScene::ETime>(r.NextU32(3));
+        // Scene groups where changing the time of day is disallowed
+        if (i == Sp2::Cmn::EGroupID_Fld + 1 ||
+            i == Sp2::Cmn::EGroupID_Bwl + 1 ||
+            i == Sp2::Cmn::EGroupID_Png + 1 ||
+            i == Sp2::Cmn::EGroupID_Pln + 1 ||
+            i == Sp2::Cmn::EGroupID_Glf + 1 ||
+            i == Sp2::Cmn::EGroupID_Dgl + 1) {
+            mRandomTimeMapping[i] = RPSysScene::ETime_Auto;
+        } else {
+            mRandomTimeMapping[i] = static_cast<RPSysScene::ETime>(
+                r.NextU32(RPSysScene::ETime_Night + 1));
+        }
     }
 }
 

src/core/CosmeticMgr.h

@@ -11,6 +11,9 @@
 
 namespace AP {
 
+/**
+ * @brief Archipelago cosmetic manager
+ */
 class CosmeticMgr : public kiwi::DynamicSingleton<CosmeticMgr>,
                     public kiwi::IBinary<CosmeticMgr> {
     friend class kiwi::DynamicSingleton<CosmeticMgr>;

src/hooks/Cmn/cosmetics_Cmn.cpp

@@ -70,7 +70,9 @@ RPSysScene::ETime InterceptIslandTime(RPSysScene* pScene) {
         return pScene->getIslandTime();
     }
 
-    return CosmeticMgr::GetInstance().GetRandomTime(group);
+    // 'Auto' delegates to the scene
+    RPSysScene::ETime time = CosmeticMgr::GetInstance().GetRandomTime(group);
+    return time != RPSysScene::ETime_Auto ? time : pScene->getIslandTime();
 }
 KM_CALL(0x8026a56c, InterceptIslandTime);