fix DamageReduce from Suspend (fixes #32)

userXinos · Nov 1, 2023 · 43a4fc2 · 43a4fc2
1 parent bca6e47
commit 43a4fc2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/parser/dist/modules.js b/parser/dist/modules.js
@@ -1850,8 +1850,8 @@ export default {
  EffectRadius: 2400,
  EffectDurationx10: 450,
  EffectDurationx10WS: 288000,
- DamageAmplifyFactor_PVE: [60, 58, 56, 54, 52, 50, 48, 46, 44, 42, 40, 38, 36, 34, 32],
  MovementSlowdown: [75, 72, 69, 66, 63, 60, 57, 54, 51, 48, 46, 44, 42, 40, 38],
+ DamageReduceFactor_PVE: [60, 58, 56, 54, 52, 50, 48, 46, 44, 42, 40, 38, 36, 34, 32],
  },
  Recoil: {
  Name: "Recoil",

diff --git a/parser/runners/Modules.js b/parser/runners/Modules.js
@@ -53,7 +53,13 @@ export default class Modules extends Runner {
  const TIME_SLOWDOWN_FACTOR_WS = dataTables[2].WhiteStar.TimeSlowdownFactor;
 
  Object.values(CONFIG.combineKeys).forEach((e) => delete data[e]);
- data.FlagshipDartBarrage.TID_Description = data.FlagshipDartBarrage.TID_Description[0]; // какие-то буквы лишние в таблице
+ Object.keys(data.Suspend).forEach((k) => { // пупупу
+ if (k.includes('DamageAmplify')) {
+ const nK = k.replace('DamageAmplify', 'DamageReduce');
+ data.Suspend[nK] = data.Suspend[k];
+ delete data.Suspend[k];
+ }
+ });
  data.FlagshipDartBarrage.FlagshipWeaponModule.SpawnLifetime_WS = data.FlagshipDartBarrage.FlagshipWeaponModule.SpawnLifetime_WS * TIME_SLOWDOWN_FACTOR_WS; // ...
  data.FlagshipAreaShield.FlagshipShieldModule.SpawnLifetime_WS = data.FlagshipAreaShield.FlagshipShieldModule.SpawnLifetime_WS * TIME_SLOWDOWN_FACTOR_WS; // ...
  delete data['FlagshipDartBarrage']['TID_Description']; // какие-то буквы лишние в таблице
@@ -111,11 +117,6 @@ function dataMapCallback([ key, value ], index, array, [ capitalShips, projectil
  }
  }
 
- // опрокинуть Salvage
- if (value.SalvageHullPercent) {
- value.SalvageHullPercent = Runner.transposeMatrix(value.SalvageHullPercent);
- }
-
  // добавить LaserTurret данные
  if (key === 'LaserTurret') {
  Runner.combineObjects(value.LaserTurret_Laser, capitalShips.LaserTurret);

diff --git a/src/regulation/formatValueRules.js b/src/regulation/formatValueRules.js
@@ -140,11 +140,11 @@ export default [
  (v) => `x${v}`,
  ],
  [
- ['MovementSlowdown', 'DamageAmplifyFactor'],
+ ['MovementSlowdown', 'DamageReduceFactor'],
  (v) => `${100 - v}%`,
  ],
  [
- ['MiningSpeedModifierPct'],
+ ['MiningSpeedModifierPct', 'DamageAmplifyFactor'],
  (v) => `x${v / 100}`,
  ],
  [

diff --git a/src/regulation/headersOrder.js b/src/regulation/headersOrder.js
@@ -28,10 +28,7 @@ export default [
  'RedStarLifeExtention',
  'RepairHullPointsPerSecond',
  'TimeWarpFactor',
- 'DamageAmplifyFactor',
  'TimeWarpSuppression',
- 'UnityBoostPercent',
- 'DamageReductionPct',
  'ExtraTradeSlots',
  'WaypointShipmentRewardBonus',
  'JobPayoutIncreasePercent',
@@ -122,6 +119,7 @@ export default [
  'FortifyDamageAmpFactor_PVP',
  'DamageAmplifyFactor_PVE',
  'DamageAmplifyFactor_PVP',
+ 'DamageReduceFactor_PVE',
  'LeapAOEAmtPvP',
  'LeapAOEAmtPvE',
  'MovementSlowdown',

diff --git a/src/regulation/locKeys.mjs b/src/regulation/locKeys.mjs
@@ -30,7 +30,8 @@ export const gameCharsLocKeys = {
  AdditionalRangesPerLink: 'TID_MODULE_SUPPORT_ADDITIONAL_RANGE',
  LinkDPSBoost: 'TID_MODULE_SUPPORT_ADDITIONAL_DPS',
  LeapAOEAmt: 'TID_DESTROYER_AREADAMAGE',
- DamageAmplifyFactor: 'TID_MODULE_DAMAGE_REDUCTION_STAT',
+ DamageAmplifyFactor: 'TID_MODULE_DAMAGE_AMPLIFY_STAT',
+ DamageReduceFactor: 'TID_MODULE_DAMAGE_REDUCTION_STAT',
  MirrorDamageAsAOE: 'TID_MODULE_MIRROR_DAMAGE_STAT',
  DroneSquadBattery: 'TID_MODULE_BATTERY',
  ArtifactBoostPct: 'TID_MODULE_ARTIFACT_BOOST_BONUS',