Skip to content

Commit

Permalink
Merged Changes by ItzBlack6093 and squashed changes, and removed whit…
Browse files Browse the repository at this point in the history
…espace changes

Previous commit messages:
added hyperspeed-related things (the pbpace, the splits (i hate css), the sfx)
clear delay
reworked splits
upload the file manually cus i'm stupid
skins
Delete assets/skins directory
Delete skins directory
fk me
moved to gamemode_extended
missed a fucikng 's'
Update gamemode_extended.js
  • Loading branch information
ItzBlack6093 authored and TitanPlayz100 committed Oct 24, 2024
1 parent 680c050 commit 9fb625c
Show file tree
Hide file tree
Showing 58 changed files with 5,847 additions and 5,635 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vscode/
package-lock.json
Cargo.lock
Cargo.lock
README.md
42 changes: 21 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License

Copyright (c) 2024 TitanPlayz

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
MIT License
Copyright (c) 2024 TitanPlayz
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
100 changes: 50 additions & 50 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
# Teti README

Hosted on github pages [here](https://titanplayz100.github.io/teti/)

The info page can be found [here](https://titanplayz100.github.io/teti/info.html)

> [!WARNING]
> Firefox is not supported (due to import assertions)
## Desktop App
### NEW!

Releases are now run through a workflow. They are **up to date** and contain all the latest features.

App build using Tauri, feel free to open issues and PRs.

## Data Formats (for my convenience)
### Gamemode Structure (gamemodes.json)
```js
gamemodes = {
"gamemode_name": {
settings: {}, // settings that override the default * settings
displayName: "", // name shown on gamemode selection
objectiveText: "", // subtext displayed on right side
goalStat: "", // stat being tracked (valid property in stats class)
target: "", // target (valid target in settings)
result: "", // displayed as result (another valid stat in stats class)

// TO BE ADDED LATER
music: "", // custom song that can play
compmusic: "", // custom song that played on pb pace
startBoard: "", // starting board, tetrio map format
effects: [], // custom background / effects
}
}
```

Add functionality mainly in `features/modes.js`.
You can modify existing modules as well from other files

### Adding Audio (sfxlist.json)
```json
{
{
"name": "<name used in code>",
"path": "assets/sfx/<file path / name>.<ext>"
}
}
```
Use with `this.game.sounds.playSound(<name>)`
# Teti README

Hosted on github pages [here](https://titanplayz100.github.io/teti/)

The info page can be found [here](https://titanplayz100.github.io/teti/info.html)

> [!WARNING]
> Firefox is not supported (due to import assertions)
## Desktop App
### NEW!

Releases are now run through a workflow. They are **up to date** and contain all the latest features.

App build using Tauri, feel free to open issues and PRs.

## Data Formats (for my convenience)
### Gamemode Structure (gamemodes.json)
```js
gamemodes = {
"gamemode_name": {
settings: {}, // settings that override the default * settings
displayName: "", // name shown on gamemode selection
objectiveText: "", // subtext displayed on right side
goalStat: "", // stat being tracked (valid property in stats class)
target: "", // target (valid target in settings)
result: "", // displayed as result (another valid stat in stats class)

// TO BE ADDED LATER
music: "", // custom song that can play
compmusic: "", // custom song that played on pb pace
startBoard: "", // starting board, tetrio map format
effects: [], // custom background / effects
}
}
```

Add functionality mainly in `features/modes.js`.
You can modify existing modules as well from other files

### Adding Audio (sfxlist.json)
```json
{
{
"name": "<name used in code>",
"path": "assets/sfx/<file path / name>.<ext>"
}
}
```
Use with `this.game.sounds.playSound(<name>)`
10 changes: 5 additions & 5 deletions assets/icons/cleargarb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/icons/download.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions assets/icons/info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions assets/icons/next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sfx/zenith_speedrun_end.mp3
Binary file not shown.
Binary file added assets/sfx/zenith_speedrun_start.mp3
Binary file not shown.
Binary file added assets/skins/tgm_c.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/skins/tgm_w.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ <h1>Teti</h1>
<div class="settingRow"><p>Allow Hold Queue</p> <input class="option check" type="checkbox" id="allowHold" /></div>
<div class="settingRow"><p>Infinite Hold</p> <input class="option check" type="checkbox" id="infiniteHold" /></div>
<div class="settingRow"><p>Allow Queue Modification</p> <input class="option check" type="checkbox" id="allowQueueModify" /></div>
<div class="settingRow"><p>Line Clear Delay</p> <input class="option range" type="range" id="clearDelay" min="0" max="1000" step="5" /></div>
<div class="settingRow"><p>Line Clear Delay</p> <input class="option range" type="range" id="clearDelay" min="0" max="1000" step="5" /></div>
<div class="settingRow"><p>Allspin</p> <input class="option check" type="checkbox" id="allspin" /></div>
<div class="settingRow"><p>Allspin's are mini</p> <input class="option check" type="checkbox" id="allspinminis" /></div>
<div class="settingRow"><p>Allow history (undo/redo)</p> <input class="option check" type="checkbox" id="history" /></div>
Expand Down
Loading

0 comments on commit 9fb625c

Please sign in to comment.