From 7010c6a497265d70a121de66fc3f60aa881331bc Mon Sep 17 00:00:00 2001 From: Virx Date: Sat, 14 Jun 2025 20:21:16 -0400 Subject: [PATCH] v0.7 spec Update deps --- app.go | 30 +-- frontend/package.json | 4 +- frontend/pnpm-lock.yaml | 248 +++++++++--------- .../src/components/MatchSettings/Main.svelte | 17 +- .../components/MatchSettings/rlmutators.ts | 4 +- frontend/src/pages/Home.svelte | 2 +- go.mod | 30 +-- go.sum | 66 +++-- loadout.go | 37 +-- players.go | 45 ++-- rockethost.go | 6 +- scripts.go | 2 +- 12 files changed, 242 insertions(+), 249 deletions(-) diff --git a/app.go b/app.go index 7c7e3e6..84afc4f 100644 --- a/app.go +++ b/app.go @@ -134,15 +134,15 @@ type Result struct { } type ExtraOptions struct { - Freeplay bool `json:"freeplay"` - EnableRendering bool `json:"enableRendering"` - EnableStateSetting bool `json:"enableStateSetting"` - InstantStart bool `json:"instantStart"` - SkipReplays bool `json:"skipReplays"` - AutoSaveReplay bool `json:"autoSaveReplay"` - ExistingMatchBehavior byte `json:"existingMatchBehavior"` - AutoStartAgents bool `json:"autoStartAgents"` - WaitForAgents bool `json:"waitForAgents"` + Freeplay bool `json:"freeplay"` + EnableRendering flat.DebugRendering `json:"enableRendering"` + EnableStateSetting bool `json:"enableStateSetting"` + InstantStart bool `json:"instantStart"` + SkipReplays bool `json:"skipReplays"` + AutoSaveReplay bool `json:"autoSaveReplay"` + ExistingMatchBehavior byte `json:"existingMatchBehavior"` + AutoStartAgents bool `json:"autoStartAgents"` + WaitForAgents bool `json:"waitForAgents"` } type StartMatchOptions struct { @@ -247,14 +247,14 @@ func (a *App) StartMatch(options StartMatchOptions) Result { var gameMode flat.GameMode switch options.GameMode { - case "Soccer": - gameMode = flat.GameModeSoccer + case "Soccar": + gameMode = flat.GameModeSoccar case "Hoops": gameMode = flat.GameModeHoops case "Dropshot": gameMode = flat.GameModeDropshot - case "Hockey": - gameMode = flat.GameModeHockey + case "Snowday": + gameMode = flat.GameModeSnowday case "Rumble": gameMode = flat.GameModeRumble case "Heatseeker": @@ -264,8 +264,8 @@ func (a *App) StartMatch(options StartMatchOptions) Result { case "Knockout": gameMode = flat.GameModeKnockout default: - println("No mode chosen, defaulting to soccer") - gameMode = flat.GameModeSoccer + println("No mode chosen, defaulting to soccar") + gameMode = flat.GameModeSoccar } var launcher flat.Launcher diff --git a/frontend/package.json b/frontend/package.json index 0b4bb3e..f2cdef7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,14 +9,14 @@ }, "dependencies": { "@wailsio/runtime": "3.0.0-alpha.66", - "svelte": "^5.33.1", + "svelte": "^5.34.3", "svelte-5-french-toast": "^2.0.4", "svelte-dnd-action": "^0.9.61", "svelte-portal": "^2.2.1" }, "devDependencies": { "@biomejs/biome": "^1.9.4", - "@rsbuild/core": "^1.3.21", + "@rsbuild/core": "^1.3.22", "@rsbuild/plugin-svelte": "^1.0.10", "typescript": "^5.8.3" } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 2608058..1645de7 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: 3.0.0-alpha.66 version: 3.0.0-alpha.66 svelte: - specifier: ^5.33.1 - version: 5.33.1 + specifier: ^5.34.3 + version: 5.34.3 svelte-5-french-toast: specifier: ^2.0.4 - version: 2.0.4(svelte@5.33.1) + version: 2.0.4(svelte@5.34.3) svelte-dnd-action: specifier: ^0.9.61 - version: 0.9.61(svelte@5.33.1) + version: 0.9.61(svelte@5.34.3) svelte-portal: specifier: ^2.2.1 version: 2.2.1 @@ -28,11 +28,11 @@ importers: specifier: ^1.9.4 version: 1.9.4 '@rsbuild/core': - specifier: ^1.3.21 - version: 1.3.21 + specifier: ^1.3.22 + version: 1.3.22 '@rsbuild/plugin-svelte': specifier: ^1.0.10 - version: 1.0.10(@rsbuild/core@1.3.21)(svelte@5.33.1)(typescript@5.8.3) + version: 1.0.10(@rsbuild/core@1.3.22)(svelte@5.34.3)(typescript@5.8.3) typescript: specifier: ^5.8.3 version: 5.8.3 @@ -114,26 +114,26 @@ packages: '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - '@module-federation/error-codes@0.13.1': - resolution: {integrity: sha512-azgGDBnFRfqlivHOl96ZjlFUFlukESz2Rnnz/pINiSqoBBNjUE0fcAZP4X6jgrVITuEg90YkruZa7pW9I3m7Uw==} + '@module-federation/error-codes@0.14.0': + resolution: {integrity: sha512-GGk+EoeSACJikZZyShnLshtq9E2eCrDWbRiB4QAFXCX4oYmGgFfzXlx59vMNwqTKPJWxkEGnPYacJMcr2YYjag==} - '@module-federation/runtime-core@0.13.1': - resolution: {integrity: sha512-TfyKfkSAentKeuvSsAItk8s5tqQSMfIRTPN2e1aoaq/kFhE+7blps719csyWSX5Lg5Es7WXKMsXHy40UgtBtuw==} + '@module-federation/runtime-core@0.14.0': + resolution: {integrity: sha512-fGE1Ro55zIFDp/CxQuRhKQ1pJvG7P0qvRm2N+4i8z++2bgDjcxnCKUqDJ8lLD+JfJQvUJf0tuSsJPgevzueD4g==} - '@module-federation/runtime-tools@0.13.1': - resolution: {integrity: sha512-GEF1pxqLc80osIMZmE8j9UKZSaTm2hX2lql8tgIH/O9yK4wnF06k6LL5Ah+wJt+oJv6Dj55ri/MoxMP4SXoPNA==} + '@module-federation/runtime-tools@0.14.0': + resolution: {integrity: sha512-y/YN0c2DKsLETE+4EEbmYWjqF9G6ZwgZoDIPkaQ9p0pQu0V4YxzWfQagFFxR0RigYGuhJKmSU/rtNoHq+qF8jg==} - '@module-federation/runtime@0.13.1': - resolution: {integrity: sha512-ZHnYvBquDm49LiHfv6fgagMo/cVJneijNJzfPh6S0CJrPS2Tay1bnTXzy8VA5sdIrESagYPaskKMGIj7YfnPug==} + '@module-federation/runtime@0.14.0': + resolution: {integrity: sha512-kR3cyHw/Y64SEa7mh4CHXOEQYY32LKLK75kJOmBroLNLO7/W01hMNAvGBYTedS7hWpVuefPk1aFZioy3q2VLdQ==} - '@module-federation/sdk@0.13.1': - resolution: {integrity: sha512-bmf2FGQ0ymZuxYnw9bIUfhV3y6zDhaqgydEjbl4msObKMLGXZqhse2pTIIxBFpIxR1oONKX/y2FAolDCTlWKiw==} + '@module-federation/sdk@0.14.0': + resolution: {integrity: sha512-lg/OWRsh18hsyTCamOOhEX546vbDiA2O4OggTxxH2wTGr156N6DdELGQlYIKfRdU/0StgtQS81Goc0BgDZlx9A==} - '@module-federation/webpack-bundler-runtime@0.13.1': - resolution: {integrity: sha512-QSuSIGa09S8mthbB1L6xERqrz+AzPlHR6D7RwAzssAc+IHf40U6NiTLPzUqp9mmKDhC5Tm0EISU0ZHNeJpnpBQ==} + '@module-federation/webpack-bundler-runtime@0.14.0': + resolution: {integrity: sha512-POWS6cKBicAAQ3DNY5X7XEUSfOfUsRaBNxbuwEfSGlrkTE9UcWheO06QP2ndHi8tHQuUKcIHi2navhPkJ+k5xg==} - '@rsbuild/core@1.3.21': - resolution: {integrity: sha512-0Xy3CEFiLFXZpPmmVmX1XvfAENGrb5IyXYL7zkJ8vF7v3fmZgo3yy3ZeY8SesPTsiZIbCObJ6PemFbLee3S3oA==} + '@rsbuild/core@1.3.22': + resolution: {integrity: sha512-FGB7m8Tn/uiOhvqk0lw+NRMyD+VYJ+eBqVfpn0X11spkJDiPWn8UkMRvfzCX4XFcNZwRKYuuKJaZK1DNU8UG+w==} engines: {node: '>=16.10.0'} hasBin: true @@ -142,56 +142,56 @@ packages: peerDependencies: '@rsbuild/core': 1.x - '@rspack/binding-darwin-arm64@1.3.11': - resolution: {integrity: sha512-sGoFDXYNinubhEiPSjtA/ua3qhMj6VVBPTSDvprZj+MT18YV7tQQtwBpm+8sbqJ1P5y+a3mzsP3IphRWyIQyXw==} + '@rspack/binding-darwin-arm64@1.3.12': + resolution: {integrity: sha512-8hKjVTBeWPqkMzFPNWIh72oU9O3vFy3e88wRjMPImDCXBiEYrKqGTTLd/J0SO+efdL3SBD1rX1IvdJpxCv6Yrw==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-x64@1.3.11': - resolution: {integrity: sha512-4zgOkCLxhp4Ki98GuDaZgz4exXcE4+sgvXY/xA/A5FGPVRbfQLQ5psSOk0F/gvMua1r15E66loQRJpuzUK6bTA==} + '@rspack/binding-darwin-x64@1.3.12': + resolution: {integrity: sha512-Sj4m+mCUxL7oCpdu7OmWT7fpBM7hywk5CM9RDc3D7StaBZbvNtNftafCrTZzTYKuZrKmemTh5SFzT5Tz7tf6GA==} cpu: [x64] os: [darwin] - '@rspack/binding-linux-arm64-gnu@1.3.11': - resolution: {integrity: sha512-NIOaIfYUmJs1XL4lbGVtcMm1KlA/6ZR6oAbs2ekofKXtJYAFQgnLTf7ZFmIwVjS0mP78BmeSNcIM6pd2w5id4w==} + '@rspack/binding-linux-arm64-gnu@1.3.12': + resolution: {integrity: sha512-7MuOxf3/Mhv4mgFdLTvgnt/J+VouNR65DEhorth+RZm3LEWojgoFEphSAMAvpvAOpYSS68Sw4SqsOZi719ia2w==} cpu: [arm64] os: [linux] - '@rspack/binding-linux-arm64-musl@1.3.11': - resolution: {integrity: sha512-CRRAQ379uzA2QfD9HHNtxuuqzGksUapMVcTLY5NIXWfvHLUJShdlSJQv3UQcqgAJNrMY7Ex1PnoQs1jZgUiqZA==} + '@rspack/binding-linux-arm64-musl@1.3.12': + resolution: {integrity: sha512-s6KKj20T9Z1bA8caIjU6EzJbwyDo1URNFgBAlafCT2UC6yX7flstDJJ38CxZacA9A2P24RuQK2/jPSZpWrTUFA==} cpu: [arm64] os: [linux] - '@rspack/binding-linux-x64-gnu@1.3.11': - resolution: {integrity: sha512-k3OyvLneX2ZeL8z/OzPojpImqy6PgqKJD+NtOvcr/TgbgADHZ3xQttf6B2X+qnZMAgOZ+RTeTkOFrvsg9AEKmA==} + '@rspack/binding-linux-x64-gnu@1.3.12': + resolution: {integrity: sha512-0w/sRREYbRgHgWvs2uMEJSLfvzbZkPHUg6CMcYQGNVK6axYRot6jPyKetyFYA9pR5fB5rsXegpnFaZaVrRIK2g==} cpu: [x64] os: [linux] - '@rspack/binding-linux-x64-musl@1.3.11': - resolution: {integrity: sha512-2agcELyyQ95jWGCW0YWD0TvAcN40yUjmxn9NXQBLHPX5Eb07NaHXairMsvV9vqQsPsq0nxxfd9Wsow18Y5r/Hw==} + '@rspack/binding-linux-x64-musl@1.3.12': + resolution: {integrity: sha512-jEdxkPymkRxbijDRsBGdhopcbGXiXDg59lXqIRkVklqbDmZ/O6DHm7gImmlx5q9FoWbz0gqJuOKBz4JqWxjWVA==} cpu: [x64] os: [linux] - '@rspack/binding-win32-arm64-msvc@1.3.11': - resolution: {integrity: sha512-sjGoChazu0krigT/LVwGUsgCv3D3s/4cR/3P4VzuDNVlb4pbh1CDa642Fr0TceqAXCeKW5GiL/EQOfZ4semtcQ==} + '@rspack/binding-win32-arm64-msvc@1.3.12': + resolution: {integrity: sha512-ZRvUCb3TDLClAqcTsl/o9UdJf0B5CgzAxgdbnYJbldyuyMeTUB4jp20OfG55M3C2Nute2SNhu2bOOp9Se5Ongw==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-ia32-msvc@1.3.11': - resolution: {integrity: sha512-tjywW84oQLSqRmvQZ+fXP7e3eNmjScYrlWEPAQFjf08N19iAJ9UOGuuFw8Fk5ZmrlNZ2Qo9ASSOI7Nnwx2aZYg==} + '@rspack/binding-win32-ia32-msvc@1.3.12': + resolution: {integrity: sha512-1TKPjuXStPJr14f3ZHuv40Xc/87jUXx10pzVtrPnw+f3hckECHrbYU/fvbVzZyuXbsXtkXpYca6ygCDRJAoNeQ==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-x64-msvc@1.3.11': - resolution: {integrity: sha512-pPy3yU6SAMfEPY7ki1KAetiDFfRbkYMiX3F89P9kX01UAePkLRNsjacHF4w7N3EsBsWn1FlGaYZdlzmOI5pg2Q==} + '@rspack/binding-win32-x64-msvc@1.3.12': + resolution: {integrity: sha512-lCR0JfnYKpV+a6r2A2FdxyUKUS4tajePgpPJN5uXDgMGwrDtRqvx+d0BHhwjFudQVJq9VVbRaL89s2MQ6u+xYw==} cpu: [x64] os: [win32] - '@rspack/binding@1.3.11': - resolution: {integrity: sha512-BbMfZHqfH+CzFtZDg+v9nbKifJIJDUPD6KuoWlHq581koKvD3UMx6oVrj9w13JvO2xWNPeHclmqWAFgoD7faEQ==} + '@rspack/binding@1.3.12': + resolution: {integrity: sha512-4Ic8lV0+LCBfTlH5aIOujIRWZOtgmG223zC4L3o8WY/+ESAgpdnK6lSSMfcYgRanYLAy3HOmFIp20jwskMpbAg==} - '@rspack/core@1.3.11': - resolution: {integrity: sha512-aSYPtT1gum5MCfcFANdTroJ4JwzozuL3wX0twMGNAB7amq6+nZrbsUKWjcHgneCeZdahxzrKdyYef3FHaJ7lEA==} + '@rspack/core@1.3.12': + resolution: {integrity: sha512-mAPmV4LPPRgxpouUrGmAE4kpF1NEWJGyM5coebsjK/zaCMSjw3mkdxiU2b5cO44oIi0Ifv5iGkvwbdrZOvMyFA==} engines: {node: '>=16.0.0'} peerDependencies: '@swc/helpers': '>=0.5.1' @@ -211,14 +211,14 @@ packages: '@swc/helpers@0.5.17': resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} - '@types/estree@1.0.7': - resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==} + '@types/estree@1.0.8': + resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} '@wailsio/runtime@3.0.0-alpha.66': resolution: {integrity: sha512-ENLu8rn1griL1gFHJqkq1i+BVxrrA0JPJHYneUJYuf/s54kjuQViW0RKDEe/WTDo56ABpfykrd/T8OYpPUyXUw==} - acorn@8.14.1: - resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} + acorn@8.15.0: + resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} engines: {node: '>=0.4.0'} hasBin: true @@ -233,8 +233,8 @@ packages: big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - caniuse-lite@1.0.30001718: - resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==} + caniuse-lite@1.0.30001723: + resolution: {integrity: sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==} clsx@2.1.1: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} @@ -250,8 +250,8 @@ packages: esm-env@1.2.2: resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==} - esrap@1.4.6: - resolution: {integrity: sha512-F/D2mADJ9SHY3IwksD4DAXjTt7qt7GWUf3/8RhCNWmC/67tyb55dpimHmy7EplakFaflV0R/PC+fdSPqrRHAQw==} + esrap@1.4.9: + resolution: {integrity: sha512-3OMlcd0a03UGuZpPeUC1HxR3nA23l+HEyCiZw3b3FumJIN9KphoGzDJKMXI1S72jVS1dsenDyQC0kJlO1U9E1g==} is-reference@3.0.3: resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==} @@ -344,8 +344,8 @@ packages: peerDependencies: svelte: ^3.2.1 || ^4.0.0-next.1 || ^5.0.0-next.94 - svelte@5.33.1: - resolution: {integrity: sha512-7znzaaQALL62NBzkdKV04tmYIVla8qjrW+k6GdgFZcKcj8XOb8iEjmfRPo40iaWZlKv3+uiuc0h4iaGgwoORtA==} + svelte@5.34.3: + resolution: {integrity: sha512-Y0QKP2rfWD+ARKe91c4JgZgc/nXa2BfOnVBUjYUMB819m7VyPszihkjdzXPIV0qlGRZYEukpgNq7hgbzTbopJw==} engines: {node: '>=18'} tslib@2.8.1: @@ -418,44 +418,44 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 - '@module-federation/error-codes@0.13.1': {} + '@module-federation/error-codes@0.14.0': {} - '@module-federation/runtime-core@0.13.1': + '@module-federation/runtime-core@0.14.0': dependencies: - '@module-federation/error-codes': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/error-codes': 0.14.0 + '@module-federation/sdk': 0.14.0 - '@module-federation/runtime-tools@0.13.1': + '@module-federation/runtime-tools@0.14.0': dependencies: - '@module-federation/runtime': 0.13.1 - '@module-federation/webpack-bundler-runtime': 0.13.1 + '@module-federation/runtime': 0.14.0 + '@module-federation/webpack-bundler-runtime': 0.14.0 - '@module-federation/runtime@0.13.1': + '@module-federation/runtime@0.14.0': dependencies: - '@module-federation/error-codes': 0.13.1 - '@module-federation/runtime-core': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/error-codes': 0.14.0 + '@module-federation/runtime-core': 0.14.0 + '@module-federation/sdk': 0.14.0 - '@module-federation/sdk@0.13.1': {} + '@module-federation/sdk@0.14.0': {} - '@module-federation/webpack-bundler-runtime@0.13.1': + '@module-federation/webpack-bundler-runtime@0.14.0': dependencies: - '@module-federation/runtime': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/runtime': 0.14.0 + '@module-federation/sdk': 0.14.0 - '@rsbuild/core@1.3.21': + '@rsbuild/core@1.3.22': dependencies: - '@rspack/core': 1.3.11(@swc/helpers@0.5.17) + '@rspack/core': 1.3.12(@swc/helpers@0.5.17) '@rspack/lite-tapable': 1.0.1 '@swc/helpers': 0.5.17 core-js: 3.42.0 jiti: 2.4.2 - '@rsbuild/plugin-svelte@1.0.10(@rsbuild/core@1.3.21)(svelte@5.33.1)(typescript@5.8.3)': + '@rsbuild/plugin-svelte@1.0.10(@rsbuild/core@1.3.22)(svelte@5.34.3)(typescript@5.8.3)': dependencies: - '@rsbuild/core': 1.3.21 - svelte-loader: 3.2.4(svelte@5.33.1) - svelte-preprocess: 6.0.3(svelte@5.33.1)(typescript@5.8.3) + '@rsbuild/core': 1.3.22 + svelte-loader: 3.2.4(svelte@5.34.3) + svelte-preprocess: 6.0.3(svelte@5.34.3)(typescript@5.8.3) transitivePeerDependencies: - '@babel/core' - coffeescript @@ -469,69 +469,69 @@ snapshots: - svelte - typescript - '@rspack/binding-darwin-arm64@1.3.11': + '@rspack/binding-darwin-arm64@1.3.12': optional: true - '@rspack/binding-darwin-x64@1.3.11': + '@rspack/binding-darwin-x64@1.3.12': optional: true - '@rspack/binding-linux-arm64-gnu@1.3.11': + '@rspack/binding-linux-arm64-gnu@1.3.12': optional: true - '@rspack/binding-linux-arm64-musl@1.3.11': + '@rspack/binding-linux-arm64-musl@1.3.12': optional: true - '@rspack/binding-linux-x64-gnu@1.3.11': + '@rspack/binding-linux-x64-gnu@1.3.12': optional: true - '@rspack/binding-linux-x64-musl@1.3.11': + '@rspack/binding-linux-x64-musl@1.3.12': optional: true - '@rspack/binding-win32-arm64-msvc@1.3.11': + '@rspack/binding-win32-arm64-msvc@1.3.12': optional: true - '@rspack/binding-win32-ia32-msvc@1.3.11': + '@rspack/binding-win32-ia32-msvc@1.3.12': optional: true - '@rspack/binding-win32-x64-msvc@1.3.11': + '@rspack/binding-win32-x64-msvc@1.3.12': optional: true - '@rspack/binding@1.3.11': + '@rspack/binding@1.3.12': optionalDependencies: - '@rspack/binding-darwin-arm64': 1.3.11 - '@rspack/binding-darwin-x64': 1.3.11 - '@rspack/binding-linux-arm64-gnu': 1.3.11 - '@rspack/binding-linux-arm64-musl': 1.3.11 - '@rspack/binding-linux-x64-gnu': 1.3.11 - '@rspack/binding-linux-x64-musl': 1.3.11 - '@rspack/binding-win32-arm64-msvc': 1.3.11 - '@rspack/binding-win32-ia32-msvc': 1.3.11 - '@rspack/binding-win32-x64-msvc': 1.3.11 - - '@rspack/core@1.3.11(@swc/helpers@0.5.17)': + '@rspack/binding-darwin-arm64': 1.3.12 + '@rspack/binding-darwin-x64': 1.3.12 + '@rspack/binding-linux-arm64-gnu': 1.3.12 + '@rspack/binding-linux-arm64-musl': 1.3.12 + '@rspack/binding-linux-x64-gnu': 1.3.12 + '@rspack/binding-linux-x64-musl': 1.3.12 + '@rspack/binding-win32-arm64-msvc': 1.3.12 + '@rspack/binding-win32-ia32-msvc': 1.3.12 + '@rspack/binding-win32-x64-msvc': 1.3.12 + + '@rspack/core@1.3.12(@swc/helpers@0.5.17)': dependencies: - '@module-federation/runtime-tools': 0.13.1 - '@rspack/binding': 1.3.11 + '@module-federation/runtime-tools': 0.14.0 + '@rspack/binding': 1.3.12 '@rspack/lite-tapable': 1.0.1 - caniuse-lite: 1.0.30001718 + caniuse-lite: 1.0.30001723 optionalDependencies: '@swc/helpers': 0.5.17 '@rspack/lite-tapable@1.0.1': {} - '@sveltejs/acorn-typescript@1.0.5(acorn@8.14.1)': + '@sveltejs/acorn-typescript@1.0.5(acorn@8.15.0)': dependencies: - acorn: 8.14.1 + acorn: 8.15.0 '@swc/helpers@0.5.17': dependencies: tslib: 2.8.1 - '@types/estree@1.0.7': {} + '@types/estree@1.0.8': {} '@wailsio/runtime@3.0.0-alpha.66': {} - acorn@8.14.1: {} + acorn@8.15.0: {} aria-query@5.3.2: {} @@ -539,7 +539,7 @@ snapshots: big.js@5.2.2: {} - caniuse-lite@1.0.30001718: {} + caniuse-lite@1.0.30001723: {} clsx@2.1.1: {} @@ -549,13 +549,13 @@ snapshots: esm-env@1.2.2: {} - esrap@1.4.6: + esrap@1.4.9: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 is-reference@3.0.3: dependencies: - '@types/estree': 1.0.7 + '@types/estree': 1.0.8 jiti@2.4.2: {} @@ -573,52 +573,52 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - svelte-5-french-toast@2.0.4(svelte@5.33.1): + svelte-5-french-toast@2.0.4(svelte@5.34.3): dependencies: - svelte: 5.33.1 - svelte-writable-derived: 3.1.1(svelte@5.33.1) + svelte: 5.34.3 + svelte-writable-derived: 3.1.1(svelte@5.34.3) svelte-dev-helper@1.1.9: {} - svelte-dnd-action@0.9.61(svelte@5.33.1): + svelte-dnd-action@0.9.61(svelte@5.34.3): dependencies: - svelte: 5.33.1 + svelte: 5.34.3 - svelte-hmr@0.14.12(svelte@5.33.1): + svelte-hmr@0.14.12(svelte@5.34.3): dependencies: - svelte: 5.33.1 + svelte: 5.34.3 - svelte-loader@3.2.4(svelte@5.33.1): + svelte-loader@3.2.4(svelte@5.34.3): dependencies: loader-utils: 2.0.4 - svelte: 5.33.1 + svelte: 5.34.3 svelte-dev-helper: 1.1.9 - svelte-hmr: 0.14.12(svelte@5.33.1) + svelte-hmr: 0.14.12(svelte@5.34.3) svelte-portal@2.2.1: {} - svelte-preprocess@6.0.3(svelte@5.33.1)(typescript@5.8.3): + svelte-preprocess@6.0.3(svelte@5.34.3)(typescript@5.8.3): dependencies: - svelte: 5.33.1 + svelte: 5.34.3 optionalDependencies: typescript: 5.8.3 - svelte-writable-derived@3.1.1(svelte@5.33.1): + svelte-writable-derived@3.1.1(svelte@5.34.3): dependencies: - svelte: 5.33.1 + svelte: 5.34.3 - svelte@5.33.1: + svelte@5.34.3: dependencies: '@ampproject/remapping': 2.3.0 '@jridgewell/sourcemap-codec': 1.5.0 - '@sveltejs/acorn-typescript': 1.0.5(acorn@8.14.1) - '@types/estree': 1.0.7 - acorn: 8.14.1 + '@sveltejs/acorn-typescript': 1.0.5(acorn@8.15.0) + '@types/estree': 1.0.8 + acorn: 8.15.0 aria-query: 5.3.2 axobject-query: 4.1.0 clsx: 2.1.1 esm-env: 1.2.2 - esrap: 1.4.6 + esrap: 1.4.9 is-reference: 3.0.3 locate-character: 3.0.0 magic-string: 0.30.17 diff --git a/frontend/src/components/MatchSettings/Main.svelte b/frontend/src/components/MatchSettings/Main.svelte index 5f6e47a..a1eb24d 100644 --- a/frontend/src/components/MatchSettings/Main.svelte +++ b/frontend/src/components/MatchSettings/Main.svelte @@ -29,6 +29,12 @@ const existingMatchBehaviors: { [n: string]: number } = { "Restart if different": 2, }; +const renderingOptions: { [n: string]: number } = { + "Off by default": 0, + "On by default": 1, + "Always off": 2, +}; + function cleanCase(toClean: string) { const halfClean = toClean.replaceAll("_", " "); return halfClean.charAt(0).toUpperCase() + halfClean.slice(1); @@ -179,14 +185,9 @@ const ALL_MAPS = getMaps();

