Pull source files out of junctions

Author: Perryvw

.gitignore

@@ -2,7 +2,6 @@ node_modules
 
 /content/panorama/scripts/custom_game/**/*.js
 /game/scripts/vscripts/**/*.lua
-!/game/scripts/vscripts/lib/timers.lua
 
 # Dota 2 stuff
 *.bin

README.md

@@ -15,6 +15,11 @@ A template for Dota 2 Custom Games built with modern technologies. It includes
 
 After that you can press `Ctrl+Shift+B` in VSCode or run `npm run dev` command in terminal to compile your code and watch for changes.
 
+## Contents:
+
+* **[src/vscripts]:** TypeScript code Dota addon (Lua) scripts. Compiles lua to game/scripts/vscripts.
+* **[src/panorama]:** TypeScript code for panorama UI
+
 ## Continuous Integration
 
 This template includes a [GitHub Actions](https://github.com/features/actions) [workflow](.github/workflows/ci.yml) that builds your custom game on every commit and fails when there are type errors.

content/panorama/scripts/custom_game/hud.ts

@@ -8,8 +8,8 @@
         "build:panorama": "tsc --project content/panorama/scripts/custom_game/tsconfig.json",
         "build:vscripts": "tstl --project game/scripts/vscripts/tsconfig.json",
         "dev": "run-p dev:*",
-        "dev:panorama": "tsc --project content/panorama/scripts/custom_game/tsconfig.json --watch",
-        "dev:vscripts": "tstl --project game/scripts/vscripts/tsconfig.json --watch"
+        "dev:panorama": "tsc --project src/panorama/tsconfig.json --watch",
+        "dev:vscripts": "tstl --project src/vscripts/tsconfig.json --watch"
     },
     "devDependencies": {
         "@moddota/dota-lua-types": "^4.11.0",

package.json

@@ -0,0 +1,25 @@
+/**
+ * This file contains types for the events you want to send between the UI (Panorama)
+ * and the server (VScripts).
+ * 
+ * IMPORTANT: 
+ * 
+ * The dota engine will change the type of event data slightly when it is sent, so on the
+ * Panorama side your event handlers will have to handle NetworkedData<EventType>, changes are:
+ *   - Booleans are turned to 0 | 1
+ *   - Arrays are automatically translated to objects when sending them as event. You have
+ *     to change them back into arrays yourself! See 'toArray()' in src/panorama/hud.ts
+ */
+
+// To declare an event for use, add it to this table with the type of its data
+interface CustomGameEventDeclarations {
+    example_event: ExampleEventData
+}
+
+// Define the type of data sent by the example_event event
+interface ExampleEventData {
+    myNumber: number;
+    myBoolean: boolean;
+    myString: string[];
+    myArrayOfNumbers: number[]
+}

src/common/events.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file contains some general types related to your game that can be shared between
+ * front-end (Panorama) and back-end (VScripts). Only put stuff in here you need to share.
+ */
+
+interface Color {
+    r: number,
+    g: number,
+    b: number
+}
+
+interface UnitData {
+    name: string,
+    level: number
+}

src/common/general.d.ts

@@ -0,0 +1,36 @@
+$.Msg("Hud panorama loaded");
+
+GameEvents.Subscribe("my_custom_event", event => {
+    $.Msg("Received custom event", event);
+});
+
+GameEvents.SendCustomGameEventToServer<{}>("ui_loaded", {});
+
+GameEvents.Subscribe("example_event", (data: NetworkedData<ExampleEventData>) => {
+    const myNumber = data.myNumber;
+    const myString = data.myString;
+
+    const myBoolean = data.myBoolean; // After sending to client this is now type 0 | 1!
+
+    const myArrayObject = data.myArrayOfNumbers; // After sending this is now an object!
+
+    const myArray = toArray(myArrayObject); // We can turn it back into an array ourselves.
+
+});
+
+/**
+ * Turn a table object into an array.
+ * @param obj The object to transform to an array.
+ * @returns An array with items of the value type of the original object.
+ */
+function toArray<T>(obj: Record<number, T>): T[] {
+    const result = [];
+    
+    let key = 1;
+    while (obj[key]) {
+        result.push(obj[key]);
+        key++;
+    }
+
+    return result;
+}

src/panorama/hud.ts

@@ -1,10 +1,12 @@
 {
     "compilerOptions": {
         "rootDir": ".",
+        "outDir": "../../content/panorama/scripts/custom_game",
         "target": "es2017",
         "lib": ["es2017"],
         "types": ["@moddota/panorama-types"],
         "moduleResolution": "node",
         "strict": true
-    }
+    },
+    "include": ["**/*.ts", "../common/**/*.ts"]
 }

…panorama/scripts/custom_game/manifest.ts src/panorama/manifest.tscontent/panorama/scripts/custom_game/manifest.ts renamed to src/panorama/manifest.ts content/panorama/scripts/custom_game/manifest.ts renamed to src/panorama/manifest.ts

@@ -1,7 +1,7 @@
 import { reloadable } from "./lib/tstl-utils";
-import "./modifiers/modifier_panic";
+import { modifier_panic } from "./modifiers/modifier_panic";
 
-const heroSelectionTime = 10;
+const heroSelectionTime = 20;
 
 declare global {
     interface CDOTAGamerules {
@@ -17,6 +17,7 @@ export class GameMode {
     }
 
     public static Activate(this: void) {
+        // When the addon activates, create a new instance of this GameMode class.
         GameRules.Addon = new GameMode();
     }
 
@@ -44,8 +45,17 @@ export class GameMode {
             }
         }
 
+        if (state === DOTA_GameState.DOTA_GAMERULES_STATE_CUSTOM_GAME_SETUP) {
+            // Automatically skip setup in tools
+            if (IsInToolsMode()) {
+                Timers.CreateTimer(3, () => {
+                    GameRules.FinishCustomGameSetup();
+                });
+            }
+        }
+
         // Start game once pregame hits
-        if (state == DOTA_GameState.DOTA_GAMERULES_STATE_PRE_GAME) {
+        if (state === DOTA_GameState.DOTA_GAMERULES_STATE_PRE_GAME) {
             Timers.CreateTimer(0.2, () => this.StartGame());
         }
     }
@@ -68,7 +78,7 @@ export class GameMode {
         const unit = EntIndexToHScript(event.entindex) as CDOTA_BaseNPC; // Cast to npc since this is the 'npc_spawned' event
         if (unit.IsRealHero()) {
             Timers.CreateTimer(1, () => {
-                unit.AddNewModifier(unit, undefined, "modifier_panic", { duration: 8 });
+                unit.AddNewModifier(unit, undefined, modifier_panic.name, { duration: 8 });
             });
 
             if (!unit.HasAbility("meepo_earthbind_ts_example")) {