Merge branch 'dev'

cadon · Nov 13, 2022 · 18c2615 · 18c2615
2 parents d7e43e3 + 3b990c2
commit 18c2615
Show file tree

Hide file tree

Showing 10 changed files with 347 additions and 41 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -628,6 +628,7 @@
     <Compile Include="miscClasses\ValueMinMax.cs" />
     <Compile Include="utils\ArkWiki.cs" />
     <Compile Include="utils\ColorModeColors.cs" />
+    <Compile Include="utils\Convert32.cs" />
     <Compile Include="utils\Debouncer.cs" />
     <Compile Include="utils\ExportFolderLocation.cs" />
     <Compile Include="utils\ExtensionMethods.cs" />

diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -2918,6 +2918,7 @@ private void CreatureInfoInput_CreatureDataRequested(CreatureInfoInput input, bo
             {
                 CreatureCollection.ColorExisting[] colorAlreadyExistingInformation = null;
                 if (Properties.Settings.Default.NamingPatterns != null
+                    && !string.IsNullOrEmpty(Properties.Settings.Default.NamingPatterns[namingPatternIndex])
                     && Properties.Settings.Default.NamingPatterns[namingPatternIndex].IndexOf("#colorNew:", StringComparison.InvariantCultureIgnoreCase) != -1)
                     colorAlreadyExistingInformation = _creatureCollection.ColorAlreadyAvailable(cr.Species, input.RegionColors, out _);
                 input.ColorAlreadyExistingInformation = colorAlreadyExistingInformation;

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.50.5.0")]
+[assembly: AssemblyFileVersion("0.50.6.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json
@@ -4,7 +4,7 @@
     "ARK Smart Breeding": {
       "Id": "ARK Smart Breeding",
       "Category": "main",
-      "version": "0.50.5.0"
+      "version": "0.50.6.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",
@@ -16,7 +16,7 @@
       "LocalPath": "images/speciesImages",
       "IsFolder": true,
       "Selectable": true,
-      "version": "2022.07.04"
+      "version": "2022.11.13"
     },
     "NamePatternTemplates": {
       "Id": "NamePatternTemplates",

diff --git a/ARKBreedingStats/_manifest.tt b/ARKBreedingStats/_manifest.tt
@@ -27,7 +27,7 @@ string appVersion = Regex.Match(File.ReadAllText(Host.ResolvePath("Properties/As
       "LocalPath": "images/speciesImages",
       "IsFolder": true,
       "Selectable": true,
-      "version": "2022.07.04"
+      "version": "2022.11.13"
     },
     "NamePatternTemplates": {
       "Id": "NamePatternTemplates",

diff --git a/ARKBreedingStats/json/values/_manifest.json b/ARKBreedingStats/json/values/_manifest.json
@@ -6,7 +6,7 @@
 			"mod": { "id": "1083349027", "tag": "SpeedyFlyers", "title": "Najs Speedy Flyers" }
 		},
 		"1090809604-Pyria.json": {
-			"version": "350.5.1665173924",
+			"version": "351.6.1667005010",
 			"mod": { "id": "1090809604", "tag": "Pyria", "title": "Pyria: Mythos Evolved" }
 		},
 		"1092784125-Gryphons.json": {
@@ -35,7 +35,7 @@
 			"mod": { "id": "1139775728", "tag": "Confuciusornis", "title": "Confuciusornis" }
 		},
 		"1169020368-Trex.json": {
-			"version": "349.27.1663957342",
+			"version": "352.6.1667855320",
 			"mod": { "id": "1169020368", "tag": "Trex", "title": "Ark Creature Rebalance (AG Reborn)" }
 		},
 		"1178308359-ShadDragon.json": {
@@ -72,7 +72,7 @@
 			"mod": { "id": "1356703358", "tag": "Primal_Fear_Noxious_Creatures", "title": "Primal Fear Noxious Creatures" }
 		},
 		"1373744537-AC2.json": {
-			"version": "348.7.1660069796",
+			"version": "353.1.1668296598",
 			"mod": { "id": "1373744537", "tag": "AC2", "title": "Additional Creatures 2: Wild Ark" }
 		},
 		"1405944717-Project_Evolution.json": {
@@ -100,15 +100,15 @@
 			"mod": { "id": "1522327484", "tag": "Additions_Pack", "title": "ARK Additions!" }
 		},
 		"1523045986-Paranoia.json": {
-			"version": "349.27.1664841143",
+			"version": "351.5.1666238000",
 			"mod": { "id": "1523045986", "tag": "Paranoia", "title": "Additional Creatures 2: Paranoia!" }
 		},
 		"1565015734-BetterDinosTest.json": {
 			"version": "348.7.1659637030",
 			"mod": { "id": "1565015734", "tag": "BetterDinosTest", "title": "Better Dinos" }
 		},
 		"1576299694-ElementalDinos.json": {
-			"version": "349.27.1664277537",
+			"version": "352.6.1667827331",
 			"mod": { "id": "1576299694", "tag": "ElementalDinos", "title": "Elemental Ark" }
 		},
 		"1587391872-FasterFlyers.json": {
@@ -129,7 +129,7 @@
 			"mod": { "id": "1633860796", "tag": "DE_Breedable_RockDrakes", "title": "Dark Edges Breedable Rock Drakes" }
 		},
 		"1652120435-AtlasPort.json": {
-			"version": "347.1.1657088085",
+			"version": "353.1.1668127679",
 			"mod": { "id": "1652120435", "tag": "AtlasPort", "title": "Shad's Atlas Imports" }
 		},
 		"1654255131-AtlasImports.json": {
@@ -141,7 +141,7 @@
 			"mod": { "id": "1662691167", "tag": "Senior", "title": "Additional Creatures: Senior Class" }
 		},
 		"1675895024-NoUntameables.json": {
-			"version": "349.27.1664641331",
+			"version": "353.1.1668065900",
 			"mod": { "id": "1675895024", "tag": "NoUntameables", "title": "No Untameables" }
 		},
 		"1676159020-Aquaria.json": {
@@ -166,7 +166,7 @@
 			"mod": { "id": "1729512589", "tag": "Brachiosaurus", "title": "ARK Additions: Brachiosaurus!" }
 		},
 		"1734595558-Pyria2.json": {
-			"version": "346.16.1653902498",
+			"version": "352.6.1667780578",
 			"mod": { "id": "1734595558", "tag": "Pyria2", "title": "Pyria: The Second Chapter" }
 		},
 		"1768499278-BalancedJPE.json": {
@@ -235,7 +235,7 @@
 			"mod": { "id": "2000326197", "tag": "ExtraResources", "title": "Event Assets" }
 		},
 		"2003934830-Beasts.json": {
-			"version": "348.10.1660762304",
+			"version": "351.6.1667098123",
 			"mod": { "id": "2003934830", "tag": "Beasts", "title": "Prehistoric Beasts" }
 		},
 		"2019846325-ApexMod.json": {
@@ -263,9 +263,13 @@
 			"mod": { "id": "2135314513", "tag": "CI_Dinos", "title": "Crystal Isles Dino Addition" }
 		},
 		"2447186973-ArkOmega.json": {
-			"version": "350.5.1665202463",
+			"version": "351.6.1667016777",
 			"mod": { "id": "2447186973", "tag": "ArkOmega", "title": "Ark Omega" }
 		},
+		"2869411055-SDinoVariants.json": {
+			"version": "351.6.1666358758",
+			"mod": { "id": "2869411055", "tag": "SDinoVariants", "title": "SDinoVariants" }
+		},
 		"729352919-IndomRex.json": {
 			"version": "340.3.1488771984",
 			"mod": { "id": "729352919", "tag": "IndomRex", "title": "Indom Rex Nemesis" }
@@ -313,7 +317,7 @@
 			}
 		},
 		"values.json": {
-			"version": "346.16.8991126"
+			"version": "352.6.9875140"
 		}
 	}
 }
diff --git a/ARKBreedingStats/json/values/values.json b/ARKBreedingStats/json/values/values.json
@@ -1,5 +1,5 @@
 {
-	"version": "346.16.8991126",
+	"version": "352.6.9875140",
 	"format": "1.14-flyerspeed",
 	"species": [
 		{
@@ -1113,7 +1113,7 @@
 					]
 				},
 				null,
-				null,
+				{ "name": "Lantern" },
 				{
 					"name": "Belly",
 					"colors": [
@@ -7052,7 +7052,7 @@
 			"variants": [ "Fjordur" ],
 			"isFlyer": true,
 			"fullStatsRaw": [
-				[ 150, 0.2, 0.27, 0.5, 0 ],
+				[ 125, 0.167, 0.22545, 0.5, 0 ],
 				[ 150, 0.1, 0.1, 0, 0 ],
 				[ 120, 0.06, 0, 0.5, 0 ],
 				[ 150, 0.1, 0.1, 0, 0 ],
@@ -44468,7 +44468,7 @@
 					]
 				},
 				{
-					"name": "Membrane accents",
+					"name": "Belly",
 					"colors": [
 						"BigFoot0",
 						"BigFoot4",
@@ -44546,7 +44546,7 @@
 					]
 				},
 				{
-					"name": "Belly",
+					"name": "Membrane accents",
 					"colors": [
 						"BigFoot0",
 						"BigFoot4",
@@ -89318,6 +89318,177 @@
 			"TamedBaseHealthMultiplier": 0.96,
 			"displayedStats": 919
 		},
+		{
+			"name": "Carcharodontosaurus",
+			"blueprintPath": "/Game/PrimalEarth/Dinos/Carcharodontosaurus/Carcha_Character_BP.Carcha_Character_BP",
+			"fullStatsRaw": [
+				[ 70000, 0.0008, 0.004, -54000, 0 ],
+				[ 480, 0.006, 0.025, 0, 0 ],
+				[ 6000, 0.06, 0, 0, 0 ],
+				[ 150, 0.0025, 0.025, 0, 0 ],
+				[ 4000, 0.0025, 0.025, 0, 0 ],
+				null,
+				null,
+				[ 650, 0.02, 0.01, 0, 0 ],
+				[ 1, 0.05, 0.05, -0.8, 0 ],
+				[ 1, 0, 0.0031, 0, 0 ],
+				null,
+				null
+			],
+			"immobilizedBy": [ "Large Bear Trap" ],
+			"breeding": {
+				"gestationTime": 0,
+				"incubationTime": 179985.601,
+				"eggTempMin": 37,
+				"eggTempMax": 39,
+				"maturationTime": 878348.704,
+				"matingCooldownMin": 64800,
+				"matingCooldownMax": 172800
+			},
+			"colors": [
+				{
+					"name": "Body Main",
+					"colors": [
+						"BigFoot0",
+						"Black",
+						"BlackSands",
+						"BurntSienna",
+						"Cammo",
+						"Dark Grey",
+						"DarkCement",
+						"DarkWarmGray",
+						"Dino Dark Brown",
+						"Dino Dark Orange",
+						"Dino Dark Red",
+						"Dino Dark Yellow",
+						"Dino Darker Grey",
+						"Dino Light Brown",
+						"Dino Light Yellow",
+						"Dino Medium Brown",
+						"DragonBase0",
+						"DragonGreen0",
+						"DragonGreen1",
+						"DryMoss",
+						"GreenSlate",
+						"Light Grey",
+						"LightAutumn",
+						"LightWarmGray",
+						"MediumWarmGray",
+						"Mustard",
+						"NearBlack"
+					]
+				},
+				null,
+				{
+					"name": "Spikes",
+					"colors": [
+						"BlackSands",
+						"BurntSienna",
+						"DarkBlue",
+						"DarkCement",
+						"DarkWarmGray",
+						"DarkWolfFur",
+						"Dino Dark Brown",
+						"Dino Darker Grey",
+						"Dino Medium Brown",
+						"MediumWarmGray",
+						"NearBlack",
+						"Sage"
+					]
+				},
+				{
+					"name": "Spike Webbing",
+					"colors": [
+						"BigFoot0",
+						"BigFoot4",
+						"BigFoot5",
+						"Coral",
+						"Cream",
+						"Dino Dark Orange",
+						"Dino Light Blue",
+						"Dino Light Green",
+						"Dino Light Orange",
+						"Dino Light Purple",
+						"Dino Light Yellow",
+						"DragonBase0",
+						"DragonBase1",
+						"DragonFire",
+						"DragonGreen1",
+						"DragonGreen3",
+						"LightAutumn",
+						"MediumAutumn",
+						"WolfFur",
+						"WyvernBlue0",
+						"WyvernPurple1"
+					]
+				},
+				{
+					"name": "Body Underbelly",
+					"colors": [
+						"BigFoot0",
+						"BigFoot4",
+						"BigFoot5",
+						"Coral",
+						"Cream",
+						"Dino Dark Orange",
+						"Dino Light Blue",
+						"Dino Light Green",
+						"Dino Light Orange",
+						"Dino Light Purple",
+						"Dino Light Yellow",
+						"DragonBase0",
+						"DragonBase1",
+						"DragonFire",
+						"DragonGreen1",
+						"DragonGreen3",
+						"LightAutumn",
+						"MediumAutumn",
+						"WolfFur",
+						"WyvernBlue0",
+						"WyvernPurple1"
+					]
+				},
+				{
+					"name": "Spots and Stripes",
+					"colors": [
+						"BigFoot0",
+						"BigFoot4",
+						"BigFoot5",
+						"Coral",
+						"Cream",
+						"Dino Dark Orange",
+						"Dino Light Blue",
+						"Dino Light Green",
+						"Dino Light Orange",
+						"Dino Light Purple",
+						"Dino Light Yellow",
+						"DragonBase0",
+						"DragonBase1",
+						"DragonFire",
+						"DragonGreen1",
+						"DragonGreen3",
+						"LightAutumn",
+						"MediumAutumn",
+						"WolfFur",
+						"WyvernBlue0",
+						"WyvernPurple1"
+					]
+				}
+			],
+			"taming": {
+				"nonViolent": false,
+				"violent": true,
+				"tamingIneffectiveness": 0,
+				"affinityNeeded0": 9000,
+				"affinityIncreasePL": 240,
+				"torporDepletionPS0": 0.5,
+				"foodConsumptionBase": 0.002314,
+				"foodConsumptionMult": 150.0634,
+				"babyFoodConsumptionMult": 700
+			},
+			"TamedBaseHealthMultiplier": 1,
+			"displayedStats": 927
+		},
 		{
 			"name": "Skeletal Carnotaurus",
 			"blueprintPath": "/Game/PrimalEarth/Dinos/Carno/Bone_MegaCarno_Character_BP.Bone_MegaCarno_Character_BP",
@@ -104214,7 +104385,7 @@
 				},
 				null,
 				{
-					"name": "Body",
+					"name": "Body and Feathers",
 					"colors": [
 						"Black",
 						"Dark Grey",
@@ -104234,7 +104405,7 @@
 					]
 				},
 				{
-					"name": "Feathers",
+					"name": "Spine",
 					"colors": [
 						"Dino Light Blue",
 						"Dino Light Green",