extend MinMax for a number of interfaces

This commit is contained in:
Dev 2023-07-18 15:18:01 +01:00
parent ca48f0e83c
commit 5b3e3e33df
10 changed files with 107 additions and 142 deletions

View File

@ -1,13 +1,14 @@
/* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @typescript-eslint/naming-convention */
import { Ixyz } from "./Ixyz";
import { Item } from "./tables/IItem"; import { Item } from "./tables/IItem";
export interface IGlobals export interface IGlobals
{ {
time: number time: number
config: Config config: Config
bot_presets: BotPreset[] bot_presets: IBotPreset[]
AudioSettings: IAudioSettings AudioSettings: IAudioSettings
BotWeaponScatterings: BotWeaponScattering[] BotWeaponScatterings: IBotWeaponScattering[]
ItemPresets: Record<string, Preset> ItemPresets: Record<string, Preset>
} }
@ -74,15 +75,15 @@ export interface Config
SkillFatigueReset: number SkillFatigueReset: number
DiscardLimitsEnabled: boolean DiscardLimitsEnabled: boolean
EventType: string[] EventType: string[]
WalkSpeed: xyz WalkSpeed: Ixyz
SprintSpeed: xyz SprintSpeed: Ixyz
SquadSettings: ISquadSettings SquadSettings: ISquadSettings
SkillEnduranceWeightThreshold: number SkillEnduranceWeightThreshold: number
TeamSearchingTimeout: number TeamSearchingTimeout: number
Insurance: Insurance Insurance: Insurance
SkillExpPerLevel: number SkillExpPerLevel: number
GameSearchingTimeout: number GameSearchingTimeout: number
WallContusionAbsorption: xyz WallContusionAbsorption: Ixyz
SkillsSettings: SkillsSettings SkillsSettings: SkillsSettings
AzimuthPanelShowsPlayerOrientation: boolean AzimuthPanelShowsPlayerOrientation: boolean
Aiming: Aiming Aiming: Aiming
@ -903,27 +904,27 @@ export interface Stamina
AimRangeFinderDrainRate: number AimRangeFinderDrainRate: number
OxygenCapacity: number OxygenCapacity: number
OxygenRestoration: number OxygenRestoration: number
WalkOverweightLimits: xyz WalkOverweightLimits: Ixyz
BaseOverweightLimits: xyz BaseOverweightLimits: Ixyz
SprintOverweightLimits: xyz SprintOverweightLimits: Ixyz
WalkSpeedOverweightLimits: xyz WalkSpeedOverweightLimits: Ixyz
CrouchConsumption: xyz CrouchConsumption: v
WalkConsumption: xyz WalkConsumption: Ixyz
StandupConsumption: xyz StandupConsumption: Ixyz
TransitionSpeed: xyz TransitionSpeed: Ixyz
SprintAccelerationLowerLimit: number SprintAccelerationLowerLimit: number
SprintSpeedLowerLimit: number SprintSpeedLowerLimit: number
SprintSensitivityLowerLimit: number SprintSensitivityLowerLimit: number
AimConsumptionByPose: xyz AimConsumptionByPose: Ixyz
RestorationMultiplierByPose: xyz RestorationMultiplierByPose: Ixyz
OverweightConsumptionByPose: xyz OverweightConsumptionByPose: Ixyz
AimingSpeedMultiplier: number AimingSpeedMultiplier: number
WalkVisualEffectMultiplier: number WalkVisualEffectMultiplier: number
HandsCapacity: number HandsCapacity: number
HandsRestoration: number HandsRestoration: number
ProneConsumption: number ProneConsumption: number
BaseHoldBreathConsumption: number BaseHoldBreathConsumption: number
SoundRadius: xyz SoundRadius: Ixyz
ExhaustedMeleeSpeed: number ExhaustedMeleeSpeed: number
FatigueRestorationRate: number FatigueRestorationRate: number
FatigueAmountToCreateEffect: number FatigueAmountToCreateEffect: number
@ -934,10 +935,10 @@ export interface Stamina
StaminaExhaustionCausesJiggle: boolean StaminaExhaustionCausesJiggle: boolean
StaminaExhaustionStartsBreathSound: boolean StaminaExhaustionStartsBreathSound: boolean
StaminaExhaustionRocksCamera: boolean StaminaExhaustionRocksCamera: boolean
HoldBreathStaminaMultiplier: xyz HoldBreathStaminaMultiplier: Ixyz
PoseLevelIncreaseSpeed: xyz PoseLevelIncreaseSpeed: Ixyz
PoseLevelDecreaseSpeed: xyz PoseLevelDecreaseSpeed: Ixyz
PoseLevelConsumptionPerNotch: xyz PoseLevelConsumptionPerNotch: Ixyz
} }
export interface StaminaRestoration export interface StaminaRestoration
@ -1386,7 +1387,7 @@ export interface TroubleShooting
export interface Aiming export interface Aiming
{ {
ProceduralIntensityByPose: xyz ProceduralIntensityByPose: Ixyz
AimProceduralIntensity: number AimProceduralIntensity: number
HeavyWeight: number HeavyWeight: number
LightWeight: number LightWeight: number
@ -1397,9 +1398,9 @@ export interface Aiming
RecoilScaling: number RecoilScaling: number
RecoilDamping: number RecoilDamping: number
CameraSnapGlobalMult: number CameraSnapGlobalMult: number
RecoilXIntensityByPose: xyz RecoilXIntensityByPose: Ixyz
RecoilYIntensityByPose: xyz RecoilYIntensityByPose: Ixyz
RecoilZIntensityByPose: xyz RecoilZIntensityByPose: Ixyz
RecoilCrank: boolean RecoilCrank: boolean
RecoilHandDamping: number RecoilHandDamping: number
RecoilConvergenceMult: number RecoilConvergenceMult: number
@ -1420,7 +1421,7 @@ export interface Malfunction
OutToIdleSpeedMultForPistol: number OutToIdleSpeedMultForPistol: number
IdleToOutSpeedMultOnMalf: number IdleToOutSpeedMultOnMalf: number
TimeToQuickdrawPistol: number TimeToQuickdrawPistol: number
DurRangeToIgnoreMalfs: xyz DurRangeToIgnoreMalfs: Ixyz
DurFeedWt: number DurFeedWt: number
DurMisfireWt: number DurMisfireWt: number
DurJamWt: number DurJamWt: number
@ -1494,51 +1495,44 @@ export interface FenceLevel
export interface Inertia export interface Inertia
{ {
InertiaLimits: xyz InertiaLimits: Ixyz
InertiaLimitsStep: number InertiaLimitsStep: number
ExitMovementStateSpeedThreshold: xyz ExitMovementStateSpeedThreshold: Ixyz
WalkInertia: xyz WalkInertia: Ixyz
FallThreshold: number FallThreshold: number
SpeedLimitAfterFallMin: xyz SpeedLimitAfterFallMin: Ixyz
SpeedLimitAfterFallMax: xyz SpeedLimitAfterFallMax: Ixyz
SpeedLimitDurationMin: xyz SpeedLimitDurationMin: Ixyz
SpeedLimitDurationMax: xyz SpeedLimitDurationMax: Ixyz
SpeedInertiaAfterJump: xyz SpeedInertiaAfterJump: Ixyz
BaseJumpPenaltyDuration: number BaseJumpPenaltyDuration: number
DurationPower: number DurationPower: number
BaseJumpPenalty: number BaseJumpPenalty: number
PenaltyPower: number PenaltyPower: number
InertiaTiltCurveMin: xyz InertiaTiltCurveMin: Ixyz
InertiaTiltCurveMax: xyz InertiaTiltCurveMax: Ixyz
InertiaBackwardCoef: xyz InertiaBackwardCoef: Ixyz
TiltInertiaMaxSpeed: xyz TiltInertiaMaxSpeed: Ixyz
TiltStartSideBackSpeed: xyz TiltStartSideBackSpeed: Ixyz
TiltMaxSideBackSpeed: xyz TiltMaxSideBackSpeed: Ixyz
TiltAcceleration: xyz TiltAcceleration: Ixyz
AverageRotationFrameSpan: number AverageRotationFrameSpan: number
SprintSpeedInertiaCurveMin: xyz SprintSpeedInertiaCurveMin: Ixyz
SprintSpeedInertiaCurveMax: xyz SprintSpeedInertiaCurveMax: Ixyz
SprintBrakeInertia: xyz SprintBrakeInertia: Ixyz
SprintTransitionMotionPreservation: xyz SprintTransitionMotionPreservation: Ixyz
WeaponFlipSpeed: xyz WeaponFlipSpeed: Ixyz
PreSprintAccelerationLimits: xyz PreSprintAccelerationLimits: Ixyz
SprintAccelerationLimits: xyz SprintAccelerationLimits: Ixyz
SideTime: xyz SideTime: Ixyz
DiagonalTime: xyz DiagonalTime: Ixyz
MaxTimeWithoutInput: xyz MaxTimeWithoutInput: Ixyz
MinDirectionBlendTime: number MinDirectionBlendTime: number
MoveTimeRange: xyz MoveTimeRange: Ixyz
ProneDirectionAccelerationRange: xyz ProneDirectionAccelerationRange: Ixyz
ProneSpeedAccelerationRange: xyz ProneSpeedAccelerationRange: Ixyz
MinMovementAccelerationRangeRight: xyz MinMovementAccelerationRangeRight: Ixyz
MaxMovementAccelerationRangeRight: xyz MaxMovementAccelerationRangeRight: Ixyz
}
export interface xyz
{
x: number
y: number
z: number
} }
export interface Ballistic export interface Ballistic

View File

@ -1,3 +1,6 @@
import { MinMax } from "../../../models/common/MinMax";
import { Ixyz } from "./Ixyz";
/* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @typescript-eslint/naming-convention */
export interface ILocationBase export interface ILocationBase
{ {
@ -84,10 +87,8 @@ export interface ILocationBase
waves: Wave[] waves: Wave[]
} }
export interface ILimit export interface ILimit extends MinMax
{ {
min: number
max: number
items: any[] items: any[]
} }
@ -158,11 +159,9 @@ export interface BotLocationModifier
VisibleDistance: number VisibleDistance: number
} }
export interface MinMaxBot export interface MinMaxBot extends MinMax
{ {
WildSpawnType: WildSpawnType | string WildSpawnType: WildSpawnType | string
max: number
min: number
} }
export interface Preview export interface Preview
@ -185,7 +184,7 @@ export interface SpawnPointParam
DelayToCanSpawnSec: number DelayToCanSpawnSec: number
Id: string Id: string
Infiltration: string Infiltration: string
Position: xyz Position: Ixyz
Rotation: number Rotation: number
Sides: string[] Sides: string[]
} }
@ -198,16 +197,10 @@ export interface ColliderParams
export interface Props export interface Props
{ {
Center: xyz Center: Ixyz
Radius: number Radius: number
} }
export interface xyz
{
x: number
y: number
z: number
}
export interface Exit export interface Exit
{ {

View File

@ -1,3 +1,4 @@
import { Ixyz } from "./Ixyz";
import { Item } from "./tables/IItem"; import { Item } from "./tables/IItem";
export interface ILooseLoot export interface ILooseLoot
@ -26,11 +27,11 @@ export interface SpawnpointTemplate
IsStatic: boolean IsStatic: boolean
useGravity: boolean useGravity: boolean
randomRotation: boolean randomRotation: boolean
Position: Xyz Position: Ixyz
Rotation: Xyz Rotation: Ixyz
IsGroupPosition: boolean IsGroupPosition: boolean
GroupPositions: any[] GroupPositions: any[]
Root: any Root: string
Items: Item[] Items: Item[]
} }
@ -42,15 +43,6 @@ export interface Spawnpoint
itemDistribution: ItemDistribution[] itemDistribution: ItemDistribution[]
} }
export interface Xyz
{
x: number
y: number
z: number
}
export interface ItemDistribution export interface ItemDistribution
{ {
composedKey: ComposedKey composedKey: ComposedKey

View File

@ -0,0 +1,7 @@
export interface Ixyz
{
x: number;
y: number;
z: number;
}

View File

@ -1,3 +1,5 @@
import { Ixyz } from "../Ixyz";
export interface ICustomizationItem export interface ICustomizationItem
{ {
_id: string _id: string
@ -22,8 +24,8 @@ export interface Props
Prefab: Prefab Prefab: Prefab
WatchPrefab: Prefab WatchPrefab: Prefab
IntegratedArmorVest: boolean IntegratedArmorVest: boolean
WatchPosition: Xyz WatchPosition: Ixyz
WatchRotation: Xyz WatchRotation: Ixyz
} }
export interface Prefab export interface Prefab
@ -31,10 +33,3 @@ export interface Prefab
path: string path: string
rcid: string rcid: string
} }
export interface Xyz
{
x: number
y: number
z: number
}

