Merge Changes from Beta into Alpha #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…weaks Update branch: Temporal paradox tweaks
…ed on UI elements.
1000 years was 100 times weaker than intended with heatCompression formula. ooups
Fix extra game ticks.
buffed 1000 years challenge rewards by 100 times
leader job is now saved On deleting the loadout name is displayed
…outs Added loadout system
You could assign a leader with existing loadouts
loadout anarchy fix
* Prevent NULL year & season from showing in the log if you don't have Calendar * Fix hash level not being properly reset at 0 hashes * Easter egg will disappear on April 2 * Easter egg: pumpkin spice in October * Hide redeemGiftBtn if elderBox resource is hidden from resource pane
Added Dragon Relations: Dynamicists Effect: hunt catpower cost -10, trade catpower cost -5, Orbital launch catpower cost -50% Changed Lizard Priests: Manuscripts give some faith while reducing manuscript from them. Removed uneeded comments
- Kittens can be sorted - There are pages in the census - Kittens can be favorited, and favorite kittens are prioritized when you reset with cryochambers - If a kitten is an engineer census now also lists what they are crafting.
…tions-update Foreign Relations update
…gory Sorting and favorite system
* Loadout sorting and description - When loadouts are assigning a leader, the most experienced kittens will be prioritized. - Loadout description now shows leader job saved. - Comment cleanup * Fix Comments assing is replaced with assign
I noticed my tab running sluggishly, dumped the heap, and quickly noticed about 64MB of retained closures in the ui/update topic listeners. I noticed they had the `setCommand` function and found this React component. It looks like there was a typo which prevents the unsubscription. I was able to confirm with the debugger that `componentDidMount` is called fairly frequently and that `componentWillUmount` does not get called. The best I could do to verify this fix, since I don't have a user login server, was to change the condition to render the furthest ring tab and then check the listeners via `dojo._topics["ui/update"]._listeners`. Before the fix, this would grow by 1 each time you click in and out of the space tab. After apply the fix, it did not grow, though it appears `dojo.unsubscribe` simply deletes from the array, leaving it sparse. It appears to run just fine.
The bug is that when applying redshift under certain conditions, `game.calendar.fastForward()` is called twice. This is triggered when: 1. The `QUEUE_REDSHIFT` flag is enabled (true by default) 2. The queue is empty The short-circuiting path must call `this.applyRedshift(x, true)` to ignore the calendar, since `game.calendar.fastForward(x)` is called on the other side of the `while` loop. Without passing `true`, the calendar is advanced twice, meaning you get twice as many events, antimatter, beacon relics, void, and years as you would normally. Originally introduced in 66d4511. You can reproduce this by pausing long enough for any of those values to tick (e.g., a few seconds for relics) and noting the difference in values compared to the number of days gained. With the patch, you no longer get twice as many. I chose to rename `daysOffset` to `daysOffsetLeft` even though they're both the same value since it matches the other calls to `applyRedshift` in this branch and maybe somewhat indicates that we're only doing part of the work.
* Fix offline kitten arrival ignoring Hydroponics * Fix bug where we get 1 tick of production while importing a save. Hopefully less hacky than previous solution.
* Make compareShatterTime easier to read * Make bulk TC shattering approximately 30% faster
…-unicorn#63) * Limit storage capacity for unicorn-related resources * Improvements to the religious resource refining system
…corn#66) * Fix Temporal Presses consuming energy after reset * Don't call getPricesMultiple multiple times * Write a faster function to get multiple TC shatter prices * Remove lag in the time tab from having lots of Temporal Presses * Simplify getPrices for shattering 1 TC at a time * Fix Temporal Press carryover not properly limited by 1kY completions * Fix Temporal Press not updating custom shatter link handler * Remove queue itemType label, turn items red if storage limited, fix incorrect caption * Make red queue items respect the game settings * Don't gray out completed Challenges * Fix a bug where custom shatter link was visible when it wasn't supposed to be * Fix necrocorn per day being affected by Tempus Fugit * Clarify that synergies care about active AI cores, not AI level * Holding SHIFT no longer squares the active HGs as shown in the tooltip * Add test suite for bulk TC shatter prices * Fix math error with bulk shatter TC prices * Rewrite queue logic to not have setState in componentDidUpdate
Bringing RN requirement in line with description and Dead Space
…tedPrices Experimental weighted prices for Unicorn Tears Challenge
* Add flag to track if the current run was started without benefit of Chronospheres * Add silly things that happen if the player shatters 500 TCs during a temporal paradox. * Add a bunch of new achievements & basges * Don't count unethical starred achievements * Update the achievements panel live whenever anything changes. * Update badges panel live whenever anything changes. * Make the basges panel much more readable * Silly formatting for some basges * Make Fantastic Fur Color work in all color themes & fix issue with current leader overlapping their own crown. * Add achievement for Challenge completions. * Achievements UI improvement: Handle text overflow cleanly (usually using ellipses).
As far as I know, the integration has been broken for some time and the resources being loaded just slow down the page.
* Tame infinite prices * Tame really, really large--but still finite--toDisplaySeconds * Update expected outputs from toDisplaySeconds to match new behavior
Also updates the manifest, thus a feature-level change.
The reference to the source map causes a 404 every time devtools are being used.
… live-updates, fix bugs, promote individual kittens, bulk mass promote (nuclear-unicorn#81)
This file was used as an entrypoint to Kittens Game when it was accessed on Kongregate. This service is defunct today, and the file is no longer relevant.
* fix: Only show instructions if no saves exist * feat: Auto-sync saves if login is valid on startup
* Fix bugs related to recursive nature of renderConsoleLog * Upon purchasing SETI, hide the log filter for astro events & auto-complete the ongoing astro event if there is one.
* Overcapping unicorn tears results in pollution * Technologies cost unicorn-related resources in a Unicorn Tears Challenge * Add test case for enforcement of resource caps * Prevent overcap from triggering due to floating-point precision limitations
…Tweaks Set temporal paradox chance effect to be hidden
…radoxTweaks Merge temporal paradox tweaks into dev/beta
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should complete realigning master -> beta -> alpha as designed, with all changes from previous stages being available in the current stage.