Olivier Gagnon
6c24ed69a2
merge prs
2021-11-26 17:56:49 -05:00
Olivier Gagnon
39df55cfe5
fix logbox color
2021-11-26 17:55:14 -05:00
hydroflame
a21e2f0dd5
Merge pull request #1791 from alainbryden/1766-fix-blackjack-double-loss
...
#1766 - Fix blackjack double loss, black-on-black text
2021-11-26 17:51:45 -05:00
hydroflame
1a06b25ff7
Merge pull request #1790 from alainbryden/1773-dont-append-js-to-all-script-files
...
#1773 - Fix duplicate file extensions
2021-11-26 17:50:09 -05:00
Alain Bryden
f7da154411
Blackjack pays 1.5x, fix appearances
...
I'll lead with this so it doesn't look like I snuck it in: Winning by blackjack is special and usually pays 1.5x so I made it so :) All the infrastructure was already in place.
Fixed bkack-on-black text, I didn't even know the game kept count of your cards for you! Improved the way it's displayed a bit (screenshot in PR)
Also simplified the code that determines gains and applies the win since there was some duplication there.
2021-11-26 00:37:18 -04:00
Alain Bryden
dbde0b8112
#1766 Fix blackjack double loss
...
Bet was being removed twice instead of just once. This fact was accounted for in the win and tie if branches, but not the loss branch.
2021-11-25 23:28:23 -04:00
Alain Bryden
ef23033b2c
#1773 - Fix duplicate file extensions
...
For some time now, filenames have included the extension, so there's no need to append ".js" either on a single-file download or zip download.
While I was in the area, I also fixed .txt files in a folder - they had the same bug as scripts used to (appear in the zip as an underscore). I consolidated the code since it was the same for script files and text files.
I also added the ability to download *.js and *.ns (previously only supported *, *.script, and *.txt)
I also made the wildcard matching just a bit more flexible, so if someone really wanted to, they could go "download *blah.js" and get all scripts ending with that pattern ¯\_(ツ)_/¯
2021-11-25 23:06:13 -04:00
hydroflame
01a6dd7aab
Merge pull request #1787 from danielyxie/dev
...
Scripting stuff
2021-11-25 11:47:56 -05:00
Olivier Gagnon
f0a004e75b
Fix a bunch of scripting related stuff.
2021-11-25 11:47:31 -05:00
hydroflame
8ad7ca5136
Merge pull request #1763 from alainbryden/patch-1
...
Return the price paid/recieved on short/sellShort
2021-11-25 11:36:59 -05:00
hydroflame
c2b58ffcce
Merge pull request #1781 from danielyxie/dev
...
gang with 0 territory cannot fight
2021-11-24 17:58:37 -05:00
Olivier Gagnon
afe6a72458
gang with 0 territory cannot fight
2021-11-24 17:58:20 -05:00
hydroflame
f42bc288a6
Merge pull request #1780 from danielyxie/dev
...
Prevent browser back
2021-11-24 16:15:55 -05:00
Olivier Gagnon
31edf92092
prevent browser back in history
2021-11-24 16:15:19 -05:00
Olivier Gagnon
9c85df1f5d
update screenshots
2021-11-23 17:03:38 -05:00
Olivier Gagnon
735b1ec4a0
assets
2021-11-22 17:57:30 -05:00
Olivier Gagnon
85c53180af
doc fix
2021-11-22 11:37:39 -05:00
hydroflame
d6cbca94bd
Merge pull request #1764 from danielyxie/dev
...
few bugfix
2021-11-22 11:36:34 -05:00
Olivier Gagnon
42518c3caa
fix few bugs
2021-11-22 11:36:13 -05:00
Alain Bryden
6b8a91a23b
Return the price paid/recieved on short/sellShort
2021-11-22 11:19:23 -04:00
hydroflame
626c1b49eb
Merge pull request #1760 from BartKoppelmans/patch-5
...
Fixed BladeBurner `getCityCommunities` ram cost
2021-11-20 15:14:03 -05:00
Bart Koppelmans
79f456b598
Fixed BladeBurner getCityCommunities ram cost
...
With the renamed function, the ram cost was not taken into account.
2021-11-20 21:12:21 +01:00
hydroflame
d169d2af4c
Merge pull request #1759 from danielyxie/dev
...
fix tprintf printing filename
2021-11-20 15:01:33 -05:00
Olivier Gagnon
f035457efc
build part pr
2021-11-20 15:01:04 -05:00
hydroflame
7b3369223d
Merge pull request #1758 from BartKoppelmans/patch-4
...
Fixed tprintf also printing the file name
2021-11-20 14:59:38 -05:00
Bart Koppelmans
b6b191bdbe
Fixed tprintf also printing the file name
2021-11-20 20:54:31 +01:00
Olivier Gagnon
faa9b87733
added new mechanic that allows the wd to be stronger
2021-11-20 01:30:45 -05:00
Olivier Gagnon
3ab3106634
build with dev
2021-11-20 00:26:01 -05:00
hydroflame
ac74d6a46b
Merge pull request #1751 from danielyxie/dev
...
fix some coloring stuff
2021-11-19 23:55:21 -05:00
Olivier Gagnon
7255ce24ef
fix some coloring stuff
2021-11-19 23:55:10 -05:00
Olivier Gagnon
60d34c3cc6
rebuild
2021-11-19 23:45:34 -05:00
hydroflame
41592a199a
Merge pull request #1750 from danielyxie/dev
...
fix tprintf catching errors
2021-11-19 22:58:56 -05:00
Olivier Gagnon
c88dade19a
fix tprintf catching errors
2021-11-19 22:58:41 -05:00
hydroflame
7764afaf31
Merge pull request #1748 from danielyxie/dev
...
v1.0.2
2021-11-19 15:50:51 -05:00
Olivier Gagnon
983c102123
v1.0.2
2021-11-19 15:50:22 -05:00
Olivier Gagnon
b80d12b9f8
v1.0.2 part 1
2021-11-19 15:44:12 -05:00
Olivier Gagnon
a4a931dad7
v1.0.2 part 1
2021-11-19 14:39:38 -05:00
hydroflame
73bbf4d454
Merge pull request #1743 from danielyxie/dev
...
spawn defaults to 1 thread
2021-11-18 18:01:04 -05:00
Olivier Gagnon
762b5b44aa
spawn defaults to 1 thread
2021-11-18 18:00:20 -05:00
Olivier Gagnon
cb4c06d2ba
remove cooling because it fucks with very high level hacking strategies
2021-11-18 15:42:49 -05:00
Olivier Gagnon
632de50a73
convert BN13 to a more conventional one.
2021-11-18 15:38:19 -05:00
hydroflame
ced4ac2502
Merge pull request #1742 from danielyxie/dev
...
Add button to donate blood.
2021-11-18 15:23:50 -05:00
Olivier Gagnon
ca7cb0bead
Merge dev
2021-11-18 15:23:04 -05:00
Olivier Gagnon
e34467ff6e
Added blood donation link.
2021-11-18 15:21:12 -05:00
hydroflame
6e7ca6a9b5
Merge pull request #1741 from danielyxie/dev
...
v1.0.1
2021-11-18 11:33:10 -05:00
hydroflame
459f73702d
Merge pull request #1740 from danielyxie/doc
...
Doc
2021-11-18 11:32:33 -05:00
Olivier Gagnon
fc4c0fd8fd
rebuild
2021-11-18 11:32:22 -05:00
Olivier Gagnon
f3fa2a7c79
v1.0.1
2021-11-18 11:30:45 -05:00
Olivier Gagnon
c69eb34341
v1.0.1
2021-11-17 19:56:17 -05:00
hydroflame
b64389af73
Merge pull request #1738 from alainbryden/patch-1
...
Remove forgotten debug statement.
2021-11-17 18:53:54 -05:00
