Merge branch 'main' into sam-radius

Author: wnusair

eslint.config.js

@@ -107,7 +107,7 @@ export default [
       "function-call-argument-newline": ["error", "consistent"],
       "max-depth": ["error", { max: 5 }],
       "max-len": ["error", { code: 120 }],
-      "max-lines": ["error", { max: 677, skipBlankLines: true, skipComments: true }],
+      "max-lines": ["error", { max: 650, skipBlankLines: true, skipComments: true }],
       "max-lines-per-function": ["error", { max: 561 }],
       "no-loss-of-precision": "error",
       "no-multi-spaces": "error",

resources/QuickChat.json

@@ -4,6 +4,10 @@
       "key": "troops",
       "requiresPlayer": false
     },
+    {
+      "key": "troops_frontlines",
+      "requiresPlayer": false
+    },
     {
       "key": "gold",
       "requiresPlayer": false
@@ -25,8 +29,8 @@
       "requiresPlayer": true
     },
     {
-      "key": "team_up",
-      "requiresPlayer": true
+      "key": "trade_partners",
+      "requiresPlayer": false
     }
   ],
   "attack": [
@@ -45,27 +49,43 @@
     {
       "key": "finish",
       "requiresPlayer": true
+    },
+    {
+      "key": "build_warships",
+      "requiresPlayer": false
     }
   ],
   "defend": [
     {
       "key": "defend",
       "requiresPlayer": true
     },
+    {
+      "key": "defend_from",
+      "requiresPlayer": true
+    },
     {
       "key": "dont_attack",
       "requiresPlayer": true
     },
     {
       "key": "ally",
       "requiresPlayer": true
+    },
+    {
+      "key": "build_posts",
+      "requiresPlayer": false
     }
   ],
   "greet": [
     {
       "key": "hello",
       "requiresPlayer": false
     },
+    {
+      "key": "good_job",
+      "requiresPlayer": false
+    },
     {
       "key": "good_luck",
       "requiresPlayer": false
@@ -109,6 +129,18 @@
     {
       "key": "trust_broken",
       "requiresPlayer": false
+    },
+    {
+      "key": "ruining_games",
+      "requiresPlayer": false
+    },
+    {
+      "key": "dont_do_that",
+      "requiresPlayer": false
+    },
+    {
+      "key": "same_team",
+      "requiresPlayer": false
     }
   ],
   "misc": [
@@ -124,9 +156,21 @@
       "key": "fun",
       "requiresPlayer": false
     },
+    {
+      "key": "team_up",
+      "requiresPlayer": true
+    },
     {
       "key": "pr",
       "requiresPlayer": false
+    },
+    {
+      "key": "build_closer",
+      "requiresPlayer": false
+    },
+    {
+      "key": "coastline",
+      "requiresPlayer": false
     }
   ],
   "warnings": [
@@ -162,6 +206,10 @@
       "key": "betrayed",
       "requiresPlayer": true
     },
+    {
+      "key": "betrayed_me",
+      "requiresPlayer": true
+    },
     {
       "key": "getting_big",
       "requiresPlayer": true
@@ -177,6 +225,18 @@
     {
       "key": "mirv_ready",
       "requiresPlayer": true
+    },
+    {
+      "key": "snowballing",
+      "requiresPlayer": true
+    },
+    {
+      "key": "cheating",
+      "requiresPlayer": true
+    },
+    {
+      "key": "stop_trading",
+      "requiresPlayer": true
     }
   ]
 }