View File

@ -1,3 +1,4 @@
import { Ixyz } from "../Ixyz";
import { Item } from "./IItem"; import { Item } from "./IItem";
export interface ILootBase export interface ILootBase
@ -26,8 +27,8 @@ export interface IStaticWeaponProps
IsStatic: boolean IsStatic: boolean
useGravity: boolean useGravity: boolean
randomRotation: boolean randomRotation: boolean
Position: Xyz Position: Ixyz
Rotation: Xyz Rotation: Ixyz
IsGroupPosition: boolean IsGroupPosition: boolean
GroupPositions: any[] GroupPositions: any[]
Root: string Root: string
@ -40,24 +41,17 @@ export interface IStaticContainerProps
IsStatic: boolean IsStatic: boolean
useGravity: boolean useGravity: boolean
randomRotation: boolean randomRotation: boolean
Position: Xyz Position: Ixyz
Rotation: Xyz Rotation: Ixyz
IsGroupPosition: boolean IsGroupPosition: boolean
GroupPositions: any[] GroupPositions: any[]
Root: any Root: string
Items: StaticItem[] Items: StaticItem[]
} }
export interface Xyz
{
x: number
y: number
z: number
}
export interface StaticItem export interface StaticItem
{ {
_id: any _id: string
_tpl: string _tpl: string
} }

