Merge 8b6ca73324 into 79576ad117

src/ui/starter-select-ui-handler.ts

@@ -1053,7 +1053,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     this.moveInfoOverlay = new MoveInfoOverlay({
       top: true,
       x: 1,
-      y: globalScene.scaledCanvas.height - MoveInfoOverlay.getHeight() - 29,
+      y: globalScene.scaledCanvas.height / 6 - MoveInfoOverlay.getHeight() - 29,
     });
 
     this.starterSelectContainer.add([

test/@types/test-helpers.ts

@@ -1,27 +0,0 @@
-import type { AtLeastOne, NonFunctionPropertiesRecursive as nonFunc } from "#types/type-helpers";
-
-/**
- * Helper type to admit an object containing the given properties
- * _and_ at least 1 other non-function property.
- * @example
- * ```ts
- * type foo = {
- *   qux: 1 | 2 | 3,
- *   bar: number,
- *   baz: string
- *   quux: () => void; // ignored!
- * }
- *
- * type quxAndSomethingElse = OneOther<foo, "qux">
- *
- * const good1: quxAndSomethingElse = {qux: 1, bar: 3} // OK!
- * const good2: quxAndSomethingElse = {qux: 2, baz: "4", bar: 12} // OK!
- * const bad1: quxAndSomethingElse = {baz: "4", bar: 12} // Errors because `qux` is required
- * const bad2: quxAndSomethingElse = {qux: 1} // Errors because at least 1 thing _other_ than `qux` is required
- * ```
- * @typeParam O - The object to source keys from
- * @typeParam K - One or more of O's keys to render mandatory
- */
-export type OneOther<O extends object, K extends keyof O> = AtLeastOne<Omit<nonFunc<O>, K>> & {
-  [key in K]: O[K];
-};