Ticket #19: dialog.mdl.ticket19.against_r74.patch

dialog.mdl

@@ -2088 +2088 @@
         GroupImage([
                 TranslateImage(fp2TargetShieldImage, Point(320, 240)),
                 TranslateImage(fp2TargetHullImage, Point(320, -16)),
-                TranslateImage(
+                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,
+                                TranslateImage(
                         GeoImage(
                                 targetGeo,
                                 Rect(0, 0, 96, 96),
@@ -2098 +2105 @@
                         ), 
                         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
+                )
         ])
         ,       IsNotNull(Target, OnEveryFrame)
 );
@@ -2867 +2867 @@
 fpTargetOvalColor =
         BlendImage(
             ImportImageFromFile("mods/CortUI/media/cortui_fp1_target_oval_color.png", true),
-            hudBlendMode
-    );
-
+        hudBlendMode
+   );
+        
 fpTargetRangeString = 
     SwitchString(
         GetRange(Target, OnEveryFrame),
@@ -2993 +2993 @@
     ]
 );
 
-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(280, 120)),
+                        TranslateImage(fpTargetOvalColor, Point(6, 17)),
+                        TranslateImage(TargetName, Point(6, 108)),
+                        TranslateImage(fpTargetRange, Point(166, 16)),
+                        TranslateImage(fpTargetSpeed, Point(-142, 16)),
+                        TranslateImage(fpTargetInRange, Point(6, 14))
+                        ]);
+
+fpTargetGeo = 
+        GeoImage(
+                targetGeo,
+                Rect(0, 0, 96, 96),
+                targetCamera,
+                true
+                );
+                        
+fpTargetDisplay = 
+VisibleImage(
+        TranslateImage(
+                GroupImage([    
+                        TranslateImage(fpTargetGeo,Point(36, -8)),
+                        TranslateImage(fpTargetDisplayGroup1, Point(0, 0))
+                        ])
+                ,Point(234, 27)
     ),
         IsNotNull(Target, OnEveryFrame)
 );