Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ lintcode: ## Lint just the code

lintcss: ## Lint just the CSS
npm run csslint

dev: ## Start esbuild:watch and open a live server on port 3000
npm run dev
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 Pictures/Achievements/Grouped/Accelerators.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 Pictures/Achievements/Grouped/AntCrumbs.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 Pictures/Achievements/Grouped/AscensionCount.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 Pictures/Achievements/Grouped/AscensionScore.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 Pictures/Achievements/Grouped/CampaignTokens.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 Pictures/Achievements/Grouped/Challenge1.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 Pictures/Achievements/Grouped/Challenge10.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 Pictures/Achievements/Grouped/Challenge11.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 Pictures/Achievements/Grouped/Challenge12.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 Pictures/Achievements/Grouped/Challenge13.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 Pictures/Achievements/Grouped/Challenge14.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 Pictures/Achievements/Grouped/Challenge2.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 Pictures/Achievements/Grouped/Challenge3.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 Pictures/Achievements/Grouped/Challenge4.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 Pictures/Achievements/Grouped/Challenge5.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 Pictures/Achievements/Grouped/Challenge6.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 Pictures/Achievements/Grouped/Challenge7.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 Pictures/Achievements/Grouped/Challenge8.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 Pictures/Achievements/Grouped/Challenge9.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 Pictures/Achievements/Grouped/Constant.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 Pictures/Achievements/Grouped/FifthOwnedCoin.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 Pictures/Achievements/Grouped/FirstOwnedCoin.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 Pictures/Achievements/Grouped/FourthOwnedCoin.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 Pictures/Achievements/Grouped/GroupedBorder.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 Pictures/Achievements/Grouped/Multipliers.png
Binary file added Pictures/Achievements/Grouped/PrestigeCount.png
Binary file added Pictures/Achievements/Grouped/RuneFreeLevel.png
Binary file added Pictures/Achievements/Grouped/RuneLevel.png
Binary file added Pictures/Achievements/Grouped/SacMult.png
Binary file added Pictures/Achievements/Grouped/SecondOwnedCoin.png
Binary file added Pictures/Achievements/Grouped/SpeedBlessing.png
Binary file added Pictures/Achievements/Grouped/SpeedSpirit.png
Binary file added Pictures/Achievements/Grouped/ThirdOwnedCoin.png
Binary file added Pictures/Achievements/Milestones/AutoPrestige.png
Binary file added Pictures/Achievements/Milestones/Border.png
Binary file added Pictures/Achievements/Milestones/DuplicationRune.png
Binary file added Pictures/Achievements/Milestones/PrismRune.png
Binary file added Pictures/Achievements/Milestones/SIRune.png
Binary file added Pictures/Achievements/Milestones/SpeedRune.png
Binary file added Pictures/Achievements/Milestones/ThriftRune.png
Binary file added Pictures/Achievements/Progressive/Exalts.png
Binary file added Pictures/Achievements/Progressive/RuneLevel.png
Binary file not shown.
Binary file added Pictures/Achievements/Rewards/AmbrosiaLuck.png
Binary file added Pictures/Achievements/Rewards/Border.png
Binary file added Pictures/Achievements/Rewards/Obtainium.png
Binary file added Pictures/Achievements/Rewards/Offerings.png
Binary file added Pictures/Achievements/Rewards/Quarks.png
Binary file added Pictures/Achievements/Rewards/RedAmbrosiaLuck.png
Binary file added Pictures/Achievements/Rewards/Salvage.png
Binary file added Pictures/Achievements/Rewards/WowCubes.png
Binary file added Pictures/Achievements/Rewards/WowHepteractCubes.png
Binary file added Pictures/Achievements/Rewards/WowHyperCubes.png
Binary file added Pictures/Achievements/Rewards/WowOcteracts.png
Binary file added Pictures/Achievements/Rewards/WowPlatonicCubes.png
Binary file added Pictures/Achievements/Rewards/WowTesseracts.png
Binary file added Pictures/Achievements/Ungrouped/Ascended.png
Binary file added Pictures/Achievements/Ungrouped/Chal1NoGen.png
Binary file added Pictures/Achievements/Ungrouped/Chal2NoGen.png
Binary file added Pictures/Achievements/Ungrouped/Chal3NoGen.png
Binary file added Pictures/Achievements/Ungrouped/DiamondSearch.png
Binary file added Pictures/Achievements/Ungrouped/HighlyBlessed.png
Binary file added Pictures/Achievements/Ungrouped/OneCubeOfMany.png
Binary file added Pictures/Achievements/Ungrouped/Overtaxed.png
Binary file added Pictures/Achievements/Ungrouped/SadisticAch.png
Binary file added Pictures/Achievements/Ungrouped/SeeingRed.png
Binary file added Pictures/Achievements/Ungrouped/Smith.png
Binary file added Pictures/Achievements/Ungrouped/ThousandMoons.png
Binary file added Pictures/Achievements/Ungrouped/ThousandSuns.png
Binary file added Pictures/Achievements/Ungrouped/Unsmith.png
Binary file added Pictures/Achievements/Ungrouped/VeryFast.png
Binary file added Pictures/Achievements/Ungrouped/VerySlow.png
Binary file added Pictures/Default/BlueberryLuck4.png
Binary file added Pictures/Default/BlueberryRuneOOMBonus.png
Binary file added Pictures/Default/ExaltChalNoOfferingPower.png
Binary file added Pictures/Default/ExaltChalNoRune.png
Binary file added Pictures/Default/OcteractTalismanLevelCap1.png
Binary file added Pictures/Default/OcteractTalismanLevelCap2.png
Binary file added Pictures/Default/OcteractTalismanLevelCap3.png
Binary file added Pictures/Default/OcteractTalismanLevelCap4.png
Binary file added Pictures/Default/ShopHorseShoe.png
Binary file modified Pictures/Default/ach98.png
Binary file added Pictures/Default/perkdemeterHarvest.png
Binary file added Pictures/Default/perkinfiniteRecycling.png
Binary file added Pictures/Default/perkrecycledContent.png
Binary file added Pictures/Default/perkrecyclistsDesktop.png
Binary file added Pictures/Default/perktaxReduction.png
Binary file added Pictures/Legacy/BlueberryLuck4.png
Binary file added Pictures/Legacy/BlueberryRuneOOMBonus.png
Binary file added Pictures/Legacy/OcteractTalismanLevelCap1.png
Binary file added Pictures/Legacy/OcteractTalismanLevelCap2.png
Binary file added Pictures/Legacy/OcteractTalismanLevelCap3.png
Binary file added Pictures/Legacy/OcteractTalismanLevelCap4.png
Binary file added Pictures/Legacy/ShopHorseShoe.png
Binary file added Pictures/Legacy/perkdemeterHarvest.png
Binary file added Pictures/Legacy/perkinfiniteRecycling.png
Binary file added Pictures/Legacy/perkrecycledContent.png
Binary file added Pictures/Legacy/perkrecyclistsDesktop.png
Binary file added Pictures/Legacy/perktaxReduction.png
Binary file added Pictures/Monotonous/BlueberryLuck4.png
Binary file added Pictures/Monotonous/BlueberryRuneOOMBonus.png
Binary file added Pictures/Monotonous/OcteractTalismanLevelCap1.png
Binary file added Pictures/Monotonous/OcteractTalismanLevelCap2.png
Binary file added Pictures/Monotonous/OcteractTalismanLevelCap3.png
Binary file added Pictures/Monotonous/OcteractTalismanLevelCap4.png
Binary file added Pictures/Monotonous/ShopHorseShoe.png
Binary file added Pictures/Monotonous/perkdemeterHarvest.png
Binary file added Pictures/Monotonous/perkinfiniteRecycling.png
Binary file added Pictures/Monotonous/perkrecycledContent.png
Binary file added Pictures/Monotonous/perkrecyclistsDesktop.png
Binary file added Pictures/Monotonous/perktaxReduction.png
Binary file added Pictures/RedAmbrosia/RedAmbrosiaSalvageYinYang.png
Binary file added Pictures/Runes/Antiquities.png
Binary file added Pictures/Runes/Duplication.png
Binary file added Pictures/Runes/FiniteDescent.png
Binary file added Pictures/Runes/HorseShoe.png
Binary file added Pictures/Runes/InfiniteAscent.png
Binary file added Pictures/Runes/Prism.png
Binary file added Pictures/Runes/Speed.png
Binary file added Pictures/Runes/SuperiorIntellect.png
Binary file added Pictures/Runes/Thrift.png
Binary file added Pictures/Simplified/BlueberryLuck4.png
Binary file added Pictures/Simplified/BlueberryRuneOOMBonus.png
Binary file added Pictures/Simplified/OcteractTalismanLevelCap1.png
Binary file added Pictures/Simplified/OcteractTalismanLevelCap2.png
Binary file added Pictures/Simplified/OcteractTalismanLevelCap3.png
Binary file added Pictures/Simplified/OcteractTalismanLevelCap4.png
Binary file added Pictures/Simplified/ShopHorseShoe.png
Binary file added Pictures/Simplified/perkdemeterHarvest.png
Binary file added Pictures/Simplified/perkinfiniteRecycling.png
Binary file added Pictures/Simplified/perkrecycledContent.png
Binary file added Pictures/Simplified/perkrecyclistsDesktop.png
Binary file added Pictures/Simplified/perktaxReduction.png
Binary file added Pictures/Talismans/Achievement.png
Binary file added Pictures/Talismans/Chronos.png
Binary file added Pictures/Talismans/CookieGrandma.png
Binary file added Pictures/Talismans/Exemption.png
Binary file added Pictures/Talismans/HorseShoe.png
Binary file added Pictures/Talismans/HorseShow.png
Binary file added Pictures/Talismans/Metaphysics.png
Binary file added Pictures/Talismans/Midas.png
Binary file added Pictures/Talismans/Mortuus.png
Binary file added Pictures/Talismans/Plastic.png
Binary file added Pictures/Talismans/Polymath.png
Binary file added Pictures/Talismans/WowSquare.png
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
## Contributing
Before running any of these commands below, make sure to have installed:

