Commit Graph

6539 Commits

Author SHA1 Message Date
hydroflame
23ac3d6288
Merge pull request #3642 from nickofolas/fix/options-sliders
OPTIONS: Fix sliders not sliding correctly
2022-05-13 11:02:51 -04:00
Vic1970
636d081abc Update Bladeburner.tsx
add string case conversion to allow capitalised action types in automate command.
2022-05-12 11:01:26 +10:00
hydroflame
d70d91b7b1
Merge pull request #3646 from Undeemiss/contract-already-solved-check
CODINGCONTRACT: Fix #3391 Double contract reward exploit
2022-05-11 20:49:07 -04:00
Undeemiss
831b2262de Reran format and lint 2022-05-11 16:06:05 -05:00
Undeemiss
a23c55c760 Added a check to prevent doubling coding contract rewards 2022-05-11 15:51:54 -05:00
Olivier Gagnon
f5f5879fc3 allbuild commit c799b291 2022-05-11 14:57:27 -04:00
hydroflame
c799b2918b
Merge pull request #3620 from nickofolas/fix/modal-z-index
UI: Fix z-index of modals overriding everything
2022-05-11 14:54:04 -04:00
borisflagell
7a6bcfc513 slight tweak to the no fragment use case
Removed the "non currently" message displayed when the played got no fragment.
2022-05-11 20:18:05 +02:00
borisflagell
5542d43fb9 Added support of duplicate fragment
Fragments sharing the same effect will now be merged in the summary.
2022-05-11 20:13:03 +02:00
JP Sugarbroad
01529a8347 fix typing conflict between jest and cypress
Cypress and Jest both define "expect", but they come from different
libraries (Cypress uses Chai, Jest uses its own thing). So we can't
include both of them in the tsconfig.json. Conveniently, however, we
don't need any of the test code to be part of the main project, so
it suffices to give these things their own tsconfig.json files.

That being done, adding "jest" to the global types lets us remove all
those imports.
2022-05-10 22:26:54 -07:00
hydroflame
ce888b757a
Merge pull request #3632 from trambelus/patch-1
Fix infiltration rep BN mult calculation
2022-05-10 00:40:12 -04:00
nickofolas
770312b9df Remove redundant arrow function 2022-05-09 19:34:36 -05:00
nickofolas
8baafe438d Fix options sliders not sliding 2022-05-09 19:32:32 -05:00
nickofolas
dd949697df Fix handle position 2022-05-09 19:26:20 -05:00
nickofolas
d4e97d786c Various log box improvements 2022-05-09 18:15:23 -05:00
nickofolas
bc9bce0d2c Tweaks to classes 2022-05-09 17:50:45 -05:00
Undeemiss
c2f381cc6e Fix compilation error
I must have missed this file in the commit while having it changed
in my working directory, because the game compiled fine when I was
testing initially but not when I switched branches and came back.
2022-05-09 16:15:11 -05:00
Undeemiss
6748017dd8 Require Blade's Simulacrum be installed in order to take effect
The check for when an action is started was not set to ignore a
purchased but not yet installed Blade's Simulacrum. That is fixed
here.
2022-05-09 15:17:42 -05:00
Undeemiss
a1754da9f6 Random comment added to my coding contract so I can PR this branch 2022-05-09 15:04:09 -05:00
Undeemiss
b00301f4e1 Renamed BN mult CorporationSoftCap to CorporationSoftcap
Replaced all instances of "CorporationSoftCap" in src/ with
"CorporationSoftcap". If files outside of src/ must be changed, I
do not know what those would be.
2022-05-09 14:45:19 -05:00
Undeemiss
8a68633d9c Throw an error when trying to charge stanek booster fragments 2022-05-09 14:29:42 -05:00
Dane Horn
a778015a21 formatting 2022-05-09 09:56:44 +02:00
Dane Horn
1675a2811c ignore ctrl and alt keypresses 2022-05-09 09:55:41 +02:00
Dane Horn
05f2f267b1 reorder 0 territory gangs to the back of the list and reduce opacity 2022-05-09 08:11:22 +02:00
nickofolas
ebc6b52af5 Properly show stats with a BitNode mult of 0 2022-05-08 20:45:00 -05:00
Dane Horn
86b29237eb add new function to detect key presses that can be ignored 2022-05-08 23:59:00 +02:00
Dane Horn
a64c271175 initial approach removing gangs with <= 0 territory 2022-05-08 22:59:36 +02:00
Alt
a6d578eb2e
Edit RAM cost in comment to equal actual RAM usage 2022-05-08 22:53:34 +02:00
rderfler
b683bc0340 fmt 2022-05-08 14:14:05 -04:00
Trambelus
6d63d6f44a
Fix infiltration rep BN mult calculation 2022-05-08 04:23:32 -04:00
Olivier Gagnon
c6806caca2 Wrap most of the API 2022-05-07 19:08:07 -04:00
nickofolas
dd0ff1b614 Fix check for player gang access 2022-05-07 17:51:02 -05:00
nickofolas
1147df8c75 Format 2022-05-07 17:34:50 -05:00
nickofolas
ce500f9bfa Update SF description to reflect changes 2022-05-07 17:20:45 -05:00
nickofolas
d1498598a9 Fix conditional rendering of BN mults element 2022-05-07 17:16:47 -05:00
nickofolas
6d1a3bb47a Fix naming inconsistencies 2022-05-07 16:54:55 -05:00
nickofolas
05f6e079cd Fix hack money BN mult in PlayerMultipliers 2022-05-07 16:52:46 -05:00
nickofolas
c688e20876 Refactor character stats table 2022-05-07 16:51:34 -05:00
Olivier Gagnon
fb08139903 Implemented infinite loop safety net. 2022-05-07 17:43:45 -04:00
nickofolas
5d89f17e4a Tweak max SF level code 2022-05-07 16:28:01 -05:00
nickofolas
d43ec1d501 Fix computation of BN level 2022-05-07 16:19:31 -05:00
nickofolas
1f8c5164d7 Update BN Mults UI and add section to Stats 2022-05-07 15:52:10 -05:00
nickofolas
b1f945ff8e Refactor CharacterStats a bit 2022-05-07 14:48:26 -05:00
nickofolas
ef29baf563 Refactor PlayerMultipliers.tsx 2022-05-07 12:46:04 -05:00
nickofolas
81912d7876 Fix defaultMultipliers being changed 2022-05-07 10:14:01 -05:00
borisflagell
cc6089092f Fix Test error on Tooltip import (hopefully) 2022-05-07 15:35:27 +02:00
borisflagell
705a56f3bd prettier
Add a summary to the stanek page

Tweak UI

Ran Prettier & lint, added a margin to a stanek page element

revert shit
2022-05-07 15:14:51 +02:00
rderfler
30521468fc Merge dev 2022-05-06 22:44:37 -04:00
rderfler
77073836cb Merge remote-tracking branch 'upstream/dev' into dev 2022-05-06 22:44:24 -04:00
nickofolas
3e9bcea9e4 Fix modal z-index 2022-05-06 11:35:23 -05:00