Skip to content

Commit d3904cc

Browse files
committed
More changes and slight progress
1 parent d73b9c1 commit d3904cc

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

PawMapLoader/Res/Components/BuildingSetup.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Il2CppScoring;
55
using MelonLoader;
66
using UnityEngine;
7+
78
//TODO: Finish Quick Building Component
89

910
namespace PawMapLoader.Res.Components
@@ -27,7 +28,7 @@ void Awake()
2728

2829
damageable.MaxHealth = Health;
2930
damageable.Health = Health;
30-
31+
3132
Il2CppSystem.Collections.Generic.List<Damageable> cdamageables = new Il2CppSystem.Collections.Generic.List<Damageable>();
3233
foreach (GameObject section in Sections)
3334
{
@@ -42,7 +43,12 @@ void Awake()
4243

4344
building.Damageable = damageable;
4445
building.DamageEffectsPlayer = dmgeffectsplayer;
46+
47+
dmgtoscore.ValuePerHealth = 700f;
48+
dmgtoscore._damageable = damageable;
49+
dmgtoscore.Type = PlayerScore.ScoreType.Building;
4550

51+
playsoundondamage._damageable = damageable;
4652
}
4753
}
4854
}

PawMapLoader/Res/HarmonyPatches.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using MelonLoader;
88
using PawMapLoader.Res.Abstractions;
99
using UnityEngine;
10+
using UnityEngine.SceneManagement;
1011

1112
namespace PawMapLoader.Res
1213
{
@@ -16,19 +17,20 @@ public static class GameManager_StartGame_Patch
1617
[HarmonyPrefix]
1718
public static bool Prefix(GameManager __instance)
1819
{
20+
string scenename = ConfigManager.Instance.Level.Scene.SceneName;
1921
Store.IsMapCustom = false;
20-
if (ConfigManager.Instance.Level.Scene.SceneName == "AtroCity" || ConfigManager.Instance.Level.Scene.SceneName == "DownTown") return true;
22+
if (scenename == "AtroCity" || scenename == "DownTown") return true;
2123
try
2224
{
2325
Store.IsMapCustom = true;
24-
MelonLogger.Msg("Loading " + ConfigManager.Instance.Level.Scene.SceneName);
25-
var stream = FileManagement.OpenMapFile(ConfigManager.Instance.Level.Scene.SceneName);
26+
MelonLogger.Msg("Loading " + scenename);
27+
var stream = FileManagement.OpenMapFile(scenename);
2628
Store.LoadedAssetBundle = AssetBundle.LoadFromStream(stream);
27-
MelonLogger.Msg("Loaded " + ConfigManager.Instance.Level.Scene.SceneName);
29+
MelonLogger.Msg("Loaded " + scenename);
2830
stream.Close();
2931
stream.Dispose();
3032
}
31-
catch (System.Exception e)
33+
catch (Exception e)
3234
{
3335
MelonLogger.Error("Failed to load bundle " + e);
3436
}
@@ -68,7 +70,7 @@ public static void Prefix(BuildingsManager __instance)
6870
{
6971
if (AbUe.GetTypeAll<CityBlockGrid>()[0] == null)
7072
{
71-
foreach (var go in UnityEngine.SceneManagement.SceneManager
73+
foreach (var go in SceneManager
7274
.GetSceneByName(GameManager._instance.GameplaySceneName).GetRootGameObjects())
7375
{
7476
if (go.name == "SceneConfig")
@@ -97,6 +99,7 @@ public static bool Prefix(GroundDecalController __instance, bool __result)
9799
}
98100
return true;
99101
}
102+
100103
[HarmonyFinalizer]
101104
public static Exception Finalizer(Exception __exception, ref bool __result)
102105
{

0 commit comments

Comments
 (0)