Tools bug - merging conflcts

Sandiford
Corporal
Posts: 28
Joined: Thu 8 Dec 2016 19:54
Contact:

Tools bug - merging conflcts

Postby Sandiford » Wed 28 Jun 2017 17:17

So they conflicts system work pretty well, I'd still like it to pop up in kdiff (for any devs out there), but hey it's good.

The only problem is that is raising conflicts that aren't really conflicts

e.g. I changed the MaxDamages for a fighter bomber, and eugen in the patch changed the SupressDamageLevelsPack, both in the Damage module in UniteDescriptor

Then because I changed the optics in the Scanner module it highlights the whole section as a merge conflict

See spoiler:
Spoiler : :
<<<<<<<
MaxDamages = 7.0
HitRollSize = 0
HitRollECM = 0
MaxHPForHUD = 7
AutoOrientation = True
IsTargetableAsBoat = False
IsTargetableOutsideCenter = False
SkipCadavreCreation = False
FxDoImpactOnUnit = True
UseDamageMultiplierForFirePower = False
UseTopArmorAgainstFire = True
Dangerousness = 125.0
PhysicalDamageLevelsPack = ~/DamageLevelsPackDescriptor_Default_pack_paliers_degats_phy
SuppressDamageLevelsPack = ~/DamageLevelsPackDescriptor_Multiroles_bombardier_packSupp
TypeForGroundDamageModifier = EGroundDamageModifierType/Undefined
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// Rout
TModuleSelector
(
ControllerName = EControllerName/Rout
Default = TRoutModuleDescriptor
(
ControllerName = EControllerName/Rout
MoralLevel = 20
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

~/TemplateHaloAirplane,
// MouvementHandlerAirplane
MouvementHandler is TModuleSelector
(
ControllerName = EControllerName/MouvementHandler
Default = TMouvementHandlerAirplaneDescriptor
(
ControllerName = EControllerName/MouvementHandler
UnitMovingType = EUnitMovingType/Flying
PreferredLayerMask = EWorldFloorLayer/All
Maxspeed = ((900) * Metre)
VitesseCombat = ((650) * Metre)
SpeedFakefactorType = ESpeedFakeFactorType/Air
Altitude = ((1000) * Metre)
AltitudeMax = $/GFX/Everything/MaxAltitude
AltitudeMin = (200 * Metre)
Speed = ((900) * Metre)
AgilityRadius = ((2400) * Metre)
PitchAngle = 12
PitchSpeed = $/GFX/Everything/MaxPitchParTick
RollAngle = 70
RollSpeed = 165
EvacAngle = 10
FollowGround = $/GFX/Everything/FollowGround
IgnoreBattlefieldOrders = False
EvacuateOnTargetReached = False
EvacToStartingPoint = True
ElevatorRotationMax = $/GFX/Everything/ElevatorRotationMax
AileronRotationMax = $/GFX/Everything/AileronRotationMax
RudderRotationMax = $/GFX/Everything/RudderRotationMax
AttackStrategyDescriptors =
[
TBombAttackStrategyDescriptor(),
TDogfightAttackStrategyDescriptor
(
MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy = $/GFX/Everything/MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy
MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy = $/GFX/Everything/MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy
SpeedRatioForAttackOnSlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnSlowAirplaneStrategy
SpeedRatioForAttackOnVerySlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnVerySlowAirplaneStrategy
MaxAngleDifferenceWithTarget = $/GFX/Everything/MaxAngleDifferenceWithTarget
MaxAngleToConsiderTargetAhead = $/GFX/Everything/MaxAngleToConsiderTargetAhead
AngleToFakeTargetPosition = $/GFX/Everything/AngleToFakeTargetPosition
),
TDiveAttackStrategyDescriptor
(
MaxPitchForAggressiveDive = $/GFX/Everything/MaxPitchForAggressiveDive
),
]
)
Selection = [~/NilDescriptorIfGhostOrCadavre]
),

// Fuel
TModuleSelector
(
ControllerName = EControllerName/Fuel
Default = TFuelModuleDescriptor
(
ControllerName = EControllerName/Fuel
FuelCapacity = 900.0
FuelMoveDuration = 90.0
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// ScannerConfiguration
TModuleSelector
(
ControllerName = EControllerName/ScannerConfiguration
Default = TScannerConfigurationDescriptor
(
ControllerName = EControllerName/ScannerConfiguration
OpticsAltitudeConfig = ~/EVisionOpticsAltitudeConfig/UseOnRS_TBAWithGroundOpticsLerp
DoesNotCountInScannerAbsoluteMaxRange = False
PorteeVisionTBA = ((14000) * Metre)
PorteeVisionFOW = ((0.0) * Metre)
DetectionTBA = ((14000) * Metre)
PorteeVision = ((12000) * Metre)
PorteeIdentification = 0.0
OpticalStrength = 0
|||||||
MaxDamages = 7.0
HitRollSize = 0
HitRollECM = 0
MaxHPForHUD = 7
AutoOrientation = True
IsTargetableAsBoat = False
IsTargetableOutsideCenter = False
SkipCadavreCreation = False
FxDoImpactOnUnit = True
UseDamageMultiplierForFirePower = False
UseTopArmorAgainstFire = True
Dangerousness = 125.0
PhysicalDamageLevelsPack = ~/DamageLevelsPackDescriptor_Default_pack_paliers_degats_phy
SuppressDamageLevelsPack = ~/DamageLevelsPackDescriptor_Multiroles_packSupp
TypeForGroundDamageModifier = EGroundDamageModifierType/Undefined
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// Rout
TModuleSelector
(
ControllerName = EControllerName/Rout
Default = TRoutModuleDescriptor
(
ControllerName = EControllerName/Rout
MoralLevel = 20
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

~/TemplateHaloAirplane,
// MouvementHandlerAirplane
MouvementHandler is TModuleSelector
(
ControllerName = EControllerName/MouvementHandler
Default = TMouvementHandlerAirplaneDescriptor
(
ControllerName = EControllerName/MouvementHandler
UnitMovingType = EUnitMovingType/Flying
PreferredLayerMask = EWorldFloorLayer/All
Maxspeed = ((900) * Metre)
VitesseCombat = ((650) * Metre)
SpeedFakefactorType = ESpeedFakeFactorType/Air
Altitude = ((1000) * Metre)
AltitudeMax = $/GFX/Everything/MaxAltitude
AltitudeMin = (200 * Metre)
Speed = ((900) * Metre)
AgilityRadius = ((2400) * Metre)
PitchAngle = 12
PitchSpeed = $/GFX/Everything/MaxPitchParTick
RollAngle = 70
RollSpeed = 165
EvacAngle = 10
FollowGround = $/GFX/Everything/FollowGround
IgnoreBattlefieldOrders = False
EvacuateOnTargetReached = False
EvacToStartingPoint = True
ElevatorRotationMax = $/GFX/Everything/ElevatorRotationMax
AileronRotationMax = $/GFX/Everything/AileronRotationMax
RudderRotationMax = $/GFX/Everything/RudderRotationMax
AttackStrategyDescriptors =
[
TBombAttackStrategyDescriptor(),
TDogfightAttackStrategyDescriptor
(
MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy = $/GFX/Everything/MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy
MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy = $/GFX/Everything/MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy
SpeedRatioForAttackOnSlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnSlowAirplaneStrategy
SpeedRatioForAttackOnVerySlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnVerySlowAirplaneStrategy
MaxAngleDifferenceWithTarget = $/GFX/Everything/MaxAngleDifferenceWithTarget
MaxAngleToConsiderTargetAhead = $/GFX/Everything/MaxAngleToConsiderTargetAhead
AngleToFakeTargetPosition = $/GFX/Everything/AngleToFakeTargetPosition
),
TDiveAttackStrategyDescriptor
(
MaxPitchForAggressiveDive = $/GFX/Everything/MaxPitchForAggressiveDive
),
]
)
Selection = [~/NilDescriptorIfGhostOrCadavre]
),

// Fuel
TModuleSelector
(
ControllerName = EControllerName/Fuel
Default = TFuelModuleDescriptor
(
ControllerName = EControllerName/Fuel
FuelCapacity = 900.0
FuelMoveDuration = 90.0
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// ScannerConfiguration
TModuleSelector
(
ControllerName = EControllerName/ScannerConfiguration
Default = TScannerConfigurationDescriptor
(
ControllerName = EControllerName/ScannerConfiguration
OpticsAltitudeConfig = ~/EVisionOpticsAltitudeConfig/UseOnRS_TBAWithGroundOpticsLerp
DoesNotCountInScannerAbsoluteMaxRange = False
PorteeVisionTBA = ((14000) * Metre)
PorteeVisionFOW = ((0.0) * Metre)
DetectionTBA = ((14000) * Metre)
PorteeVision = ((12000) * Metre)
PorteeIdentification = 0.0
OpticalStrength = 0
=======
MaxDamages = 4.0
HitRollSize = 0
HitRollECM = 0
MaxHPForHUD = 4
AutoOrientation = True
IsTargetableAsBoat = False
IsTargetableOutsideCenter = False
SkipCadavreCreation = False
FxDoImpactOnUnit = True
UseDamageMultiplierForFirePower = False
UseTopArmorAgainstFire = True
Dangerousness = 125.0
PhysicalDamageLevelsPack = ~/DamageLevelsPackDescriptor_Default_pack_paliers_degats_phy
SuppressDamageLevelsPack = ~/DamageLevelsPackDescriptor_Multiroles_packSupp
TypeForGroundDamageModifier = EGroundDamageModifierType/Undefined
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// Rout
TModuleSelector
(
ControllerName = EControllerName/Rout
Default = TRoutModuleDescriptor
(
ControllerName = EControllerName/Rout
MoralLevel = 20
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

~/TemplateHaloAirplane,
// MouvementHandlerAirplane
MouvementHandler is TModuleSelector
(
ControllerName = EControllerName/MouvementHandler
Default = TMouvementHandlerAirplaneDescriptor
(
ControllerName = EControllerName/MouvementHandler
UnitMovingType = EUnitMovingType/Flying
PreferredLayerMask = EWorldFloorLayer/All
Maxspeed = ((900) * Metre)
VitesseCombat = ((650) * Metre)
SpeedFakefactorType = ESpeedFakeFactorType/Air
Altitude = ((1000) * Metre)
AltitudeMax = $/GFX/Everything/MaxAltitude
AltitudeMin = (200 * Metre)
Speed = ((900) * Metre)
AgilityRadius = ((2400) * Metre)
PitchAngle = 12
PitchSpeed = $/GFX/Everything/MaxPitchParTick
RollAngle = 70
RollSpeed = 165
EvacAngle = 10
FollowGround = $/GFX/Everything/FollowGround
IgnoreBattlefieldOrders = False
EvacuateOnTargetReached = False
EvacToStartingPoint = True
ElevatorRotationMax = $/GFX/Everything/ElevatorRotationMax
AileronRotationMax = $/GFX/Everything/AileronRotationMax
RudderRotationMax = $/GFX/Everything/RudderRotationMax
AttackStrategyDescriptors =
[
TBombAttackStrategyDescriptor(),
TDogfightAttackStrategyDescriptor
(
MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy = $/GFX/Everything/MinDistanceBetweenFighterAndTargetForAttackOnSlowAirplaneStrategy
MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy = $/GFX/Everything/MaxDistanceBetweenFighterAndTargetForLateralMoveOnSlowAirplaneStrategy
SpeedRatioForAttackOnSlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnSlowAirplaneStrategy
SpeedRatioForAttackOnVerySlowAirplaneStrategy = $/GFX/Everything/SpeedRatioForAttackOnVerySlowAirplaneStrategy
MaxAngleDifferenceWithTarget = $/GFX/Everything/MaxAngleDifferenceWithTarget
MaxAngleToConsiderTargetAhead = $/GFX/Everything/MaxAngleToConsiderTargetAhead
AngleToFakeTargetPosition = $/GFX/Everything/AngleToFakeTargetPosition
),
TDiveAttackStrategyDescriptor
(
MaxPitchForAggressiveDive = $/GFX/Everything/MaxPitchForAggressiveDive
),
]
)
Selection = [~/NilDescriptorIfGhostOrCadavre]
),

// Fuel
TModuleSelector
(
ControllerName = EControllerName/Fuel
Default = TFuelModuleDescriptor
(
ControllerName = EControllerName/Fuel
FuelCapacity = 900.0
FuelMoveDuration = 270.0
)
Selection = [ ~/NilDescriptorIfGhostOrCadavre ]
),

// ScannerConfiguration
TModuleSelector
(
ControllerName = EControllerName/ScannerConfiguration
Default = TScannerConfigurationDescriptor
(
ControllerName = EControllerName/ScannerConfiguration
OpticsAltitudeConfig = ~/EVisionOpticsAltitudeConfig/UseOnRS_TBAWithGroundOpticsLerp
DoesNotCountInScannerAbsoluteMaxRange = False
PorteeVisionTBA = ((14000) * Metre)
PorteeVisionFOW = ((0.0) * Metre)
DetectionTBA = ((14000) * Metre)
PorteeVision = ((12000) * Metre)
PorteeIdentification = 0.0
OpticalStrength = 40
>>>>>>>


These changes should just go through without raising a conflict, and if there are multiple changes within one class then highlighting them separately would be better.

Would make things a lot easier

Ta

Who is online

Users browsing this forum: No registered users and 1 guest