Merge pull request #2 from oscar-wos/1.1

Re-write & default map configs

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on: push
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+              with:
+                submodules: recursive
+
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v4
+              with:
+                  dotnet-version: '8.0.x'
+
+            - name: Restore dependencies
+              run: dotnet restore
+
+            - name: Build
+              run: dotnet build -c Release

.github/workflows/dotnet.yml → .github/workflows/release.yml

@@ -1,6 +1,9 @@
 name: Build and Release
 
-on: push
+on:
+  push:
+    branches:
+      - main
 
 jobs:
     build:
@@ -9,6 +12,8 @@ jobs:
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4
+              with:
+                submodules: recursive
 
             - name: Setup .NET
               uses: actions/setup-dotnet@v4
@@ -29,6 +34,8 @@ jobs:
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4
+              with:
+                submodules: recursive
 
             - name: Setup .NET
               uses: actions/setup-dotnet@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cs2-retakes"]
+	path = cs2-retakes
+	url = https://github.com/B3none/cs2-retakes

Retakes-Zones.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.10.34928.147
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zones", "src\Zones.csproj", "{281D1A18-97D7-494A-9EA2-322AF4BC7057}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RetakesPluginShared", "RetakesPluginShared\RetakesPluginShared.csproj", "{17DC10DD-4F4F-4D66-953A-29D641390D4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RetakesPluginShared", "cs2-retakes\RetakesPluginShared\RetakesPluginShared.csproj", "{17DC10DD-4F4F-4D66-953A-29D641390D4B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

config/de_ancient.json

@@ -0,0 +1,42 @@
+{
+  "a": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 395.57385, 958.4874, 105.912964 ],
+      "y": [ 424.41107, 754.1365, 282.2173 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -240.83891, -649.0581, 336.64508 ],
+      "y": [ -200.55945, -913.92194, 162.99442 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -1099.0615, -1714.856, -28.029297 ],
+      "y": [ -1039.9855, -1431, 185.11436 ]
+    }
+  ],
+  "b": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -666.0047, 1436.6984, 31.718761 ],
+      "y": [ -736.8267, 998, 235.11986 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -710.8304, -910.6106, 37.132427 ],
+      "y": [ -739.94525, -75.25255, 299.49985 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 817.62476, -1500.6615, -6.0914 ],
+      "y": [ 775.61285, -1380.197, 159.09056 ]
+    }
+  ]
+}

config/de_anubis.json

@@ -0,0 +1,84 @@
+{
+  "a": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -928.1232, 2048.642, 205.1853 ],
+      "y": [ -876.46747, 1873.5063, 16.018814 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -903.77277, 1865.2053, 171.52405 ],
+      "y": [ -716.18756, 1843.5371, 16.000004 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -496.46573, 1214.7007, 230.18097 ],
+      "y": [ -543.50116, 1032, 56.13047 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 2.3324504, 71.39349, -16 ],
+      "y": [ -49.40605, 319.35785, -188.8649 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -208, -51.53247, 134.43846 ],
+      "y": [ -16.000008, 18.888643, 0.2599678 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 1280, 316.5419, 159.94922 ],
+      "y": [ 1515.1339, 279.6265, 0 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 720, -31.373041, 40.02186 ],
+      "y": [ 854.82074, -13.726757, -151.57324 ]
+    }
+  ],
+  "b": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 720, -31.373041, 40.02186 ],
+      "y": [ 854.82074, -13.726757, -151.57324 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 720, 305.0564, 37.476814 ],
+      "y": [ 1267.8851, 348.82477, -188 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 431.664, -735.2962, -1 ],
+      "y": [ 389.54303, -520.0312, 163.0344 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -980.9968, -1047.9418, 272.98633 ],
+      "y": [ -1263.3822, -984.33124, 63.999996 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 420.43683, 1359.307, 160 ],
+      "y": [ 465.32565, 1228.1498, -31.999998 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 192, 2465.0093, 24.878288 ],
+      "y": [ 416, 2403.3828, -151.79666 ]
+    }
+  ]
+}

config/de_dust2.json

@@ -0,0 +1,55 @@
+{
+  "a": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -592.3416, 2079.2966, -118.12747 ],
+      "y": [ -685.66235, 2640.01, 114.837845 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -1146.3015, 1314.092, -110.50049 ],
+      "y": [ -1024.0082, 1284.1519, 35.03357 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -511.26465, 191.88031, -0.03924179 ],
+      "y": [ -383.99347, 171.66547, 155.49341 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 384.11343, -384.43207, 156.81729 ],
+      "y": [ 97.706085, -416.05682, 2.499878 ]
+    }
+  ],
+  "b": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 536, 2292.3535, 37.816467 ],
+      "y": [ 509.13562, 2032.0306, -123.39116 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -512.0008, 720.6355, 1.6234131 ],
+      "y": [ -128, 666.35223, 204.28952 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -1411.7316, -156.6405, 325.23245 ],
+      "y": [ -2076.8384, -113.92674, 7.8232727 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -63.773808, 1326.3427, 143.21495 ],
+      "y": [ -10.04047, 1600.0009, 3.0171127 ]
+    }
+  ]
+}
+

config/de_inferno.json

@@ -0,0 +1,78 @@
+{
+  "a": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 328.67874, 618.22577, 61.09875 ],
+      "y": [ 262.15146, 604.9944, -32.56378 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 176.17119, 750.5145, 51.394302 ],
+      "y": [ 18.8329, 786.74945, 244.75998 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 707.98315, 32.64191, 31.369291 ],
+      "y": [ 644.8329, -286.323, 241.64008 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 788.1582, -572.3561, 47.926437 ],
+      "y": [ 751.8094, -751.3685, 172.27112 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 1697.5143, 1920.8099, 118.66513 ],
+      "y": [ 1577.079, 1954.521, 337.25342 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 2191.3057, 2207.5205, 99.2032 ],
+      "y": [ 2098.3787, 2969.7449, 446.91803 ]
+    }
+  ],
+  "b": [
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 328.67874, 618.22577, 61.09875 ],
+      "y": [ 262.15146, 604.9944, -32.56378 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ -348.07312, 758.8972, -55.19696 ],
+      "y": [ -890.65234, 687.4915, 114.6773 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 977.6457, 415.446, 63.663822 ],
+      "y": [ 695.35297, 343.09033, 193.42664 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 1298.1471, 421.34482, 98.12476 ],
+      "y": [ 1507.6096, 350.1063, 288.7592 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 1874.8666, 1238.9279, 123.93955 ],
+      "y": [ 1922.8247, 985.7421, 297.62064 ]
+    },
+    {
+      "type": 1,
+      "teams": [ 2, 3 ],
+      "x": [ 2372.9092, 1560.5975, 118.25932 ],
+      "y": [ 2301.6233, 1547.9435, 241.6854 ]
+    }
+  ]
+}