Skip to content

Commit 0869ab0

Browse files
TrimpsTrimps
committed
5.2.1
1 parent e0f7a03 commit 0869ab0

7 files changed

+36
-22
lines changed

‎ScreenReader.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.2.0 (Screen Reader version)</title>
6+
<title>Trimps 5.2.1 (Screen Reader version)</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Brownprobe">
99
<link rel="stylesheet" href="css/bootstrap.css">
1010
<link rel="stylesheet" href="fonts/icomoon/style.css">
1111
<link rel="icon" href="favicon.ico" type="image/x-icon">
12-
<link rel="stylesheet" type="text/css" href="css/style.css?21" />
12+
<link rel="stylesheet" type="text/css" href="css/style.css?22" />
1313
<script>
1414
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
1515
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -1488,10 +1488,10 @@ <h6>Game Overview</h6>
14881488
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
14891489
<script type="text/javascript" src="lz-string.js"></script>
14901490
<script type="text/javascript" src="decimal.min.js"></script>
1491-
<script type="text/javascript" src="config.js?30"></script>
1492-
<script type="text/javascript" src="updates.js?30"></script>
1493-
<script type="text/javascript" src="playerSpire.js?30"></script>
1494-
<script type="text/javascript" src="main.js?30"></script>
1491+
<script type="text/javascript" src="config.js?31"></script>
1492+
<script type="text/javascript" src="updates.js?31"></script>
1493+
<script type="text/javascript" src="playerSpire.js?31"></script>
1494+
<script type="text/javascript" src="main.js?31"></script>
14951495

14961496
</body>
14971497

