Merge branch 'main' into main

Author: baba33mrt

.github/scripts/check-yaml.cjs

@@ -0,0 +1,63 @@
+const fs = require("fs");
+const yaml = require("js-yaml");
+const glob = require("glob");
+
+const SNAKE_CASE_REGEX = /^[a-z][a-z0-9_]*$/;
+
+let hasError = false;
+const parsedFiles = [];
+
+function checkKeys(obj, file, path = "") {
+  if (typeof obj !== "object" || obj === null) return;
+
+  for (const key of Object.keys(obj)) {
+    const fullPath = path ? `${path}.${key}` : key;
+
+    if (!SNAKE_CASE_REGEX.test(key)) {
+      console.error(
+        `❌ ${file} → clé invalide "${fullPath}" (snake_case requis)`
+      );
+      hasError = true;
+    }
+
+    checkKeys(obj[key], file, fullPath);
+  }
+}
+
+const files = glob.sync("**/*.{yml,yaml}", {
+  ignore: ["node_modules/**"]
+});
+
+if (files.length === 0) {
+  console.log("ℹ️ Aucun fichier YAML trouvé");
+  process.exit(0);
+}
+
+for (const file of files) {
+  try {
+    const content = fs.readFileSync(file, "utf8");
+    const data = yaml.load(content);
+
+    checkKeys(data, file);
+
+    parsedFiles.push({
+      file,
+      data
+    });
+  } catch (err) {
+    console.error(`❌ Erreur YAML dans ${file}`);
+    console.error(err.message);
+    hasError = true;
+  }
+}
+
+if (hasError) {
+  console.error("\n⛔ Validation YAML échouée");
+  process.exit(1);
+}
+
+/**
+ * OUTPUT FINAL
+ * Tu peux le parser dans un autre step GitHub Actions
+ */
+console.log(JSON.stringify(parsedFiles, null, 2));

.github/workflows/yaml-lint.yml

@@ -0,0 +1,31 @@
+name: YAML format & snake_case check
+
+on:
+  push:
+    paths:
+      - "**/*.yml"
+      - "**/*.yaml"
+  pull_request:
+    paths:
+      - "**/*.yml"
+      - "**/*.yaml"
+
+jobs:
+  yaml-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm install js-yaml glob
+
+      - name: Validate YAML files and keys
+        run: node .github/scripts/check-yaml.cjs
+

patterns/NationsGloryJava.yml

@@ -1,21 +1,30 @@
 # ===========================
 # Commandes Joueur
 # ===========================
+
 player_command:
   pattern: "{timestamp} [INFO] {player} issued server command: {command}"
 
 player_alias:
   pattern: "{timestamp} [INFO] {player} issued alias: {command}"
 
+player_warp:
+  pattern: "{timestamp} [INFO] [NationsGUI] {player} vient de payer 20 pour se téléporter au warp {region}"
+  
+player_back:
+  pattern: "{timestamp} [INFO] [NationsUtils] Back du joueur {player} vers {world}, {x}, {y}, {z}"
+
 # ===========================
 # NationsStats
 # ===========================
+
 stats_login:
   pattern: "{timestamp} [INFO] [NationsStats] Connexion de {player} avec {money}$"
 
 # ===========================
 # HDV — Hôtel des ventes
 # ===========================
+
 hdv_sell:
   pattern: "{timestamp} [HDV] {player} vient de mettre en vente {qty}x ID:({itemid}) pour un prix unitaire de {unitprice} $/U (UUID:{uuid})"
 
@@ -57,8 +66,8 @@ war_add:
 war_start:
   pattern: "{timestamp} [INFO] [NationsGUI] START WAR between {country_a} and {country_b} for reason {reason}"
 
-war_surrender:
-  pattern: "{timestamp} [INFO] [NationsGUI] {country_a} SURREND WAR AGAINST {country_b} APPLY REWARDS : {reward_type}#{amount}"
+war_surrend:
+  pattern: "{timestamp} [INFO] [NationsGUI] {country} SURREND WAR AGAINST {country} APPLY REWARDS : {reward}#{amount}"
 
 war_status_change:
   pattern: "{timestamp} [INFO] [NationsUtils] Change status of war request between {country_a} and {country_b} by {player} to {status}"
@@ -80,9 +89,37 @@ war_decrease_powerloss:
 
 war_end_decrease_powerloss:
   pattern: "{timestamp} [INFO] [Factions] Decrease powerLoss from won in war against {country} from 1 to -9 (no powerLoss left)"
+
+# ===========================
+# Factions
+# ===========================
+
+chunk_access:
+  pattern: "{timestamp} [INFO] [Factions] Player {player} set access to player {player} in chunk {x}, {z} to true"
+  
+chunk_unaccess:
+  pattern: "{timestamp} [INFO] [Factions] Player {player} remove access to player {player} in chunk {x}, {z} to false"
+  
+faction_chat:
+  pattern: "{timestamp} [INFO] [FactionChat] FACTION|{player}: {text}"
+  
+faction_invite:
+  pattern: "{timestamp} [INFO] [NationsGUI] Player {player} invited {player} to join country {country}"
+  
+faction_uninvite:
+  pattern: "{timestamp} [INFO] [NationsGUI] Player {player} cancelled invitation {player} to join country {country}"
+  
+faction_promote:
+  pattern: "{timestamp} [INFO] [NationsGUI] Player {player} demoted to {rank} {player} in country {country}"
+  
+faction_demote:
+  pattern: "{timestamp} [INFO] [NationsGUI] Player {player} prommoted to {rank} {player} in country {country}"
+  
+faction_perms:
+  pattern: "{timestamp} [INFO] [FACTION] {player} changed faction permission {permission} to [{ALLY}, {LEADER}, {MEMBER}, {NEUTRAL}, {OFFICER}, {RECRUIT}]"
 
 # ===========================
-# Transactions bancaires
+# Bank transactions
 # ===========================
 
 bank_deposit:
@@ -117,6 +154,9 @@ combat_fired:
 combat_bullet:
   pattern: "{timestamp} MISE EN COMBAT DE {player} HIT BY BULLET"
 
+player_death:
+  pattern: "{timestamp} [INFO] [NationsUtils] Le joueur {player} est mort aux coordonnées : X{x}, Y{y}, Z{z}"
+
 # ===========================
 # Intrusions / Divers
 # ===========================