add launcher settings

Author: swz-git

app.go

@@ -74,6 +74,8 @@ type StartMatchOptions struct {
 	OrangePlayers   []PlayerJs            `json:"orangePlayers"`
 	MutatorSettings flat.MutatorSettingsT `json:"mutatorSettings"`
 	ExtraOptions    ExtraOptions          `json:"extraOptions"`
+	Launcher        string                `json:"launcher"`
+	GamePath        string                `json:"gamePath"`
 }
 
 func (a *App) StartMatch(options StartMatchOptions) Result {
@@ -105,6 +107,19 @@ func (a *App) StartMatch(options StartMatchOptions) Result {
 		gameMode = flat.GameModeSoccer
 	}
 
+	var launcher flat.Launcher
+	switch options.Launcher {
+	case "steam":
+		launcher = flat.LauncherSteam
+	case "epic":
+		launcher = flat.LauncherEpic
+	case "custom":
+		launcher = flat.LauncherCustom
+	default:
+		println("No launcher chosen, defaulting to steam")
+		launcher = flat.LauncherSteam
+	}
+
 	var playerConfigs []*flat.PlayerConfigurationT
 
 	for _, playerInfo := range options.BluePlayers {
@@ -128,6 +143,8 @@ func (a *App) StartMatch(options StartMatchOptions) Result {
 		InstantStart:          options.ExtraOptions.InstantStart,
 		SkipReplays:           options.ExtraOptions.SkipReplays,
 		AutoSaveReplay:        options.ExtraOptions.AutoSaveReplay,
+		Launcher:              launcher,
+		GamePath:              options.GamePath,
 		ExistingMatchBehavior: flat.ExistingMatchBehavior(options.ExtraOptions.ExistingMatchBehavior),
 	})
 

frontend/src/components/LauncherSelector.svelte

@@ -0,0 +1,50 @@
+<script lang="ts">
+    import Modal from "./Modal.svelte"
+    // todo: remember these! global state etc, save locally through go?
+    let {launcher = $bindable(), gamePath = $bindable()} = $props();
+    let visible = $state(false)
+
+    function uid(){
+      return Date.now().toString(36) + Math.random().toString(36).substr(2);
+    }
+    let uids = [uid(), uid(), uid()];
+</script>
+
+<button onclick={()=>{visible = true}}>Launcher Options</button>
+
+<Modal title="Select a launcher" bind:visible>
+    <div class="container">
+        <div class="launcherSelect">
+            <input name="launcher" type="radio" id={`launcher-steam-${uids[0]}`} bind:group={launcher} value="steam">
+            <label for={`launcher-steam-${uids[0]}`}>Steam</label><br>
+
+            <input name="launcher" type="radio" id={`launcher-epic-${uids[1]}`} bind:group={launcher} value="epic">
+            <label for={`launcher-epic-${uids[1]}`}>Epic</label><br>
+
+            <input name="launcher" type="radio" id={`launcher-custom-${uids[2]}`} bind:group={launcher} value="custom">
+            <label for={`launcher-custom-${uids[2]}`}>Custom</label>
+        </div>
+        <div class="gamePath">
+            <label for="gamePath">Game path:</label>
+            <input type="text" id="gamePath" bind:value={gamePath} placeholder="(Leave blank for default)" >
+        </div>
+    </div>
+</Modal>
+
+<style>
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+}
+.launcherSelect {
+    font-size: 1.1rem;
+}
+input[type='radio'] {
+    transform: scale(1.1);
+}
+.gamePath {
+    display: flex;
+    flex-direction: column;
+}
+</style>

frontend/src/components/MatchSettings/Main.svelte

@@ -4,12 +4,15 @@
     import { MAPS_STANDARD } from "../../arena-names.js";
     import { mutators as mutatorOptions } from "./rlmutators";
     import type { ExtraOptions } from "../../../bindings/gui";
+    import LauncherSelector from "../LauncherSelector.svelte";
 
     let {
         map = $bindable(),
         mode = $bindable(),
         extraOptions = $bindable(),
         mutators = $bindable(),
+        launcher = $bindable(),
+        gamePath = $bindable(),
         onStart = () => {},
         onStop = () => {},
     } = $props();
@@ -53,6 +56,11 @@
                 bind:value={mode}
                 placeholder="Select mode"
             />
