Merge pull request #40 from Phreelosu/master

bunch of fixes, temporaryoverlay and language tokens
cheeeeeeeeeen · Sep 7, 2024 · 9a801fe · 9a801fe
2 parents 57cf888 + 97f0d9c
commit 9a801fe
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 132 deletions.
diff --git a/ChensGradiusMod/Artifacts/Machines/Machines.Setup.cs b/ChensGradiusMod/Artifacts/Machines/Machines.Setup.cs
@@ -1,4 +1,5 @@
 using Chen.Helpers.GeneralHelpers;
+using R2API;
 using RoR2;
 using System.Collections.Generic;
 using TILER2;
@@ -107,6 +108,13 @@ public override void SetupBehavior()
             AddEnemyDroneType(missileDroneMaster, missileDroneSpawnWeight);
             AddEnemyDroneType(turret1Master, gunnerTurretSpawnWeight);
             AddEnemyDroneType(tc280DroneMaster, tc280SpawnWeight);
+            AddLanguageTokens();
+        }
+
+        private void AddLanguageTokens()
+        {
+            LanguageAPI.Add("CHENSGRADIUSMOD_MACHINES_NAME_RENDERED", "Artifact of Machines");
+            LanguageAPI.Add("CHENSGRADIUSMOD_MACHINES_DESC_RENDERED", GetDescString());
         }
 
         private bool IsPrototypeCountUncapped(CharacterMaster master)
@@ -149,13 +157,23 @@ private void SummonDrone(CharacterBody ownerBody, GameObject droneMasterPrefab,
                     ModelLocator component = bodyObject.GetComponent<ModelLocator>();
                     if (component && component.modelTransform)
                     {
-                        TemporaryOverlay temporaryOverlay = component.modelTransform.gameObject.AddComponent<TemporaryOverlay>();
+                        var overlay = TemporaryOverlayManager.AddOverlay(component.modelTransform.gameObject);
+                        overlay.duration = 0.5f;
+                        overlay.alphaCurve = AnimationCurve.EaseInOut(0f, 1f, 1f, 0f);
+                        overlay.animateShaderAlpha = true;
+                        overlay.destroyComponentOnEnd = true;
+                        overlay.originalMaterial = summonDroneMaterial;
+                        overlay.AddToCharacterModel(component.modelTransform.GetComponent<RoR2.CharacterModel>());
+
+                        /*TemporaryOverlay temporaryOverlay = component.modelTransform.gameObject.AddComponent<TemporaryOverlay>();
                         temporaryOverlay.duration = 0.5f;
                         temporaryOverlay.animateShaderAlpha = true;
                         temporaryOverlay.alphaCurve = AnimationCurve.EaseInOut(0f, 1f, 1f, 0f);
                         temporaryOverlay.destroyComponentOnEnd = true;
                         temporaryOverlay.originalMaterial = summonDroneMaterial;
-                        temporaryOverlay.AddToCharacerModel(component.modelTransform.GetComponent<CharacterModel>());
+                        temporaryOverlay.AddToCharacerModel(component.modelTransform.GetComponent<CharacterModel>());*/
+
+                        //this above is outdated and caused NREs so I just used what modding discord suggested via TemporaryOverlayManager
                     }
                 }
                 RepositionGroundedDrones(characterMaster.GetBody(), ownerBody.transform.position);

diff --git a/ChensGradiusMod/ChensGradiusMod.csproj b/ChensGradiusMod/ChensGradiusMod.csproj
@@ -38,6 +38,12 @@
     <EmbeddedResource Include="chensgradiusmod_soundbank.bnk" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Artifacts\Machines\Machines.API.cs" />
+    <Compile Remove="Artifacts\Machines\Machines.Hooks.cs" />
+    <Compile Remove="Artifacts\Machines\Machines.Setup.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="DefaultDocumentation" Version="0.7.5">
       <PrivateAssets>all</PrivateAssets>
@@ -71,7 +77,7 @@
 
   <ItemGroup>
     <Reference Include="Aetherium">
-      <HintPath>lib\Aetherium.dll</HintPath>
+      <HintPath>..\..\..\aetherium\AetheriumMod-SotS\Aetherium\bin\Debug\netstandard2.1\Aetherium.dll</HintPath>
     </Reference>
     <Reference Include="ChensHelpers">
       <HintPath>lib\ChensHelpers.dll</HintPath>

diff --git a/ChensGradiusMod/Compatibility/Aetherium.cs b/ChensGradiusMod/Compatibility/Aetherium.cs
@@ -1,7 +1,8 @@
 using Aetherium;
-using Aetherium.Items;
 using RoR2;
