pcfantasy · itsumo2009 · Dec 13, 2021 · Mar 21, 2023 · Mar 23, 2023 · Mar 24, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,107 @@
+cmake_minimum_required(VERSION 3.8.2)
+project(RealCity VERSION 0.1.0 LANGUAGES CSharp)
+
+set(CITIES_STEAM_ID 255710)
+set(REAL_CITY_REVISED_STEAM_ID 2949699934)
+
+file(GLOB_RECURSE SRCS *.cs)
+file(GLOB_RECURSE RES Resources/*)
+file(GLOB_RECURSE ICONS Icon/*)
+
+
+if(WIN32)
+	set(MOD_INSTALL_INITAL_PATH "$ENV{LOCALAPPDATA}/Colossal Order/Cities_Skylines/${PROJECT_NAME}")
+elseif(APPLE)
+	set(MOD_INSTALL_INITAL_PATH "$ENV{HOME}//Library/Application Support/Colossal Order/Cities_Skylines/${PROJECT_NAME}" )
+else()
+	set(MOD_INSTALL_INITAL_PATH "$ENV{HOME}/.local/share/Colossal Order/Cities_Skylines/${PROJECT_NAME}" )
+endif()
+
+set(MOD_INSTALL_PATH "${MOD_INSTALL_INITAL_PATH}" CACHE PATH "Path for publishing mod")
+
+set(STEAM_CITIES_LIBRARY "C:/Program Files (x86)/Steam" CACHE PATH "Path to steam library which contents Cities:Skylines")
+find_path(CITIES_MOD_PARENT_PATH 
+          ${CITIES_STEAM_ID}
+          PATHS "${STEAM_CITIES_LIBRARY}/steamapps/workshop/content"
+          DOC "Path to RealCity installation")
+
+set(MOD_PATH "${CITIES_MOD_PARENT_PATH}/${CITIES_STEAM_ID}/${REAL_CITY_REVISED_STEAM_ID}") 
+
+add_library(${PROJECT_NAME} ${SRCS} ${RES})
+
+find_path(CITIES_MANAGED_PATH
+	ICities.dll
+	PATHS "${STEAM_CITIES_LIBRARY}/steamapps/common/Cities_Skylines/Cities_Data/Managed" DOC "Path to Cities Skylines managed libs")
+
+set(REFS
+    System
+    System.Core
+    System.Xml.Linq
+    System.Data.DataSetExtensions
+    System.Data
+    System.Net.Http
+    System.Xml
+    )
+
+set(CITIES_REFS
+    Assembly-CSharp
+    Assembly-CSharp-firstpass
+    ColossalManaged
+    ICities
+    ICSharpCode.SharpZipLib
+    Mono.Posix
+    Mono.Security
+    UnityEngine
+    UnityEngine.Networking
+    UnityEngine.UI
+)
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES ${REFS})
+
+foreach(CITIES_REF IN ITEMS ${CITIES_REFS})
+	set_target_properties(${PROJECT_NAME} PROPERTIES VS_DOTNET_REFERENCE_${CITIES_REF} "${CITIES_MANAGED_PATH}/${CITIES_REF}.dll")
+endforeach()
+
+find_program(NUGET nuget HINTS "${CMAKE_SOURCE_DIR}")
+
+add_custom_command(TARGET ${PROJECT_NAME}
+    PRE_BUILD
+    COMMAND "${NUGET}" restore "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.sln")
+
+
+target_compile_options(${PROJECT_NAME} PRIVATE "/langversion:latestMajor" "/unsafe" "/platform:anycpu")
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+  VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
+  VS_GLOBAL_ProjectGuid "{40017200-7278-44D7-A12C-8DDC6BD98440}"
+  VS_GLOBAL_CodeAnalysisRuleSet "${CMAKE_SOURCE_DIR}/RealCity.ruleset"
+  VS_GLOBAL_FileAlignment "512"
+  VS_GLOBAL_Prefer32Bit "false"
+  VS_GLOBAL_LangVersion "7.3"
+  VS_GLOBAL_AllowUnsafeBlocks "true"
+  VS_GLOBAL_Platform "AnyCPU"
+  VS_GLOBAL_WarningLevel "4"
+  VS_GLOBAL_PlatformTarget "AnyCPU"
+  )
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_TARGET_FRAMEWORK_VERSION "v3.5")
+set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES_COPY_LOCAL False)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VS_DOTNET_REFERENCE_0Harmony "${CMAKE_BINARY_DIR}/packages/Lib.Harmony.2.0.0.9/lib/net35/0Harmony.dll")
+set_target_properties(${PROJECT_NAME} PROPERTIES VS_DOTNET_REFERENCE_CitiesHarmony.API "${CMAKE_BINARY_DIR}/packages/CitiesHarmony.API.1.0.4/lib/net35/CitiesHarmony.API.dll")
+
+function(add_mod_file SRC DEST)
+	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${SRC}" "${DEST}" COMMENT "Copying ${SRC} -> ${DEST}\r")
+	install(FILES "${DEST}" DESTINATION "${MOD_INSTALL_PATH}")
+endfunction(add_mod_file)
+
+function(add_mod_directory SRC DEST)
+	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy_directory "${SRC}" "${DEST}" COMMENT "Copying ${SRC} -> ${DEST}\r")
+	install(DIRECTORY "${DEST}" DESTINATION  "${MOD_INSTALL_PATH}")
+endfunction(add_mod_directory)
+
+add_mod_directory("${CMAKE_SOURCE_DIR}/Resources" "${MOD_PATH}/Resources")
+add_mod_directory("${CMAKE_SOURCE_DIR}/Icon" "${MOD_PATH}/Icon")
+
+add_mod_file("${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.dll" "${MOD_PATH}/${PROJECT_NAME}.dll")
+execute_process(COMMAND "${NUGET}" install "${CMAKE_SOURCE_DIR}/packages.config" -OutputDirectory "${CMAKE_BINARY_DIR}/packages" -SolutionDirectory "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}")
diff --git a/Patch/CommonBuildingAIGetColorPatch.cs b/Patch/CommonBuildingAIGetColorPatch.cs
@@ -16,11 +16,11 @@ public static MethodBase TargetMethod()
                     "GetColor",
                     BindingFlags.Instance | BindingFlags.Public,
                     null,
-                    new[] { typeof(ushort), typeof(Building).MakeByRefType(), typeof(InfoManager.InfoMode) },
+                    new[] { typeof(ushort), typeof(Building).MakeByRefType(), typeof(InfoManager.InfoMode), typeof(InfoManager.SubInfoMode) },
                     new ParameterModifier[0]);
         }
 
-        public static void Postfix(ushort buildingID, ref Building data, InfoManager.InfoMode infoMode, ref Color __result)
+        public static void Postfix(ushort buildingID, ref Building data, InfoManager.InfoMode infoMode, InfoManager.SubInfoMode subInfoMode, ref Color __result)
         {
             if (infoMode == InfoManager.InfoMode.LandValue)
             {

diff --git a/Patch/PrivateBuildingAISimulationStepActivePatch.cs b/Patch/PrivateBuildingAISimulationStepActivePatch.cs
@@ -125,23 +125,23 @@ public static void ProcessBuildingDataFinal(ushort buildingID, ref Building buil
                 }
             }
 
-            if (buildingData.m_problems == Notification.Problem.None)
+            if (buildingData.m_problems == Notification.Problem1.None)
             {
                 //mark no good
                 if ((buildingData.Info.m_class.m_service == ItemClass.Service.Commercial) && (RealCity.debugMode))
                 {
-                    Notification.Problem problem = Notification.RemoveProblems(buildingData.m_problems, Notification.Problem.NoGoods);
+                    Notification.Problem1 problem = Notification.RemoveProblems(buildingData.m_problems, Notification.Problem1.NoGoods);
                     if (buildingData.m_customBuffer2 < 500)
                     {
-                        problem = Notification.AddProblems(problem, Notification.Problem.NoGoods | Notification.Problem.MajorProblem);
+                        problem = Notification.AddProblems(problem, Notification.Problem1.NoGoods | Notification.Problem1.MajorProblem);
                     }
                     else if (buildingData.m_customBuffer2 < 1000)
                     {
-                        problem = Notification.AddProblems(problem, Notification.Problem.NoGoods);
+                        problem = Notification.AddProblems(problem, Notification.Problem1.NoGoods);
                     }
                     else
                     {
-                        problem = Notification.Problem.None;
+                        problem = Notification.Problem1.None;
                     }
                     buildingData.m_problems = problem;
                 }

diff --git a/Patch/ResidentAIStartMovingPatch.cs b/Patch/ResidentAIStartMovingPatch.cs
@@ -0,0 +1,67 @@
+using System;
+using ColossalFramework;
+using UnityEngine;
+using RealCity.Util;
+using HarmonyLib;
+using System.Reflection;
+using RealCity.CustomData;
+using RealCity.CustomAI;
+using ColossalFramework.Math;
+
+namespace RealCity.Patch
+{
+    [HarmonyPatch]
+    public class ResidentAIStartMovingPatch
+    {
+        public static MethodBase TargetMethod()
+        {
+            return typeof(ResidentAI).GetMethod("StartMoving", BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(uint), typeof(Citizen).MakeByRefType(), typeof(ushort), typeof(ushort) }, null);
+        }
+
+        public static void Prefix(uint citizenID, ref Citizen data, ref ushort sourceBuilding, ref ushort targetBuilding)
+        {
+            if (data.m_workBuilding != targetBuilding)
+            {
+                var building = Singleton<BuildingManager>.instance.m_buildings.m_buffer[targetBuilding];
+                if (building.Info.m_class.m_service == ItemClass.Service.Commercial)
+                {
+                    CitizenManager instance = Singleton<CitizenManager>.instance;
+                    ushort homeBuilding = instance.m_citizens.m_buffer[citizenID].m_homeBuilding;
+                    uint citizenUnit = CitizenData.GetCitizenUnit(homeBuilding);
+                    uint containingUnit = instance.m_citizens.m_buffer[citizenID].GetContainingUnit((uint)citizenID, citizenUnit, CitizenUnit.Flags.Home);
+
+                    Citizen.BehaviourData behaviour = default;
+                    int aliveVisitCount = 0;
+                    int totalVisitCount = 0;
+                    RealCityCommercialBuildingAI.InitDelegate();
+                    RealCityCommercialBuildingAI.GetVisitBehaviour((CommercialBuildingAI)(building.Info.m_buildingAI), targetBuilding, ref building, ref behaviour, ref aliveVisitCount, ref totalVisitCount);
+                    var amount = building.m_customBuffer2 / MainDataStore.maxGoodPurchase - totalVisitCount + aliveVisitCount;
+                    var CommercialBuildingAI = building.Info.m_buildingAI as CommercialBuildingAI;
+                    var maxCount = CommercialBuildingAI.CalculateVisitplaceCount((ItemClass.Level)building.m_level, new Randomizer(targetBuilding), building.m_width, building.m_length);
+                    if ((amount <= 0) || (maxCount <= totalVisitCount))
+                    {
+                        //Close CommercialBuilding
+                        //Reject citizen to building which lack of goods
+                        sourceBuilding = targetBuilding;
+                        building.m_flags &= ~Building.Flags.Active;
+                        return;
+                    }
+
+                    if (CitizenUnitData.familyMoney[containingUnit] < MainDataStore.maxGoodPurchase * RealCityIndustryBuildingAI.GetResourcePrice(TransferManager.TransferReason.Shopping))
+                    {
+                        //Reject poor citizen to building
+                        sourceBuilding = targetBuilding;
+                        return;
+                    }
+                    else if (CitizenUnitData.familyGoods[containingUnit] > 2000)
+                    {
+                        //Reject citizen who already have enough goods to building
+                        sourceBuilding = targetBuilding;
+                        return;
+                    }
+
+                }
+            }
+        }
+    }
+}
diff --git a/Patch/TouristAIStartMovingPatch.cs b/Patch/TouristAIStartMovingPatch.cs
@@ -0,0 +1,52 @@
+using System;
+using ColossalFramework;
+using UnityEngine;
+using RealCity.Util;
+using HarmonyLib;
+using System.Reflection;
+using RealCity.CustomData;
+using RealCity.CustomAI;
+using ColossalFramework.Math;
+
+namespace RealCity.Patch
+{
+    [HarmonyPatch]
+    public class TouristAIStartMovingPatch
+    {
+        public static MethodBase TargetMethod()
+        {
+            return typeof(TouristAI).GetMethod("StartMoving", BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(uint), typeof(Citizen).MakeByRefType(), typeof(ushort), typeof(ushort) }, null);
+        }
+
+        public static void Prefix(uint citizenID, ref Citizen data, ref ushort sourceBuilding, ref ushort targetBuilding)
+        {
+            if (data.m_workBuilding != targetBuilding)
+            {
+                var building = Singleton<BuildingManager>.instance.m_buildings.m_buffer[targetBuilding];
+                if (building.Info.m_class.m_service == ItemClass.Service.Commercial)
+                {
+                    CitizenManager instance = Singleton<CitizenManager>.instance;
+                    ushort homeBuilding = instance.m_citizens.m_buffer[citizenID].m_homeBuilding;
+                    uint citizenUnit = CitizenData.GetCitizenUnit(homeBuilding);
+                    uint containingUnit = instance.m_citizens.m_buffer[citizenID].GetContainingUnit((uint)citizenID, citizenUnit, CitizenUnit.Flags.Home);
+
+                    Citizen.BehaviourData behaviour = default(Citizen.BehaviourData);
+                    int aliveVisitCount = 0;
+                    int totalVisitCount = 0;
+                    RealCityCommercialBuildingAI.GetVisitBehaviour((CommercialBuildingAI)(building.Info.m_buildingAI), targetBuilding, ref building, ref behaviour, ref aliveVisitCount, ref totalVisitCount);
+                    var amount = building.m_customBuffer2 / MainDataStore.maxGoodPurchase - totalVisitCount + aliveVisitCount;
+                    var CommercialBuildingAI = building.Info.m_buildingAI as CommercialBuildingAI;
+                    var maxCount = CommercialBuildingAI.CalculateVisitplaceCount((ItemClass.Level)building.m_level, new Randomizer(targetBuilding), building.m_width, building.m_length);
+                    if ((amount <= 0) || (maxCount <= totalVisitCount))
+                    {
+                        //Close CommercialBuilding
+                        //Reject citizen to building which lack of goods
+                        sourceBuilding = targetBuilding;
+                        building.m_flags &= ~Building.Flags.Active;
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/RealCity.sln b/RealCity.sln