Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.

Commit 0f37a93

Browse files
committed
Merge branch 'release/2.0.0'
2 parents a113e26 + 96b447e commit 0f37a93

File tree

307 files changed

+22961
-13111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+22961
-13111
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ about: Create a report to help us improve
66

77
Version:
88
Permalink:
9-
Seed:
10-
Logic:
11-
Mode:
12-
Artifacts:
139

1410
Description of problem:
1511

1612
Spoiler log (if available):
13+
14+
Verify ISO file (if available):

.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/app-builds
88
/release
99
main.js
10+
main.js.LICENSE.txt
1011
src/**/*.js
1112
*.js.map
1213
common/**/*.js
@@ -51,9 +52,3 @@ package-lock.json
5152
# System Files
5253
.DS_Store
5354
Thumbs.db
54-
55-
# Image assets
56-
/src/assets/banners/
57-
58-
# Randomizer output
59-
/output

.vscode/launch.json

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"type": "node",
6-
"request": "launch",
7-
"name": "Electron: Main",
8-
"program": "${workspaceFolder}/main.ts",
9-
"preLaunchTask": "electron-build",
10-
"outputCapture": "std",
11-
"outFiles": [
12-
"${workspaceFolder}/main.js",
13-
"${workspaceFolder}/common/**/*.js"
14-
],
15-
"cwd": "${workspaceFolder}",
16-
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
17-
"windows": {
18-
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
19-
},
20-
"runtimeArgs": [
21-
"--remote-debugging-port=9223",
22-
".",
23-
"--serve"
24-
]
25-
},
26-
{
27-
"name": "Electron: Renderer",
28-
"type": "chrome",
29-
"request": "launch",
30-
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
31-
"windows": {
32-
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
33-
},
34-
"runtimeArgs": [
35-
"${workspaceFolder}/main.js",
36-
"--remote-debugging-port=9222"
37-
],
38-
"webRoot": "${workspaceFolder}"
39-
},
40-
]
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "launch",
7+
"name": "Electron: Main",
8+
"protocol": "inspector",
9+
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
10+
"runtimeArgs": [
11+
"--remote-debugging-port=9223",
12+
".",
13+
"--serve"
14+
],
15+
"windows": {
16+
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
17+
},
18+
"sourceMaps": true,
19+
"console": "integratedTerminal",
20+
"preLaunchTask": "electron-build"
21+
},
22+
{
23+
"type": "node",
24+
"request": "launch",
25+
"name": "Mocha All",
26+
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
27+
"args": [
28+
"--require",
29+
"ts-node/register",
30+
"test/**/*.test.ts"
31+
],
32+
"console": "integratedTerminal",
33+
"internalConsoleOptions": "neverOpen"
34+
},
35+
]
4136
}

.vscode/tasks.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
2-
// See https://go.microsoft.com/fwlink/?LinkId=733558
3-
// for the documentation about the tasks.json format
4-
"version": "2.0.0",
5-
"tasks": [
6-
{
7-
"label": "electron-build",
8-
"type": "typescript",
9-
"tsconfig": "tsconfig-serve.json",
10-
"problemMatcher": [
11-
"$tsc"
12-
]
13-
}
14-
]
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "electron-build",
8+
"type": "npm",
9+
"script": "electron:build"
10+
},
11+
{
12+
"label": "electron-build-prod",
13+
"type": "npm",
14+
"script": "electron:build:prod"
15+
}
16+
]
1517
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 Evan Taylor, Pwootage, and April Wade
3+
Copyright (c) 2018-2020 BashPrime, Syncathetic, and Pwootage
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,22 @@ The randomizer is currently option-based, allowing the user to enable or disable
1212

1313
## Install
1414

15+
This section is to build the randomizer application from source. If you just want to use the randomizer and start playing randomized seeds, you can download it from the [Releases page](https://github.com/etaylor8086/metroid-prime-randomizer/releases).
16+
1517
To build from source, you will need to install the 64-bit version of [Node.js](https://nodejs.org) to install the application and its dependencies using `npm`. 32-bit builds of the randomizer are not supported currently.
1618

1719
You will need to [install Rust](https://www.rust-lang.org/install.html). I recommend installing it via [Rustup](https://rustup.rs/).
1820

1921
Install `node-gyp` globally on your system. [Follow the instructions](https://github.com/nodejs/node-gyp#installation) to install it on your given operating system.
2022

23+
The RandomPrime patcher requires the `powerpc-unknown-linux-gnu` target installed to build correctly. Run the following two `rustup` commands to install them.
24+
25+
```
26+
rustup toolchain install nightly
27+
rustup target add --toolchain nightly powerpc-unknown-linux-gnu
28+
```
29+
30+
2131
Once the above prerequisites are installed, run `npm install` to install the project dependencies and build the `randomprime` native Node module.
2232

2333
## Build for Development
@@ -35,12 +45,13 @@ To build the project for production, run one of the following commands depending
3545
The randomizer application will be packaged in the `release` directory.
3646

3747
## Special Thanks
38-
* Pwootage, for providing significant contributions to this project
39-
* Syncathetic, for providing significant contributions to this project and for creating the [randomprime patcher](https://github.com/aprilwade/randomprime) used in this project.
40-
* The [URDE](https://gitlab.axiodl.com/AxioDL/urde) development team.
41-
* LLCoolDave for creating the item filling algorithm used in this project
42-
* Interslice, for help with the Hard mode logic as well as creating the Metroid Prime Seed Generator (for Claris's randomizer).
48+
* Syncathetic, for creating the [randomprime patcher](https://github.com/aprilwade/randomprime) that this project uses, and for providing significant contributions to this project.
49+
* Pwootage, for hosting the randomizer website, and for providing significant contributions to this project.
50+
* The [Randovania development team](https://github.com/randovania/randovania) for their inspiration and support.
51+
* The [URDE development team](https://gitlab.axiodl.com/AxioDL/urde).
4352
* Claris, for creating the first Metroid Prime/Metroid Prime 2 randomizer.
53+
* Interslice, for help with the higher difficulty item logic as well as creating the Metroid Prime Seed Generator (for Claris's randomizer).
4454
* Rekameohs, for creating the Metroid Prime Randomizer Script.
45-
* The Metroid Prime speedrunning and randomizer communities for thir inspiration, support, and testing.
46-
* The Zelda: A Link to the Past, and Ocarina of Time randomizer communities for their support and inspiration.
55+
* LLCoolDave, whose randomizer filling algorithm was the basis for what is used in this randomizer.
56+
* The Metroid Prime speedrunning and randomizer communities for their inspiration, support, and testing.
57+
* The Zelda: A Link to the Past, and Ocarina of Time randomizer communities for their support and design inspiration.

common/PathHandler.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

common/Utilities.ts

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)