Joe Zeng
2e3eff025f
Replaced spaces with tabs.
...
Check CONTRIBUTING.md, guys!
2020-11-06 20:54:14 -05:00
Joe Zeng
9b04e14388
Added "Always reverse" option for rotation reversal.
2020-11-06 19:17:32 -05:00
Ishaan Bhardwaj
f52da36bf7
TGM3 cool system change
2020-11-06 14:01:28 -05:00
Ishaan Bhardwaj
76142c1dff
More Green Orange line
2020-11-05 16:21:58 -05:00
Ishaan Bhardwaj
a3458e2413
Fix Arika SRS
2020-11-04 22:46:45 -05:00
Ishaan Bhardwaj
4d2868b7b6
Small changes.
2020-11-04 16:57:44 -05:00
Ishaan Bhardwaj
10833f2ec1
Score drain changes
2020-11-03 23:20:41 -05:00
Ishaan Bhardwaj
abb2b9491e
Preparing for v0.2.1
2020-11-03 23:04:47 -05:00
Ishaan Bhardwaj
062ab2005e
v0.2 release commit - hold piece darken
2020-11-03 16:56:08 -05:00
Ishaan Bhardwaj
468025fc80
last commit to core modes before release
2020-11-03 12:17:36 -05:00
Ishaan Bhardwaj
c8544975d6
Fix interval training
2020-11-03 11:55:30 -05:00
Ishaan Bhardwaj
6776229bfb
Small push to Cambridge modes
2020-11-03 11:52:52 -05:00
Ishaan Bhardwaj
84b4dc5073
World Bone Blocks
2020-11-03 10:58:21 -05:00
Ishaan Bhardwaj
35dafb6615
keep leaving debug code in new commits
2020-11-02 22:51:16 -05:00
Ishaan Bhardwaj
3641d85fcb
Major changes, including modpack support
2020-11-02 22:47:58 -05:00
Ishaan Bhardwaj
9b89c4d1de
G/O line fix
2020-11-02 21:17:13 -05:00
Ishaan Bhardwaj
2dba120919
Green line and orange line for TAP Master
2020-11-02 20:43:10 -05:00
Ishaan Bhardwaj
9224f271b1
Hotfix for last
2020-11-02 16:20:22 -05:00
Ishaan Bhardwaj
febb5d546c
Score overhauls
2020-11-02 16:12:05 -05:00
Ishaan Bhardwaj
c6482c423e
4w optimization and green/orange line adding for applicable modes
2020-11-02 13:46:16 -05:00
Ishaan Bhardwaj
6beb313c6b
Debug fixes
2020-11-02 12:44:15 -05:00
Ishaan Bhardwaj
eb70f55b6e
TGM2 fixes and cool fixes
2020-11-02 12:21:12 -05:00
Ishaan Bhardwaj
0badcde9ad
Basset: the only person to leave debug code in a repo
2020-11-01 13:44:35 -05:00
Ishaan Bhardwaj
129237f0b0
TGM+
2020-11-01 13:24:52 -05:00
Ishaan Bhardwaj
741c246244
second lol
2020-11-01 12:04:07 -05:00
Ishaan Bhardwaj
b5937af8b2
lol
2020-11-01 12:01:26 -05:00
Ishaan Bhardwaj
33b8533d8e
Fixes to TAP M-roll requirements
2020-11-01 11:06:43 -05:00
Ishaan Bhardwaj
69959ff687
TA Death level advance formula is very bugged
2020-10-30 21:36:05 -04:00
Ishaan Bhardwaj
f91cd99dfd
Minor fixes to TGM modes
2020-10-30 21:28:39 -04:00
Ishaan Bhardwaj
be59727ca5
Some demon mode fixes
2020-10-30 13:09:49 -04:00
Ishaan Bhardwaj
cca295066c
Fix.
2020-10-29 23:05:49 -04:00
Ishaan Bhardwaj
f2862b4d93
Some score fixes for core TGM modes
2020-10-29 23:03:54 -04:00
Ishaan Bhardwaj
2aafd30253
Fixed secret grade detection
2020-10-29 22:14:34 -04:00
Ishaan Bhardwaj
b27ba335ba
Improved secret grade
2020-10-29 21:40:50 -04:00
Ishaan Bhardwaj
33244736b8
Secret grade for sprint? Also ARR and DAS change so remember to change it in the lua file
2020-10-29 20:56:18 -04:00
Mizu
a324e0015a
Replace SFX and add hold
2020-10-27 12:17:00 +01:00
Ishaan Bhardwaj
285108ca08
ACTUALLY fixed TI Master torikan
2020-10-26 14:07:09 -04:00
Ishaan Bhardwaj
4b1fed727c
Update marathon_a3.lua
2020-10-26 14:03:09 -04:00
Mizu
b0ce0f17f5
Add new sound effects to the game
2020-10-26 14:21:49 +01:00
Ishaan Bhardwaj
9fca272e8d
Update ck.lua
2020-10-24 09:12:12 -04:00
Ishaan Bhardwaj
4923b2e2d4
Removed debug code
2020-10-23 21:23:45 -04:00
Ishaan Bhardwaj
8810f24e7a
v0.1.8, SHIRASE-CK ADDEDgit add scene/mode_select.lua tetris/modes/ck.lua !
2020-10-23 21:02:27 -04:00
Ishaan Bhardwaj
57a9f6ef55
Fixing Demon Mode backgrounds
2020-10-23 14:52:59 -04:00
Oshisaure
342036bc28
Fixed guideline SRS anti-stalling to work closer to guideline games
...
Currenly behaves similarly to Tetris Friends, lock as soon as it can after exceeding the manipulation limit.
That still allows to have a piece in the air forever in low G though, might be worth looking into it?
2020-10-21 05:30:28 +01:00
Oshisaure
78dcfe43c4
Made Survival A2/A3 torikans stop your game instead of giving an end roll
2020-10-21 05:24:11 +01:00
Ishaan Bhardwaj
cdf6b5cf33
TI Master torikan
2020-10-20 23:14:25 -04:00
Oshisaure
5f29c987f2
Tweaked Cambridge RS to fix how S and Z show in the next queue
2020-10-19 16:50:49 +01:00
Oshisaure
1427c0d19e
Updated Ti-World and ACE-SRS to use the Arika kick table
...
This possibly needs further testing, although the example
given [on the wiki](tetris.wiki/SRS#Arika_SRS) works
2020-10-19 05:07:31 +01:00
Ishaan Bhardwaj
e221a91d73
Swapped some settings around
2020-10-18 23:32:57 -04:00
Oshisaure
bdcd25b82c
Fixed T floorkick in ARS Ti/ACE/ACE2
2020-10-19 04:19:36 +01:00
Ishaan Bhardwaj
a5158e0994
Fixed Demon Mode torikan madness
2020-10-18 21:54:24 -04:00
Oshisaure
8c62f321a0
Added secret grade for the Phantom Mania/-2/-N modes
2020-10-17 04:22:41 +01:00
Oshisaure
8ddf468121
Removed print statements leftover from when i was making sure the torikans were working as intended
2020-10-17 03:42:31 +01:00
Oshisaure
8e77407ff2
Merge branch 'master' of https://github.com/SashLilac/cambridge
2020-10-17 03:38:07 +01:00
Oshisaure
92c852d178
Renamed ACE-ARS to ACE-ARS2 and added ACE-ARS that guideline piece lock and colours
2020-10-17 03:37:44 +01:00
Ishaan Bhardwaj
f658ed63f2
apparently I made ti-srs too strict
2020-10-16 22:20:18 -04:00
Oshisaure
c2d1c1183c
Survival A3 torikan now switches to 03:03:00 when playing with World-type rulesets
2020-10-17 02:51:29 +01:00
Ishaan Bhardwaj
36c568feaf
demon mode grade display fixed
2020-10-16 21:35:30 -04:00
Ishaan Bhardwaj
bf30fcefbd
Add Sega randomizer
2020-10-14 15:00:17 -04:00
Ishaan Bhardwaj
d978ff8d87
fixed a thing
2020-10-14 13:45:56 -04:00
Ishaan Bhardwaj
b47d0f36b9
oshi forced me to add bags
2020-10-14 13:43:28 -04:00
Ishaan Bhardwaj
abc210c69c
made our debug randomizer not bad
2020-10-13 22:10:27 -04:00
Oshisaure
a48d7c67b5
Merge branch 'HEAD' of https://github.com/SashLilac/cambridge.git
2020-10-13 20:26:33 +01:00
Oshisaure
f6ca79ff91
Fixed big mode spawn positions
2020-10-13 20:26:07 +01:00
Ishaan Bhardwaj
4eb3901610
Some big mode fixes
2020-10-13 14:16:23 -04:00
Ishaan Bhardwaj
12a6f42198
Revert "Fixing step reset" - didn't realize infinite floorkicks
...
This reverts commit 0c317d9ce1
.
2020-10-11 15:46:34 -04:00
Ishaan Bhardwaj
0c317d9ce1
Fixing step reset
2020-10-11 15:41:56 -04:00
Ishaan Bhardwaj
eddfee566d
Grade display changed for TA Death modes
2020-10-11 15:34:10 -04:00
Ishaan Bhardwaj
7fe366a8de
Bravo score update
2020-10-11 14:17:18 -04:00
Ishaan Bhardwaj
55be30c99f
experimental bravo formula for tgm1
2020-10-11 13:21:03 -04:00
Ishaan Bhardwaj
36ceef8488
experimental bravo formula for tgm1
2020-10-11 12:57:57 -04:00
Oshisaure
5d32b6a3e7
Discord RPC cleanup
...
- Loading Discord RPC is now handled by `load/rpc.lua`
- Removed `presence` global, call `DiscordRPC:update()` directly with what needs updating
- Game doesn't crash anymore if the Discord RPC fails to load
- Added RPC variables in the gamemode superclass to let each gamemode handle its special case
2020-10-11 02:17:48 +01:00
Oshisaure
05230ac046
Game settings screen, and minor fix on discordRPC
...
- Uses BG previously from the input config screen, which has gotten a new BG
- Minor tweak on the input config screen to display all inputs names regardless of if they are bound or not
- Added Mod1 function to `funcs.lua`, may be useful again sometime
- Added game settings
* Manual locking (per gamemode, per ruleset, on harddrop or on softdrop)
* Piece colours (per ruleset, TTC or Arika)
* World Reverse toggle
- Moved the discordRPC `libs/` directory, as it's a third party library
- Edited the `discordRPC.lua` file to look for the dll at the right place regardless of how you run the game (until we fuse it that is)
This should have probably been done in several commits, sorry about that
2020-10-11 00:42:56 +01:00
Oshisaure
f28dc08ae2
Updated Race 40 randomiser to use 7-bag no SZO start
2020-10-10 23:07:12 +01:00
Ishaan Bhardwaj
00c46961f9
Bug.
2020-10-09 21:31:49 -04:00
Ishaan Bhardwaj
0a0053276b
SG!!!!
2020-10-09 21:14:20 -04:00
Ishaan Bhardwaj
9982613e26
Removed the BG limit, because someone is a madman
2020-10-09 17:55:22 -04:00
Ishaan Bhardwaj
63c0721978
Slight cosmetic change concerning the bonus timer
2020-10-09 13:37:39 -04:00
Oshisaure
1366451a3d
Fixed randomisers in A1-A4 modes:
...
- History 4-rolls, history 6-rolls and history 6-rolls 35-bag no longer deal S, Z or O as their first piece
- Added a 7-bag randomiser with the same behaviour (bag7noSZOstart)
- Tweaked the "35-bag" part of the history 6-rolls 35-bag randomiser to work closer to what it's supposed to be
- Switched Marathon AX4's randomiser from history 6-rolls to 7-bag no SZO start
2020-10-09 04:34:11 +01:00
Ishaan Bhardwaj
6b624b9853
Ti-World placeholder
2020-10-08 22:20:37 -04:00
Ishaan Bhardwaj
b0bda25466
Cool Regret System TM
2020-10-08 22:13:35 -04:00
Oshisaure
2bde9d1378
Added secret grade detection for Marathon A1-A3 and Survival A1-A3
2020-10-09 02:00:42 +01:00
Ishaan Bhardwaj
6178b2cee9
Proper bravo detection!
2020-10-08 20:44:06 -04:00
Ishaan Bhardwaj
4e8a237de3
TA GM requirements updated
2020-10-08 20:35:40 -04:00
Oshisaure
5606251ea7
Added extra buttons:
...
- Implemented retry button*
- Escape on mode select sends you to title screen
- Escape on title screen closes the game
- Added "Exit Game" entry on title screen, closes the game when selected
*Pardon my angry comment in `scene/game.lua`.
2020-10-08 04:56:46 +01:00
Oshisaure
a4984fd687
Fixed jank regarding the area above the field
...
- The game now discards blocks locked over y = 1 instead of panicking and crashing
2020-10-07 20:40:43 +01:00
Ishaan Bhardwaj
b7ef7d1976
Fix I's ghost piece in ACE modes
2020-10-07 15:17:56 -04:00
Oshisaure
293b7398a2
Typo lol
2020-10-07 20:11:15 +01:00
Oshisaure
8a2237a77c
Fixed Arika rulesets
...
- Fixed centre column rule on Classic ARS, Ti-ARS and ACE-ARS
- Added T floorkick for Ti-ARS and ACE-ARS
2020-10-07 19:54:18 +01:00
Ishaan Bhardwaj
bdad32ac79
For Oshisaure :)
2020-10-07 13:24:28 -04:00
Oshisaure
3cc918841f
Added display for time limit extensions
2020-10-07 01:57:07 +01:00
Oshisaure
5f7ea0648e
Fixed Konoha randomiser and added ghost before lv100
2020-10-06 23:53:02 +01:00
Oshisaure
5d34218b97
Merge branch 'master' of https://github.com/SashLilac/cambridge
2020-10-06 21:50:36 +01:00
Oshisaure
fcd8b0f360
Set a fixed height for piece previews
2020-10-06 21:45:57 +01:00
Ishaan Bhardwaj
b983e1c108
Merge branch 'master' of https://github.com/SashLilac/cambridge
2020-10-06 16:29:24 -04:00
Ishaan Bhardwaj
36ab451b70
Fix big mode spawns
2020-10-06 16:27:28 -04:00
Oshisaure
8fef7faa6a
Fixed randomiser and next queue whhhackiness
2020-10-06 21:10:15 +01:00
Ishaan Bhardwaj
f13e2096b2
More randomizer fixes?
2020-10-06 15:49:06 -04:00
Oshisaure
6b7f18d58a
Refactored funcs.lua
...
- Renamed st and sp to strTrueValues and frameTime respectively
- Modified files calling these to use the new names
- Tidying like formatTime now using a single string.format
2020-10-06 18:14:00 +01:00
Ishaan Bhardwaj
be644bf57b
Made level counter not look awkward
2020-10-05 23:24:59 -04:00
Ishaan Bhardwaj
9d15feef33
Another fix?
2020-10-05 22:47:34 -04:00
Ishaan Bhardwaj
634a5bc03b
Potential fix for bag not working
2020-10-05 22:33:57 -04:00
Ishaan Bhardwaj
f1ad1f0ea4
Added the lost Konoha mode from TGM4
2020-10-05 22:17:15 -04:00
Ishaan Bhardwaj
a534331b11
Ace-ARS!
2020-10-05 11:52:37 -04:00
Ishaan Bhardwaj
d602fdfc7e
TAP big mode added
2020-10-05 11:11:46 -04:00
Ishaan Bhardwaj
971151e210
Added 5 bag randomizer
2020-10-04 22:49:17 -04:00
Joe Zeng
1254de15d5
Refactored the "Ligne" modes. ( #21 )
...
* Added Ligne C89, now known as Marathon C89.
* Refactored all the Ligne modes to no longer use the "Ligne" name.
Ligne -> Race 40
Ligne A1 -> Marathon AX4
Ligne C89 -> Marathon C89
2019-06-16 22:24:06 -04:00
Joe Zeng
5c5ffc6887
Added Big Mode as a piece type. ( #20 )
...
Survival A3 and Phantom Mania 2 are now in their fully complete glory! :D
Implements #13 .
2019-06-16 22:16:09 -04:00
Joe Z
209e60e82e
Fixed a roll and section COOL bug in Marathon A3.
2019-06-09 18:37:23 -04:00
Joe Zeng
c4ba80b60d
Fixed a roll level bug in Phantom Mania. ( #18 )
...
Also refactored Phantom Mania N so that any changes made to regular Phantom Mania get applied automatically.
2019-06-09 09:14:43 -04:00
Joe Zeng
321de8564c
Background 20 doesn't exist!
...
Should _actually_ fix #1 this time.
2019-06-03 23:16:24 -04:00
Joe Zeng
96ac054cf6
Stopped bottom-row garbage from clearing 5 lines. ( #16 )
...
Resolves #15 .
1) Cleared row count is marked before the onPieceLock method is called, letting the piece lock procedure react to the count of rows the piece is about to clear. (In practice, only 0 and non-0 will be different.)
2) The modes with bottom-row garbage will not advance the garbage counter when the piece is about to clear lines, as should be the case.
Also included:
3) Changed the Always O Randomizer to the Always Randomizer that takes which piece it should "always" produce as an argument in the constructor.
4) Fixed the torikan for level 800 in Phantom Mania 2. It should have been 4:45, not 4:40.
2019-06-03 23:12:48 -04:00
Joe Z
704e6dae55
Fixed the pacer test mode's backgrounds and strikes.
2019-05-31 23:25:27 -04:00
Joe Z
5a1b137c2a
Made it so that level 900 no longer displays 1000 on the bottom where it should display 999.
2019-05-29 22:27:50 -04:00
Joe Z
956e826bb2
Added the ghost piece to modes that needed them.
2019-05-29 22:10:27 -04:00
Joe Z
cebe57dd1e
Removed some of the extraneous static properties.
...
ARR and drop speed are handled by getters now.
2019-05-29 21:59:53 -04:00
Joe Z
0e7a2bb9fe
Turns out I corrected some of the delays too far the other way.
2019-05-29 21:50:14 -04:00
smiegrin
31b0f60475
Corrects survival_a1.lua crash. ( #7 )
...
Due to a stupid copy-paste error.
2019-05-29 19:47:51 -04:00
Joe Z
1d6ac62d7d
Added drop bonuses and fixed some of the delays.
2019-05-29 00:52:54 -04:00
Joe Zeng
b316d9617b
Updated Marathon A1's combo calculation algorithm.
...
Apparently the 1/6/15/28 multiplier comes from updating combo before calculating the multiplier, not something that gets independently multiplied.
2019-05-28 21:26:38 -04:00
Joe Z
99f7ff72fd
Fixed the credit roll in Marathon 2020.
2019-05-26 16:34:35 -04:00
Joe Z
c973929e0c
First bundled release.
2019-05-23 00:35:11 -04:00