Commit graph

842 commits

Author SHA1 Message Date
unsoftcapped3
cb83e058ad
Merge pull request #3 from thepaperpilot/day-17-toys
merge day 17
2022-12-20 16:26:07 -08:00
unsoftcapped3
993db57bfe fix typo 2022-12-21 00:25:05 +00:00
unsoftcapped3
2cf4e58e5e rest of day 17 stuff 2022-12-21 00:23:02 +00:00
unsoftcapped3
6a625f2fb8 workshop scaling 2022-12-21 00:07:40 +00:00
unsoftcapped3
764861b3f4 fix a ton of stuff 2022-12-20 23:39:37 +00:00
circle-gon
35fad1f5b5 checkout 2022-12-20 21:26:48 +00:00
803ee66770 Oops 2022-12-20 08:16:55 -06:00
a0b60cb41f Oops 2022-12-20 08:16:45 -06:00
017f8b812f Merge branch 'main' into day-17-toys 2022-12-20 08:14:23 -06:00
df63826fed Make ribbon costs highlight unmet conditions 2022-12-20 08:13:55 -06:00
ducdat0507
4f496765a9 Arbitrary infinite factory size 2022-12-20 21:00:07 +07:00
ducdat0507
6b9a53685b Merge branch 'day-17-toys' into day-20-factory 2022-12-20 18:05:46 +07:00
ducdat0507
a0b147064e Toy bar gradient 2022-12-20 16:31:33 +07:00
ducdat0507
be092fcada Merge branch 'main' into day-17-toys 2022-12-20 16:24:42 +07:00
ducdat0507
b0b617791b Decoration polishing 2022-12-20 16:22:23 +07:00
b00ee8518b Fix merge conflicts 2022-12-19 23:32:10 -06:00
3bf13b1558 Added mastery lore 2022-12-19 23:21:43 -06:00
unsoftcapped3
deca7bffc1 Merge branch 'day-17-toys' of https://github.com/thepaperpilot/Advent-Incremental into day-17-toys 2022-12-20 05:20:43 +00:00
unsoftcapped3
2115a8ea78 finish balancing toys layer 2022-12-20 05:19:55 +00:00
unsoftcapped3
d412b09c2a Implement milestone 1 2022-12-20 05:19:27 +00:00
unsoftcapped3
477ebaa621 milestone 2022-12-20 05:19:27 +00:00
unsoftcapped3
62fe4af283 add buyable costs 2022-12-20 05:19:27 +00:00
unsoftcapped3
0e13e7e2d1 rename teddy bears and trains 2022-12-20 05:19:27 +00:00
unsoftcapped3
dc1c9d48c9 fix toy sum 2022-12-20 05:19:27 +00:00
unsoftcapped3
468c650baa fix toy thing 2022-12-20 05:18:31 +00:00
unsoftcapped3
4408a20f2e add toys to advent 2022-12-20 05:18:31 +00:00
unsoftcapped3
9e17c4ce39 do toy stuff? 2022-12-20 05:18:31 +00:00
unsoftcapped3
84e6825997 start day 17 2022-12-20 05:18:31 +00:00
6a3f18a31a Implemented letters mastery 2022-12-19 23:13:08 -06:00
40b40dc9dd Implemented dye mastery effect 2022-12-19 22:43:14 -06:00
969b555043 Changed plastic to give elf 2022-12-19 22:21:21 -06:00
268f9a20f6 Implemented plastic mastery effect 2022-12-19 21:28:52 -06:00
3d477d5809 Implement oil mastery effect 2022-12-19 20:55:38 -06:00
circle-gon
d5dc17922d feat: components now move, and map is now finitely draggable 2022-12-20 02:02:06 +00:00
0e8d63557b Balancing 2022-12-19 20:01:08 -06:00
e047d1f672 Implemented cloth mastery effect 2022-12-19 19:42:19 -06:00
8e6eec0b78 Implement basic mechanic for ribbons 2022-12-19 19:42:19 -06:00
e6596a7df1 Open ribbons 2022-12-19 19:42:19 -06:00
2b541c2a3b Show small numbers in modifiers' totals 2022-12-19 19:41:37 -06:00
f7666fcd05 Decoration effect display 2022-12-19 19:39:11 -06:00
129cbcd200 Display dye chamber hotkeys on the buyables 2022-12-19 19:28:28 -06:00
17338e37ef Made dye amounts computed and adjusted appropriately 2022-12-19 19:26:01 -06:00
unsoftcapped3
afbc52997b remove more dye resetting 2022-12-19 19:20:09 +00:00
unsoftcapped3
c1cc2e26e1 remove dye resetting 2022-12-19 19:16:52 +00:00
unsoftcapped3
56f0096fd9 make dye calculated based on chambers 2022-12-19 19:12:42 +00:00
unsoftcapped3
79f4b64fad
blue before red 2022-12-19 10:31:59 -08:00
unsoftcapped3
8563d6976d
blue before red 2022-12-19 10:30:23 -08:00
c534cf697e Highlight resources you don't have in upgrades with multiple resources 2022-12-19 08:25:50 -06:00
ducdat0507
6aae9f3a4e Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-19 21:16:27 +07:00
ducdat0507
413ab4a498 Day progress bar gradients 2022-12-19 21:16:23 +07:00