Merge branch 'PiTi2k5-master'

Crumplecorn · Sep 24, 2021 · 4fe4854 · 4fe4854
2 parents d96566b + 57add14
commit 4fe4854
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 13 deletions.
diff --git a/breeding.html b/breeding.html
@@ -4,7 +4,7 @@
 <form>
 	<h3>Crumplecorn's ARK Breeding Calculator</h3>
 	<p class="subheading">Hover over labels for tooltips<br>
-	Updated to v326.6 <a href="https://a-calc.de">by a-calc.de</a></p>
+	Updated to v678.20 <a href="https://a-calc.de">by a-calc.de</a></p>
 
 	<div class="tableheader slide" ng-class="{'dimmed': !tablevisibility['Creature']}" ng-click="showhidetable('Creature')">Creature Details</div>
 	<div class="tableslide" ng-show="tablevisibility['Creature']">

diff --git a/controller.js b/controller.js
@@ -120,6 +120,14 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			waste: 0
 		},
 
+		'Mutagen': {
+			food: 1000,
+			stack: 1,
+			spoil: 10*60*3,
+			weight: 0.1,
+			waste: 0
+		},
+
 		'Primal Crystal': {
 			food: 350,
 			stack: 1,
@@ -268,6 +276,14 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			waste: 0
 		},
 
+		'Mutagen': {
+			food: 1000,
+			stack: 1,
+			spoil: 10*60*3,
+			weight: 0.1,
+			waste: 0
+		},
+
 		'Primal Crystal': {
 			food: 350,
 			stack: 1,
@@ -315,15 +331,16 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 		Carrion_: ['Spoiled Meat', 'Raw Meat (Carrion)'],
 		Piscivore: ['Raw Fish Meat', 'Cooked Fish Meat'],
 		Wyvern: ['Wyvern Milk'],
+		Voidwyrm: ['Mutagen'],
 		CrystalWyvern: ['Primal Crystal'],
 		Magmasaur: ['Ambergris'],
 		RockDrake: ['Nameless Venom'],
 		BloodStalker: ['Blood Pack', 'Raw Meat (Carrion)', 'Raw Fish Meat (Carrion)']
 	}
 
-	$scope.foodlist=['Raw Meat', 'Cooked Meat', 'Raw Fish Meat', 'Raw Fish Meat (Carrion)', 'Cooked Fish Meat', 'Mejoberry', 'Berry', 'Vegetables', 'Kibble', 'Rare Flower', 'Chitin', 'Spoiled Meat', 'Wyvern Milk', 'Primal Crystal', 'Ambergris', 'Nameless Venom', 'Raw Meat (Carrion)', 'Blood Pack'] //Display order
+	$scope.foodlist=['Raw Meat', 'Cooked Meat', 'Raw Fish Meat', 'Raw Fish Meat (Carrion)', 'Cooked Fish Meat', 'Mejoberry', 'Berry', 'Vegetables', 'Kibble', 'Rare Flower', 'Chitin', 'Spoiled Meat', 'Wyvern Milk', 'Mutagen', 'Primal Crystal', 'Ambergris', 'Nameless Venom', 'Raw Meat (Carrion)', 'Blood Pack'] //Display order
 
-	$scope.foodorder=['Raw Fish Meat', 'Raw Fish Meat (Carrion)', 'Cooked Fish Meat', 'Raw Meat', 'Berry', 'Cooked Meat', 'Mejoberry', 'Vegetables', 'Kibble', 'Rare Flower', 'Chitin', 'Spoiled Meat', 'Wyvern Milk', 'Primal Crystal', 'Ambergris', 'Nameless Venom', 'Raw Meat (Carrion)', 'Blood Pack'] //In-game order
+	$scope.foodorder=['Raw Fish Meat', 'Raw Fish Meat (Carrion)', 'Cooked Fish Meat', 'Raw Meat', 'Berry', 'Cooked Meat', 'Mejoberry', 'Vegetables', 'Kibble', 'Rare Flower', 'Chitin', 'Spoiled Meat', 'Wyvern Milk', 'Mutagen', 'Primal Crystal', 'Ambergris', 'Nameless Venom', 'Raw Meat (Carrion)', 'Blood Pack'] //In-game order
 
 	$scope.troughtypes={
 		Normal: 4,
@@ -391,7 +408,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 250
 		},
 