View File

@ -1,3 +1,5 @@
import { Ixyz } from "../Ixyz";
export interface ITemplateItem export interface ITemplateItem
{ {
_id: string _id: string
@ -204,11 +206,11 @@ export interface Props
CameraSnap?: number CameraSnap?: number
ReloadMode?: string ReloadMode?: string
AimPlane?: number AimPlane?: number
TacticalReloadStiffnes?: Xyz TacticalReloadStiffnes?: Ixyz
TacticalReloadFixation?: number TacticalReloadFixation?: number
RecoilCenter?: Xyz RecoilCenter?: Ixyz
RotationCenter?: Xyz RotationCenter?: Ixyz
RotationCenterNoStock?: Xyz RotationCenterNoStock?: Ixyz
FoldedSlot?: string FoldedSlot?: string
CompactHandling?: boolean CompactHandling?: boolean
MinRepairDegradation?: number MinRepairDegradation?: number
@ -250,7 +252,7 @@ export interface Props
FaceShieldComponent?: boolean FaceShieldComponent?: boolean
FaceShieldMask?: string FaceShieldMask?: string
MaterialType?: string MaterialType?: string
RicochetParams?: Xyz RicochetParams?: Ixyz
DeafStrength?: string DeafStrength?: string
BlindnessProtection?: number BlindnessProtection?: number
Distortion?: number Distortion?: number
@ -288,12 +290,12 @@ export interface Props
PrimaryConsumption?: number PrimaryConsumption?: number
SecondryConsumption?: number SecondryConsumption?: number
DeflectionConsumption?: number DeflectionConsumption?: number
AppliedTrunkRotation?: Xyz AppliedTrunkRotation?: Ixyz
AppliedHeadRotation?: Xyz AppliedHeadRotation?: Ixyz
DisplayOnModel?: boolean DisplayOnModel?: boolean
AdditionalAnimationLayer?: number AdditionalAnimationLayer?: number
StaminaBurnRate?: number StaminaBurnRate?: number
ColliderScaleMultiplier?: Xyz ColliderScaleMultiplier?: Ixyz
ConfigPathStr?: string ConfigPathStr?: string
MaxMarkersCount?: number MaxMarkersCount?: number
scaleMin?: number scaleMin?: number
@ -358,9 +360,9 @@ export interface Props
ShowHitEffectOnExplode?: boolean ShowHitEffectOnExplode?: boolean
ExplosionType?: string ExplosionType?: string
AmmoLifeTimeSec?: number AmmoLifeTimeSec?: number
Contusion?: Xyz Contusion?: Ixyz
ArmorDistanceDistanceDamage?: Xyz ArmorDistanceDistanceDamage?: Ixyz
Blindness?: Xyz Blindness?: Ixyz
IsLightAndSoundShot?: boolean IsLightAndSoundShot?: boolean
LightAndSoundShotAngle?: number LightAndSoundShotAngle?: number
LightAndSoundShotSelfContusionTime?: number LightAndSoundShotSelfContusionTime?: number
@ -450,13 +452,6 @@ export interface SlotFilter
AnimationIndex?: number AnimationIndex?: number
} }
export interface Xyz
{
x: number
y: number
z: number
}
export interface StackSlot export interface StackSlot
{ {
_name?: string _name?: string

View File

@ -1,6 +1,6 @@
export interface IGetItemPriceResult import { MinMax } from "../../../models/common/MinMax";
export interface IGetItemPriceResult extends MinMax
{ {
avg: number avg: number
min: number
max: number
} }

View File

@ -1,3 +1,4 @@
import { MinMax } from "../../../models/common/MinMax";
import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBase"; import { BossLocationSpawn, Wave } from "../../../models/eft/common/ILocationBase";
import { IBaseConfig } from "./IBaseConfig"; import { IBaseConfig } from "./IBaseConfig";
@ -50,11 +51,9 @@ export interface CustomWaves
normal: Record<string, Wave[]> normal: Record<string, Wave[]>
} }
export interface IBotTypeLimit export interface IBotTypeLimit extends MinMax
{ {
type: string type: string
min: number
max: number
} }
export interface LootMultiplier export interface LootMultiplier

View File

@ -36,11 +36,9 @@ export interface Chance
underpriced: number underpriced: number
} }
export interface Time export interface Time extends MinMax
{ {
base: number base: number
min: number
max: number
} }
export interface Reputation export interface Reputation
@ -119,12 +117,10 @@ export interface OfferAdjustment
priceThreshholdRub: number priceThreshholdRub: number
} }
export interface Condition export interface Condition extends MinMax
{ {
/** Percentage change durability is altered */ /** Percentage change durability is altered */
conditionChance: number conditionChance: number
min: number
max: number
} }
export interface Blacklist export interface Blacklist