From 90d1c22aca83ecaac1b662154a4379df2477cb8a Mon Sep 17 00:00:00 2001 From: phyzical Date: Wed, 13 Apr 2022 18:54:13 +0800 Subject: [PATCH] changes all references to "heath reduction to damage reduction" --- src/Augmentation/Augmentation.tsx | 10 +++++----- src/Augmentation/data/AugmentationCreator.tsx | 2 +- src/Augmentation/ui/PlayerMultipliers.tsx | 6 +++--- src/Infiltration/ui/Game.tsx | 2 +- src/NetscriptFunctions.ts | 2 +- src/PersonObjects/IPlayer.ts | 2 +- src/PersonObjects/Person.ts | 4 ++-- src/PersonObjects/Player/PlayerObject.ts | 4 ++-- .../Player/PlayerObjectGeneralMethods.tsx | 2 +- src/ui/CharacterStats.tsx | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Augmentation/Augmentation.tsx b/src/Augmentation/Augmentation.tsx index 1633e2349..f8099cd46 100644 --- a/src/Augmentation/Augmentation.tsx +++ b/src/Augmentation/Augmentation.tsx @@ -55,7 +55,7 @@ export interface IConstructorParams { infiltration_trade_mult?: number; infiltration_sell_mult?: number; infiltration_timer_mult?: number; - infiltration_health_reduction_mult?: number; + infiltration_damage_reduction_mult?: number; startingMoney?: number; programs?: string[]; @@ -380,12 +380,12 @@ function generateStatsDescription(mults: IMap, programs?: string[], star
+{f(mults.infiltration_timer_mult - 1)} Infiltration time per minigame ); - if (mults.infiltration_health_reduction_mult) + if (mults.infiltration_damage_reduction_mult) desc = ( <> {desc}
- {f(mults.infiltration_health_reduction_mult - 1)} Infiltration health lost per failed minigame + {f(mults.infiltration_damage_reduction_mult - 1)} Infiltration health lost per failed minigame ); @@ -582,8 +582,8 @@ export class Augmentation { if (params.infiltration_timer_mult) { this.mults.infiltration_timer_mult = params.infiltration_timer_mult; } - if (params.infiltration_health_reduction_mult) { - this.mults.infiltration_health_reduction_mult = params.infiltration_health_reduction_mult; + if (params.infiltration_damage_reduction_mult) { + this.mults.infiltration_damage_reduction_mult = params.infiltration_damage_reduction_mult; } if (params.stats === undefined) diff --git a/src/Augmentation/data/AugmentationCreator.tsx b/src/Augmentation/data/AugmentationCreator.tsx index fa82b0e2a..298811e0f 100644 --- a/src/Augmentation/data/AugmentationCreator.tsx +++ b/src/Augmentation/data/AugmentationCreator.tsx @@ -152,7 +152,7 @@ export const initInfiltratorsAugmentations = (): Augmentation[] => [ name: AugmentationNames.BitaniumArmorAlloy, repCost: 5e2, moneyCost: 1e6, - infiltration_health_reduction_mult: 0.7, + infiltration_damage_reduction_mult: 0.7, info: `Deep in the mines of ${CityName.Ishima} miners found a strange new material, now known as bitanium after ` + "many iterations of experimenting it was found to be exceptional at increasing ones amour at absorbing " + diff --git a/src/Augmentation/ui/PlayerMultipliers.tsx b/src/Augmentation/ui/PlayerMultipliers.tsx index b36021202..97ceddb5b 100644 --- a/src/Augmentation/ui/PlayerMultipliers.tsx +++ b/src/Augmentation/ui/PlayerMultipliers.tsx @@ -282,9 +282,9 @@ export function PlayerMultipliers(): React.ReactElement { 1, ], [ - "Infiltration minigame health reduction", - Player.infiltration_health_reduction_mult, - -1 * (1 - Player.infiltration_health_reduction_mult * mults.infiltration_health_reduction_mult), + "Infiltration minigame damage reduction", + Player.infiltration_damage_reduction_mult, + -1 * (1 - Player.infiltration_damage_reduction_mult * mults.infiltration_damage_reduction_mult), 1, ], ].map((data): MultiplierListItemData => (data as any).concat([Settings.theme.primary])), diff --git a/src/Infiltration/ui/Game.tsx b/src/Infiltration/ui/Game.tsx index eac6b45f0..5188079f9 100644 --- a/src/Infiltration/ui/Game.tsx +++ b/src/Infiltration/ui/Game.tsx @@ -93,7 +93,7 @@ export function Game(props: IProps): React.ReactElement { // it's clear they're not meant to const damage = options?.automated ? player.hp - : props.StartingDifficulty * 3 * player.infiltration_health_reduction_mult; + : props.StartingDifficulty * 3 * player.infiltration_damage_reduction_mult; if (player.takeDamage(damage)) { router.toCity(); return; diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts index a93d94097..34da4d555 100644 --- a/src/NetscriptFunctions.ts +++ b/src/NetscriptFunctions.ts @@ -2479,7 +2479,7 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS { infiltration_trade_mult: Player.infiltration_trade_mult, infiltration_sell_mult: Player.infiltration_sell_mult, infiltration_timer_mult: Player.infiltration_timer_mult, - infiltration_health_reduction_mult: Player.infiltration_health_reduction_mult, + infiltration_damage_reduction_mult: Player.infiltration_damage_reduction_mult, bitNodeN: Player.bitNodeN, totalPlaytime: Player.totalPlaytime, playtimeSinceLastAug: Player.playtimeSinceLastAug, diff --git a/src/PersonObjects/IPlayer.ts b/src/PersonObjects/IPlayer.ts index 1e1c30bcd..c0d32f3c3 100644 --- a/src/PersonObjects/IPlayer.ts +++ b/src/PersonObjects/IPlayer.ts @@ -129,7 +129,7 @@ export interface IPlayer { infiltration_trade_mult: number; infiltration_sell_mult: number; infiltration_timer_mult: number; - infiltration_health_reduction_mult: number; + infiltration_damage_reduction_mult: number; createProgramReqLvl: number; factionWorkType: string; diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts index fab443bff..9db8d5f17 100644 --- a/src/PersonObjects/Person.ts +++ b/src/PersonObjects/Person.ts @@ -102,7 +102,7 @@ export abstract class Person { infiltration_trade_mult = 1; infiltration_sell_mult = 1; infiltration_timer_mult = 1; - infiltration_health_reduction_mult = 1; + infiltration_damage_reduction_mult = 1; /** * Augmentations @@ -219,7 +219,7 @@ export abstract class Person { this.infiltration_trade_mult = 1; this.infiltration_sell_mult = 1; this.infiltration_timer_mult = 1; - this.infiltration_health_reduction_mult = 1; + this.infiltration_damage_reduction_mult = 1; } /** diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts index bbbcd56b8..e2c66b9eb 100644 --- a/src/PersonObjects/Player/PlayerObject.ts +++ b/src/PersonObjects/Player/PlayerObject.ts @@ -138,7 +138,7 @@ export class PlayerObject implements IPlayer { infiltration_trade_mult: number; infiltration_sell_mult: number; infiltration_timer_mult: number; - infiltration_health_reduction_mult: number; + infiltration_damage_reduction_mult: number; createProgramReqLvl: number; factionWorkType: string; @@ -476,7 +476,7 @@ export class PlayerObject implements IPlayer { this.infiltration_trade_mult = 1; this.infiltration_sell_mult = 1; this.infiltration_timer_mult = 1; - this.infiltration_health_reduction_mult = 1; + this.infiltration_damage_reduction_mult = 1; // Sleeves & Re-sleeving this.sleeves = []; diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx b/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx index b3db8ea9a..a0ccaef19 100644 --- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx +++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx @@ -320,7 +320,7 @@ export function resetMultipliers(this: IPlayer): void { this.infiltration_trade_mult = 1; this.infiltration_sell_mult = 1; this.infiltration_timer_mult = 1; - this.infiltration_health_reduction_mult = 1; + this.infiltration_damage_reduction_mult = 1; } export function hasProgram(this: IPlayer, programName: string): boolean { diff --git a/src/ui/CharacterStats.tsx b/src/ui/CharacterStats.tsx index 6ae72ffae..534c85165 100644 --- a/src/ui/CharacterStats.tsx +++ b/src/ui/CharacterStats.tsx @@ -502,7 +502,7 @@ export function CharacterStats(): React.ReactElement { ["Infiltration sell", player.infiltration_sell_mult], ["Infiltration trade", player.infiltration_trade_mult], ["Infiltration minigame timer", player.infiltration_timer_mult], - ["Infiltration minigame health reduction", -1 * (1 - player.infiltration_health_reduction_mult)], + ["Infiltration minigame damage reduction", -1 * (1 - player.infiltration_damage_reduction_mult)], ]} /> )}