fixes and regulation for resolve #98

userXinos · Feb 15, 2024 · 6183302 · 6183302
1 parent e1965bc
commit 6183302
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/i18n/locales/en/game.json b/i18n/locales/en/game.json
@@ -101,5 +101,8 @@
   "COOLDOWN_AFTER_JUMPING_TO_ANOTHER_SHIP_TYPE": "Cooldown after jumping to another ship type",
   "MOONS": "Moons",
   "TURRET": "Turret",
-  "BLUEPRINTS_GRANTED": "Blueprints granted"
+  "BLUEPRINTS_GRANTED": "Blueprints granted",
+  "MINIMUM_RANGE": "Minimum range",
+  "HYDRO_COST_MODIFIER": "Hydro cost modifier",
+  "ARTIFACT_DRS_POINTS": "Points for DRS artifact"
 }
diff --git a/src/components/DataStatByStar.vue b/src/components/DataStatByStar.vue
@@ -126,7 +126,7 @@ const table = computed<Table>(() => {
         });
     });
 
-    if (!Object.keys(props.items).some((k) => BS_REGEX.test(k))) {
+    if (!Object.keys(props.items).some((k) => BS_REGEX.test(k)) && usedStars.includes('BS')) {
         usedStars.splice(usedStars.indexOf('BS'), 1);
     }
     usedStars = usedStars.sort((a, b) => Object.keys(STARS).indexOf(a) - Object.keys(STARS).indexOf(b));

diff --git a/src/regulation/hideKeys.js b/src/regulation/hideKeys.js
@@ -101,6 +101,9 @@ export default {
         'InitialModule',
         'InitialModuleLevels',
         'BarrierPreventsTeleport',
+        'SeparateBuildingPerLevel',
+        'PrefabModel_WithStarHarvester',
+        'StarScannerType',
 
         // временно ?
         'BSPenaltyPerSec',
@@ -141,7 +144,7 @@ export default {
 
         // Ships.FlagmanModules
         /(Recoil|Immolation|EMPRocket|FlagshipWeaponModule|FlagshipDartBarrage|FlagshipShieldModule|FlagshipAreaShield|FlagshipDroneSwarm|FlagshipRocketCluster)\.RSLevel/,
-        /(Recoil|Immolation|EMPRocket|FlagshipWeaponModule|FlagshipDartBarrage|FlagshipShieldModule|FlagshipAreaShield|FlagshipDroneSwarm|FlagshipRocketCluster)\.UnlockBlueprints/,
+        /(Recoil|Immolation|EMPRocket|FlagshipWeaponModule|FlagshipDartBarrage|FlagshipShieldModule|FlagshipAreaShield|FlagshipDroneSwarm|FlagshipRocketCluster|FlagshipStealth)\.UnlockBlueprints/,
         'FlagshipDartBarrage.SingleTarget',
         'FlagshipDartBarrage.SingleTarget',
         'FlagshipDroneSwarm.NewModuleSlots',
@@ -224,7 +227,7 @@ export default {
         'HydroStorageCapacity.FuelUseIncrease',
 
         // Weapons
-        /(WeakBattery|GuardianBattery|InterceptorMBattery|ColossusLaser|DestroyerVengeance|BomberLauncher|PhoenixShield|DartBarrage)\.(UnlockPrice|UnlockBlueprints|UnlockTime|ShowWSInfo|Install|BCCost)/, // В небуле не неужно модулям церберов
+        /(WeakBattery|GuardianBattery|InterceptorMBattery|ColossusLaser|DestroyerVengeance|BomberLauncher|PhoenixShield|DartBarrage|ColossusSalvage|StormDarts|HydraBarrage)\.(UnlockPrice|UnlockBlueprints|UnlockTime|ShowWSInfo|Install|BCCost|RSLevel)/,
         'PlayerRocketLauncher.MinEffectRadius',
         'ChainRay.MaxIncomingLinks', // хз что это
 
@@ -240,16 +243,19 @@ export default {
         'Bond.BondMinPullVector',
         'Bond.BondMaxPullListSize',
         'Bond.BondWorksOnLoadingTransport',
-        /((\w+)Drone|LaserTurret|DroneSquad)\.(BuildCost|DesignUpgradeCost|DesignUpgradeTime|NewModuleSlots)/,
+        /((\w+)Drone|LaserTurret|DroneSquadShip)\.(BuildCost|DesignUpgradeCost|DesignUpgradeTime|NewModuleSlots)/,
         'RemoteBomb.SpeedPVE',
-        'RemoteBomb.SpeedPVP',
+        'RemoteBomb.Speed_WS',
+        'RemoteBomb.Speed_BS',
         'LaserTurret.Speed',
-        'LaserTurret.MaxPerRS',
         'DeltaRocket.PreventUseOnWsJumpgate',
         /^\w+\.Is\w+/,
 
         // Drone
         'DecoyDrone.HasTaunt',
         'DeltaDrones.NewModuleSlots',
+        /(DroneRocketLauncher|ChainRayForDrone)\.UnlockBlueprints/,
+        'LaserTurret.MaxPerRS',
+        /(LaserTurret|DeltaDroneBattery|DeltaDroneTeleport|DroneSquadBattery)\.(RSLevel|UnlockBlueprints)/,
     ],
 };
diff --git a/src/regulation/locKeys.mjs b/src/regulation/locKeys.mjs
@@ -228,8 +228,8 @@ export const gameCharsLocKeys = {
     JumpCostMiner: 'TID_SHIP_MINER',
     JumpCostBattleship: 'TID_SHIP_BATTLESHIP',
     Sentinel: 'TID_SHIP_CERB_FIGHTER',
-    Guardian: 'TID_SHIP_CERB_COLOSSUS',
-    Colossu: 'TID_SHIP_CERB_SECTOR_GUARDIAN',
+    Guardian: 'TID_SHIP_CERB_SECTOR_GUARDIAN',
+    Colossu: 'TID_SHIP_CERB_COLOSSUS',
     TimeToResearch: 'TID_OBJ_RESEARCH_ARTIFACTS',
     ShipmentsCRValuePerDay: 'TID_PLANET_UPG_SHIPMENT_YIELD',
     TINDMG: 'TID_MODULE_STAT_TELEPORT_DAMAGE',
@@ -330,6 +330,9 @@ export default {
     TimeToUpgradeParallel: 'UPGRADE_TIME_IN_PARALLEL',
     turret: 'TURRET',
     BlueprintsGranted: 'BLUEPRINTS_GRANTED',
+    MinEffectRadius: 'MINIMUM_RANGE',
+    HydroCostModifierPct: 'HYDRO_COST_MODIFIER',
+    ArtifactDRSPoints: 'ARTIFACT_DRS_POINTS',
 
     ...gameCharsLocKeys,
     ...gameSlostLocKeys,