Merge pull request #1123 from solaris-games/feature/improve-settings

Feature/improve settings
solaris-games · Aug 7, 2024 · caab7dc · caab7dc
2 parents 81ab5aa + df0315e
commit caab7dc
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 41 deletions.
diff --git a/server/config/game/settings/official/1v1.json b/server/config/game/settings/official/1v1.json
@@ -117,7 +117,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/newPlayer.json b/server/config/game/settings/official/newPlayer.json
@@ -117,7 +117,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 60,
     "afk": {

diff --git a/server/config/game/settings/official/special_anonymous.json b/server/config/game/settings/official/special_anonymous.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_arcade.json b/server/config/game/settings/official/special_arcade.json
@@ -121,7 +121,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "tickLimit": 1000,
     "startDelay": 240,

diff --git a/server/config/game/settings/official/special_battleRoyale.json b/server/config/game/settings/official/special_battleRoyale.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_dark.json b/server/config/game/settings/official/special_dark.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_fog.json b/server/config/game/settings/official/special_fog.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_freeForAll.json b/server/config/game/settings/official/special_freeForAll.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_homeStar.json b/server/config/game/settings/official/special_homeStar.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_homeStarElimination.json b/server/config/game/settings/official/special_homeStarElimination.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_kingOfTheHill.json b/server/config/game/settings/official/special_kingOfTheHill.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_orbital.json b/server/config/game/settings/official/special_orbital.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_tinyGalaxy.json b/server/config/game/settings/official/special_tinyGalaxy.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/special_ultraDark.json b/server/config/game/settings/official/special_ultraDark.json
@@ -118,7 +118,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "startDelay": 240,
     "afk": {

diff --git a/server/config/game/settings/official/standard.json b/server/config/game/settings/official/standard.json
@@ -120,7 +120,7 @@
   },
   "gameTime": {
     "gameType": "realTime",
-    "speed": 1800,
+    "speed": 3600,
     "isTickLimited": "disabled",
     "tickLimit": 1000,
     "startDelay": 240,

diff --git a/server/config/game/settings/official/turnBased.json b/server/config/game/settings/official/turnBased.json
@@ -119,11 +119,11 @@
     "gameType": "turnBased",
     "isTickLimited": "disabled",
     "turnJumps": 6,
-    "maxTurnWait": 1440,
+    "maxTurnWait": 720,
     "afk": {
       "lastSeenTimeout": 2,
       "cycleTimeout": 3,
-      "turnTimeout": 3
+      "turnTimeout": 5
     }
   }
 }
diff --git a/server/config/game/settings/options.json b/server/config/game/settings/options.json
@@ -220,15 +220,15 @@
     "carrierCost": [
       {
         "value": "cheap",
-        "text": "Cheap"
+        "text": "Cheap (15 credits)"
       },
       {
         "value": "standard",
-        "text": "Standard"
+        "text": "Standard (25 credits)"
       },
       {
         "value": "expensive",
-        "text": "Expensive"
+        "text": "Expensive (50 credits)"
       }
     ],
     "carrierUpkeepCost": [
@@ -238,15 +238,15 @@
       },
       {
         "value": "cheap",
-        "text": "Cheap"
+        "text": "Cheap (1 credit)"
       },
       {
         "value": "standard",
-        "text": "Standard"
+        "text": "Standard (3 credits)"
       },
       {
         "value": "expensive",
-        "text": "Expensive"
+        "text": "Expensive (6 credits)"
       }
     ],
     "warpgateCost": [
@@ -270,23 +270,23 @@
     "specialistCost": [
       {
         "value": "none",
-        "text": "No"
+        "text": "No specialists"
       },
       {
         "value": "standard",
         "text": "Standard"
       },
       {
         "value": "expensive",
-        "text": "Expensive"
+        "text": "Expensive (2x cost)"
       },
       {
         "value": "veryExpensive",
-        "text": "Very Expensive"
+        "text": "Very Expensive (4x cost)"
       },
       {
         "value": "crazyExpensive",
-        "text": "Crazy Expensive"
+        "text": "Crazy Expensive (8x cost)"
       }
     ],
     "specialistsCurrency": [
@@ -647,19 +647,19 @@
       },
       {
         "value": "cheap",
-        "text": "Cheap"
+        "text": "Cheap (5% of your income per ally)"
       },
       {
         "value": "standard",
-        "text": "Standard"
+        "text": "Standard (10% of your income per ally)"
       },
       {
         "value": "expensive",
-        "text": "Expensive"
+        "text": "Expensive (15% of your income per ally)"
       },
       {
         "value": "crazyExpensive",
-        "text": "Crazy Expensive"
+        "text": "Crazy Expensive (25% of your income per ally)"
       }
     ],
     "tradeRestricted": [
@@ -687,27 +687,27 @@
     "researchCosts": [
       {
         "value": "none",
-        "text": "No"
+        "text": "No research"
       },
       {
         "value": "cheap",
-        "text": "Cheap"
+        "text": "Cheap (50)"
       },
       {
         "value": "standard",
-        "text": "Standard"
+        "text": "Standard (100)"
       },
       {
         "value": "expensive",
-        "text": "Expensive"
+        "text": "Expensive (200)"
       },
       {
         "value": "veryExpensive",
-        "text": "Very Expensive"
+        "text": "Very Expensive (400)"
       },
       {
         "value": "crazyExpensive",
-        "text": "Crazy Expensive"
+        "text": "Crazy Expensive (800)"
       }
     ],
     "researchCostProgression": [
@@ -723,15 +723,15 @@
     "researchCostProgressionGrowthFactor": [
       {
         "value": "soft",
-        "text": "Soft"
+        "text": "Soft (x1.25 per level)"
       },
       {
         "value": "medium",
-        "text": "Medium"
+        "text": "Medium (x1.5 per level)"
       },
       {
         "value": "hard",
-        "text": "Hard"
+        "text": "Hard (x1.75 per level)"
       }
     ],
     "bankingReward": [

diff --git a/server/config/game/settings/user/standard.json b/server/config/game/settings/user/standard.json
@@ -131,7 +131,7 @@
     },
     "gameTime":{
        "gameType":"realTime",
-       "speed":1800,
+       "speed":3600,
        "isTickLimited": "disabled",
        "tickLimit": 1000,
        "startDelay":240,