Index: dialog.mdl =================================================================== --- dialog.mdl (revision 74) +++ dialog.mdl (working copy) @@ -1262,28 +1262,6 @@ // ////////////////////////////////////////////////////////////////////////////// -fpVectorLockNormal = ImportImageFromFile("mods/CortUI/media/cortui_fp1_con_vector_lock.png", true); - -fpVectorLockOn = - SwitchImage( - GetVectorLock(Me, OnEveryFrame), - emptyImage, - [ - (1, fpVectorLockNormal) - ] - ); - -fpAutopilotNormal = ImportImageFromFile("mods/CortUI/media/cortui_fp1_con_auto_pilot.png", true); - -fpAutopilotOnImage = - SwitchImage( - AutopilotOn, - emptyImage, - [ - (1, fpAutopilotNormal) - ] - ); - fpThrustGaugeBack = BlendImage( GaugeImageRect( @@ -1522,20 +1500,67 @@ ] ); +fpVectorLockNormal = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp1_con_vector_lock.png", true), + Rect(0, 0, 32, 32), + true, + 1 + ), + hudBlendMode + ); + +fpVectorLockOn = + SwitchImage( + GetVectorLock(Me, OnEveryFrame), + emptyImage, + [ + (1, fpVectorLockNormal) + ] + ); + +fpAutopilotNormal = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp1_con_auto_pilot.png", true), + Rect(0, 0, 32, 32), + true, + 1 + ), + hudBlendMode + ); + +fpAutopilotOnImage = + SwitchImage( + AutopilotOn, + emptyImage, + [ + (1, fpAutopilotNormal) + ] + ); + + fpRadOn = - ImagePane(ImportImageFromFile("mods/CortUI/media/cortui_fp1_rad_on.png", false), []); -// fpRadOff = - // ImagePane(ImportImageFromFile("mods/CortUI/media/cortui_fp1_rad_on.png", false), []); + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp1_rad_on.png", true), + Rect(0, 0, 32, 32), + true, + 1 + ), + hudBlendMode + ); -fpRadarDetectPane = - SwitchPane( - Detected, - [ - (fpRadOn, 0) - // (fpRadOff, 1) - ] - ); - +fpRadarDetectPane = SwitchImage( + Detected, + fpRadOn, + [ + (1, emptyImage) + ] +); + fpExperienceImage = GroupImage([ TranslateImage(StringImage( @@ -1595,7 +1620,7 @@ TranslateImage(fpEnergyImage, Point(324, 89)), TranslateImage(SpeedImage, Point(281, 152)), TranslateImage(fpExperienceImage, Point(281, 105)), - TranslateImage(PaneImage(fpRadarDetectPane, false, true), Point(415, 122)), + TranslateImage(fpRadarDetectPane, Point(415, 122)), TranslateImage(fpCaptureFlag, Point(429, 349)), TranslateImage(fpArtifact, Point(147, 349)), TranslateImage(SignatureImage, Point(281, 133)) @@ -1775,10 +1800,17 @@ TranslateImage(fp2EnergyGauge, Point(2, 10)) ]); -fp2AutopilotOn = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_autopilot_on.png", true), - hudBlendMode -); +fp2AutopilotOn = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_autopilot_on.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); fp2Autopilot = SwitchImage( AutopilotOn, @@ -1788,10 +1820,17 @@ ] ); -fp2CloakOn = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_cloak_on.png", true), - hudBlendMode -); +fp2CloakOn = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_cloak_on.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); fp2Cloak = SwitchImage( IsCloaked(Me, OnEveryFrame), @@ -1801,10 +1840,17 @@ ] ); -fp2VectorLockOn = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_vector_lock_on.png", true), - hudBlendMode -); +fp2VectorLockOn = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_vector_lock_on.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); fp2VectorLock = SwitchImage( GetVectorLock(Me, OnEveryFrame), @@ -1814,10 +1860,17 @@ ] ); -fp2EyeOn = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_eye_on.png", true), - hudBlendMode -); +fp2EyeOn = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_eye_on.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); fp2Eye = SwitchImage( Detected, @@ -1827,23 +1880,50 @@ ] ); -fp2DamageOn1 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage1.png", true), - hudBlendMode -); -fp2DamageOn2 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage2.png", true), - hudBlendMode -); -fp2DamageOn3 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage3.png", true), - hudBlendMode -); -fp2DamageOn4 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage4.png", true), - hudBlendMode -); +fp2DamageOn1 = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage1.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); +fp2DamageOn2 = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage2.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + +fp2DamageOn3 = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage3.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + +fp2DamageOn4 = BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_damage4.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + fp2DamageOn = GroupImage([ TranslateImage(fp2DamageOn1, Point(10, 292)), TranslateImage(fp2DamageOn2, Point(566, 292)), @@ -1851,6 +1931,7 @@ TranslateImage(fp2DamageOn4, Point(566, 124)) ]); + fp2Damage = SwitchImage( Flash, emptyImage, @@ -1969,10 +2050,17 @@ TranslateImage(fp2TargetHullGauge, Point(4, 29)) ]); -fp2TargetOvalColor = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_oval_color.png", true), - hudBlendMode -); +fp2TargetOvalColor = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_oval_color.png", true), + Rect(0, 0, 256, 256), + true, + 1 + ), + hudBlendMode + ); fp2TargetExperience = StringImage( JustifyLeft, @@ -2052,23 +2140,56 @@ NumberString(GetSpeed(Target, OnEveryFrame)) ); -fp2TargetInRange1 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range1.png", true), - hudBlendMode -); -fp2TargetInRange2 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range2.png", true), - hudBlendMode -); -fp2TargetInRange3 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range3.png", true), - hudBlendMode -); -fp2TargetInRange4 = BlendImage( - ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range4.png", true), - hudBlendMode -); +fp2TargetInRange1 = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range1.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); +fp2TargetInRange2 = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range2.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + +fp2TargetInRange3 = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range3.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + +fp2TargetInRange4 = + BlendImage( + GaugeImageRect( + JustifyBottom, + ImportImageFromFile("mods/CortUI/media/cortui_fp2_target_in_range4.png", true), + Rect(0, 0, 64, 64), + true, + 1 + ), + hudBlendMode + ); + + + fp2TargetInRangeImage = GroupImage([ TranslateImage(fp2TargetInRange1, Point(10, 336)), TranslateImage(fp2TargetInRange2, Point(566, 336)), @@ -2088,24 +2209,14 @@ GroupImage([ TranslateImage(fp2TargetShieldImage, Point(320, 240)), TranslateImage(fp2TargetHullImage, Point(320, -16)), - TranslateImage( - GeoImage( - targetGeo, - Rect(0, 0, 96, 96), - // Rect(0, 0, 144, 144), - targetCamera, - true - ), - Point(272, -122) - // Point(248, -146) - ), - TranslateImage(fp2TargetOvalColor, Point(192, -144)), TranslateImage(fp2TargetExperience, Point(337, 484)), TranslateImage(fp2TargetName, Point(422, -12)), TranslateImage(fp2TargetDesc, Point(422, -30)), TranslateImage(fp2TargetSpeed, Point(342, 15)), fp2TargetRange, - fp2TargetInRange + fp2TargetInRange, + TranslateImage(GeoImage(targetGeo, Rect(0, 0, 96, 96), targetCamera, true ), Point(272, -122)), + TranslateImage(fp2TargetOvalColor, Point(192, -144)) ]) , IsNotNull(Target, OnEveryFrame) ); @@ -2865,11 +2976,18 @@ ////////////////////////////////////////////////////////////////////////////// fpTargetOvalColor = - BlendImage( + BlendImage( + GaugeImageRect( + JustifyBottom, ImportImageFromFile("mods/CortUI/media/cortui_fp1_target_oval_color.png", true), - hudBlendMode + Rect(0, 0, 164, 67), + true, + 1 + ), + hudBlendMode ); - + + fpTargetRangeString = SwitchString( GetRange(Target, OnEveryFrame), @@ -2888,17 +3006,26 @@ fpTargetRangeString ); -fpTargetInRangeImage = - ImportImageFromFile("mods/CortUI/media/cortui_fp1_turret_range.png", true); +// fpTargetInRangeImage = +// BlendImage( +// GaugeImageRect( +// JustifyBottom, +// ImportImageFromFile("mods/CortUI/media/cortui_fp1_turret_range.png", true), +// Rect(0, 0, 164, 67), +// true, +// 1 +// ), +// hudBlendMode +// ); -fpTargetInRange = - SwitchImage( - TargetInRangeFlag, - emptyImage, - [ - (1, fpTargetInRangeImage) - ] - ); +//fpTargetInRange = +// SwitchImage( +// TargetInRangeFlag, +// emptyImage, +// [ +// (1, fpTargetInRangeImage) +// ] +// ); fpTargetSpeed = StringImage( @@ -2993,26 +3120,34 @@ ] ); -fpTargetDisplay = VisibleImage( +fpTargetDisplayGroup1 = GroupImage([ - TranslateImage(fpTargetShieldImage, Point(353, 27)), - TranslateImage(fpTargetHullImage, Point(234, 27)), - TranslateImage( - GeoImage( - targetGeo, - Rect(0, 0, 96, 96), - targetCamera, - true - ), - Point(270, 19) - ), - TranslateImage(fpTargetExperienceImage, Point(280, 120)), - TranslateImage(fpTargetOvalColor, Point(240, 41)), - TranslateImage(TargetName, Point(240, 135)), - TranslateImage(fpTargetRange, Point(400, 43)), - TranslateImage(fpTargetSpeed, Point(92, 43)), - TranslateImage(fpTargetInRange, Point(240, 41)) - ] + TranslateImage(fpTargetShieldImage, Point(119, 0)), + TranslateImage(fpTargetHullImage, Point(0, 0)), + TranslateImage(fpTargetExperienceImage, Point(46, 95)), + //TranslateImage(fpTargetInRange, Point(6, 14)), + TranslateImage(fpTargetOvalColor, Point(6, 17)), + TranslateImage(TargetName, Point(6, 108)), + TranslateImage(fpTargetRange, Point(166, 16)), + TranslateImage(fpTargetSpeed, Point(-142, 16)) + ]); + +fpTargetGeo = + GeoImage( + targetGeo, + Rect(0, 0, 96, 96), + targetCamera, + true + ); + +fpTargetDisplay = +VisibleImage( + TranslateImage( + GroupImage([ + TranslateImage(fpTargetGeo,Point(36, 0)), + TranslateImage(fpTargetDisplayGroup1, Point(0, 0)) + ]) + ,Point(234, 27) ), IsNotNull(Target, OnEveryFrame) );