Commit Graph

261 Commits

Author SHA1 Message Date
BB
c7a95ccb2d Fixed eslint warning for unused vars 2022-04-02 13:11:55 +02:00
hydroflame
8354ba2314
Merge pull request #3286 from phyzical/bugfix/fix-max-warehouse-bulk-purchase
incorrect ternary with bulk purchase
2022-03-30 11:34:48 -04:00
Olivier Gagnon
98ae97afea Validate city name coming from netscript 2022-03-30 11:34:03 -04:00
phyzical
3c991a743c incorrect ternary 2022-03-30 23:33:45 +08:00
hydroflame
04d45a1f0e
Merge pull request #3192 from gianfun/check-corp-upgrade-before-purchase
Check before unlocking corp upgrade
2022-03-20 21:27:21 -04:00
hydroflame
9922ffb3c2
Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
Gian P
8be65faf9f Check before unlocking corp upgrade 2022-03-19 16:53:28 -03:00
Olivier Gagnon
bdb4d96f43 fix tooltip not dissapearing. 2022-03-19 11:19:59 -04:00
phyzical
44ea479043 update constants
* added OperationNames
* added faction names
* used citynames where appropriate
2022-03-19 16:09:59 +08:00
Master-Guy
d4f01c8b40 Fix for SRC folder 2022-03-18 11:07:29 +01:00
Master-Guy
9dd933ecee Changed .keyCode to .key for files in "src" 2022-03-18 10:43:56 +01:00
BB
4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01:00
hydroflame
03ab9ed1e2
Merge pull request #2914 from pd/product-industry-research
Fix research tree of product industries post-prestige
2022-03-16 14:54:10 -04:00
hydroflame
f65221b1f1
Merge pull request #3114 from ApamNapat/turn_on_three_more_lints
Mixing spaces and tabs, extra semicolons and lonely ifs are now illegal
2022-03-16 14:51:05 -04:00
TheRealMaxion
208af6ce9c
Fix some misleading corporation errors 2022-03-16 12:08:00 +01:00
BB
5e2ccc71ec Mixing spaces and tabs, extra semicolons and lonely ifs are now forbidden 2022-03-11 16:32:48 +01:00
hydroflame
d955398a68
Merge pull request #2757 from ltoni90/bugfix/2719_Corporation_Expressions
Bug fix corporation expressions
2022-03-10 22:15:39 -05:00
hydroflame
f117cc8a74
Merge pull request #2912 from phyzical/bugfix/2899
Added a check for exisiting industry type before expanding
2022-03-10 22:14:18 -05:00
hydroflame
b7ffdeb5e2
Merge pull request #3076 from ApamNapat/turned_two_eslint_rules_on
Trailing whitespace and files not ending with \n are now illegal
2022-03-10 22:12:17 -05:00
hydroflame
31a26a31ad
Merge pull request #3055 from ApamNapat/simplified_some_boolean_logic
Simplified some booleans and if elses
2022-03-10 22:11:26 -05:00
hydroflame
f5ca700476
Merge pull request #2864 from SagePtr/corp-material-fix
Don't hide irrelevant materials if their stock is not empty and hide irrelevant divisions from Export
2022-03-10 21:46:13 -05:00
BB
0eced1b9f2 Simplified some booleans and if elses 2022-03-08 22:52:26 +01:00
BB
2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
ChrissiQ
44c4529d90 🐛 (Bug: Corp) Fixes sufficient player money check to buy back shares.
`BuyBackShares()` checks the corp for sufficient funds, but since shares are purchased with player money, it should be checking the player's money instead.
2022-03-07 23:18:51 -07:00
hydroflame
4921cdea24
Merge branch 'dev' into phyzical/Corp-Api-Updates 2022-03-07 17:44:43 -05:00
hydroflame
e10571c0e8
Merge branch 'dev' into bugfix/corp-api-fixes 2022-03-07 17:43:29 -05:00
hydroflame
b226b3d872
Merge pull request #3087 from nickofolas/improvement/tabs
#2710 Addendum
2022-03-07 17:42:54 -05:00
nickofolas
e9033914e1 Update corp tabs to account for excessively long names 2022-03-07 16:40:22 -06:00
hydroflame
3310928598
Merge pull request #2710 from nickofolas/improvement/tabs
Update `<Tabs>` sizing and style
2022-03-07 17:22:06 -05:00
hydroflame
fc3a7edf6d
Merge pull request #3044 from ChrissiQ/fix-ui-style-corp-spacing
️  (Corp Warehouse UI Accessibility) Stop warehouse UI jump at higher zoom.
2022-03-01 10:50:09 -05:00
hydroflame
763800570b
Merge pull request #2867 from SagePtr/corp-formula
Better readable production equation (rewording)
2022-03-01 10:48:39 -05:00
ChrissiQ
565a827f28 ️ (Corp Warehouse UI Accessibility) Stop warehouse UI jump at higher zoom 2022-02-26 14:03:12 -07:00
phyzical
6e21f16160 adjustments per review comments
* updated error message
* used correct price for bulk purchasing check
* moved onclose and rerenders outside try blocks
2022-02-19 16:05:55 +08:00
phyzical
a2b4a63c2e merge latest dev 2022-02-15 20:24:24 +08:00
phyzical
da955a4774 refector of setEmployeeToJob 2022-02-13 17:57:13 +08:00
Matthew Thornton
fe0262eda1
Grammar Fix
Product is the noun, while the correct part of speech here is the verb "produce". 
Also of note, the limit doesn't change unless data is entered and then removed (otherwise the previous limit is kept) even if the button is clicked (which isn't the expected behavior based on the text). However, I'm not sure how to convey this succintly though and I'm not familiar enough with React to change the value when only the button is clicked (especially since it is probably the intended behavior to not change the value when the modal is closed by clicking outside of it).
2022-02-12 15:40:17 -06:00
phyzical
3e36e6a80b few more adjustments
* fixed the export material fix
* changed teh dev menu fund adjuster for more granular control
* added checks for smartSupply and setSmartSupply
* few random autolints
2022-02-12 11:31:50 +08:00
phyzical
51d10290d2 added early out for redundant assignment 2022-02-12 00:13:56 +08:00
phyzical
8b55b0293c corp api fixes
* added early out in UpgradeWarehouse when not enough cash
* added checks to enforce maxProducts
* added checks to enforce export material is valid for location
* added checks for market ti reasearches
2022-02-11 23:48:19 +08:00
ltoni90
b4cce9b57f
typo fix
Co-authored-by: ChrissiQ <1127719+ChrissiQ@users.noreply.github.com>
2022-02-07 16:00:08 +01:00
Phil Despotos
16655349f5 Fix research tree of product industries post-prestige
After destroying a BitNode, the `resetIndustryResearchTrees` reset all
industries to the _base_ research tree, leaving the product industries
without the `uPgrade` researches in the graph. So corporations started
in the next BitNode were unable to expand product capacity.

This fixes that reset function to use the correct product industry tree.
2022-02-04 19:40:49 -06:00
phyzical
105ea19eae add the industry name to assist with debugging when error occurs 2022-02-04 17:46:08 +08:00
phyzical
608cc089b2 Added a check for exisiting industry type before expanding 2022-02-04 17:34:16 +08:00
SagePtr
622ba0a2bd Better readable production equation 2022-01-29 20:59:18 +02:00
SagePtr
f22f0ed50a Hide irrelevant divisions in Export modal 2022-01-29 20:02:07 +02:00
SagePtr
a5f82e96ed Don't hide irrelevant materials if their stock is not empty 2022-01-29 18:58:21 +02:00
nickofolas
41eac2e775 Adjust sizing for corp and gang tabs 2022-01-26 00:53:17 -06:00
hydroflame
acee3c2994
Merge pull request #2705 from pigalot/bug-corp-product-cost
BUG: Fix for corp product cost
2022-01-26 00:46:39 -05:00
Luca Montagna
bd775f167e fixed temp evaluation of MAX and PROD for products 2022-01-22 13:58:51 +01:00
Luca Montagna
bfa271881b fixed temporary evaluation of MAX and PROD 2022-01-22 13:32:35 +01:00