Merge pull request #24 from IngoHHacks/MergedPRs

Merged PRs

Author: Windows10CE

API.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>API</AssemblyName>
     <Description>An API for inscryption</Description>
-    <Version>1.12.1.0</Version>
+    <Version>1.13.0.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>9.0</LangVersion>
+    <DebugType>full</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

API.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "API.csproj", "{DB27EC94-8D11-49F9-B2DB-F977B011F6CD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DB27EC94-8D11-49F9-B2DB-F977B011F6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB27EC94-8D11-49F9-B2DB-F977B011F6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB27EC94-8D11-49F9-B2DB-F977B011F6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB27EC94-8D11-49F9-B2DB-F977B011F6CD}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0414124C-4C03-4ED8-B606-E9EDE5608A85}
+	EndGlobalSection
+EndGlobal

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 1.13.0
+- Added support for custom card backgrounds, dialogs, encounters and talking cards
+- Fixes to abilities loading and stackable custom abilities
+
 ## v1.12.1
 - Bugfix so CustomCard doesn't wipe ability information.
 

Models/CustomCard.cs Models/Custom/CustomCard.csModels/CustomCard.cs renamed to Models/Custom/CustomCard.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using DiskCardGame;
 using UnityEngine;
 
@@ -94,15 +93,19 @@ public CustomCard(
 		public CardInfo AdjustCard(CardInfo card)
 		{
 			TypeMapper<CustomCard, CardInfo>.Convert(this, card);
-
+			Plugin.Log.LogDebug($"Finished TypeMapping for card [{card.name}]!");
+			
+			Plugin.Log.LogDebug($"Checking default tex is not null...");
 			if (this.tex is not null)
 			{
+				Plugin.Log.LogDebug($"Default tex is not null, setting fields...");
 				tex.name = "portrait_" + name;
 				tex.filterMode = FilterMode.Point;
 				card.portraitTex = Sprite.Create(tex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
 				card.portraitTex.name = "portrait_" + name;
 				if (this.emissionTex is not null)
 				{
+					Plugin.Log.LogDebug($"Emission tex is not null, setting fields...");
 					emissionTex.name = tex.name + "_emission";
 					emissionTex.filterMode = FilterMode.Point;
 					Sprite emissionSprite = Sprite.Create(emissionTex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
@@ -111,23 +114,38 @@ public CardInfo AdjustCard(CardInfo card)
 				}
 			}
 
+			Plugin.Log.LogDebug($"Checking AltTex is not null...");
 			if (this.altTex is not null)
 			{
+				Plugin.Log.LogDebug($"--> AltTex is not null, setting fields...");
 				altTex.name = "portrait_" + name;
 				altTex.filterMode = FilterMode.Point;
 				card.alternatePortrait = Sprite.Create(altTex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
 				card.alternatePortrait.name = "portrait_" + name;
 			}
 
+			Plugin.Log.LogDebug($"Checking pixelTex is not null...");
 			if (this.pixelTex is not null)
 			{
+				Plugin.Log.LogDebug($"PixelTex is not null, setting fields...");
 				pixelTex.name = "portrait_" + name;
 				pixelTex.filterMode = FilterMode.Point;
 				card.pixelPortrait =
 					Sprite.Create(pixelTex, CardUtils.DefaultCardPixelArtRect, CardUtils.DefaultVector2);
 				card.pixelPortrait.name = "portrait_" + name;
 			}
 
+			Plugin.Log.LogDebug($"Checking decals is not null...");
+			if (this.decals is not null)
+			{
+				foreach (var decal in this.decals)
+				{
+					decal.filterMode = FilterMode.Point;
+				}
+
+				card.decals = this.decals;
+			}
+
 			Plugin.Log.LogInfo($"Adjusted default card {name}!");
 			return card;
 		}

Models/Custom/CustomRegion.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using DiskCardGame;
+using UnityEngine;
+
+#pragma warning disable 169
+
+namespace APIPlugin
+{
+	public class CustomRegion
+	{
+		public static List<CustomRegion> regions = new List<CustomRegion>();
+
+		public string name;
+		public int? tier;
+		public List<CardInfo> terrainCards;
+		public List<ConsumableItemData> consumableItems;
+		public List<EncounterBlueprintData> encounters;
+		public List<Opponent.Type> bosses;
+		public List<CardInfo> likelyCards;
+		public List<Tribe> dominantTribes;
+		public PredefinedNodes predefinedNodes;
+		public EncounterBlueprintData bossPrepEncounter;
+		public StoryEventCondition bossPrepCondition;
+		public List<ScarceSceneryEntry> scarceScenery;
+		public List<FillerSceneryEntry> fillerScenery;
+		public PredefinedScenery predefinedScenery;
+		public string ambientLoopId;
+		public bool? silenceCabinAmbience;
+		public Color? boardLightColor;
+		public Color? cardsLightColor;
+		public bool? dustParticlesDisabled;
+		public bool? fogEnabled;
+		public VolumetricFogAndMist.VolumetricFogProfile fogProfile;
+		public float? fogAlpha;
+		public Texture mapAlbedo;
+		public Texture mapEmission;
+		public Color? mapEmissionColor;
+		public List<GameObject> mapParticlesPrefabs;
+
+		public CustomRegion(string name)
+		{
+			this.name = name;
+			CustomRegion.regions.Add(this);
+		}
+
+		public RegionData AdjustRegion(RegionData region)
+		{
+			TypeMapper<CustomRegion, RegionData>.Convert(this, region);
+			Plugin.Log.LogInfo($"Adjusted default region {name}!");
+			return region;
+		}
+
+	}
+}

Models/CustomRegion.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using DiskCardGame;
 
@@ -17,7 +18,13 @@ private AbilityIdentifier(string guid, string name)
 			ids.Add(this);
 		}
 
+		[Obsolete("Replaced by GetID")]
 		public static AbilityIdentifier GetAbilityIdentifier(string guid, string name)
+		{
+			return GetID(guid, name);
+		}
+
+		public static AbilityIdentifier GetID(string guid, string name)
 		{
 			return ids.Exists(x => x.guid == guid && x.name == name)
 				? ids.Find(x => x.guid == guid && x.name == name)

Models/AbilityIdentifier.cs Models/Identifiers/AbilityIdentifier.csModels/AbilityIdentifier.cs renamed to Models/Identifiers/AbilityIdentifier.cs

@@ -4,10 +4,11 @@ namespace APIPlugin
 {
 	public class EvolveIdentifier
 	{
-    private string name;
-    private int turnsToEvolve;
+		private string name;
+		private int turnsToEvolve;
 		private CardModificationInfo mods;
 		private EvolveParams evolution;
+
 		public EvolveParams Evolution
 		{
 			get
@@ -26,6 +27,7 @@ public EvolveParams Evolution
 						}
 					}
 				}
+
 				return this.evolution;
 			}
 		}
@@ -34,28 +36,28 @@ public EvolveIdentifier(string name, int turnsToEvolve, CardModificationInfo mod
 		{
 			this.name = name;
 			this.turnsToEvolve = turnsToEvolve;
-      this.mods = mods;
+			this.mods = mods;
 		}
 
 		private void SetParams(CardInfo card)
 		{
-			EvolveParams evolution = new EvolveParams();
+			EvolveParams _evolution = new EvolveParams();
 
-			evolution.turnsToEvolve = this.turnsToEvolve;
+			_evolution.turnsToEvolve = this.turnsToEvolve;
 
-			evolution.evolution = card;
+			_evolution.evolution = card;
 
 			if (this.mods != null)
 			{
-				evolution.evolution.mods.Add(this.mods);
+				_evolution.evolution.mods.Add(this.mods);
 			}
 
-			this.evolution = evolution;
+			this.evolution = _evolution;
 		}
 
 		public override string ToString()
 		{
 			return name;
 		}
 	}
-}
+}