Commit graph

775 commits

Author SHA1 Message Date
0e93cc9401 Add day progress and modifiers display 2022-12-21 22:05:35 -06:00
8b2161e9df Make energy a modifier 2022-12-21 22:01:46 -06:00
5e1da63401 Make stuff compile 2022-12-21 21:57:01 -06:00
c88928199b Major factory UI/X rework 2022-12-21 21:47:18 -06:00
unsoftcapped3
e88bf020bf more building types 2022-12-22 02:56:11 +00:00
unsoftcapped3
8a1f63e8b8 add energy costs to wood stuff 2022-12-22 02:49:51 +00:00
unsoftcapped3
c2e2ff426c remove the stuff 2022-12-22 02:46:22 +00:00
unsoftcapped3
a58c3b682b Merge branch 'day-18-toy-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-18-toy-factory 2022-12-22 02:46:09 +00:00
unsoftcapped3
91ee0cd17d remove all the square stuff 2022-12-22 02:43:51 +00:00
7cbbf732fc Implement energy that affects factory tick rate 2022-12-21 20:37:11 -06:00
ef4c0b606d Stop selecting tooltip text 2022-12-21 20:27:06 -06:00
4ba4fcdb25 Merge branch 'main' into day-18-toy-factory 2022-12-21 18:45:09 -06:00
10482aaf90 Fix typo 2022-12-21 18:44:16 -06:00
6a353642d6 Change how letters handles being maxed out 2022-12-21 18:43:36 -06:00
unsoftcapped3
98afdc7301
Merge pull request #6 from thepaperpilot/day-20-factory
merge day 20 into day 18 again
2022-12-21 14:51:08 -08:00
Chunkybanana
25c0b60ec6 Show building on hover (pls don't break package.json) 2022-12-21 22:25:22 +00:00
0bbfe4c170 hide "lmited by" for metal after mastery 2022-12-21 14:56:49 -05:00
ad958913b0 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-21 14:36:15 -05:00
247085978a hide "limited by" for trees after ivy lv 5 2022-12-21 14:35:16 -05:00
unsoftcapped3
7039ea077f
display letter hardcap 2022-12-21 10:39:44 -08:00
cad540735e Drop periods in milestone effects
I kept them when there were 2+ sentences
2022-12-21 11:08:16 -05:00
ducdat0507
58ea4f8213 Keep the tooltip on screen 2022-12-21 22:26:00 +07:00
circle-gon
fcb2f58986 remove useless code 2022-12-21 14:20:34 +00:00
circle-gon
6f3f1f1985 Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-21 14:15:43 +00:00
5868cda0da Fix typo 2022-12-21 08:15:25 -06:00
90bacccbbb Change FACTORY_COMPONENTS typing for best of both worlds 2022-12-21 08:11:39 -06:00
ducdat0507
dbf6af8607 The factory should work as intended now 2022-12-21 20:52:09 +07:00
circle-gon
4d4c15cdf0 Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-21 12:57:04 +00:00
circle-gon
d1808fa2c8 Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-21 12:56:56 +00:00
ducdat0507
56fb26dcad Whoops 2022-12-21 17:15:55 +07:00
ducdat0507
ed16506ab2 Whoops 2022-12-21 17:09:06 +07:00
ducdat0507
0f2ae44de0 Fix ts errors 2022-12-21 17:00:56 +07:00
ducdat0507
67b093a7b0 Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-21 13:40:58 +07:00
ducdat0507
b7d337f19b Some factory redesigning 2022-12-21 13:40:54 +07:00
unsoftcapped3
6b08323297 change factory day to 18 2022-12-21 05:47:49 +00:00
81145f50c3 Implemented rotation 2022-12-20 23:40:08 -06:00
ducdat0507
33df73165b Merge branch 'day-20-factory' of https://github.com/thepaperpilot/Advent-Incremental into day-20-factory 2022-12-21 12:19:45 +07:00
ducdat0507
feef047cdb Fix complain 2022-12-21 12:19:42 +07:00
88cd106a39 open factory 2022-12-20 22:35:21 -06:00
da06e1f6d8 Middle click drag to pan 2022-12-20 22:35:13 -06:00
9163b840b9 Merge branch 'main' into day-20-factory 2022-12-20 21:56:47 -06:00
02f87571e3 Hide dev speed when paused 2022-12-20 21:56:41 -06:00
3e2f103000 Fix saves manager display issues 2022-12-20 21:55:56 -06:00
3fd098625d Toys progress text color 2022-12-20 21:52:08 -06:00
dac26b8de2 Merge branch 'main' into day-20-factory 2022-12-20 21:44:44 -06:00
cb3b66bdb7 Fixed workshop display 2022-12-20 21:40:55 -06:00
850ccdbd5f Cleaned up 2022-12-20 21:27:26 -06:00
0c0de62a83 Add eslint rule for strict boolean expressions and fix linting issues 2022-12-20 21:27:26 -06:00
unsoftcapped3
31c53e0379
Merge pull request #4 from thepaperpilot/day-17-toys
why is this in the wrong branch
2022-12-20 19:12:52 -08:00
unsoftcapped3
198b49f487 remove .value 2022-12-21 03:12:07 +00:00
unsoftcapped3
315a2ae00b make wording about you have toys more clear 2022-12-21 03:11:00 +00:00
2e9c2e4487 Skip black dye for ribbons cost 2022-12-20 20:46:45 -06:00
unsoftcapped3
3d4d43fa15
fix typo 2022-12-20 17:41:33 -08:00
c20f6282a8 Hardcap letters at 8e9 2022-12-20 19:33:02 -06:00
eede682a69 Prepare toys for release 2022-12-20 19:12:54 -06: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
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
f14eb22e46 Make hotkeys 2-column 2022-12-19 07:41:49 -06:00
d84f0ad51b Add hotkeys for dyes 2022-12-19 07:41:37 -06:00
044ba23617 Add notif to dyes when reset 2022-12-19 07:35:15 -06:00
17fe735d82 Made hotkeys only appear when day is unlocked 2022-12-19 07:31:28 -06:00
ba34b7b581 Actually, filter is redundant 2022-12-19 07:29:57 -06:00
0f9e639a43 Fix JSX for hotkeys 2022-12-19 07:25:56 -06:00
ducdat0507
11666d2977 Hotkey display 2022-12-19 19:31:05 +07:00
75f3ca9f68 Fix createdSaplings not having a mastery ref 2022-12-19 00:01:43 -06:00
02967bb0e1 Make workshop use cost modifier method again 2022-12-18 23:58:26 -06:00
172233328e Carol cooldown modifiers 2022-12-18 23:44:17 -06:00
unsoftcapped3
a39508b9b2
fix red dye bug 2022-12-18 21:43:55 -08:00
e8e2880cff Add Noel to Mary Level 3 desc 2022-12-18 23:39:24 -06:00
cf56c4aa20 Fix wrapping paper req display 2022-12-18 23:37:53 -06:00
unsoftcapped3
30a5e7d80a
add buy max to fertilizer 2022-12-18 21:35:01 -08:00
7fbeaa8212 Fix synergy I and II not taking effect until refresh 2022-12-18 23:34:52 -06:00
fb3788ea4b Clarify wording 2022-12-18 23:15:28 -06:00
7dfce2ca06 Balancing pass 2022-12-18 22:59:27 -06:00
056dfa5b03 Fixed some issues 2022-12-18 22:41:11 -06:00
10af5bf7c9 Hide management upgrades in mastery 2022-12-18 22:20:40 -06:00
Seth Posner
6d60b32428 Dye buy max should be correct now 2022-12-18 19:56:59 -08:00
Seth Posner
7e2a1663dd Keep the previous dye amount when autobuying 2022-12-18 19:40:02 -08:00
Seth Posner
cf8df5e27e Merge branch 'days-15-16' of https://github.com/thepaperpilot/Advent-Incremental into days-15-16 2022-12-18 19:07:03 -08:00
Seth Posner
e0c8629d19 Carol and dye buy max now add actual dyes 2022-12-18 19:06:00 -08:00
6d7aa5f3ac Carol doesn't reset anything 2022-12-18 20:33:34 -06:00
circle-gon
c077a28c6e some fixes 2022-12-19 02:31:18 +00:00
circle-gon
5bb365dac1 attempt at moving stuff 2022-12-19 02:22:25 +00:00
c50b9873c5 Fixed some dye elf stuff 2022-12-18 20:12:00 -06:00
Seth Posner
e42e1f4c32 Add ribbon milestones for dye elf 2022-12-18 17:55:39 -08:00
4c07345855 Add barebones ribbons layer 2022-12-18 19:49:36 -06:00
circle-gon
be368e11bd first 7 layers' mastered story done 2022-12-19 01:35:31 +00:00
circle-gon
621d4c1beb makes components move items 2022-12-19 01:16:07 +00:00
Seth Posner
fbeca727ff Merge branch 'days-15-16' of https://github.com/thepaperpilot/Advent-Incremental into days-15-16 2022-12-18 17:12:36 -08:00
Seth Posner
bacac4e72c Get dye elf functional and into management 2022-12-18 17:07:09 -08:00
7eb3e2fa0b Fixed cloth and up not treating mastery correctly 2022-12-18 18:27:18 -06:00
a84eceea65 Fix wrapping paper modal replacing metal decorating modal 2022-12-18 18:08:57 -06:00
f3ce9cc0ca Fix goal now appearing on progress bar while decorating 2022-12-18 18:05:43 -06:00
98a8681711 Implemented metal mastery 2022-12-18 18:02:50 -06:00
f9cca20a14 Stop wrapping paper from affecting things in mastery 2022-12-18 18:01:30 -06:00
c48244531b Implemented boxes mastery 2022-12-18 16:58:09 -06:00
294cd5c989 Fixed some layers activating during mastery before they should 2022-12-18 16:41:00 -06:00
bef5ce94ec Hide decorating button once they're all decorated 2022-12-18 16:26:47 -06:00
2035ac7e03 Implemented paper mastery 2022-12-18 16:24:59 -06:00
bbf6c94fe5 Safeguard against createdSaplings going negative 2022-12-18 16:24:33 -06:00
e326f94d7e Raise coal mastery goal 2022-12-18 16:22:57 -06:00
85342bae2a Fixed coal mastery 2022-12-18 16:05:45 -06:00
0bbe295d70 Fixed workshop mastery issues 2022-12-18 15:47:46 -06:00
c47e6cf2f5 Fix manually cutting causing problems post-trees mastery 2022-12-18 15:33:19 -06:00