X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FDiscordAppCommands%2FAosrPresetCommand.php;h=7a8907a419c87b3258ded2761bed28144de30380;hb=b814478f9bc289cd558fd4a5beab44f299347d88;hp=a023fcbd45752ff704f223cf1a789260bbb33960;hpb=ca90048a9fb2d8c3c65d81096ecd36bbf7c51ff5;p=alttp.git

diff --git a/app/DiscordAppCommands/AosrPresetCommand.php b/app/DiscordAppCommands/AosrPresetCommand.php
index a023fcb..7a8907a 100644
--- a/app/DiscordAppCommands/AosrPresetCommand.php
+++ b/app/DiscordAppCommands/AosrPresetCommand.php
@@ -5,9 +5,6 @@ namespace App\DiscordAppCommands;
 use App\Models\AosSeed;
 use Discord\Builders\MessageBuilder;
 use Discord\Discord;
-use Discord\Parts\Embed\Embed;
-use Discord\Parts\Embed\Field;
-use Discord\Parts\Embed\Footer;
 use Discord\Parts\Interactions\Interaction;
 
 class AosrPresetCommand {
@@ -43,53 +40,67 @@ class AosrPresetCommand {
 					'type' => 3,
 					'required' => true,
 					'choices' => $choices,
+				], [
+					'name' => 'race',
+					'description' => 'Generate race ROM, seed will be hidden',
+					'description_localizations' => [
+						'de' => 'Race ROM generieren, Seed wird versteckt.',
+					],
+					'type' => 5,
+					'required' => false,
 				]],
 			]],
 		]);
 		$discord->application->commands->save($cmd);
 	}
 
+	public static function presetByName($name) {
+		if (isset(static::$presets[$name])) {
+			return static::$presets[$name];
+		}
+		foreach (static::$presets as $presetName => $preset) {
+			if (strcasecmp($name, $presetName) === 0) {
+				return $preset;
+			}
+		}
+		return null;
+	}
+
 	public static function listen(Discord $discord) {
 		$discord->listenCommand(['aosr', 'preset'], function(Interaction $interaction) use ($discord) {
 			$interaction
 				->acknowledgeWithResponse()
 				->done(function() use($discord, $interaction) {
 				$presetName = $interaction->data->options['preset']->options['preset']->value;
-				$message = MessageBuilder::new();
+				$race =  isset($interaction->data->options['preset']->options['race'])
+					? $interaction->data->options['preset']->options['race']->value : false;
 				if (isset(static::$presets[$presetName])) {
 					$preset = static::$presets[$presetName];
-					$seed = AosSeed::generateSurge($presetName, $preset['settings']);
+					$seed = AosSeed::generateSurge($presetName, $preset['settings'], $race);
 
-					$embed = new Embed($discord, [
-						'fields' => [
-							new Field($discord, [ 'name' => 'Generator', 'value' => 'This seed has been generated with fusecv\'s randomizer on aosrando.surge.sh.' ]),
-							new Field($discord, [ 'name' => 'Preset', 'value' => $preset['name'], 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Seed', 'value' => $seed->seed, 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Logic', 'value' => $preset['settings']['logic'], 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Area', 'value' => $preset['settings']['area'], 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Boss', 'value' => $preset['settings']['boss'], 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Enemy', 'value' => $preset['settings']['enemy'], 'inline' => true ]),
-							new Field($discord, [ 'name' => 'Permalink', 'value' => $seed->permalink ]),
-						],
-						'footer' => new Footer($discord, [
-							'text' => 'Grün',
-						]),
-						'timestamp' => now(),
-						'title' => 'AoSRando Seed',
-						'type' => 'rich',
-						'url' => $seed->permalink,
-					]);
-					$message->addEmbed($embed);
+					$process = $seed->createProcess();
+					$process->on('exit', function() use ($discord, $interaction, $seed) {
+						$seed = $seed->fresh();
+
+						$embed = $seed->createEmbed($discord);
+						$message = MessageBuilder::new();
+						$message->addEmbed($embed);
+
+						$interaction->updateOriginalResponse($message);
+					});
+
+					$process->start($discord->getLoop());
 				} else {
+					$message = MessageBuilder::new();
 					$message->setContent('unknown preset '.$presetName);
+					$interaction->updateOriginalResponse($message);
 				}
-				$interaction->updateOriginalResponse($message);
 			});
 			return true;
 		});
 	}
 
-	private static $presets = [
+	public static $presets = [
 		'Normal' => [
 			'name' => 'Normal',
 			'value' => 'Normal',
@@ -111,6 +122,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -135,6 +148,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'true',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -159,6 +174,8 @@ class AosrPresetCommand {
 				'telestart' => 'true',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -183,6 +200,8 @@ class AosrPresetCommand {
 				'telestart' => 'true',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -207,6 +226,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -231,6 +252,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'true',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -255,6 +278,8 @@ class AosrPresetCommand {
 				'telestart' => 'true',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -279,6 +304,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -303,6 +330,8 @@ class AosrPresetCommand {
 				'telestart' => 'true',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -327,6 +356,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',
 			],
 		],
@@ -351,6 +408,8 @@ class AosrPresetCommand {
 				'telestart' => 'true',
 				'mapassist' => 'true',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -375,6 +434,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -399,16 +460,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',
@@ -423,16 +486,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',
@@ -447,6 +512,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],
@@ -471,6 +538,8 @@ class AosrPresetCommand {
 				'telestart' => 'false',
 				'mapassist' => 'false',
 				'doublechaos' => 'false',
+				'reqallsouls' => 'false',
+				'noww' => 'false',
 				'palette' => 'Vanilla',
 			],
 		],