Commit graph

786 commits

Author SHA1 Message Date
circle-gon
91015b4652 merge changes 2022-12-18 20:37:39 +00:00
e1aacd4c91 Changing wrapping paper day requirements and decorating toggle stuff 2022-12-18 14:19:52 -06:00
066bf6520f Fixed trees mastery effect 2022-12-18 13:28:42 -06:00
circle-gon
e7dd7317d4 attempt at having stuff produce stuff 2022-12-18 19:14:42 +00:00
ducdat0507
c78a31d713 Deminimizable 2022-12-18 18:02:47 +07:00
ducdat0507
317712bdbe Infinite grid 2022-12-18 17:58:08 +07:00
8dc7488d31 Add computed value for when a layer's mastery effect should be active 2022-12-18 01:48:09 -06:00
65fbeb73ff Make optional components handle false-y values better 2022-12-18 01:43:02 -06:00
ducdat0507
c92eb6ab3b Merge branch 'main' into day-20-factory 2022-12-18 10:58:50 +07:00
5f1b2e7178 Open day when beginning mastery 2022-12-17 10:42:59 -06:00
271485a5a6 Stop metal from generating before it should be 2022-12-17 10:37:30 -06:00
ae37422645 Fix errors swapping mastery values 2022-12-17 10:31:00 -06:00
8d3092802e Handle mastery req for workshop 2022-12-17 10:07:43 -06:00
ducdat0507
eccfcc418a Minor polishing 2022-12-17 15:57:28 +07:00
circle-gon
a48d6595cf the start of adding components 2022-12-17 02:36:12 +00:00
7b92fd9bee Fixed some layers not including day 2022-12-16 19:24:17 -06:00
808b6d9900 Handle mastery in setUpDailyProgressTracker, and completing mastery 2022-12-16 19:18:22 -06:00
Seth Posner
3c9e2be650 Add mastery data for last four days 2022-12-16 16:58:22 -08:00
Seth Posner
e9d45cae02 Add mastery data to Cloth, Oil, and Metal 2022-12-16 16:29:03 -08:00
Seth Posner
9e68dab914 Make better mastery data swap method 2022-12-16 16:15:46 -08:00
Seth Posner
ed2c8d08b1 Add paper mastery data 2022-12-16 15:57:27 -08:00
Seth Posner
95fed06116 Add elf mastery data 2022-12-16 15:46:26 -08:00
Seth Posner
e314f234eb Change mastery system to swap out persistent refs 2022-12-16 15:24:24 -08:00
circle-gon
2200ba8b3c factory is now full screen 2022-12-16 21:18:17 +00:00
circle-gon
a23198cc4d Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-16 20:49:59 +00:00
332e5f69b9 Fixed colorful plastic affecting max focus multi 2022-12-16 08:20:31 -06:00
99ed4e4a93 Coal buyable styling 2022-12-16 08:20:30 -06:00
circle-gon
9c5a31a81a
uses computed not the modifier 2022-12-16 09:17:47 -05:00
33bd09e9bf Fix 0x yellow multiplier 2022-12-16 08:12:30 -06:00
5235dc924e Add wrapping paper and ribbons to scene 2022-12-16 01:08:43 -06:00
93038164e6 Add mastered effect to ribbon days 2022-12-16 01:05:38 -06:00
6725fc850f Added mastered effect to calendar days 2022-12-16 00:42:04 -06:00
bc13b05d85 Fixed mastery.saplings 2022-12-16 00:40:03 -06:00
unsoftcapped3
226962699a
fix negative trees bug 2022-12-15 19:52:40 -08:00
unsoftcapped3
19d58d575e finish balancing toys layer 2022-12-16 03:32:47 +00:00
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
unsoftcapped3
7f0301b3e1 Implement milestone 1 2022-12-16 02:37:37 +00:00
Chunkybanana
47c4874746 maybe this works? just maybe... 2022-12-16 02:37:36 +00:00
unsoftcapped3
6b9ec5f3c5 milestone 2022-12-16 02:07:19 +00:00
circle-gon
096fea964a attempt to add components display 2022-12-16 02:01:56 +00:00
unsoftcapped3
f690495518 add buyable costs 2022-12-16 01:51:10 +00:00
unsoftcapped3
b9ac4ee40e rename teddy bears and trains 2022-12-16 01:14:51 +00:00
circle-gon
fc653e6e5a some ui on factory 2022-12-16 01:11:48 +00:00
unsoftcapped3
c629b77946 fix toy sum 2022-12-16 01:10:07 +00:00
unsoftcapped3
6217b521b6 fix toy thing 2022-12-16 00:43:22 +00:00
unsoftcapped3
6bc0a53ce3 add toys to advent 2022-12-16 00:17:18 +00:00
unsoftcapped3
46eb86fd48 do toy stuff? 2022-12-16 00:13:44 +00:00