Commit graph

329 commits

Author SHA1 Message Date
69b79eec16 Implemented Noel lv1-3 2022-12-12 11:29:43 -06:00
eea9ce22c0 Implement Joy lv1-3 2022-12-12 10:47:19 -06:00
1950404b72 Fix wrong name 2022-12-12 10:43:24 -06:00
8354d08846 Implement Faith lv1-3 2022-12-12 10:39:45 -06:00
e684191660 Implement Snowball lv1-3 2022-12-12 10:34:04 -06:00
8a74d961c5 Implemented Star lv1-3 2022-12-12 10:05:28 -06:00
circle-gon
6bd96e9616
minor fixes 2022-12-12 10:51:59 -05:00
db50be95a5 Implemented Bell lv1-3 2022-12-12 09:45:23 -06:00
ducdat0507
2493012c3f Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-12 21:51:55 +07:00
ducdat0507
ac01155504 Focus system prototype 2022-12-12 21:47:27 +07:00
661cda21cb Implemented gingersnap lv1-3
Plus some cleanup
2022-12-12 08:35:43 -06:00
c6c6ff0947 Fix fixOldSave check 2022-12-12 07:38:26 -06:00
ducdat0507
6808f983ce Fix oil and depth upgrades mixing up 2022-12-12 18:37:25 +07:00
ducdat0507
e2d9f20422 Some styling changes 2022-12-12 15:02:33 +07:00
ducdat0507
df2d8f37ff Fix timer 2022-12-12 13:34:15 +07:00
7f5191b82f Build error 2022-12-11 23:47:04 -06:00
7ee620a724 Also pause 2022-12-11 23:45:09 -06:00
670b9b9eb9 Set modVersion 🤦 2022-12-11 23:43:47 -06:00
4a5771d2ad Deactivate tons of shit 2022-12-11 23:43:27 -06:00
0179775e0e Fix display issues with management 2022-12-11 23:29:32 -06:00
67ec8c9856 Formatting 2022-12-11 23:29:32 -06:00
unsoftcapped3
13bf1cb8bf
Update boxes.tsx 2022-12-11 21:23:48 -08:00
unsoftcapped3
4156e6cc0e
generic 2022-12-11 20:56:27 -08:00
unsoftcapped3
5d0a2fa6fb
the box upgrade descriptions 2022-12-11 20:23:06 -08:00
5e6fb25e86 Fix build issue 2022-12-11 21:52:52 -06:00
8504bbd374 Fix typo 2022-12-11 21:49:10 -06:00
unsoftcapped3
34c0094075
remove build errors 2022-12-11 19:46:27 -08:00
unsoftcapped3
50bf6db5ce
add post-100% milestone descriptions for workshop 2022-12-11 19:42:34 -08:00
543de79dcc Fix oil upgrades display issue 2022-12-11 21:42:29 -06:00
unsoftcapped3
c3f61108fd
fix a typo 2022-12-11 19:34:47 -08:00
unsoftcapped3
95973cd66f
finish adding milestone descriptions 2022-12-11 19:32:40 -08:00
unsoftcapped3
a2cb8c3e2f
more milestone descriptions 2022-12-11 19:25:54 -08:00
unsoftcapped3
90385e3519
add some milestone descriptions 2022-12-11 19:17:25 -08:00
unsoftcapped3
f7e26ac426
undefined does not compile, use "" instead 2022-12-11 18:56:03 -08:00
circle-gon
d9bbd9dce0
some slight improvements 2022-12-11 21:05:19 -05:00
circle-gon
6199f07fbc fixes some issues 2022-12-12 01:38:36 +00:00
Chunkybanana
9ceacb08d9 hardcap elf levels at school level 2022-12-12 01:04:47 +00:00
circle-gon
f3007eb942 some progress on management 2022-12-11 23:59:36 +00:00
unsoftcapped3
83d1b08258
change x0% to +0% 2022-12-11 10:51:58 -08:00
circle-gon
3641db9fe0 prevents management layer from showing up in production 2022-12-11 18:44:09 +00:00
circle-gon
6911f6c1f0 basic management layer 2022-12-11 01:40:35 +00:00
3128e2d290 Management tweaks 2022-12-10 19:06:19 -06:00
1a4beb4f4e Fix wetter dyes upgrade 2022-12-10 18:39:00 -06:00
8e97fd3e4f Make dyes look a bit nicer 2022-12-10 18:30:40 -06:00
965d1e4030 Use renderGrid 2022-12-10 18:30:40 -06:00
ae8e1e47c5 Add renderGrid function 2022-12-10 18:30:40 -06:00
32eea67b53 Fixed dyes not being created outside lazy proxies 2022-12-10 18:30:40 -06:00
circle-gon
7715a7fa65 some more changes 2022-12-10 22:55:15 +00:00
circle-gon
c24255acc3 basic management layer 2022-12-10 22:38:42 +00:00
circle-gon
743f982d7d basic management layer 2022-12-10 22:33:37 +00:00
a327ec715d Merge pull request #12 from adsaf123/main
Merge grid rows and retain soft edges
2022-12-10 13:04:08 -06:00
0826f39542 Add elf management symbol 2022-12-10 11:48:12 -06:00
c5ce6aab04 Add dyes symbol 2022-12-10 11:42:15 -06:00
ducdat0507
b572cc2c76 Dye text changes 2022-12-10 18:35:41 +07:00
Jacorb90
dd0f59ca46 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-10 02:10:40 -05:00
Jacorb90
c01808e46c Created Dye Layer 2022-12-10 02:10:38 -05:00
0ac7bc42d1 Reword PWA update notif 2022-12-10 00:47:11 -06:00
df4c584327 Tweak wording 2022-12-09 18:34:54 -06:00
Jacorb90
0c44171589 Display Coal Drilling when Cloth unlocked 2022-12-09 13:47:18 -05:00
Jacorb90
a8ff894537 Visual fixes 2022-12-09 10:13:25 -05:00
8bad5f164b Fix typo 2022-12-09 08:33:21 -06:00
ed1b7b86a6 Implemented plastic 2022-12-09 03:44:51 -06:00
circle-gon
6be17f68ec hopefully fixes negative coal bug 2022-12-09 02:34:47 +00:00
circle-gon
c80dcffaee adds utility function for buyables 2022-12-09 02:27:27 +00:00
Jacorb90
93716fa4ff Merge conflict moment (sorry) 2022-12-08 20:39:11 -05:00
Jacorb90
4acfa0c5e1 Oil display fixes 2022-12-08 20:37:22 -05:00
a71b99f926 Fix collapsed oil milestones not being defined 2022-12-08 19:34:31 -06:00
d599f37bbb Fixed PWAs not showing updates 2022-12-08 19:31:36 -06:00
circle-gon
eaebb4048e Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-09 00:24:03 +00:00
circle-gon
bcc62a802f fixes some grammar 2022-12-09 00:23:57 +00:00
Jacorb90
e986297030 Fixed various persistence bugs 2022-12-08 19:15:28 -05:00
Jacorb90
4a94162ed4 fix typescript 4.9.3 bs errors 2022-12-08 19:09:15 -05:00
ducdat0507
2d1fb360dc Add oil gain requirement text 2022-12-08 22:35:53 +07:00
ducdat0507
87a36fd4e7 Oil icon 2022-12-08 21:54:39 +07:00
ducdat0507
756bcdc54c Fix oil integration 2022-12-08 21:22:41 +07:00
ducdat0507
34b96f6862 Change efficiency labels 2022-12-08 21:10:42 +07:00
ducdat0507
6a9e3cc1ac Oil prototype 2022-12-08 21:04:58 +07:00
132ef32525 Don't open days until they're implemented 2022-12-08 07:50:52 -06:00
ef6f9935a5 Make PWA check every minute instead of hour 2022-12-08 07:46:24 -06:00
04525a95bc Fix total resources increasing on load 2022-12-07 23:00:30 -06:00
Seth Posner
5da85eacce Add optional gain multiplier to limit format 2022-12-07 10:57:08 -08:00
Seth Posner
2b5f435176 Fix metal/s display 2022-12-07 10:46:19 -08:00
Chunkybanana
e5deee9731 Added hotkeys for the cloth layer 2022-12-07 10:49:04 +00:00
ducdat0507
99658fe3ab Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-07 13:55:01 +07:00
ducdat0507
5919f1a579 Style refinements 2022-12-07 13:54:57 +07:00
71f0ad1c93 Lay out outfits vertically 2022-12-07 00:45:46 -06:00
1871fe8f60 Bump up small fires synergy 2022-12-06 23:52:55 -06:00
68fe6fa1fb Make faith spend small fires regardless of toggle 2022-12-06 23:51:19 -06:00
b88d6bedbf Implemented day 8 2022-12-06 23:44:20 -06:00
unsoftcapped3
009d33383f
add .max(0)s 2022-12-06 19:43:55 -08:00
unsoftcapped3
21dda55cb6
why is .max() not a thing 2022-12-06 19:28:05 -08:00
unsoftcapped3
e79a5edd7f
fix negative fire bug 2022-12-06 19:24:07 -08:00
circle-gon
84f4f94e4a
fixes autosmelt display showing up earlier than normal 2022-12-06 21:10:04 -05:00
a1baaf14fb Add story for metal 2022-12-06 19:48:41 -06:00
01396a2ee2 Add metal to scene 2022-12-06 19:39:42 -06:00
3c890e003b Fix elves not activating purchased fires 2022-12-06 19:39:42 -06:00
Seth Posner
c26f7ddd21 Move bonfire condition to correct buyable 2022-12-06 17:34:40 -08:00
43ae56d901 Unwrap canPurchase 2022-12-06 19:05:03 -06:00
circle-gon
2339a41cf6 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-07 00:21:29 +00:00
circle-gon
fbc82018e3 adds formatGain utility, and shows limiting factor for metal gain 2022-12-07 00:21:24 +00:00
Seth Posner
9fcdcfbfc9 Add industrial crucible metal multiplier, reduce goal 2022-12-06 15:16:17 -08:00
Chunkybanana
4215157a2c Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-06 20:23:06 +00:00
Chunkybanana
fc17b12ac7 Added notification for coal drill upgrade 2022-12-06 20:23:03 +00:00
Seth Posner
deac397e46 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-06 12:18:59 -08:00
Seth Posner
f222d7eb5b Fix manual tree cutting giving too many logs 2022-12-06 12:18:50 -08:00
Chunkybanana
307a887053 jsx fix 2022-12-06 20:17:13 +00:00
Seth Posner
99670cc488 Add limit display to metal production 2022-12-06 11:52:25 -08:00
Seth Posner
4bfbf2a25a Heighten goal to match higher gain 2022-12-06 11:45:02 -08:00
Seth Posner
f2f214065e Fix ore gain, revert to tougher scaling 2022-12-06 11:44:10 -08:00
Seth Posner
e9873e2436 Add visibility conditions to coal buyables 2022-12-06 11:19:28 -08:00
Seth Posner
e48ad79f2a Add forgotten metal export 2022-12-06 11:16:29 -08:00
Seth Posner
4d28e9b843 More efficient elf canBuy 2022-12-06 11:14:55 -08:00
Seth Posner
f31c31c246 Make sure elves don't buy hidden buyables 2022-12-06 11:06:00 -08:00
Seth Posner
36eb1474af Add metal layer 2022-12-06 11:02:34 -08:00
ducdat0507
7856d6f5e8 Next day timer 2022-12-06 23:38:35 +07:00
69dcad4eb0 Removed stray auto-generated function 2022-12-06 08:08:35 -06:00
2fe9a84488 Cleaned up NonPersistent typing 2022-12-06 07:14:42 -06:00
2afb1a16f4 Fixed resets 2022-12-06 07:09:21 -06:00
ca1664e705 Updated wording 2022-12-06 00:21:00 -06:00
55f0a7f2dd Mark resources as not persistent where appropriate 2022-12-06 00:18:11 -06:00
c07298df9c Fix save data object redundancy
Note: Requires the use of noPersist quite a bit, but the console will tell you when you missed a spot
Also required breaking up events.ts due to cyclical dependencies
2022-12-06 00:18:11 -06:00
Chunkybanana
14cf9f81bb Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental into main 2022-12-06 05:22:53 +00:00
Chunkybanana
5e72a75fee hopefully made elves not buy? 2022-12-06 05:21:37 +00:00
circle-gon
cd875447ca fixes some grammar 2022-12-06 01:45:44 +00:00
circle-gon
33bbaba3dd fixes a coding error 2022-12-06 01:24:37 +00:00
circle-gon
3bc260b8b8 adds log/linear for day completion bars and removes more unused imports 2022-12-06 01:17:59 +00:00
Seth Posner
f302d2afab Add text color option 2022-12-05 16:46:34 -08:00
Seth Posner
ee48800c37 Create progress tracker utility function 2022-12-05 16:30:23 -08:00
Seth Posner
65622c84c7 Merge branch 'main' of https://github.com/thepaperpilot/Advent-Incremental 2022-12-05 10:27:42 -08:00
Seth Posner
45391be8ce Fix bonfire autobuying and fire display 2022-12-05 10:27:41 -08:00
ducdat0507
710dc62504 Fix stuff 2022-12-05 23:20:39 +07:00
ducdat0507
73e92610a7 Made some styling changes 2022-12-05 23:13:05 +07:00
0bc90eeacf Only convert day.shouldNotify once 2022-12-05 07:18:53 -06:00
c292f6bcc3 Make rest of discord links open in new tab 2022-12-05 07:17:15 -06:00
12366ce59c Make 3 elves milestone modifier support low numbers 2022-12-05 07:15:43 -06:00
d6ff6c4c58 Revert "Fixed 3 elves milestone decreasing coal production"
This reverts commit 2be480d4ec.
2022-12-05 07:15:18 -06:00
Chunkybanana
2be480d4ec Fixed 3 elves milestone decreasing coal production 2022-12-05 09:47:20 +00:00
Chunkybanana
0af5acd630 Made discord link open in a new tab 2022-12-05 09:41:23 +00:00
Chunkybanana
bad30a9fd0 Added notifications on layers updating each other 2022-12-05 09:37:56 +00:00
Chunkybanana
3e5696d35e Fixed grammar errors with box layer 2022-12-05 04:26:02 +00:00
43df6f567c Use createCollapsibleMilestones to display milestones 2022-12-04 20:31:27 -06:00
3bf534f5b2 Create createCollapsibleMilestones util function 2022-12-04 20:31:14 -06:00
a9d7d6215c Disabled workshop milestones once they're no longer reset 2022-12-04 20:12:16 -06:00
7d3b9c4209 Add showPopups property to milestones 2022-12-04 20:06:21 -06:00
Seth Posner
8c255e0e67 Fix fire cost not being based on bonfires 2022-12-04 16:59:40 -08:00
f670ffa6aa Implemented boxes day 2022-12-04 16:55:14 -06:00
3ba15fd969 Made toggles work better on features 2022-12-04 16:50:24 -06:00
circle-gon
c23a4d5626
an actual fix this time 2022-12-04 14:44:20 -05:00
circle-gon
df645f7b47
fixes elves autobuying 2022-12-04 14:43:27 -05:00
02a1f6d44c Make books show current effect 2022-12-04 13:43:22 -06:00