- - +

Rendering (bots can draw on screen)

+ +

{ localStorage.setItem("MS_MODE", mode); }); diff --git a/go.mod b/go.mod index 30c09ab..64a7cde 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.6 require ( github.com/BurntSushi/toml v1.5.0 - github.com/RLBot/go-interface v0.0.0-20250415214826-040d3d30ba7f + github.com/RLBot/go-interface v0.0.0-20250614230240-3eb3ca4b34e1 github.com/ncruces/zenity v0.10.14 github.com/ulikunitz/xz v0.5.12 github.com/wailsapp/mimetype v1.4.1 @@ -14,20 +14,20 @@ require ( ) require ( - dario.cat/mergo v1.0.1 // indirect + dario.cat/mergo v1.0.2 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/ProtonMail/go-crypto v1.2.0 // indirect + github.com/ProtonMail/go-crypto v1.3.0 // indirect github.com/adrg/xdg v0.5.3 // indirect github.com/akavel/rsrc v0.10.2 // indirect github.com/bep/debounce v1.2.1 // indirect github.com/cloudflare/circl v1.6.1 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect - github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect - github.com/ebitengine/purego v0.8.2 // indirect + github.com/dchest/jsmin v1.0.0 // indirect + github.com/ebitengine/purego v0.8.4 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.2 // indirect - github.com/go-git/go-git/v5 v5.16.0 // indirect + github.com/go-git/go-git/v5 v5.16.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect @@ -35,28 +35,28 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect - github.com/josephspurrier/goversioninfo v1.4.1 // indirect + github.com/josephspurrier/goversioninfo v1.5.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/leaanthony/go-ansi-parser v1.6.1 // indirect github.com/leaanthony/u v1.1.1 // indirect - github.com/lmittmann/tint v1.0.7 // indirect + github.com/lmittmann/tint v1.1.2 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/pjbgf/sha1cd v0.3.2 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/samber/lo v1.49.1 // indirect - github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect + github.com/samber/lo v1.51.0 // indirect + github.com/sergi/go-diff v1.4.0 // indirect github.com/skeema/knownhosts v1.3.1 // indirect github.com/wailsapp/go-webview2 v1.0.21 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.37.0 // indirect + golang.org/x/crypto v0.39.0 // indirect golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect - golang.org/x/image v0.21.0 // indirect - golang.org/x/net v0.39.0 // indirect - golang.org/x/sys v0.32.0 // indirect - golang.org/x/text v0.24.0 // indirect + golang.org/x/image v0.28.0 // indirect + golang.org/x/net v0.41.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.26.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index a96c0c7..a5d5d9b 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,14 @@ -dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= -dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/ProtonMail/go-crypto v1.2.0 h1:+PhXXn4SPGd+qk76TlEePBfOfivE0zkWFenhGhFLzWs= -github.com/ProtonMail/go-crypto v1.2.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= -github.com/RLBot/go-interface v0.0.0-20250415214826-040d3d30ba7f h1:SEbN/466Lfjs/6rvHojmkmPKRq7gXLYJr/44GaQWKB8= -github.com/RLBot/go-interface v0.0.0-20250415214826-040d3d30ba7f/go.mod h1:zogQvXLJKb2EQ4bb/PUH168VPwxBdzG1SSFJt9uJM5c= +github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= +github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= +github.com/RLBot/go-interface v0.0.0-20250614230240-3eb3ca4b34e1 h1:iWOTI2DIjy9g/WZV4uaFl/UrG0SbzjJSAnds1UES/C4= +github.com/RLBot/go-interface v0.0.0-20250614230240-3eb3ca4b34e1/go.mod h1:zogQvXLJKb2EQ4bb/PUH168VPwxBdzG1SSFJt9uJM5c= github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78= github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ= github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw= @@ -26,10 +26,10 @@ github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f h1:OGqDDftRTwrvUoL6pOG7rYTmWsTCvyEWFsMjg+HcOaA= -github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f/go.mod h1:Dv9D0NUlAsaQcGQZa5kc5mqR9ua72SmA8VXi4cd+cBw= -github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I= -github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/dchest/jsmin v1.0.0 h1:Y2hWXmGZiRxtl+VcTksyucgTlYxnhPzTozCwx9gy9zI= +github.com/dchest/jsmin v1.0.0/go.mod h1:AVBIund7Mr7lKXT70hKT2YgL3XEXUaUk5iw9DZ8b0Uc= +github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw= +github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= @@ -42,8 +42,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ= -github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= +github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM= +github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -60,8 +60,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ= github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= -github.com/josephspurrier/goversioninfo v1.4.1 h1:5LvrkP+n0tg91J9yTkoVnt/QgNnrI1t4uSsWjIonrqY= -github.com/josephspurrier/goversioninfo v1.4.1/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY= +github.com/josephspurrier/goversioninfo v1.5.0 h1:9TJtORoyf4YMoWSOo/cXFN9A/lB3PniJ91OxIH6e7Zg= +github.com/josephspurrier/goversioninfo v1.5.0/go.mod h1:6MoTvFZ6GKJkzcdLnU5T/RGYUbHQbKpYeNP0AgQLd2o= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -75,8 +75,8 @@ github.com/leaanthony/go-ansi-parser v1.6.1 h1:xd8bzARK3dErqkPFtoF9F3/HgN8UQk0ed github.com/leaanthony/go-ansi-parser v1.6.1/go.mod h1:+vva/2y4alzVmmIEpk9QDhA7vLC5zKDTRwfZGOp3IWU= github.com/leaanthony/u v1.1.1 h1:TUFjwDGlNX+WuwVEzDqQwC2lOv0P4uhTQw7CMFdiK7M= github.com/leaanthony/u v1.1.1/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQcaRfI= -github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= -github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= +github.com/lmittmann/tint v1.1.2 h1:2CQzrL6rslrsyjqLDwD11bZ5OpLBPU+g3G/r5LSfS8w= +github.com/lmittmann/tint v1.1.2/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= @@ -102,17 +102,16 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew= -github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI= +github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= +github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= +github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= @@ -128,16 +127,16 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= -golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= -golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s= -golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78= +golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE= +golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -147,14 +146,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= -golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= -golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -166,6 +165,5 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/loadout.go b/loadout.go index 5a7941f..8610fae 100644 --- a/loadout.go +++ b/loadout.go @@ -43,17 +43,18 @@ func (options LoadoutPreviewOptions) GetPreviewMatch(existingMatchBehavior flat. playerConfigs := []*flat.PlayerConfigurationT{ { Variety: &flat.PlayerClassT{ - Type: flat.PlayerClassCustomBot, - Value: &flat.CustomBotT{}, + Type: flat.PlayerClassCustomBot, + Value: &flat.CustomBotT{ + Name: "Showcase", + AgentId: "gui/loadout-preview", + RootDir: "", + RunCommand: "", + Loadout: loadout, + Hivemind: false, + }, }, - Name: "Showcase", - AgentId: "gui/loadout-preview", - Team: options.Team, - RootDir: "", - RunCommand: "", - Loadout: loadout, - SpawnId: 0, - Hivemind: false, + Team: options.Team, + PlayerId: 0, }, } @@ -77,13 +78,13 @@ func (options LoadoutPreviewOptions) GetPreviewMatch(existingMatchBehavior flat. GameMapUpk: options.Map, PlayerConfigurations: playerConfigs, ScriptConfigurations: []*flat.ScriptConfigurationT{}, - GameMode: flat.GameModeSoccer, + GameMode: flat.GameModeSoccar, Mutators: &flat.MutatorSettingsT{ MatchLength: flat.MatchLengthMutatorUnlimited, BoostAmount: flat.BoostAmountMutatorUnlimitedBoost, }, Freeplay: false, - EnableRendering: false, + EnableRendering: flat.DebugRenderingAlwaysOff, EnableStateSetting: true, InstantStart: true, SkipReplays: true, @@ -134,7 +135,7 @@ func (a *App) SetLoadout(options LoadoutPreviewOptions) error { return err } - switch packet := packet.(type) { + switch packet := packet.Value.(type) { case *flat.GamePacketT: gamePacket = packet } @@ -184,13 +185,13 @@ func WaitForLoadoutMatchReady(conn *rlbot.RLBotConnection, team uint32) (*flat.G // wait for the correct match to start var gamePacket *flat.GamePacketT var matchConfig *flat.MatchConfigurationT - for matchConfig == nil || gamePacket == nil || len(matchConfig.PlayerConfigurations) != 1 || matchConfig.PlayerConfigurations[0].Team != team || matchConfig.PlayerConfigurations[0].Name != "Showcase" { + for matchConfig == nil || gamePacket == nil || len(matchConfig.PlayerConfigurations) != 1 || matchConfig.PlayerConfigurations[0].Team != team || matchConfig.PlayerConfigurations[0].Variety.Type != flat.PlayerClassCustomBot || matchConfig.PlayerConfigurations[0].Variety.Value.(*flat.CustomBotT).Name != "Showcase" { packet, err := conn.RecvPacket() if err != nil { return nil, err } - switch packet := packet.(type) { + switch packet := packet.Value.(type) { case *flat.MatchConfigurationT: matchConfig = packet case *flat.GamePacketT: @@ -205,7 +206,7 @@ func WaitForLoadoutMatchReady(conn *rlbot.RLBotConnection, team uint32) (*flat.G return nil, err } - switch packet := packet.(type) { + switch packet := packet.Value.(type) { case *flat.GamePacketT: gamePacket = packet } @@ -253,8 +254,8 @@ func (a *App) StaticSetter(team uint32) error { return err } - switch packet.(type) { - case nil: + switch packet.Value.(type) { + case *flat.DisconnectSignalT: return nil case *flat.GamePacketT: conn.SendPacket(&gameState) diff --git a/players.go b/players.go index a67cbf1..b5aeee5 100644 --- a/players.go +++ b/players.go @@ -56,18 +56,15 @@ type PsyonixBotInfo struct { func (info PsyonixBotInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT { return &flat.PlayerConfigurationT{ Variety: &flat.PlayerClassT{ - Type: flat.PlayerClassPsyonix, - Value: &flat.PsyonixT{ + Type: flat.PlayerClassPsyonixBot, + Value: &flat.PsyonixBotT{ + Name: "", + Loadout: nil, BotSkill: flat.PsyonixSkill(info.Skill), }, }, - Name: "", - Team: team, - RootDir: "", - RunCommand: "", - Loadout: nil, - SpawnId: 0, - Hivemind: false, + Team: team, + PlayerId: 0, } } @@ -79,13 +76,8 @@ func (info HumanInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT { Type: flat.PlayerClassHuman, Value: &flat.HumanT{}, }, - Name: "", - Team: team, - RootDir: "", - RunCommand: "", - Loadout: nil, - SpawnId: 0, - Hivemind: false, + Team: team, + PlayerId: 0, } } @@ -180,17 +172,18 @@ func (botInfo BotInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT { return &flat.PlayerConfigurationT{ Variety: &flat.PlayerClassT{ - Type: flat.PlayerClassCustomBot, - Value: &flat.CustomBotT{}, + Type: flat.PlayerClassCustomBot, + Value: &flat.CustomBotT{ + Name: botInfo.Config.Settings.Name, + AgentId: botInfo.Config.Settings.AgentId, + RootDir: botInfo.Config.Settings.RootDir, + RunCommand: runCommand, + Loadout: loadout, + Hivemind: botInfo.Config.Settings.Hivemind, + }, }, - Name: botInfo.Config.Settings.Name, - AgentId: botInfo.Config.Settings.AgentId, - Team: team, - RootDir: botInfo.Config.Settings.RootDir, - RunCommand: runCommand, - Loadout: loadout, - SpawnId: 0, // let core do this - Hivemind: botInfo.Config.Settings.Hivemind, + Team: team, + PlayerId: 0, // let core do this } } diff --git a/rockethost.go b/rockethost.go index 7a91836..f61600e 100644 --- a/rockethost.go +++ b/rockethost.go @@ -163,12 +163,12 @@ func (a *App) StartRHostMatch(settings RHostMatchSettings) (string, error) { err = conn.SendPacket(&flat.MatchConfigurationT{ PlayerConfigurations: []*flat.PlayerConfigurationT{}, ScriptConfigurations: []*flat.ScriptConfigurationT{}, - GameMode: flat.GameModeSoccer, + GameMode: flat.GameModeSoccar, Mutators: &flat.MutatorSettingsT{}, ExistingMatchBehavior: flat.ExistingMatchBehaviorRestart, GameMapUpk: settings.Map, EnableStateSetting: true, - EnableRendering: true, + EnableRendering: flat.DebugRenderingOnByDefault, Launcher: launcher, LauncherArg: settings.LauncherArg, }) @@ -192,7 +192,7 @@ func (a *App) StartRHostMatch(settings RHostMatchSettings) (string, error) { if err != nil { return "", errors.New("Error reading packet from rlbotserver: " + err.Error()) } - _, ok := packet.(*flat.FieldInfoT) + _, ok := packet.Value.(*flat.FieldInfoT) if ok { break } diff --git a/scripts.go b/scripts.go index d73e51d..7f1205c 100644 --- a/scripts.go +++ b/scripts.go @@ -25,7 +25,7 @@ func (botInfo BotInfo) ToScriptConfig() *flat.ScriptConfigurationT { AgentId: botInfo.Config.Settings.AgentId, RootDir: botInfo.Config.Settings.RootDir, RunCommand: runCommand, - SpawnId: 0, // let core do this + ScriptId: 0, // let core do this } }