Commit Graph

5441 Commits

Author SHA1 Message Date
phyzical
a4d221f709 missed a conflict opps 2022-04-07 16:23:26 +08:00
phyzical
85e65195e5 merg dev 2022-04-07 16:22:07 +08:00
Olivier Gagnon
7d4bf90b40 fmtlinttest 2022-04-06 20:18:25 -04:00
hydroflame
371de216ea
Merge pull request #3308 from phyzical/bugfix/fix-tests
Fix tests
2022-04-06 20:16:55 -04:00
hydroflame
b6d68f7353
Merge branch 'dev' into bugfix/fix-tests 2022-04-06 20:16:51 -04:00
Olivier Gagnon
4fc352a792 fix a few test 2022-04-06 20:12:54 -04:00
Olivier Gagnon
f05b533af5 fix a few test 2022-04-06 20:08:03 -04:00
Olivier Gagnon
8ae23937fb fix a few test 2022-04-06 19:58:06 -04:00
Olivier Gagnon
9ce2023873 allbuild commit 724c0669 2022-04-06 19:40:04 -04:00
Olivier Gagnon
724c0669da sleep/asleep return promise true 2022-04-06 19:38:30 -04:00
Olivier Gagnon
e07a223d77 Added fmt and lint warnings to github pr template 2022-04-06 19:36:35 -04:00
Olivier Gagnon
48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
Olivier Gagnon
5a25faf9fa allbuild commit ba6304fb 2022-04-06 15:06:15 -04:00
hydroflame
ba6304fbd1
Merge pull request #3351 from phyzical/bugfix/augmentations-not-reseting-correctly
changes static arrays to functions to force new creation of augmentations when called
2022-04-06 15:03:45 -04:00
hydroflame
d8b2c003c2
Merge pull request #3307 from steven-r/fix-3281
Fix 3281 - ns.goToLocation is expecting the wrong minimum RAM
2022-04-05 20:03:42 -04:00
hydroflame
d683fa5eda
Merge pull request #3337 from phyzical/feature/3332
added apr1 terminal command
2022-04-05 20:02:26 -04:00
hydroflame
8e2f9a513b
Merge pull request #3335 from ApamNapat/eslint_warnings_fixes
Fixed eslint warnings for unused vars
2022-04-05 20:01:58 -04:00
hydroflame
4cdef2d898
Merge pull request #3349 from phyzical/bugfix/3347
add logic to block sleeve working for gang faction
2022-04-05 20:01:02 -04:00
hydroflame
b5005cd480
Merge pull request #3352 from phyzical/feature/3258
add app id for notifications and other magic
2022-04-05 19:53:35 -04:00
hydroflame
cd33b833d5
Merge pull request #3363 from Seancheey/patch-1
Fix workForFaction invalid worktype case
2022-04-05 19:48:56 -04:00
Qiyi Shan
b9caddeeef
Fix workForFaction invalid worktype case
When invalid work type, the function should return false instead of true
2022-04-05 11:22:02 -04:00
phyzical
ee6c13d33b add app id for notifications and other magic 2022-04-04 22:15:46 +08:00
phyzical
4a5edb9f3c changes static arrays to functions to force new creation when called 2022-04-04 19:44:25 +08:00
phyzical
8eccdf16e1 add logic to block working for gang faction 2022-04-04 18:10:21 +08:00
phyzical
6f09720393 added logic to add cmd/ctrl and +, cmd/ctrl and - cmd/ctrl and 0
* added logic to atleast allow arm64 to launch due to steam incopatibility
2022-04-02 23:04:48 +08:00
phyzical
61fc815a6b added apr1 terminal command
* just opens the rickroll modal
2022-04-02 20:08:57 +08:00
BB
c7a95ccb2d Fixed eslint warning for unused vars 2022-04-02 13:11:55 +02:00
hydroflame
acfd164927
Merge pull request #3330 from ApamNapat/fix_makeRuntimeErrorMsg_type
Fixed type of makeRuntimeErrorMsg in INetscriptHelper
2022-04-02 01:25:06 -04:00
BB
c495d39e6b Fixed type of makeRuntimeErrorMsg in INetscriptHelper 2022-04-02 00:30:12 +02:00
Olivier Gagnon
e3e6b449d4 Make Stanek hacknet cost percentage better. 2022-04-01 16:59:23 -04:00
Olivier Gagnon
b86ff7d405 allbuild commit 6c8a46d3 2022-04-01 16:39:58 -04:00
Olivier Gagnon
6c8a46d38b allbuild commit 1bf12d29 2022-04-01 16:05:16 -04:00
hydroflame
1bf12d29b5
Merge pull request #3325 from danielyxie/stanek-formula-rework
stanek-formula-rework
2022-04-01 16:01:14 -04:00
Olivier Gagnon
cd09589f25 stanek-formula-rework 2022-04-01 15:45:12 -04:00
Olivier Gagnon
9b4750aed4 allbuild commit d9499077 2022-04-01 01:18:03 -04:00
hydroflame
d94990779f
Merge pull request #3319 from danielyxie/apr1
Added apr1
2022-04-01 01:13:37 -04:00
Olivier Gagnon
40faa6af5c allbuild commit 4b867fea 2022-03-31 15:53:38 -04:00
Olivier Gagnon
4b867fea3e rename factions formulas to reputation 2022-03-31 15:52:03 -04:00
Olivier Gagnon
565659fba9 allbuild commit f55197ea 2022-03-31 15:48:16 -04:00
hydroflame
f55197eabd
Merge pull request #3314 from PSEUDOSTAGE/patch-1
Add calculateFavorToRep and calculateRepToFavor to Formulas.exe
2022-03-31 15:45:13 -04:00
PSEUDOSTAGE
a5f63e5932
fixed trailing spaces 2022-03-31 15:38:35 -04:00
PSEUDOSTAGE
ad9ff78533
Add calculateFavorToRep and calculateRepToFavor to Formulas.exe
The favorToRep and repToFavor formulas are shown to the player in the factions pages but were not available in Formulas.exe. This change adds a FactionsFormulas interface with the calculateFavorToRep and calculateRepToFavor functions.
2022-03-31 15:28:25 -04:00
PSEUDOSTAGE
a0333d36a5
Add calculateFavorToRep and calculateRepToFavor to Formulas.exe
The favorToRep and repToFavor formulas are displayed to the player in the factions pages but were not available in Formulas.exe. This change adds a FactionsFormulas interface with the calculateFavorToRep and calculateRepToFavor as new functions.
2022-03-31 15:27:02 -04:00
Olivier Gagnon
384cfb0044 Added apr1 2022-03-31 12:04:06 -04:00
Olivier Gagnon
d04e05eac8 allbuild commit 5d36336d 2022-03-31 10:52:24 -04:00
Olivier Gagnon
5d36336db9 allbuild commit 65c8e2b2 2022-03-31 10:50:06 -04:00
Olivier Gagnon
65c8e2b280 Fix aug cost 2022-03-31 10:45:52 -04:00
phyzical
18af3f8413 moved updateRam to first call to avoid lack of mocks for tests
* added wrapper funcs to simplify updateRam
* added static parser tests and skiped what isnt worker still for next person to try and fix
2022-03-31 21:41:19 +08:00
Stephen Reindl
805480693c remove unnecessary space 2022-03-31 12:46:48 +02:00
Stephen Reindl
689059ea83 Fix expected ram calculation for ns.goToLocation() 2022-03-31 12:37:33 +02:00