-		Araneo: { // NEW
+		Araneo: { //
 			birthtype: "Incubation",
 			type: "Carrion",
 			basefoodrate: 0.001736,
@@ -430,7 +447,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 400.0
 		},
 
-		Arthropluera: { // NEW
+		Arthropluera: { //
 			birthtype: "Incubation",
 			type: "Carrion",
 			basefoodrate: 0.001543,
@@ -442,6 +459,19 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			eggspeedmult: 2.0,
 			weight: 100.0
 		},
+
+		Astrodelphis: { // NEW
+			birthtype: "Gestation",
+			type: "Carnivore",
+			basefoodrate: 0.001543,
+			babyfoodrate: 25.5,
+			extrababyfoodrate: 20.0,
+			agespeed: 0.000003,
+			agespeedmult: 1.7,
+			gestationspeed: 0.000035,
+			gestationspeedmult: 1.0,
+			weight: 280
+		},
 
 		Baryonyx: { //
 			birthtype: "Incubation",
@@ -853,7 +883,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 3000.0
 		},
 
-		Giganotosaurus: { // NEW
+		Giganotosaurus: { //
 			birthtype: "Incubation",
 			type: "Carnivore",
 			basefoodrate: 0.002314,
@@ -957,7 +987,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 375.0
 		},
 
-		Jerboa: { // NEW
+		Jerboa: { //
 			birthtype: "Gestation",
 			type: "Herbivore",
 			basefoodrate: 0.000868,
@@ -1009,7 +1039,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 500.0
 		},
 
-		Lymantria: { // NEW
+		Lymantria: { //
 			birthtype: "Incubation",
 			type: "Herbivore",
 			basefoodrate: 0.001852,
@@ -1035,6 +1065,19 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 90.0
 		},
 
+		Maewing: { // NEW
+			birthtype: "Incubation",
+			type: "Carnivore",
+			basefoodrate: 0.010000,
+			babyfoodrate: 25.5,
+			extrababyfoodrate: 20.0,
+			agespeed: 0.000003,
+			agespeedmult: 2.0,
+			eggspeed: 0.005556,
+			eggspeedmult: 3.5,
+			weight: 400.0
+		},
+
 		Magmasaur: { //Food Check - Ambergris 500 Food Value - need more Tests!?
 			birthtype: "Incubation",
 			type: "Magmasaur",
@@ -1087,7 +1130,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 200.0
 		},
 
-		Mantis: { // NEW
+		Mantis: { //
 			birthtype: "Incubation",
 			type: "Carrion_",
 			basefoodrate: 0.002314,
@@ -1243,7 +1286,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 200.0
 		},
 
-		Onyc: { // NEW
+		Onyc: { //
 			birthtype: "Gestation",
 			type: "Carnivore",
 			basefoodrate: 0.002893,
@@ -1425,7 +1468,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 120.0
 		},
 
-		Pulmonoscorpius: { // NEW
+		Pulmonoscorpius: { //
 			birthtype: "Incubation",
 			type: "Carrion_",
 			basefoodrate: 0.001929,
@@ -1554,7 +1597,7 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			eggspeedmult: 2.0,
 			weight: 300.0
 		},
-
+		
 		Shinehorn: { //
 			birthtype: "Gestation",
 			type: "Herbivore",
@@ -1568,6 +1611,19 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			weight: 100.0
 		},
 
+		Shadowmane: { // NEW
+			birthtype: "Gestation",
+			type: "Carnivore",
+			basefoodrate: 0.001157,
+			babyfoodrate: 25.5,
+			extrababyfoodrate: 20.0,
+			agespeed: 0.000003,
+			agespeedmult: 1.9,
+			gestationspeed: 0.000061,
+			gestationspeedmult: 1.9,
+			weight: 425.0
+		},
+
 		"Snow Owl": { //
 			birthtype: "Incubation",
 			type: "Carnivore",
@@ -1749,6 +1805,19 @@ var breedingController=angular.module('breedingControllers', []).controller('bre
 			eggspeedmult: 3.7,
 			weight: 50
 		},
+
+		Voidwyrm: { //NEW Food Check - Mutagen 1000 Food Value - need more Tests!?
+			birthtype: "Incubation",
+			type: "Voidwyrm",
+			basefoodrate: 0.000185,
+			babyfoodrate: 13.0,
+			extrababyfoodrate: 3.0,
+			agespeed: 0.000003,
+			agespeedmult: 1.0,
+			eggspeed: 0.005556,
+			eggspeedmult: 1.0,
+			weight: 400.0
+		},
 
 		"Woolly Rhino": { //
 			birthtype: "Gestation",

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=0.8, user-scalable=no">
 	<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
 	<title>ARK Breeding Calculator</title>
-	<link rel="stylesheet" type="text/css" href="breeding.css?d=20210412">
+	<link rel="stylesheet" type="text/css" href="breeding.css?d=20210913">
 	<link rel="stylesheet" type="text/css" href="jquery-ui.structure.css">
 	<script src="jquery-1.12.0.min.js"></script>
 	<script src="jquery-ui.min.js"></script>