Skip to content

Commit 669e3a1

Browse files
TrimpsTrimps
authored
Merge pull request #300 from Trimps/dev
5.10.1
2 parents 6c374e8 + 763e7b6 commit 669e3a1

File tree

9 files changed

+217
-71
lines changed

9 files changed

+217
-71
lines changed

‎ScreenReader.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.10.0 (Screen Reader version)</title>
6+
<title>Trimps 5.10.1 (Screen Reader version)</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Greensatellite">
99
<link rel="stylesheet" href="css/bootstrap.css">
@@ -1520,11 +1520,11 @@ <h6>Game Overview</h6>
15201520
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
15211521
<script type="text/javascript" src="lz-string.js"></script>
15221522
<script type="text/javascript" src="decimal.min.js"></script>
1523-
<script type="text/javascript" src="config.js?61"></script>
1524-
<script type="text/javascript" src="updates.js?61"></script>
1525-
<script type="text/javascript" src="playerSpire.js?61"></script>
1526-
<script type="text/javascript" src="objects.js?61"></script>
1527-
<script type="text/javascript" src="main.js?61"></script>
1523+
<script type="text/javascript" src="config.js?62"></script>
1524+
<script type="text/javascript" src="updates.js?62"></script>
1525+
<script type="text/javascript" src="playerSpire.js?62"></script>
1526+
<script type="text/javascript" src="objects.js?62"></script>
1527+
<script type="text/javascript" src="main.js?62"></script>
15281528

15291529
</body>
15301530

‎config.js‎

