From 798131326f5e955587e49e1057d2c0735e4e616d Mon Sep 17 00:00:00 2001 From: gucio321 Date: Sun, 13 Jun 2021 17:25:03 +0200 Subject: [PATCH] d2core: fix part of fieldalignments --- d2core/d2records/missiles_record.go | 20 ++++++++-------- d2core/d2records/record_manager.go | 36 ++++++++++++++--------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/d2core/d2records/missiles_record.go b/d2core/d2records/missiles_record.go index 64e5568c..364aaaa6 100644 --- a/d2core/d2records/missiles_record.go +++ b/d2core/d2records/missiles_record.go @@ -78,31 +78,31 @@ type MissileElementalDamage struct { // MissileRecord is a representation of a row from missiles.txt type MissileRecord struct { - HitSubMissile [4]string ClientHitSubMissile [4]string - SubMissile [3]string + HitSubMissile [4]string ClientSubMissile [3]string + SubMissile [3]string + ProgSound string ExplosionMissile string HitSound string Name string ProgOverlay string - ProgSound string TravelSound string SkillName string + ServerCollisionCalc MissileCalc ServerMovementCalc MissileCalc - ClientCollisionCalc MissileCalc ClientMovementCalc MissileCalc ServerDamageCalc MissileCalc - ServerCollisionCalc MissileCalc - ElementalDamage MissileElementalDamage + ClientCollisionCalc MissileCalc Animation MissileAnimation Damage MissileDamage + ElementalDamage MissileElementalDamage Collision MissileCollision Light MissileLight - Id int + ServerMovementFunc int ClientMovementFunc int ClientCollisionFunc int - ServerMovementFunc int + Id int ServerCollisionFunc int ServerDamageFunc int Velocity int @@ -112,7 +112,7 @@ type MissileRecord struct { Range int LevelRangeBonus int XOffset int - YOffset int + DamageReductionRate int ZOffset int Size int DestroyedByTPFrame int @@ -127,7 +127,7 @@ type MissileRecord struct { HitClass int NumDirections int LocalBlood int - DamageReductionRate int + YOffset int DestroyedByTP bool CanDestroy bool UseAttackRating bool diff --git a/d2core/d2records/record_manager.go b/d2core/d2records/record_manager.go index 353b886d..08d38680 100644 --- a/d2core/d2records/record_manager.go +++ b/d2core/d2records/record_manager.go @@ -37,9 +37,9 @@ func NewRecordManager(l d2util.LogLevel) (*RecordManager, error) { type RecordManager struct { Item struct { Cube struct { - Recipes CubeRecipes Modifiers CubeModifiers Types CubeTypes + Recipes CubeRecipes } Magic struct { Prefix MagicPrefix @@ -77,28 +77,28 @@ type RecordManager struct { AutoMagic } Monster struct { - AI MonsterAI - Equipment MonsterEquipment - Levels MonsterLevels - Modes MonModes - Name struct { - Prefix UniqueMonsterAffixes - Suffix UniqueMonsterAffixes - } - Placements MonsterPlacements - Presets MonPresets - Props MonsterProperties - Sequences MonsterSequences - Sounds MonsterSounds - Stats MonStats - Stats2 MonStats2 - Types MonsterTypes - Unique struct { + Unique struct { Appellations UniqueAppellations Mods MonsterUniqueModifiers Constants MonsterUniqueModifierConstants Super SuperUniques } + Name struct { + Prefix UniqueMonsterAffixes + Suffix UniqueMonsterAffixes + } + Props MonsterProperties + Modes MonModes + Levels MonsterLevels + Types MonsterTypes + Presets MonPresets + Equipment MonsterEquipment + Sequences MonsterSequences + Sounds MonsterSounds + Stats MonStats + Stats2 MonStats2 + AI MonsterAI + Placements MonsterPlacements } Level struct { AutoMaps