new aosr settings

diff --git a/app/DiscordAppCommands/AosrPresetCommand.php b/app/DiscordAppCommands/AosrPresetCommand.php
index 9a537db8006452ed349a99cc7a1fec099746d856..5ad05e00b0628c87145b467fa16a3c6a52d0e1ef 100644 (file)
--- a/app/DiscordAppCommands/AosrPresetCommand.php
+++ b/app/DiscordAppCommands/AosrPresetCommand.php
@@ -110,6 +110,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -134,6 +136,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'true',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -158,6 +162,8 @@ class AosrPresetCommand {
                                'telestart' => 'true',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -182,6 +188,8 @@ class AosrPresetCommand {
                                'telestart' => 'true',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -206,6 +214,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -230,6 +240,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'true',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -254,6 +266,8 @@ class AosrPresetCommand {
                                'telestart' => 'true',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -278,6 +292,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -302,6 +318,8 @@ class AosrPresetCommand {
                                'telestart' => 'true',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -326,6 +344,34 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'true',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
+                               'palette' => 'Vanilla',
+                       ],
+               ],
+               'AreaRequireAllSouls' => [
+                       'name' => 'Area require all souls',
+                       'value' => 'AreaRequireAllSouls',
+                       'settings' => [
+                               'logic' => 'AreaTechTiers',
+                               'nodupes' => 'true',
+                               'panther' => 'NeverExists',
+                               'area' => 'AreaRandom',
+                               'boss' => 'Dead-endShuffle',
+                               'enemy' => 'RandomNoLimit',
+                               'itempool' => 'Standard',
+                               'weight' => '2.5',
+                               'grahm' => 'BookSouls',
+                               'kicker' => 'true',
+                               'startshop' => 'Vanilla',
+                               'shopprice' => 'Vanilla',
+                               'shopSouls' => 'Half',
+                               'levelexp' => 'Lvl1',
+                               'telestart' => 'false',
+                               'mapassist' => 'false',
+                               'doublechaos' => 'true',
+                               'reqallsouls' => 'true',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -350,6 +396,8 @@ class AosrPresetCommand {
                                'telestart' => 'true',
                                'mapassist' => 'true',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -374,6 +422,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -398,16 +448,18 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
-               'SGLive2021' => [
-                       'name' => 'SGLive 2021',
-                       'value' => 'SGLive2021',
+               'Tournament2021' => [
+                       'name' => 'Tournament 2021',
+                       'value' => 'Tournament2021',
                        'settings' => [
                                'logic' => 'AreaTechTiers',
                                'nodupes' => 'false',
-                               'panther' => 'FirstAlways',
+                               'panther' => 'Rand70Dup',
                                'area' => 'AreaRandom',
                                'boss' => 'Dead-endShuffle',
                                'enemy' => 'Vanilla',
@@ -422,16 +474,18 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
-               'Tournament2021' => [
-                       'name' => 'Tournament 2021',
-                       'value' => 'Tournament2021',
+               'SGLive2021' => [
+                       'name' => 'SGLive 2021',
+                       'value' => 'SGLive2021',
                        'settings' => [
                                'logic' => 'AreaTechTiers',
                                'nodupes' => 'false',
-                               'panther' => 'Rand70Dup',
+                               'panther' => 'FirstAlways',
                                'area' => 'AreaRandom',
                                'boss' => 'Dead-endShuffle',
                                'enemy' => 'Vanilla',
@@ -446,6 +500,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],
@@ -470,6 +526,8 @@ class AosrPresetCommand {
                                'telestart' => 'false',
                                'mapassist' => 'false',
                                'doublechaos' => 'false',
+                               'reqallsouls' => 'false',
+                               'noww' => 'false',
                                'palette' => 'Vanilla',
                        ],
                ],

diff --git a/resources/js/components/aos/Seed.js b/resources/js/components/aos/Seed.js
index a035e602b2e58f2f6aaed8ea886abb910075bcc6..513bdd380bddcd3a3588aaddc2494f275f3fd0f8 100644 (file)
--- a/resources/js/components/aos/Seed.js
+++ b/resources/js/components/aos/Seed.js
@@ -46,10 +46,14 @@ const isDefaultSetting = (name, value) => {
                        return value === 'false';
                case 'nodupes':
                        return value === 'false';
+               case 'noww':
+                       return value === 'false';
                case 'palette':
                        return value === 'Vanilla';
                case 'panther':
                        return value === 'Rand70Dup';
+               case 'reqallsouls':
+                       return value === 'false';
                case 'shopprice':
                        return value === 'Vanilla';
                case 'shopSouls':

diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 2ae950ce99ad735ceb2744b2f1bbdfed730a4ebd..61715480b4ce159a1b6c01739262c8db28d71e15 100644 (file)
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -77,6 +77,7 @@ export default {
                                AreaBeginner: 'Area Beginner',
                                AreaExpert: 'Area Experte',
                                AreaExtraFast: 'Area extra schnell',
+                               AreaRequireAllSouls: 'Area alle Seelen',
                                AreaSpicy: 'Area spicy',
                                Beginner: 'Beginner',
                                DoorAllBosses: 'Door alle Bosse',
@@ -103,8 +104,10 @@ export default {
                                logic: 'Logik',
                                mapassist: 'Karten-Assistent',
                                nodupes: 'Keine dupes',
+                               noww: 'Kein wrong warp',
                                palette: 'Palette',
                                panther: 'Panther',
+                               reqallsouls: 'Alle Seelen benötigt',
                                shopprice: 'Shop Preise',
                                shopSouls: 'Shop Seelen',
                                startshop: 'Start mit Shop',
@@ -172,6 +175,10 @@ export default {
                                        'false': 'Nein',
                                        'true': 'Ja',
                                },
+                               noww: {
+                                       'false': 'Nein',
+                                       'true': 'Ja',
+                               },
                                palette: {
                                        Mode1: 'Mode 1',
                                        'Mode1.5': 'Mode 1.5',
@@ -185,6 +192,10 @@ export default {
                                        NeverExists: 'Existiert nicht',
                                        Rand70Dup: 'Zufällig 70% Dupe',
                                },
+                               reqallsouls: {
+                                       'false': 'Nein',
+                                       'true': 'Ja',
+                               },
                                shopprice: {
                                        RandHV: 'Zufällig HV',
                                        Vanilla: 'Vanilla',

diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index a1b9966e51389f3e3f69da43dda3847775ab027f..32249ddad528d882d3527a6806a372f6581e1fe4 100644 (file)
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -77,6 +77,7 @@ export default {
                                AreaBeginner: 'Area beginner',
                                AreaExpert: 'Area expert',
                                AreaExtraFast: 'Area extra fast',
+                               AreaRequireAllSouls: 'Area require all souls',
                                AreaSpicy: 'Area spicy',
                                Beginner: 'Beginner',
                                DoorAllBosses: 'Door all bosses',
@@ -103,8 +104,10 @@ export default {
                                logic: 'Logic',
                                mapassist: 'Map assist',
                                nodupes: 'No dupes',
+                               noww: 'No wrong warp',
                                palette: 'Palette',
                                panther: 'Panther',
+                               reqallsouls: 'Require all souls',
                                shopprice: 'Shop price',
                                shopSouls: 'Shop souls',
                                startshop: 'Start with shop',
@@ -172,6 +175,10 @@ export default {
                                        'false': 'No',
                                        'true': 'Yes',
                                },
+                               noww: {
+                                       'false': 'No',
+                                       'true': 'Yes',
+                               },
                                palette: {
                                        Mode1: 'Mode 1',
                                        'Mode1.5': 'Mode 1.5',
@@ -185,6 +192,10 @@ export default {
                                        NeverExists: 'Never exists',
                                        Rand70Dup: 'Random 70% dupe',
                                },
+                               reqallsouls: {
+                                       'false': 'No',
+                                       'true': 'Yes',
+                               },
                                shopprice: {
                                        RandHV: 'Random HV',
                                        Vanilla: 'Vanilla',