-using static Aetherium.Items.EngineersToolbelt;
+using Aetherium.Items.Tier2;
+using Aetherium.Items.Tier3;
+using static Aetherium.Items.Tier2.EngineersToolbelt;
 using static Chen.GradiusMod.GradiusModPlugin;
 
 namespace Chen.GradiusMod.Compatibility

diff --git a/ChensGradiusMod/Drones/Drone.cs b/ChensGradiusMod/Drones/Drone.cs
@@ -1,5 +1,5 @@
 using BepInEx.Configuration;
-using Chen.GradiusMod.Artifacts.Machines;
+//using Chen.GradiusMod.Artifacts.Machines;
 using Chen.GradiusMod.Items.GradiusOption;
 using System;
 using UnityEngine;
@@ -173,7 +173,7 @@ protected virtual void SetupComponents()
         protected virtual void SetupBehavior()
         {
             if (canHaveOptions) GradiusOption.instance.SupportMinionType(name);
-            Machines.instance.AddEnemyDroneType(DroneCharacterMasterObject, spawnWeightWithMachinesArtifact);
+            //Machines.instance.AddEnemyDroneType(DroneCharacterMasterObject, spawnWeightWithMachinesArtifact);
             if (Compatibility.Aetherium.enabled)
             {
                 if (canBeInspired) Compatibility.Aetherium.AddInspiredCustomDrone(name);

diff --git a/ChensGradiusMod/Drones/DroneDeathState.cs b/ChensGradiusMod/Drones/DroneDeathState.cs
@@ -1,4 +1,4 @@
-using Chen.GradiusMod.Artifacts.Machines;
+//using Chen.GradiusMod.Artifacts.Machines;
 using RoR2;
 using UnityEngine;
 using VanillaDeathState = EntityStates.Drone.DeathState;
@@ -75,7 +75,7 @@ public override void OnEnter()
             forceAmount = originalState.forceAmount;
             hardCutoffDuration = maxFallDuration = bodyPreservationDuration = deathDuration = 12f;
             destroyOnImpact = true;
-            SpawnInteractable &= !Machines.instance.IsActiveAndEnabled();
+            //SpawnInteractable &= !Machines.instance.IsActiveAndEnabled();
             if (Compatibility.Aetherium.enabled) SpawnInteractable &= !Compatibility.Aetherium.RevivedByEngineersToolbelt(characterBody);
             base.OnEnter();
         }

diff --git a/ChensGradiusMod/Drones/PsyDrone/TwinsSpawn.cs b/ChensGradiusMod/Drones/PsyDrone/TwinsSpawn.cs
@@ -29,13 +29,21 @@ private void Awake()
                     ModelLocator component = bodyObject.GetComponent<ModelLocator>();
                     if (component && component.modelTransform)
                     {
-                        TemporaryOverlay temporaryOverlay = component.modelTransform.gameObject.AddComponent<TemporaryOverlay>();
+                        var overlay = TemporaryOverlayManager.AddOverlay(component.modelTransform.gameObject);
+                        overlay.duration = 0.5f;
+                        overlay.alphaCurve = AnimationCurve.EaseInOut(0f, 1f, 1f, 0f);
+                        overlay.animateShaderAlpha = true;
+                        overlay.destroyComponentOnEnd = true;
+                        overlay.originalMaterial = summonDroneMaterial;
+                        overlay.AddToCharacterModel(component.modelTransform.GetComponent<RoR2.CharacterModel>());
+
+                        /*TemporaryOverlay temporaryOverlay = component.modelTransform.gameObject.AddComponent<TemporaryOverlay>();
                         temporaryOverlay.duration = 0.5f;
                         temporaryOverlay.animateShaderAlpha = true;
                         temporaryOverlay.alphaCurve = AnimationCurve.EaseInOut(0f, 1f, 1f, 0f);
                         temporaryOverlay.destroyComponentOnEnd = true;
                         temporaryOverlay.originalMaterial = summonDroneMaterial;
-                        temporaryOverlay.AddToCharacerModel(component.modelTransform.GetComponent<CharacterModel>());
+                        temporaryOverlay.AddToCharacerModel(component.modelTransform.GetComponent<CharacterModel>());*/
                     }
                     body.GetOrAddComponent<TwinsDeath>().twin = bodyObject;
                     bodyObject.GetOrAddComponent<TwinsDeath>().twin = body.gameObject;

diff --git a/ChensGradiusMod/Items/GradiusOption/GradiusOption.Setup.cs b/ChensGradiusMod/Items/GradiusOption/GradiusOption.Setup.cs
@@ -1,5 +1,6 @@
 using Chen.GradiusMod.Items.GradiusOption.Components;
 using Chen.Helpers.GeneralHelpers;
+using R2API;
 using R2API.Networking;
 using RoR2;
 using System.Collections.Generic;
@@ -186,6 +187,7 @@ public override void SetupConfig()
         public override void SetupBehavior()
         {
             base.SetupBehavior();
+            AddLanguageTokens();
             InitializeAssets();
             RegisterNetworkMessages();
             //if (Compat_ItemStats.enabled)
@@ -202,6 +204,14 @@ public override void SetupBehavior()
             //}
         }
 
+        private void AddLanguageTokens()
+        {
+            LanguageAPI.Add("CHENSGRADIUSMOD_GRADIUSOPTION_NAME_RENDERED", "Gradius' Option");
+            LanguageAPI.Add("CHENSGRADIUSMOD_GRADIUSOPTION_PICKUP_RENDERED", GetPickupString());
+            LanguageAPI.Add("CHENSGRADIUSMOD_GRADIUSOPTION_DESC_RENDERED", GetDescString());
+            LanguageAPI.Add("CHENSGRADIUSMOD_GRADIUSOPTION_LORE_RENDERED", GetLoreString());
+        }
+
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 
         private void InitializeAssets()

diff --git a/ChensGradiusMod/Items/OptionSeed/OptionSeed.Setup.cs b/ChensGradiusMod/Items/OptionSeed/OptionSeed.Setup.cs
@@ -1,5 +1,6 @@
 using Chen.GradiusMod.Items.GradiusOption.Components;
 using Chen.GradiusMod.Items.OptionSeed.Components;
+using R2API;
 using RoR2;
 using System;
 using System.Collections.Generic;
@@ -136,6 +137,7 @@ public override void SetupConfig()
         public override void SetupBehavior()
         {
             base.SetupBehavior();
+            AddLanguageTokens();
             InitializeAssets();
             //if (Compat_ItemStats.enabled)
             //{
@@ -147,6 +149,14 @@ public override void SetupBehavior()
             //}
         }
 
+        private void AddLanguageTokens()
+        {
+            LanguageAPI.Add("CHENSGRADIUSMOD_OPTIONSEED_NAME_RENDERED", "Gradius' Option Seed");
+            LanguageAPI.Add("CHENSGRADIUSMOD_OPTIONSEED_PICKUP_RENDERED", GetPickupString());
+            LanguageAPI.Add("CHENSGRADIUSMOD_OPTIONSEED_DESC_RENDERED", GetDescString());
+            LanguageAPI.Add("CHENSGRADIUSMOD_OPTIONSEED_LORE_RENDERED", GetLoreString());
+        }
+
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 
         private void InitializeAssets()

diff --git a/ChensGradiusMod/lib/Aetherium.dll b/ChensGradiusMod/lib/Aetherium.dll
diff --git a/docs/06BKrroboYsdkfWNwbWj1A.md b/docs/06BKrroboYsdkfWNwbWj1A.md
diff --git a/docs/1LqF8kU18SL6Omn8Y+dMoA.md b/docs/1LqF8kU18SL6Omn8Y+dMoA.md
diff --git a/docs/ChensGradiusMod.xml b/docs/ChensGradiusMod.xml
diff --git a/docs/XJdp1Eubm6eDxnF6IddfZw.md b/docs/XJdp1Eubm6eDxnF6IddfZw.md
diff --git a/docs/ayrCd5wE1fGIQOox6GFHYA.md b/docs/ayrCd5wE1fGIQOox6GFHYA.md
diff --git a/docs/index.md b/docs/index.md
@@ -3,7 +3,6 @@
 | Namespaces | |
 | :--- | :--- |
 | [Chen.GradiusMod](neHTXX+yFsk1RpXqjkv9zg 'Chen.GradiusMod') |  |
-| [Chen.GradiusMod.Artifacts.Machines](ayrCd5wE1fGIQOox6GFHYA 'Chen.GradiusMod.Artifacts.Machines') |  |
 | [Chen.GradiusMod.Compatibility](F8aFQlqLO5uD9A4izEhK_Q 'Chen.GradiusMod.Compatibility') |  |
 | [Chen.GradiusMod.Drones](Y_iPobZkdIiJ9feSuBjDaQ 'Chen.GradiusMod.Drones') |  |
 | [Chen.GradiusMod.Items.GradiusOption](mfb9nYomeqOwYy2EkL_v0Q 'Chen.GradiusMod.Items.GradiusOption') |  |

diff --git a/docs/rBlf05VZ6caiITwwVUBbzA.md b/docs/rBlf05VZ6caiITwwVUBbzA.md
diff --git a/docs/ujVsLUGxMgrFCppqzzg4zQ.md b/docs/ujVsLUGxMgrFCppqzzg4zQ.md