Skip to content

Commit de9debe

Browse files
GabenGarQuiaaaaTrimpsGodNooNooSadAugust
authored
feat: update to 5.10.1 (#14)
* Screen Reader: Config buttons Auto Jobs, Auto Structure, Auto Equip, and Dimensional Generator config buttons * Both versions: Auto Golden Config button Create a config button for AutoGold for SR and mobile accessibility * ScreenReader: Map Chamber Tooltips Untested, these were all inaccessible before. * ScreenReader: checkbox accessibility All the checkboxes in the game should now be readable and toggleable. All checkboxes aside from the Spire Settings should have relevant labels. * SR: title to aria-label * SR: checkbox bugs * SR: perk screen display bug * SR: magnetoshriek button * SR: missing aria-labels * SR: new tooltip test (battle buttons) * SR: Mutators + misc first pass at the mutator screen achievement alerts (untested) additional cleanup on the battleside buttons export read only to avoid accidental button presses * SR: map cost * SR: mutator availability status * SR: Nature tab tooltips * fix perfect map checkbox * map chamber tooltips redo tooltips on ? instead of separate buttons * Disable tooltip updates on SR They cause a multitude of weird issues * Buildings, Jobs, Upgrades, Equipment ? tooltips Also changed both versions innerHTML += to the much less destructive insertAdjacentHTML * All versions: Convert SA spans into buttons with some css tweaks to get everything looking like it should again * Spire assault active on SR version Weirdness with game.global.lockTooltip preventing the window from updating on screenreader. button labels * Spire assault item effects and upgrade ? tooltips experimenting with aria-live because these actually exist on the page and not just in a tooltip * aria-labels & tooltips Bone charge tooltips labels on close/view Heirloom and Achievement popups remove completed mouse-tooltips (ongoing) * Spire assault item element order Change how items are displayed so that the navigation order is item, upgrade, item, upgrade, instead of item, item, upgrade, upgrade. Also add an invisible heading for screenreader purposes. * announce enlightenment activation * perk button ? tooltips * Buttons, tooltips, Headings, heirloom QoL Around 50 newly accessible tooltips Around 200 elements that have onclick events are now properly role=button and tabindex=0 New heading in Perk/Portal screen at the start of the perks New heading on heirloom screen at the Mod Breakdown so you can more easily select a mod and then upgrade it 1x 10x 100x buttons on Heirloom upgrades now have aria-disabled set when you can't afford it * Revert the Buttoning * Spire assault equipment checkboxes, tabindex on tooltip buttons * 5.10 * Fibrillator * update breed function * Bugfixes PR General bugfixes for stuff that is commonly reported on Trimps discord & very minor improvements * drawGrid * buildMapGrid * Update main.js * Update main.js * Update main.js * Update updates.js * Update main.js * Update main.js * Update updates.js * Update main.js * Remove golden upgrade purchase delay in TW With heavy TW speedups it can cause GUs not to be bought until the end of a run which is suboptimal * Update main.js * voidCorruptionIcon * setMutationTooltip * manageEqualityStacks * updateExp * mutations.setAlert * showEquality * updateFormations * updateBar * updateAllBattleNumbers * Improve building purchasing Adds an amt parameter to buildBuildings function and uses that to purchase multiple buildings at once rather than looping through each building up to 10 times * Update main.js * Refactor gather Rewrite gather so that the majority of calculations are done outside of the for loop to reduce calculations run * Remove abandon challenge code. Pushing separately. * Update main.js * Add total bonfires built to bonfire icon tooltip * Minor screwThisUniverse change * numTab * manageStacks * updateSideTrimps * updateTurkimpTime * not manageStacks * scaleHeirloomModUniverse * dropPrestiges * Update main.js * startFight function - cleanup, refactoring Cleanup and refactoring of the startFight function. I'm sorry. * remove comments, file can now be merged directly * SR update * SR update * drawX && drawAllX improvements Change drawAllX function so that they draw all innerHTMLs in 1 go rather than 5-50 updates per function Moves the alert icon creation to the drawX functions to reduce innerHTML updates I double checked and they should be compliant with Quias latest SR PR * SR update * SR update * SR update * SR update * add missing function * SR fixes * whoops one too many things deleted there, noo. * Remove shouldUpdate function * Remove shouldUpdate reference * Remove shouldUpdate reference * Remove shouldUpdate reference * Fix generator not updating outside of TW * Fix crash on pausing generator * Make the Life & Nom elems only update when changes occur * role=button to <button> incomplete * status text, WIP * formations, WIP effect icons improved Formation buttons fixed 'rename heirloom' label Enemy effect icons have names and tooltips (WIP) * Tooltip experiments: ?, shift, info buttons Also moved everything into makeAccessibleTooltip, which can make mouseover events in the future too if GS wants. * convert all role=button into <button> * consistent auto XX buttons * SR info header, optional info buttons * display DG config errors * h6 heading for SR info * oops * Map at Zone: aria-labels, buttons * remove -+ map level buttons * mutations: headers and top/bottom of page, buttons * remove mouseover tooltips on screenreader * Radio buttons for formations * mutations event listeners fix * equality fix * spire stats fix * alerts fix * tw limiter * Screenreader updates (Trimps#286) * role=button to <button> incomplete * Tooltip experiments: ?, shift, info buttons Also moved everything into makeAccessibleTooltip, which can make mouseover events in the future too if GS wants. * convert all role=button into <button> * consistent auto XX buttons * SR info header, optional info buttons * display DG config errors * h6 heading for SR info * oops * Map at Zone: aria-labels, buttons * remove -+ map level buttons * mutations: headers and top/bottom of page, buttons * remove mouseover tooltips on screenreader * Radio buttons for formations * status text, WIP * Temp Patch for August * Revert "Merge branch 'pr/282'" This reverts commit e403938, reversing changes made to 01de46c. * Revert "Merge branch 'pr/267'" This reverts commit 9f197f8, reversing changes made to 504db25. * formations, WIP effect icons improved Formation buttons fixed 'rename heirloom' label Enemy effect icons have names and tooltips (WIP) * Revert "Temp Patch for August" This reverts commit 88b806a. * SR only: bugfix perfect maps checkbox the most cursed interaction of JS and NVDA * SR: Stack display All stacks are now readable! * SR: Golden upgrade tooltips * SR: maps as lists for navigation * SR: Lists cleanup, pause alert * SR: most efficient Equip * SR: world/map icons * SR: minor fixes & improvements Alert on Achievement Show firing Gigastations 'can't afford' * remove 'patch notes' assert * SR: show buy amount on buttons * SR: fix show buyables * Bad typo bugfix and more SR stuff (Trimps#287) * SR: de-listify the footer menu * Refactor jobs/equip/buildings/upgrades Buttons code + SR bugfix fix SR display not respecting firing for Jobs * bugfix: autoUpgrade during Liq An ancient typo probably. Bug: AutoUpgrade does not fire quickly in Liq unless AutoPrestige is also on. * Bugfix: very bad typo * SR: don't display tooltips on buying X * jan 26 * Screenreader: masteries, settings buttons, player spire, misc (Trimps#288) * SR: de-listify the footer menu * Refactor jobs/equip/buildings/upgrades Buttons code + SR bugfix fix SR display not respecting firing for Jobs * bugfix: autoUpgrade during Liq An ancient typo probably. Bug: AutoUpgrade does not fire quickly in Liq unless AutoPrestige is also on. * Bugfix: very bad typo * SR: don't display tooltips on buying X * SR summary Prismatic, trimp damage fixed, time on zone/map, void maps * SR: masteries first pass tables! * remove table labels, de-tablefy Summary user feedback whee * SR: Masteries Row headers for lock/unlock and number remaining in row Messages for can't afford, and purchase dark mode css fix whoops * SR code cleanup: move screenreader check into the assert * SR: settings buttons tooltips + cleaned up DG config window + a few missing locktooltips on input-tooltips + buttonify 'cancel' on tooltips for easier access * SR: Player spire first pass tooltips, affordability, removing useless buttons Slight rearranging of how the HTML is updated to make managing the tooltips easier. * SR: don't render player spire * SR: don't render player spire * SR: magnetoshriek, for real this time * SR: minor enhancements map sliders remove more mouseovers label fluffy and turkimp Log config option tooltips second repeat maps tooltips * SR: code cleanup * SR: improve info button mode * SR: disable performance settings * SR: read row enhancements --------- Co-authored-by: Trimps <[email protected]> * hide sr info toggle * SR: fix player spire tutorial being hidden, tooltips sometimes breaking (Trimps#289) * jan 30 * SR: Timewarp screen, missing map icon labels, TW maps bugfix (Trimps#290) 'run a map' buttons were showing even when mapsAllowed was 0. * jan 31 * SR: improve labeling on autoX tooltips, fix SR summary attack (Trimps#291) * SR: improve labeling on autoX tooltips, fix SR summary attack * silly TWspeedup things sometimes !== is bad * EA * SR: Portal Screen, Dimensional Generator (Trimps#292) Portal Screen: lists for challenges more buttons DG upgrades: buttons have info on affordable status/cost Changed behavior to match the rest of the game for SR: click is buy, 'tooltip' is info. (was click is info, buy is on a button several elements down. Works great visually, not so much with a screenreader) * fixes * more fixes * another one * fix * SR: void map tooltip (Trimps#293) This is the last one I missed, right? * SR: little fixes (Trimps#294) Dailies display (aria-live and clocks are bad) Equality settings: labels and buttons Stuffy spire story headings, buttons Fluffy pats :) * finishing touches * missing patch note * fixes Player spire not showing with shrunk layout in some circumstances autojobs formatting on scientists? Swear I didn't touch this but this works better. fix label formatting on steam fix domination icons (hello stray space) * fix PS floating damage text * fix * little fixes (Trimps#298) * accessibility: ctrl-click > config buttons and a whoopsie ' * little fixes fix: don't show ring mods until level 5 fix: Scruffy radon breakdown after S23 fix: show/hide autogold config button fix: playfab 'remember info' checkbox visual: remove excess padding on auto configs * minor feature: configure hybrid number format --------- Co-authored-by: Trimps <[email protected]> * small fixes (Trimps#299) * small fixes Add extra checks to ensure Tenacity can't go below its minimum multiplier. Fix the Greed bonus not being applied if Masterfulness has levels and Greed doesn't. Fix Tenacity not being displayed in the damage breakdown if Masterfulness has levels and Tenacity doesn't. Reduce u2Mutations.openTree calls when getting seeds, now only gets called when you can afford a new mutator otherwise it just updates the seeds available element. Fix Rename Preset tooltip not being affixed with the preset number. Fix Berserk death not occurring when using Map at Spire setting. * add u2 spire seed drop buff The seed drop buff was forgotten about :( * 5.10.1 * playfab fix * Nurture VMDC bugfix The function wasn't called correctly so always returned false even if the conditions were met. * extremely small fixes apostrophes in mouseover texts, breaks a few map icons extra spaces in/around combat icons AutoUpgrade on scientist challenge 'undefined' button Equip efficiency highlight doesn't work correctly on armor Spire visuals not updating on buy/sell traps * fix fast attack map special The fast attack map special currently doesn't work when Hyperspeed 2 has been purchased as the else if doesn't get run. --------- Co-authored-by: Quiaaaa <[email protected]> Co-authored-by: Trimps <[email protected]> Co-authored-by: GodNooNoo <[email protected]> Co-authored-by: SadAugust <[email protected]>
1 parent 216427a commit de9debe

File tree

19 files changed

+6835
-3979
lines changed

19 files changed

+6835
-3979
lines changed

public/ScreenReader.html

Lines changed: 289 additions & 265 deletions
Large diffs are not rendered by default.

public/config.js

Lines changed: 317 additions & 216 deletions
Large diffs are not rendered by default.

public/css/dark.css

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
.talentItem {
5757
border-color: #5d5d5d;
58-
margin-left: -1px;
58+
margin-left: -1px;
5959
margin-top: -1px;
6060
margin-bottom: 0px;
6161
margin-right: 0px;
@@ -98,7 +98,7 @@
9898
}
9999

100100
.talentItem {
101-
width: calc(16.666666667% + 1px);
101+
width: 100%;
102102
}
103103

104104
#battleContainer {
@@ -333,7 +333,7 @@
333333
border-color: #ac2925;
334334
}
335335

336-
.settingBtn2:hover {
336+
.settingBtn2:hover, .colorYellow:hover {
337337
color: #fff;
338338
background-color: #ab7324;
339339
border-color: #885b1c;
@@ -463,7 +463,7 @@
463463
.settingBtnfalse, .settingBtn0{
464464
background-color: #441817;
465465
}
466-
.settingBtn2{
466+
.settingBtn2, .colorYellow{
467467
background-color: #574800;
468468
}
469469

@@ -498,6 +498,10 @@
498498
color: #fff;
499499
}
500500

501+
#heirloomNameInput{
502+
color: white !important;
503+
}
504+
501505
#achievementMainClose:hover,
502506
#heirloomsPopupBtns .icon-close:hover,
503507
.achievementBtnClose:hover {
@@ -639,6 +643,7 @@ input, button, select, textarea{
639643
.settingBtntrue, .settingBtn1,
640644
.settingBtnfalse, .settingBtn0,
641645
.settingBtn2,
646+
.colorYellow,
642647
#boneWrapper,
643648
#tooltipDiv,
644649
#tooltipDiv2,

public/css/gradient.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
background-image: -webkit-linear-gradient(top, #845def 0%,#7251d6 100%) !important;
7575
}
7676

77-
.spireCell.cellColorNotBeaten
77+
.spireCell.cellColorNotBeaten:not(.mutatedCell)
7878
{
7979
background-image: -webkit-linear-gradient(top, #9b96b7 0%,#85819e 100%) !important;
8080
}

public/indexKong.html

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

6-
<title>Trimps 5.9.2 (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">
1010
<link rel="stylesheet" href="fonts/icomoon/style.css">
11-
<link rel="stylesheet" type="text/css" href="css/style.css?38" />
11+
<link rel="stylesheet" type="text/css" href="css/style.css?39" />
1212
<script type="text/javascript">
1313
var kongregate = parent.kongregateAPI.getAPI();
1414
</script>
1515
</head>
1616
<!-- Trimps
17-
Copyright (C) 2023 Zach Hood
17+
Copyright (C) 2025 Zach Hood
1818
1919
This program is free software: you can redistribute it and/or modify
2020
it under the terms of the GNU General Public License as published by
@@ -584,8 +584,9 @@
584584
<span id="upgradesTitleSpan" class="titleSpan">Upgrades<br/>(Research first)</span>
585585
</div>
586586
<div class="col-xs-3 lowPad">
587-
<div id="autoGoldenBtn" onmouseover="tooltip('AutoGold', null, event)" onmouseout="tooltip('hide')" class="pointer noselect settingBtn0 autoUpgradeBtn">
587+
<div id="autoGoldenBtn" onmouseover="tooltip('AutoGold', null, event)" onmouseout="tooltip('hide')" class="pointer noselect settingBtn0 autoUpgradeBtn toggleConfigBtn">
588588
<div id='autoGoldenText' onclick="toggleAutoGolden()">AutoGold</div>
589+
<div id="goldConfig" aria-label="Configure Auto Golden" onclick="archoGolden.popup()"><span class="glyphicon glyphicon-cog"></span></div>
589590
</div>
590591
</div>
591592
<div class="col-xs-3 lowPad">
@@ -1359,7 +1360,7 @@
13591360
<div class='heirloomChanceBtnContainer'><span id="heirloomChanceLeft" onclick="changeHeirloomRarityRange(-1)" class='icomoon icon-arrow-left'></span></div><div id="heirloomRarityMain"></div><div class='heirloomChanceBtnContainer'><span id="heirloomChanceRight" class='icomoon icon-arrow-right' onclick="changeHeirloomRarityRange(1)"></span></div>
13601361
</div>
13611362
<div class="row">
1362-
<div class="col-xs-6">
1363+
<div class="col-xs-6" id="heirloomSelections">
13631364
<div id="equippedHeirlooms">
13641365
<div class="row">
13651366
<div id='ShieldEquippedContainer' class="col-xs-6 heirloomEquippedContainer">
@@ -1490,11 +1491,11 @@
14901491
<script type="text/javascript" src="Playfab/PlayFabSDK/PlayFabClientApi.js"></script>
14911492
<script type="text/javascript" src="lz-string.js"></script>
14921493
<script type="text/javascript" src="decimal.min.js"></script>
1493-
<script type="text/javascript" src="config.js?60"></script>
1494-
<script type="text/javascript" src="updates.js?60"></script>
1495-
<script type="text/javascript" src="playerSpire.js?60"></script>
1496-
<script type="text/javascript" src="objects.js?60"></script>
1497-
<script type="text/javascript" src="main.js?60"></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>
14981499
<script type="text/javascript">
14991500
document.body.addEventListener('DOMMouseScroll', onWheel, true);
15001501
document.body.addEventListener('mousewheel', onWheel, true);

0 commit comments

Comments
 (0)