Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cadaei committed Sep 22, 2019
2 parents 31222f5 + 1285c73 commit 36dac02
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
42 changes: 21 additions & 21 deletions ARKBreedingStats/json/values/values.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"format": "1.12",
"version": "298.3.4085838",
"version": "298.41.4205769",
"species": [
{
"name": "Rockwell",
Expand Down Expand Up @@ -2751,7 +2751,7 @@
"name": "Overseer",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndBoss_Character_Easy.EndBoss_Character_Easy",
"fullStatsRaw": [
[ 24000, 0.2, 0.2, 0.3, 0 ],
[ 63360, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -2790,7 +2790,7 @@
"name": "Overseer",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndBoss_Character_Hard.EndBoss_Character_Hard",
"fullStatsRaw": [
[ 24000, 0.2, 0.2, 0.3, 0 ],
[ 207360.015625, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -2829,7 +2829,7 @@
"name": "Overseer",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndBoss_Character_Medium.EndBoss_Character_Medium",
"fullStatsRaw": [
[ 24000, 0.2, 0.2, 0.3, 0 ],
[ 132480, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -2900,7 +2900,7 @@
"name": "Dragon (Gamma)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossDragon/EndBossDragon_Character_BP_Easy.EndBossDragon_Character_BP_Easy",
"fullStatsRaw": [
[ 240000, 0.2, 0.2, 0.3, 0 ],
[ 161280, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -2932,7 +2932,7 @@
"name": "Dragon (Alpha)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossDragon/EndBossDragon_Character_BP_Hard.EndBossDragon_Character_BP_Hard",
"fullStatsRaw": [
[ 240000, 0.2, 0.2, 0.3, 0 ],
[ 241920, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -2964,7 +2964,7 @@
"name": "Dragon (Beta)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossDragon/EndBossDragon_Character_BP_Medium.EndBossDragon_Character_BP_Medium",
"fullStatsRaw": [
[ 240000, 0.2, 0.2, 0.3, 0 ],
[ 186480, 0.2, 0.2, 0.3, 0 ],
[ 10000, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -3028,7 +3028,7 @@
"name": "Megapithecus (Gamma)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossGorilla/EndBossGorilla_Character_BP_Easy.EndBossGorilla_Character_BP_Easy",
"fullStatsRaw": [
[ 200000, 0.0, 0.0, 0.3, 0 ],
[ 92400, 0.0, 0.0, 0.3, 0 ],
[ 650, 0.0, 0.0, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.0, 0.0, 0, 0 ],
Expand Down Expand Up @@ -3060,7 +3060,7 @@
"name": "Megapithecus (Alpha)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossGorilla/EndBossGorilla_Character_BP_Hard.EndBossGorilla_Character_BP_Hard",
"fullStatsRaw": [
[ 200000, 0.0, 0.0, 0.3, 0 ],
[ 128800, 0.0, 0.0, 0.3, 0 ],
[ 650, 0.0, 0.0, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.0, 0.0, 0, 0 ],
Expand Down Expand Up @@ -3092,7 +3092,7 @@
"name": "Megapithecus (Beta)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossGorilla/EndBossGorilla_Character_BP_Medium.EndBossGorilla_Character_BP_Medium",
"fullStatsRaw": [
[ 200000, 0.0, 0.0, 0.3, 0 ],
[ 112000, 0.0, 0.0, 0.3, 0 ],
[ 650, 0.0, 0.0, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 2000, 0.0, 0.0, 0, 0 ],
Expand Down Expand Up @@ -3156,7 +3156,7 @@
"name": "Broodmother Lysrix (Gamma)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossSpider/EndBossSpiderL_Character_BP_Easy.EndBossSpiderL_Character_BP_Easy",
"fullStatsRaw": [
[ 324000, 0.2, 0.27, 0.5, 0 ],
[ 136080, 0.2, 0.27, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
[ 100000, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -3188,7 +3188,7 @@
"name": "Broodmother Lysrix (Alpha)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossSpider/EndBossSpiderL_Character_BP_Hard.EndBossSpiderL_Character_BP_Hard",
"fullStatsRaw": [
[ 324000, 0.2, 0.27, 0.5, 0 ],
[ 186480, 0.2, 0.27, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
[ 100000, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -3220,7 +3220,7 @@
"name": "Broodmother Lysrix (Beta)",
"blueprintPath": "/Game/EndGame/Dinos/Endboss/EndbossSpider/EndBossSpiderL_Character_BP_Medium.EndBossSpiderL_Character_BP_Medium",
"fullStatsRaw": [
[ 324000, 0.2, 0.27, 0.5, 0 ],
[ 151200, 0.2, 0.27, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
[ 100000, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -3922,7 +3922,7 @@
"name": "Enraged Triceratops",
"blueprintPath": "/Game/Extinction/Dinos/Corrupt/Trike/MegaTrike_Character_BP_Corrupt.MegaTrike_Character_BP_Corrupt",
"fullStatsRaw": [
[ 375, 0.2, 0.27, 0.5, 0 ],
[ 2500, 0.2, 0.27, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
[ 250, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -10808,7 +10808,7 @@
"name": "Alpha Carnotaurus",
"blueprintPath": "/Game/PrimalEarth/Dinos/Carno/MegaCarno_Character_BP.MegaCarno_Character_BP",
"fullStatsRaw": [
[ 420, 0.2, 0.27, 0.5, 0 ],
[ 6400, 0.2, 0.27, 0.5, 0 ],
[ 300, 0.1, 0.1, 0, 0 ],
[ 350, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand All @@ -10817,7 +10817,7 @@
null,
[ 300, 0.02, 0.04, 0, 0 ],
[ 1, 0.05, 0.1, 0.5, 0.4 ],
[ 1, 0, 0.0125, 0.085, 0 ],
[ 1, 0, 0.01, 0.085, 0 ],
null,
null
],
Expand Down Expand Up @@ -18699,7 +18699,7 @@
"name": "Alpha Megalodon",
"blueprintPath": "/Game/PrimalEarth/Dinos/Megalodon/MEgaMegalodon_Character_BP.MegaMegalodon_Character_BP",
"fullStatsRaw": [
[ 600, 0.2, 0.27, 0.3, 0 ],
[ 9600, 0.2, 0.27, 0.3, 0 ],
[ 320, 0.1, 0.1, 0, 0 ],
[ 800, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -20129,7 +20129,7 @@
"name": "Alpha Mosasaur",
"blueprintPath": "/Game/PrimalEarth/Dinos/Mosasaurus/Mosa_Character_BP_Mega.Mosa_Character_BP_Mega",
"fullStatsRaw": [
[ 3600, 0.12, 0.21, 0.3, 0 ],
[ 54000, 0.12, 0.21, 0.3, 0 ],
[ 400, 0.1, 0.1, 0, 0 ],
[ 3000, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -20224,7 +20224,7 @@
"name": "Alpha Mosasaur",
"blueprintPath": "/Game/PrimalEarth/Dinos/Mosasaurus/Mosa_Character_BP_Mega_Cave.Mosa_Character_BP_Mega_Cave",
"fullStatsRaw": [
[ 3600, 0.12, 0.21, 0.3, 0 ],
[ 54000, 0.12, 0.21, 0.3, 0 ],
[ 400, 0.1, 0.1, 0, 0 ],
[ 3000, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -24134,7 +24134,7 @@
"name": "Alpha Raptor",
"blueprintPath": "/Game/PrimalEarth/Dinos/Raptor/MegaRaptor_Character_BP.MegaRaptor_Character_BP",
"fullStatsRaw": [
[ 200, 0.2, 0.27, 0.5, 0 ],
[ 3600, 0.2, 0.27, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
[ 180, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down Expand Up @@ -24780,7 +24780,7 @@
"name": "Alpha T-Rex",
"blueprintPath": "/Game/PrimalEarth/Dinos/Rex/MegaRex_Character_BP.MegaRex_Character_BP",
"fullStatsRaw": [
[ 1100, 0.2, 0.27, 0.5, 0 ],
[ 17500, 0.2, 0.27, 0.5, 0 ],
[ 420, 0.1, 0.1, 0, 0 ],
[ 1550, 0.06, 0, 0.5, 0 ],
[ 150, 0.1, 0.1, 0, 0 ],
Expand Down
2 changes: 1 addition & 1 deletion ARKBreedingStats/raising/RaisingControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public void Tick()
{
var t = (IncubationTimerEntry)lvi.Tag;

Species species = t.mother.Species;
Species species = t.mother?.Species ?? t.father?.Species;
if (species?.breeding != null)
{
lvi.SubItems[3].Text = Utils.duration((int)(species.breeding.maturationTimeAdjusted / 10));
Expand Down

0 comments on commit 36dac02

Please sign in to comment.