Merge branch 'release/2.1.0'

Author: BashPrime

README.md

@@ -1,6 +1,6 @@
 # Metroid Prime Randomizer
 
-This application is an item randomizer for the video game Metroid Prime, powered by [Angular](https://angular.io), [TypeScript](https://www.typescriptlang.org), [Node.js](https://nodejs.org) and [Electron](https://electronjs.org).
+This application is an item randomizer for the video game Metroid Prime, powered by the [randomprime patcher](https://github.com/aprilwade/randomprime), [Angular](https://angular.io), [TypeScript](https://www.typescriptlang.org), [Node.js](https://nodejs.org) and [Electron](https://electronjs.org).
 
 [Visit website](https://randomizer.metroidprime.run)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "metroid-prime-randomizer",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Metroid Prime Randomizer",
   "homepage": "https://github.com/etaylor8086/metroid-prime-randomizer",
   "contributors": [
@@ -67,8 +67,8 @@
     "@fortawesome/angular-fontawesome": "^0.5.0",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.13",
-    "@fortawesome/fontawesome-svg-core": "^1.2.27",
-    "@fortawesome/free-solid-svg-icons": "^5.12.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.28",
+    "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "big-integer": "^1.6.48",
     "bulma": "^0.7.5",
     "bulma-checkradio": "^1.1.1",
@@ -80,15 +80,15 @@
     "ngx-toastr": "^11.3.3",
     "node-addon-api": "1.5.0",
     "primeicons": "^2.0.0",
-    "primeng": "^9.0.0",
+    "primeng": "^9.0.6",
     "rxjs": "~6.4.0",
     "tslib": "^1.11.1",
     "uuid": "^3.4.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.803.25",
-    "@angular/cli": "^8.3.25",
+    "@angular-devkit/build-angular": "^0.803.26",
+    "@angular/cli": "^8.3.26",
     "@angular/compiler-cli": "^8.2.14",
     "@angular/language-service": "^8.2.14",
     "@ngx-translate/core": "11.0.1",
@@ -97,11 +97,11 @@
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "^2.0.8",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^12.12.30",
-    "@types/uuid": "^3.4.8",
-    "@types/webpack-env": "^1.15.1",
+    "@types/node": "^12.12.37",
+    "@types/uuid": "^3.4.9",
+    "@types/webpack-env": "^1.15.2",
     "chai": "^4.2.0",
-    "codelyzer": "^5.2.1",
+    "codelyzer": "^5.2.2",
     "conventional-changelog-cli": "2.0.11",
     "core-js": "~2.5.7",
     "electron": "6.0.10",
@@ -113,18 +113,18 @@
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.5.2",
-    "mocha": "^6.2.2",
+    "karma-jasmine-html-reporter": "^1.5.3",
+    "mocha": "^6.2.3",
     "npm-run-all": "4.1.5",
-    "protractor": "^5.4.3",
-    "terser-webpack-plugin": "^2.3.5",
-    "ts-loader": "^6.2.1",
+    "protractor": "^5.4.4",
+    "terser-webpack-plugin": "^2.3.6",
+    "ts-loader": "^6.2.2",
     "ts-node": "~7.0.0",
     "tslint": "~5.15.0",
     "typescript": "~3.5.3",
     "wait-on": "3.2.0",
     "webdriver-manager": "12.1.0",
-    "webpack": "^4.42.0",
+    "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
     "webpack-node-externals": "^1.7.2"
   }

package.json

@@ -192,7 +192,9 @@ export class GenerateGameComponent implements OnInit {
   }
 
   generateSeed(spoiler: boolean) {
-    this.generatorService.generateGame(this.form.value, spoiler);
+    if (this.form.valid) {
+      this.generatorService.generateGame(this.form.value, spoiler);
+    }
   }
 
   importPreset(): void {

randomprime

@@ -1,4 +1,8 @@
 <div [formGroup]="getFormGroup()">
+  <div clas="field" style="margin-bottom: 0.5rem;">
+    <div class="control">Item Pool: <span [ngClass]="itemPoolTextStyling">{{ getItemPoolSize() }}</span> /
+      {{ ITEM_POOL_MAX_SIZE }}</div>
+  </div>
   <div class="field is-grouped">
     <div class="control">
       <div class="select is-small" style="margin-right: 0.5rem;" *ngIf="getAvailableItems().length">
@@ -24,7 +28,8 @@
         </header>
         <div class="card-content">
           <div class="field" *ngIf="getItem(override.value.name).experimental">
-            <p class="has-text-danger">EXPERIMENTAL - You are not guaranteed to finish the game if you change this item's behavior.</p>
+            <p class="has-text-danger">EXPERIMENTAL - You are not guaranteed to finish the game if you change this
+              item's behavior.</p>
           </div>
           <div class="field">
             <label class="label is-small">State</label>

src/client/src/app/generate-game/generate-game.component.ts

@@ -23,6 +23,7 @@ interface Item {
 export class ItemOverridesComponent extends SettingsSection implements OnInit {
   selectedAvailableItem: Item;
   private formArray: FormArray;
+  private globalFormGroup: FormGroup;
   private fb: FormBuilder = new FormBuilder();
   private items: Item[] = [
     { name: PrimeItem.MISSILE_LAUNCHER, maximum: 1 },
@@ -41,23 +42,27 @@ export class ItemOverridesComponent extends SettingsSection implements OnInit {
     { name: PrimeItem.GRAVITY_SUIT, maximum: 1 },
     { name: PrimeItem.PHAZON_SUIT, maximum: 1 },
     { name: PrimeItem.GRAPPLE_BEAM, maximum: 1 },
-    { name: PrimeItem.SCAN_VISOR, maximum: 1, exclude: [ItemOverrides.STATES.vanilla], experimental: true },
+    { name: PrimeItem.SCAN_VISOR, maximum: 1, exclude: [ItemOverrides.STATES.vanilla] },
     { name: PrimeItem.THERMAL_VISOR, maximum: 1 },
     { name: PrimeItem.XRAY_VISOR, maximum: 1 },
     { name: PrimeItem.WAVEBUSTER, maximum: 1 },
     { name: PrimeItem.ICE_SPREADER, maximum: 1 },
     { name: PrimeItem.FLAMETHROWER, maximum: 1 },
     { name: PrimeItem.ENERGY_TANK, maximum: 14, isExpansion: true, exclude: [ItemOverrides.STATES.vanilla] },
     { name: PrimeItem.MISSILE_EXPANSION, maximum: 49, isExpansion: true, exclude: [ItemOverrides.STATES.vanilla] },
-    { name: PrimeItem.POWER_BOMB_EXPANSION, maximum: 4 , isExpansion: true, exclude: [ItemOverrides.STATES.vanilla] }
+    { name: PrimeItem.POWER_BOMB_EXPANSION, maximum: 4, isExpansion: true, exclude: [ItemOverrides.STATES.vanilla] }
   ];
 
+  // Constants
+  readonly ITEM_POOL_MAX_SIZE = 100;
+
   constructor(private controlContainer: ControlContainer, protected randomizerService: RandomizerService) {
     super(randomizerService);
   }
 
   ngOnInit() {
     this.formArray = this.controlContainer.control.get('itemOverrides') as FormArray;
+    this.globalFormGroup = this.controlContainer.control as FormGroup;
     this.assignFirstAvailableItem();
   }
 
@@ -131,6 +136,41 @@ export class ItemOverridesComponent extends SettingsSection implements OnInit {
     return true;
   }
 
+  getItemPoolSize(): number {
+    const activeOverrides = this.formArray.value as ItemOverride[];
+    let itemPoolSize = 0;
+
+    // Everything is shuffled except for scan visor
+    for (let item of this.items) {
+      const override = activeOverrides.find(overrideItem => overrideItem.name === item.name);
+
+      if (override && override.state === ItemOverrides.STATES.shuffled) {
+        itemPoolSize += override.count;
+      } else if (!override && item.name !== PrimeItem.SCAN_VISOR) {
+        itemPoolSize += item.maximum;
+      }
+    }
+
+    // Handle artifacts
+    const artifactChoices = this.getChoices('goal');
+    switch (this.globalFormGroup.get('rules').get('goal').value) {
+      case 'artifact-collection':
+        itemPoolSize += this.globalFormGroup.get('rules').get('goalArtifacts').value;
+        break;
+      case 'all-bosses':
+        itemPoolSize += 3;
+        break;
+    }
+
+    return itemPoolSize;
+  }
+
+  get itemPoolTextStyling(): object {
+    return {
+      'has-text-danger': this.getItemPoolSize() > this.ITEM_POOL_MAX_SIZE
+    };
+  }
+
   private assignFirstAvailableItem(): void {
     const availableItems = this.getAvailableItems();
 

src/client/src/app/item-overrides/item-overrides.component.html

@@ -48,7 +48,6 @@ export class GeneratorService {
             value: currentGeneration.seeds.length,
             label: (currentGeneration.seeds.length + 1) + ' / ' + currentGeneration.total + ':'
           });
-          this.progressService.setMessage('Generating world...');
           this.progressService.setProgressBars(currentProgressBars);
 
           this.currentGeneration$.next(currentGeneration);
@@ -74,6 +73,7 @@ export class GeneratorService {
 
     this.electronService.ipcRenderer.on('importSeedResponse', (event, generatedSeed: GeneratedSeed, spoiler: boolean) => {
       this.ngZone.run(() => {
+        this.progressService.setOpen(false);
         this.spoiler$.next(spoiler);
         this.generatedSeeds$.next([generatedSeed]);
         this.toastrService.success('Imported the permalink successfully.');
@@ -100,7 +100,7 @@ export class GeneratorService {
       });
 
       this.progressService.setTitle('Generating Seed');
-      this.progressService.setMessage('Starting generator.');
+      this.progressService.setMessage('Generating world...');
       this.progressService.setProgressBars([
         {
           total: generationCount,
@@ -129,6 +129,18 @@ export class GeneratorService {
 
       if (decodedItems) {
         this.lastSettingsUsed$.next(PrimeRandomizerSettings.fromSettingsString(decodedItems.settingsString).toRandomizerForm());
+
+        this.progressService.setTitle('Importing Permalink');
+        this.progressService.setMessage('Generating world...');
+        this.progressService.setProgressBars([
+          {
+            total: 1,
+            value: null,
+            label: '1 / 1:'
+          }
+        ]);
+
+        this.progressService.setOpen(true);
         this.electronService.ipcRenderer.send('importSeed', decodedItems.seed, decodedItems.settingsString);
       }
     }

src/client/src/app/item-overrides/item-overrides.component.ts

@@ -28,7 +28,8 @@ export class RandomizerService {
       romSettings: fb.group({
         skipFrigate: [this.DEFAULT_SETTINGS.skipFrigate],
         skipHudPopups: [this.DEFAULT_SETTINGS.skipHudPopups],
-        hideItemModels: [this.DEFAULT_SETTINGS.hideItemModels]
+        hideItemModels: [this.DEFAULT_SETTINGS.hideItemModels],
+        enableMainPlazaLedgeDoor: [this.DEFAULT_SETTINGS.enableMainPlazaLedgeDoor]
       }),
       rules: fb.group({
         goal: [this.DEFAULT_SETTINGS.goal],

src/client/src/app/services/generator.service.ts

@@ -13,6 +13,10 @@ <h1 class="title has-bottom-border">ROM Settings</h1>
       <p class="heading">{{ getDisplayName('hideItemModels') }}</p>
       <p>{{ getValue('hideItemModels', 'romSettings') }}</p>
     </div>
+    <div class="field">
+      <p class="heading">{{ getDisplayName('enableMainPlazaLedgeDoor') }}</p>
+      <p>{{ getValue('enableMainPlazaLedgeDoor', 'romSettings') }}</p>
+    </div>
   </div>
   <div class="column">
     <h1 class="title has-bottom-border">Rules</h1>

src/client/src/app/services/randomizer.service.ts

@@ -21,5 +21,12 @@
           [pTooltip]="DETAILS.hideItemModels.description">{{ getDisplayName('hideItemModels') }}</label>
       </div>
     </div>
+    <div class="column is-one-third">
+      <div class="field">
+        <input class="is-checkradio" id="enableMainPlazaLedgeDoor" type="checkbox" formControlName="enableMainPlazaLedgeDoor">
+        <label for="enableMainPlazaLedgeDoor"
+          [pTooltip]="DETAILS.enableMainPlazaLedgeDoor.description">{{ getDisplayName('enableMainPlazaLedgeDoor') }}</label>
+      </div>
+    </div>
   </div>
 </form>

src/client/src/app/settings/read-only-settings-container/read-only-settings-container.component.html

@@ -113,18 +113,26 @@
       <div formGroupName="randomStartingItems">
         <label class="label is-small" [pTooltip]="DETAILS.randomStartingItems.description">Randomized Starting
           Items</label>
-        <div class="field is-spaced-field is-inline-block-tablet">
+        <div class="field">
           <label class="label is-small">Minimum</label>
           <div class="control">
             <input class="input has-width-auto is-small" type="number" formControlName="minimum"
               [pTooltip]="DETAILS.randomStartingItems.items.minimum.description">
+            <div *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors">
+              <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors.min">Minimum count is 0.</p>
+              <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.minimum.errors.max">Maximum count is 25.</p>
+            </div>
           </div>
         </div>
-        <div class="field is-spaced-field is-inline-block-tablet">
+        <div class="field">
           <label class="label is-small">Maximum</label>
           <div class="control">
             <input class="input has-width-auto is-small" type="number" formControlName="maximum"
               [pTooltip]="DETAILS.randomStartingItems.items.maximum.description">
+              <div *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors">
+                <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors.min">Minimum count is 0.</p>
+                <p class="help is-danger" *ngIf="getFormGroup().controls.randomStartingItems.controls.maximum.errors.max">Maximum count is 25.</p>
+              </div>
           </div>
         </div>
       </div>

src/client/src/app/settings/rom-settings/rom-settings.component.html

@@ -29,7 +29,8 @@ export class TricksComponent extends PicklistFormComponent implements OnInit {
     Difficulty.EASY,
     Difficulty.NORMAL,
     Difficulty.HARD,
-    Difficulty.INSANE
+    Difficulty.INSANE,
+    Difficulty.OOB
   ];
   readonly FILTERS: string[] = [
     this.NONE_FILTER,