Lines changed: 9 additions & 4 deletions
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.10.0',
25+
stringVersion: '5.10.1',
2626
//Leave 'version' at 4.914 forever, for compatability with old saves
2727
version: 4.914,
2828
isBeta: false,
@@ -282,6 +282,9 @@ var toReturn = {
282282
uberNature: "",
283283
//For the log notation base
284284
logNotBase: 10,
285+
//For configurable Hybrid
286+
hybridSwitchExp: 31,
287+
hybridExponentType: "Eng",
285288
lowestShield: 100,
286289
hemmTimer: 300,
287290
armyAttackCount: 0,
@@ -1026,7 +1029,7 @@ var toReturn = {
10261029
standardNotation: {
10271030
enabled: 1,
10281031
extraTags: "layout",
1029-
description: "Swap between Standard Formatting (12.7M, 540B), Engineering Notation (12.7e6, 540e9), Scientific Notation (1.27e7, 5.40e11), Alphabetic Notation (12.7b, 540c), Hybrid Notation (Standard up to e96, then Engineering. Mimics Standard pre 4.6), and Logarithmic Notation (10^7.10, 10^8.73). Hold Ctrl while clicking Logarithmic Notation to change the base.",
1032+
description: "Swap between Standard Formatting (12.7M, 540B), Engineering Notation (12.7e6, 540e9), Scientific Notation (1.27e7, 5.40e11), Alphabetic Notation (12.7b, 540c), Hybrid Notation (Standard up to e96, then Engineering. Mimics Standard pre 4.6), and Logarithmic Notation (10^7.10, 10^8.73). Hold Ctrl while clicking to configure Logarithmic and Hybrid Notation.",
10301033
titles: ["Scientific Notation", "Standard Formatting", "Engineering Notation", "Alphabetic Notation", "Hybrid Notation", "Logarithmic Notation"],
10311034
onToggle: function () {
10321035
document.getElementById("tab5Text").innerHTML = "+" + prettify(game.global.lastCustomAmt);
@@ -2751,7 +2754,8 @@ var toReturn = {
27512754
radSpent: 0,
27522755
timeLastZone: -1,
27532756
getMult: function(){
2754-
return Math.pow(this.getBonusAmt(), getPerkLevel("Tenacity") + getPerkLevel("Masterfulness"));
2757+
const bonusAmount = this.getBonusAmt();
2758+
return Math.pow(Math.max(1.1, bonusAmount), getPerkLevel("Tenacity") + getPerkLevel("Masterfulness"));
27552759
},
27562760
getCarryoverMult: function(){
27572761
var mult = 0.5
@@ -2762,7 +2766,7 @@ var toReturn = {
27622766
if (game.global.spireActive && !game.global.mapsActive) return 60;
27632767
var minutes = getZoneMinutes();
27642768
var lastZone = this.timeLastZone;
2765-
if (lastZone == -1) lastZone = 0;
2769+
if (lastZone <= 0) lastZone = this.timeLastZone = 0;
27662770
if (lastZone > 120) lastZone = 120;
27672771
minutes += (lastZone * this.getCarryoverMult());
27682772
if (minutes > 120) minutes = 120;
@@ -5022,6 +5026,7 @@ var toReturn = {
50225026
addHelium(reward);
50235027
if (game.global.ArchaeologyDone && !game.global.canGuString){
50245028
game.global.canGuString = true;
5029+
document.getElementById("goldConfig").style.display = "block";
50255030
message("Now that you've mastered the skill of Archaeology, you've gained the ability to use a more powerful Custom Golden Upgrade automator! See the AutoGold tooltip or Ctrl Click AutoGold for more info.", "Notices");
50265031
}
50275032
if (!game.global.ArchaeologyDone){

‎css/style.css‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,16 +419,16 @@ body {
419419
}
420420

421421
.toggleConfigBtn div:first-child{
422-
width: 80%;
422+
width: 83%;
423423
}
424424

425425
.toggleConfigBtn div:nth-child(2){
426-
width: 20%;
426+
width: 17%;
427427
background-color: grey;
428428
float: right;
429429
}
430430

431-
.toggleConfigBtn div:nth-child(2):hover{
431+
.toggleConfigBtn div:nth-child(2):hover, .settingsBtnConfig + button:hover {
432432
background-color: #666666;
433433
}
434434

@@ -1118,7 +1118,24 @@ body {
11181118
cursor: pointer;
11191119
text-align: center;
11201120
width: 100%;
1121+
}
1122+
1123+
.settingsBtnConfig {
1124+
width: 83%;
1125+
border-right: none !important;
1126+
}
1127+
1128+
.settingsBtnConfig + button {
1129+
width: 17%;
1130+
background: gray;
1131+
font-size: 1.25vw;
1132+
border: 1px solid black ;
1133+
border-left: none;
1134+
cursor: pointer;
1135+
}
11211136

1137+
.settingsBtnConfig + button > span {
1138+
top: .2vw !important;
11221139
}
11231140

11241141
#togglesaveAndExit.settingBtn0{
@@ -7637,4 +7654,17 @@ label {
76377654
max-width: inherit !important;
76387655
margin-bottom: inherit !important;
76397656
font-weight: inherit !important;
7657+
}
7658+
7659+
.numFormatTooltip {
7660+
margin-left: auto;
7661+
margin-right: auto;
7662+
}
7663+
7664+
.numFormatTooltip > tbody > tr > td :nth-child(1) {
7665+
width: 9vw;
7666+
}
7667+
7668+
.numFormatTooltip > tbody > tr > td {
7669+
padding-right: .5vw;
76407670
}

‎index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.10.0</title>
6+
<title>Trimps 5.10.1</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Greensatellite">
99
<link rel="stylesheet" href="css/bootstrap.css">
@@ -1388,11 +1388,11 @@
13881388
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
13891389
<script type="text/javascript" src="lz-string.js"></script>
13901390
<script type="text/javascript" src="decimal.min.js"></script>
1391-
<script type="text/javascript" src="config.js?61"></script>
1392-
<script type="text/javascript" src="updates.js?61"></script>
1393-
<script type="text/javascript" src="playerSpire.js?61"></script>
1394-
<script type="text/javascript" src="objects.js?61"></script>
1395-
<script type="text/javascript" src="main.js?61"></script>
1391+
<script type="text/javascript" src="config.js?62"></script>
1392+
<script type="text/javascript" src="updates.js?62"></script>
1393+
<script type="text/javascript" src="playerSpire.js?62"></script>
1394+
<script type="text/javascript" src="objects.js?62"></script>
1395+
<script type="text/javascript" src="main.js?62"></script>
13961396

13971397
</body>
13981398

‎indexKong.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55

6-
<title>Trimps 5.10.0 (Kongregate Version)</title>
6+
<title>Trimps 5.10.1 (Kongregate Version)</title>
77
<meta name="description" content="Trimps">
88
<meta name="author" content="Greensatellite">
99
<link rel="stylesheet" href="css/bootstrap.css">
@@ -1491,11 +1491,11 @@
14911491
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
14921492
<script type="text/javascript" src="lz-string.js"></script>
14931493
<script type="text/javascript" src="decimal.min.js"></script>
1494-
<script type="text/javascript" src="config.js?61"></script>
1495-
<script type="text/javascript" src="updates.js?61"></script>
1496-
<script type="text/javascript" src="playerSpire.js?61"></script>
1497-
<script type="text/javascript" src="objects.js?61"></script>
1498-
<script type="text/javascript" src="main.js?61"></script>
1494+
<script type="text/javascript" src="config.js?62"></script>
1495+
<script type="text/javascript" src="updates.js?62"></script>
1496+
<script type="text/javascript" src="playerSpire.js?62"></script>
1497+
<script type="text/javascript" src="objects.js?62"></script>
1498+
<script type="text/javascript" src="main.js?62"></script>
14991499
<script type="text/javascript">
15001500
document.body.addEventListener('DOMMouseScroll', onWheel, true);
15011501
document.body.addEventListener('mousewheel', onWheel, true);

0 commit comments

Comments
 (0)