‎config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function newGame () {
2222
var toReturn = {
2323
global: {
2424
//New and accurate version
25-
stringVersion: '5.2.0',
25+
stringVersion: '5.2.1',
2626
//Leave 'version' at 4.914 forever, for compatability with old saves
2727
version: 4.914,
2828
isBeta: false,

‎index.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.2.0</title>
6+
<title>Trimps 5.2.1</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Brownprobe">
99
<link rel="stylesheet" href="css/bootstrap.css">
1010
<link rel="stylesheet" href="fonts/icomoon/style.css">
1111
<link rel="icon" href="favicon.ico" type="image/x-icon">
12-
<link rel="stylesheet" type="text/css" href="css/style.css?21" />
12+
<link rel="stylesheet" type="text/css" href="css/style.css?22" />
1313
<!-- <script>
1414
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
1515
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -1380,10 +1380,10 @@
13801380
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
13811381
<script type="text/javascript" src="lz-string.js"></script>
13821382
<script type="text/javascript" src="decimal.min.js"></script>
1383-
<script type="text/javascript" src="config.js?30"></script>
1384-
<script type="text/javascript" src="updates.js?30"></script>
1385-
<script type="text/javascript" src="playerSpire.js?30"></script>
1386-
<script type="text/javascript" src="main.js?30"></script>
1383+
<script type="text/javascript" src="config.js?31"></script>
1384+
<script type="text/javascript" src="updates.js?31"></script>
1385+
<script type="text/javascript" src="playerSpire.js?31"></script>
1386+
<script type="text/javascript" src="main.js?31"></script>
13871387

13881388
</body>
13891389

‎indexKong.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.2.0 (Kongregate Version)</title>
6+
<title>Trimps 5.2.1 (Kongregate Version)</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Brownprobe">
99
<link rel="stylesheet" href="css/bootstrap.css">
1010
<link rel="stylesheet" href="fonts/icomoon/style.css">
11-
<link rel="stylesheet" type="text/css" href="css/style.css?21" />
11+
<link rel="stylesheet" type="text/css" href="css/style.css?22" />
1212
<script>
1313
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
1414
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -1483,10 +1483,10 @@
14831483
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
14841484
<script type="text/javascript" src="lz-string.js"></script>
14851485
<script type="text/javascript" src="decimal.min.js"></script>
1486-
<script type="text/javascript" src="config.js?30"></script>
1487-
<script type="text/javascript" src="updates.js?30"></script>
1488-
<script type="text/javascript" src="playerSpire.js?30"></script>
1489-
<script type="text/javascript" src="main.js?30"></script>
1486+
<script type="text/javascript" src="config.js?31"></script>
1487+
<script type="text/javascript" src="updates.js?31"></script>
1488+
<script type="text/javascript" src="playerSpire.js?31"></script>
1489+
<script type="text/javascript" src="main.js?31"></script>
14901490
<script type="text/javascript">
14911491
document.body.addEventListener('DOMMouseScroll', onWheel, true);
14921492
document.body.addEventListener('mousewheel', onWheel, true);

‎main.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -6264,13 +6264,13 @@ function getHeirloomRecycleValue(heirloom){
62646264
var baseValue;
62656265
if (game.heirlooms.recycleOverride[heirloom.rarity] != -1) baseValue = game.heirlooms.recycleOverride[heirloom.rarity];
62666266
else baseValue = (getHeirloomBaseValue(heirloom) / 2);
6267+
if (heirloom.nuMod) baseValue *= heirloom.nuMod;
62676268
return baseValue;
62686269
}
62696270

62706271
function getHeirloomBaseValue(heirloom){
62716272
if (heirloom.type == "Core") return game.heirlooms.coreValues(heirloom.rarity);
62726273
var amt = game.heirlooms.values[heirloom.rarity];
6273-
if (heirloom.nuMod) amt *= heirloom.nuMod;
62746274
return amt;
62756275
}
62766276

@@ -6933,6 +6933,7 @@ function rewardToken(empowerment, countOnly, atZone){
69336933
// }
69346934
var world = (countOnly) ? atZone : game.global.world;
69356935
var tokens = Math.floor((world - 241) / 15) + 1;
6936+
var unbuffedTokens = tokens;
69366937
if (game.global.challengeActive == "Daily"){
69376938
tokens *= (1 + (getDailyHeliumValue(countDailyWeight()) / 100));
69386939
}
@@ -6942,7 +6943,7 @@ function rewardToken(empowerment, countOnly, atZone){
69426943
message("You found " + prettify(tokens) + " Token" + ((tokens == 1) ? "" : "s") + " of " + empowerment + "!", "Loot", "*medal2", "empoweredCell" + empowerment, 'token');
69436944
if (game.global.buyTab == "nature")
69446945
updateNatureInfoSpans();
6945-
game.stats.bestTokens.value += tokens;
6946+
game.stats.bestTokens.value += unbuffedTokens;
69466947
return tokens;
69476948
}
69486949

@@ -12746,6 +12747,7 @@ function everythingInArrayGreaterEqual(smaller, bigger){
1274612747
return true;
1274712748
}
1274812749

12750+
var rewardingTimeoutHeirlooms = false;
1274912751
var redCritCounter = 0;
1275012752
function fight(makeUp) {
1275112753
var randomText;
@@ -12970,10 +12972,11 @@ function fight(makeUp) {
1297012972
if (currentMapObj.stacked > 0){
1297112973
var timeout = 1500;
1297212974
if (currentMapObj.stacked > 3) timeout = 1000;
12975+
rewardingTimeoutHeirlooms = true;
1297312976
for (var x = 0; x < currentMapObj.stacked; x++){
1297412977
setTimeout((function(z) {
1297512978
return function() {
12976-
createHeirloom(z);
12979+
if (rewardingTimeoutHeirlooms) createHeirloom(z);
1297712980
}
1297812981
})(game.global.world), (timeout * (x + 1)));
1297912982
}

‎updates.html

+10
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,16 @@
5151
<body>
5252
<div id="wrapper">
5353
<span style="font-size: 1.3em; font-weight: bold; display: block; width: 100%; text-align: center">Trimps Updates!</span>
54+
<ul class="betterList">
55+
<li>5.2.1 - 11/21/19</li>
56+
<ul>
57+
<li>Bug Fixes</li>
58+
<li>Radiating Heirlooms now properly reward extra Nu when earned on a Daily Challenge</li>
59+
<li>Fixed a display error showing the wrong mod upgrade cost on Heirlooms earned during a Daily Challenge</li>
60+
<li>Fixed an issue that could cause extra Heirlooms to be rewarded at the start of U2</li>
61+
<li>Extra tokens rewarded from Daily Challenges no longer count towards Bone Portal</li>
62+
</ul>
63+
</ul>
5464
<ul class="betterList">
5565
<li>5.2.0 - 11/20/19</li>
5666
<ul>

‎updates.js

+1
Original file line numberDiff line numberDiff line change
@@ -3229,6 +3229,7 @@ function prettifySub(number){
32293229
}
32303230

32313231
function resetGame(keepPortal) {
3232+
rewardingTimeoutHeirlooms = false;
32323233
if (game.options.menu.pauseGame.enabled){
32333234
game.options.menu.pauseGame.enabled = 0;
32343235
game.options.menu.pauseGame.onToggle();

0 commit comments

Comments
 (0)