Commit graph

464 commits

Author SHA1 Message Date
80a74c13a2 Merge branch 'main' into days-15-16 2022-12-15 21:09:12 -06:00
Chunkybanana
44f940d3a1 Fixed persistent refs (volar is magic) 2022-12-16 02:55:26 +00:00
Chunkybanana
23041e3a0d cleanup and finger crossing 2022-12-16 02:50:57 +00:00
Chunkybanana
09a6817b3f this compiles so it's fine 2022-12-16 02:40:25 +00:00
Chunkybanana
47c4874746 maybe this works? just maybe... 2022-12-16 02:37:36 +00:00
Chunkybanana
bc0db8c017 kludge go brrr (incomplete) 2022-12-15 12:01:54 +00:00
Chunkybanana
6b56cc05bc Merge remote-tracking branch 'origin/main' into days-15-16 2022-12-15 04:29:57 +00:00
Chunkybanana
52994915c3 min width 2022-12-15 04:29:08 +00:00
1a1e5d167c Make joy and faith buy maxable 2022-12-14 22:20:20 -06:00
ducdat0507
9f05571a35 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-15 11:16:59 +07:00
unsoftcapped3
3926cc7134 remove possible NaN 2022-12-15 04:17:37 +00:00
ducdat0507
2e7725a2c0 This should fix logs' NaN bug 2022-12-15 11:16:04 +07:00
unsoftcapped3
4d776f9f2c make ivy 3 match its effect 2022-12-15 04:12:44 +00:00
ducdat0507
b2bcd97f34 Prettier progress bars 2022-12-15 10:58:57 +07:00
417e0c4ccf Increase oil prices 2022-12-14 21:59:31 -06:00
unsoftcapped3
53dded8a9d paper upgrade costs 2022-12-15 03:58:35 +00:00
fd6becd727 Fix paper upgrades not appearing 2022-12-14 21:56:14 -06:00
unsoftcapped3
52498335a6 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-15 03:55:52 +00:00
unsoftcapped3
57f94e1a07 change focus upg costs 2022-12-15 03:55:51 +00:00
510b1933ab sanity check these values aren't NaN - not sure how that's possible though? 2022-12-14 21:51:10 -06:00
8f5980ac79 Don't softcap effects 2022-12-14 21:46:05 -06:00
ducdat0507
f1797beb2f Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-15 10:43:44 +07:00
cf18336c6b Softcap classroom cost 2022-12-14 21:45:30 -06:00
9fa6d8dd78 fixes focus upgrades row 2 not showing 2022-12-14 21:45:17 -06:00
2b67ba6e78 Swapped gingersnap and twinkle lv 5 2022-12-14 21:45:16 -06:00
ducdat0507
dd9b540e45 Fix oil pump inverse cost 2022-12-15 10:43:40 +07:00
unsoftcapped3
6f2fac66f7 even more classroom scaling! also softcaps 2022-12-15 03:39:53 +00:00
unsoftcapped3
d33372eabc classrooms refuse to stop inflating no matter how much scaling I give them 2022-12-15 03:37:14 +00:00
unsoftcapped3
941f10bc4c scaling³ 2022-12-15 03:29:43 +00:00
unsoftcapped3
25d12d5af2 even more scaling 2022-12-15 03:29:12 +00:00
unsoftcapped3
57f5da9452 more scaling 2022-12-15 03:28:03 +00:00
unsoftcapped3
45a4065876 v 2022-12-15 03:27:12 +00:00
unsoftcapped3
0a9680998b classroom scaling 2022-12-15 03:26:02 +00:00
unsoftcapped3
2c38b2e4a1 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-15 03:15:53 +00:00
unsoftcapped3
6f788a22b9 typo 2022-12-15 03:15:50 +00:00
d80adefe49 Made modifiers show small numbers 2022-12-14 21:15:06 -06:00
4c8a03b034 oil machines fixes 2022-12-14 21:15:06 -06:00
unsoftcapped3
ac505e3408 box costs 2022-12-15 03:14:44 +00:00
unsoftcapped3
f4a5b92069 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-15 03:12:16 +00:00
unsoftcapped3
7a2cf6192c change box upgrade costs 2022-12-15 03:12:01 +00:00
unsoftcapped3
9bd5056e89 fix a descriptoin 2022-12-15 02:59:37 +00:00
fb9bcf6c5f Nerf Mary lv5 2022-12-14 20:54:02 -06:00
a46f390d06 elf display fix 2022-12-14 20:34:12 -06:00
eb8a4166f4 boxes fixes 2022-12-14 20:34:02 -06:00
Chunkybanana
c89f37a867 Never touching this again 2022-12-15 02:33:24 +00:00
a3453b84ac Fix focus rolling invisible elves 2022-12-14 20:24:53 -06:00
2fc424c7e3 Misinterpreted how star lv 5 should work 2022-12-14 20:18:44 -06:00
6d25877e48 Balance/bug fix pass 2022-12-14 20:18:44 -06:00
unsoftcapped3
c2b352111a change 7 to 2 2022-12-15 01:47:34 +00:00
unsoftcapped3
0ada0d8b2b boost plastic gain even more 2022-12-15 01:45:24 +00:00