VSCode - https://code.visualstudio.com/Download
NodeJS >= 24.0.0 - https://nodejs.org/en/
git - https://git-scm.com/downloads

## Recommended Software

NodeJS - https://nodejs.org/en/ (current, not LTS).
VSCode - https://code.visualstudio.com/Download

---
1. Fork this repository at https://github.com/Pseudo-Corp/SynergismOfficial/fork
2. Clone the repository you forked with `git clone https://github.com/<USERNAME>/SynergismOfficial` (make sure to change `<USERNAME>` with your own Github username)
3. Open the repository you just downloaded in VSCode
2. Clone the repository you forked with `git clone https://github.com/<USERNAME>/SynergismOfficial` (make sure to change `<USERNAME>` with your own GitHub username).
3. cd SynergismOfficial
4. Install the project dependencies, running `npm install` (or `make install` - If you intend to use `make` from here and on, make sure it is installed first)
5. Install the liveserver extension for VSCode at https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer (or by searching for `Live Server` inside the Extensions Marketplace in VSCode. You can open the Extensions Marketplace by pressing `Ctrl+Shift+X`)
6. Switch to a new branch with `git checkout -b "my-branch-name"`
7. Run `npm run watch:esbuild` (or `make watch`)
8. Open the liveserver (bottom right corner icon similar to an Antenna in VSCode)
9. Make your desired changes and test them. When you are done making changes, press `Ctrl+C` to exit from the previous command.
10. If any new files were created, run `git add /path/to/file` (or `git add -A` to add all)
11. Before commiting any changes you made, check and lint your code to see if everything you've done is good to go by doing steps 12 through 14
12. Typecheck all your TypeScript files by running `npm run check:tsc` (or `make check`)
13. Lint the code by running `npm run lint` (or `make lintcode`)
14. Lint the CSS by running `npm run csslint` (or `make lintcss`)
15. If everything is good to go, commit your changes with `git commit -am "title of my commit"`
16. Push your changes to your personal Github Repository with `git push -u origin my-branch-name`
17. Open a Pull Request (PR) on the Official Synergism Repository at https://github.com/Pseudo-Corp/SynergismOfficial/pulls (make sure you click on `compare across forks` to select your fork and branch)
5. Switch to a new branch with `git checkout -b "my-branch-name"`
6. Run `node --run dev` (or `make dev`)
7. Make your desired changes and test them.
8. Typecheck all your TypeScript files by running `node --run check:tsc` (or `make check`).
9. Lint the code by running `node --run lint` (or `make lintcode`).
10. Lint the CSS by running `node --run csslint` (or `make lintcss`).
11. Run `git add /path/to/file` for every file updated or created (or `git add -A` for every file).
12. If everything is good to go, commit your changes with `git commit -m "title of my commit"`
13. Push your changes to your personal Github Repository with `git push -u origin my-branch-name`
14. Open a Pull Request (PR) on the Official Synergism Repository at https://github.com/Pseudo-Corp/SynergismOfficial/pulls (make sure you click on `compare across forks` to select your fork and branch)
---
To get a list of available commands in the Makefile, run `make help` or just `make`
Loading
Loading