+        </div>
+        <div class="controls">
+            <button class="start" onclick={()=>{onStart()}}>Start</button>
+            <button class="stop" onclick={()=>{onStop()}}>Stop</button>
+            <div></div>
             <button
                 onclick={() => {
                     showMutators = true;
@@ -63,10 +71,7 @@
                     showExtraOptions = true;
                 }}>Extra</button
             >
-        </div>
-        <div class="controls">
-            <button class="start" onclick={onStart}>Start</button>
-            <button class="stop" onclick={onStop}>Stop</button>
+            <LauncherSelector bind:launcher bind:gamePath />
         </div>
     </div>
 </div>
@@ -147,7 +152,7 @@
         <label for="instantStart"> Instant Start </label>
         <br />
         <select
-            name="cock"
+            name="emb"
             id="emb"
             bind:value={extraOptions.existingMatchBehavior}
         >

frontend/src/pages/Home.svelte

@@ -87,6 +87,9 @@
         localStorage.setItem("MS_MUTATORS", JSON.stringify(mutatorSettings));
     });
 
+    let launcher = $state("steam");
+    let gamePath = $state("");
+
     async function onMatchStart() {
         let options: StartMatchOptions = {
             map,
@@ -99,6 +102,8 @@
                 // @ts-ignore
                 return draggablePlayerToPlayerJs(x);
             }),
+            launcher,
+            gamePath,
             mutatorSettings,
             extraOptions,
         };
@@ -198,6 +203,8 @@
             bind:mode
             bind:mutators={mutatorSettings}
             bind:extraOptions
+            bind:launcher
+            bind:gamePath
         />
     </div>
 </div>

frontend/src/pages/RocketHost.svelte

@@ -4,6 +4,7 @@
     import { MAPS_STANDARD } from "../arena-names";
     import closeIcon from "../assets/close.svg"
     import Plus from "../assets/plus.svg.svelte";
+    import LauncherSelector from "../components/LauncherSelector.svelte";
     let { onBack } = $props();
 
     let waiting = $state(false);
@@ -65,6 +66,9 @@
 
     let blueBots: string[] = $state([]);
     let orangeBots: string[] = $state([]);
+
+    let launcher = $state("steam");
+    let gamePath = $state("");
 </script>
 
 <div class="page">
@@ -178,6 +182,10 @@
                     {/each}
                 </select>
             </div>
+            <div>
+                <label for="mapselect">Launcher</label>
+                <LauncherSelector bind:launcher bind:gamePath />
+            </div>
         </div>
 
         <div class="buttons">
@@ -190,7 +198,9 @@
                   server: serverAddr,
                   map,
                   blueBots,
-                  orangeBots
+                  orangeBots,
+                  launcher,
+                  gamePath
                 }).then((addr)=>{
                     waiting = false;
                     toast.success(

rockethost.go

@@ -112,6 +112,8 @@ type RHostMatchSettings struct {
 	Map        string   `json:"map"`
 	BlueBots   []string `json:"blueBots"`
 	OrangeBots []string `json:"orangeBots"`
+	Launcher   string   `json:"launcher"`
+	GamePath   string   `json:"gamePath"`
 }
 
 func (a *App) StartRHostMatch(settings RHostMatchSettings) (string, error) {
@@ -145,6 +147,19 @@ func (a *App) StartRHostMatch(settings RHostMatchSettings) (string, error) {
 		return "", errors.New("Couldn't connect to RLBotServer")
 	}
 
+	var launcher flat.Launcher
+	switch settings.Launcher {
+	case "steam":
+		launcher = flat.LauncherSteam
+	case "epic":
+		launcher = flat.LauncherEpic
+	case "custom":
+		launcher = flat.LauncherCustom
+	default:
+		println("No launcher chosen, defaulting to steam")
+		launcher = flat.LauncherSteam
+	}
+
 	err = conn.SendPacket(&flat.MatchSettingsT{
 		PlayerConfigurations: []*flat.PlayerConfigurationT{},
 		ScriptConfigurations: []*flat.ScriptConfigurationT{
@@ -162,6 +177,8 @@ func (a *App) StartRHostMatch(settings RHostMatchSettings) (string, error) {
 		GameMapUpk:            settings.Map,
 		EnableStateSetting:    true,
 		EnableRendering:       true,
+		Launcher:              launcher,
+		GamePath:              settings.GamePath,
 	})
 	if err != nil {
 		return "", errors.New("Couldn't send matchsettings packet")