diff --git a/megameklab/data/images/recordsheets/templates_iso/dropship_aerodyne_default.svg b/megameklab/data/images/recordsheets/templates_iso/dropship_aerodyne_default.svg
index 8b146925a..9e1ef39a6 100644
--- a/megameklab/data/images/recordsheets/templates_iso/dropship_aerodyne_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/dropship_aerodyne_default.svg
@@ -934,234 +934,808 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/dropship_spheroid_default.svg b/megameklab/data/images/recordsheets/templates_iso/dropship_spheroid_default.svg
index 9ac86a4f5..8bcd14d52 100644
--- a/megameklab/data/images/recordsheets/templates_iso/dropship_spheroid_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/dropship_spheroid_default.svg
@@ -855,224 +855,850 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/fighter_aerospace_default.svg b/megameklab/data/images/recordsheets/templates_iso/fighter_aerospace_default.svg
index 88e92a6ef..660be7315 100644
--- a/megameklab/data/images/recordsheets/templates_iso/fighter_aerospace_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/fighter_aerospace_default.svg
@@ -1,1945 +1,5848 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/mek_biped_default.svg b/megameklab/data/images/recordsheets/templates_iso/mek_biped_default.svg
index 88a206497..887d8f389 100644
--- a/megameklab/data/images/recordsheets/templates_iso/mek_biped_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/mek_biped_default.svg
@@ -1341,7 +1341,128 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2017,7 +2138,8 @@
>( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2035,7 +2156,8 @@
>( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_default.svg b/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_default.svg
index 80b5ff306..3e73128c1 100644
--- a/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_default.svg
@@ -1752,7 +1752,8 @@
>Torso
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
diff --git a/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_toheat.svg b/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_toheat.svg
index a2c140f4b..0034f72e5 100644
--- a/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/mek_quadvee_toheat.svg
@@ -1752,7 +1752,8 @@
>Torso
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
diff --git a/megameklab/data/images/recordsheets/templates_iso/mek_tripod_default.svg b/megameklab/data/images/recordsheets/templates_iso/mek_tripod_default.svg
index ef939c206..36ef51397 100644
--- a/megameklab/data/images/recordsheets/templates_iso/mek_tripod_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/mek_tripod_default.svg
@@ -1317,7 +1317,8 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
( 0 )
diff --git a/megameklab/data/images/recordsheets/templates_iso/naval_turret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/naval_turret_standard.svg
index 41b3b19a2..e2b2c2fc1 100644
--- a/megameklab/data/images/recordsheets/templates_iso/naval_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/naval_turret_standard.svg
@@ -1,965 +1,4705 @@
-
diff --git a/megameklab/data/images/recordsheets/templates_iso/smallcraft_aerodyne_default.svg b/megameklab/data/images/recordsheets/templates_iso/smallcraft_aerodyne_default.svg
index 193b7c0b8..bad4957a9 100644
--- a/megameklab/data/images/recordsheets/templates_iso/smallcraft_aerodyne_default.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/smallcraft_aerodyne_default.svg
@@ -1098,14 +1098,124 @@
/>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/submarine_turret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/submarine_turret_standard.svg
index e00fc8fd8..d509512f5 100644
--- a/megameklab/data/images/recordsheets/templates_iso/submarine_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/submarine_turret_standard.svg
@@ -1,1003 +1,4941 @@
-
diff --git a/megameklab/data/images/recordsheets/templates_iso/vehicle_dualturret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/vehicle_dualturret_standard.svg
index 9a2df974f..2ae3cb35f 100644
--- a/megameklab/data/images/recordsheets/templates_iso/vehicle_dualturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/vehicle_dualturret_standard.svg
@@ -1241,6 +1241,224 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/vehicle_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/vehicle_noturret_standard.svg
index a59bafd86..7b156f48e 100644
--- a/megameklab/data/images/recordsheets/templates_iso/vehicle_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/vehicle_noturret_standard.svg
@@ -1067,6 +1067,102 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/vehicle_turret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/vehicle_turret_standard.svg
index 8b1172d9a..8185462d5 100644
--- a/megameklab/data/images/recordsheets/templates_iso/vehicle_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/vehicle_turret_standard.svg
@@ -1156,6 +1156,102 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/vtol_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/vtol_noturret_standard.svg
index 61655630a..27f29cc82 100644
--- a/megameklab/data/images/recordsheets/templates_iso/vtol_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/vtol_noturret_standard.svg
@@ -1025,6 +1025,157 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_iso/wige_turret_standard.svg b/megameklab/data/images/recordsheets/templates_iso/wige_turret_standard.svg
index 7f1cfe46d..8b691f060 100644
--- a/megameklab/data/images/recordsheets/templates_iso/wige_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_iso/wige_turret_standard.svg
@@ -1102,6 +1102,26 @@
/>
+
+
+
+
+
+
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/dropship_spheroid_default.svg b/megameklab/data/images/recordsheets/templates_us/dropship_spheroid_default.svg
index 644ae2ee9..fbf20558c 100644
--- a/megameklab/data/images/recordsheets/templates_us/dropship_spheroid_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/dropship_spheroid_default.svg
@@ -1,1590 +1,4496 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/fighter_aerospace_default.svg b/megameklab/data/images/recordsheets/templates_us/fighter_aerospace_default.svg
index f38deec78..f6c8a2c8d 100644
--- a/megameklab/data/images/recordsheets/templates_us/fighter_aerospace_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/fighter_aerospace_default.svg
@@ -1,1939 +1,5999 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_biped_default.svg b/megameklab/data/images/recordsheets/templates_us/mek_biped_default.svg
index 672b9a671..024430df5 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_biped_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_biped_default.svg
@@ -1,2468 +1,7934 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_biped_toheat.svg b/megameklab/data/images/recordsheets/templates_us/mek_biped_toheat.svg
index 5fea6e88c..7b295a197 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_biped_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_biped_toheat.svg
@@ -1,2672 +1,8951 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_lam_default.svg b/megameklab/data/images/recordsheets/templates_us/mek_lam_default.svg
index 46ffeb798..afeff0274 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_lam_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_lam_default.svg
@@ -1,2491 +1,8303 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_lam_toheat.svg b/megameklab/data/images/recordsheets/templates_us/mek_lam_toheat.svg
index 1c7939cc5..e36cc2a90 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_lam_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_lam_toheat.svg
@@ -1,2697 +1,7105 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RECORD SHEET
+
+
+
+
+
+
+
+
+ 'MECH DATA
+
+
+
+ Type:
+
+ Lorem Ipsum
+
+ Tonnage:
+
+ Lorem Ipsum
+
+ Tech Base:
+
+ Inner Sphere
+
+ Rules Level:
+
+ Standard
+
+ Role:
+
+ Lorem Ipsum
+
+ Movement Points:
+
+ BattleMech
+
+ Walking:
+
+ 0
+
+ Running:
+
+ 0
+
+ Jumping:
+
+ 0
+
+ AirMech
+
+ Walking:
+
+ 0
+
+ Running:
+
+ 0
+
+ Cruising:
+
+ 0
+
+ Flanking:
+
+ 0
+
+ Fighter
+
+ Safe Thrust:
+
+ 0
+
+ Max Thrust:
+
+ 0
+
+ Engine Type:
+
+ Lorem Ipsum
+
+
+ Weapons & Equipment Inventory
+
+ (hexes)
+
+
+
+ BV:
+
+ 0
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ BattleMech
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+ Aerospace
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+
+
+
+
+
+ A
+
+ B
+
+ C
+
+ D
+
+ E
+
+ F
+
+ Advanced
+
+ Movement
+
+ Compass
+
+
+
+
+
+ ARMOR DIAGRAM
+
+
+ Standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DC
+
+ DA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DC
+
+ DA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+ Center
+
+ Torso
+
+
+
+ Right Torso
+
+ Left Torso
+
+ Right
+
+ Leg
+
+ Left
+
+ Leg
+
+ Center
+
+ Torso
+
+ Torso Rear
+
+ RightLeft
+
+ Torso Rear
+
+
+
+
+
+ Left Arm
+
+ Right Arm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+ CRITICAL TABLE
+
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+
+ Avionics Hits
+
+
+
+
+ Engine Hits
+
+
+
+
+ Gyro Hits
+
+
+
+
+ Sensor Hits
+
+
+
+ Landing Gear
+
+
+ Life Support
+
+
+ Structural Integrity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Damage Transfer
+
+ Diagram
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INTERNAL STRUCTURE DIAGRAM
+
+
+
+ Standard
+ Structure
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+ Center
+
+ Torso
+
+ Right
+
+ Leg
+
+ Left
+
+ Arm
+
+
+
+ Right
+
+ Arm
+
+ Left Torso Right Torso
+
+ Left
+
+ Leg
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HEAT DATA
+
+
+
+ Heat
+
+ Heat
+
+ Level*
+
+ Level*
+
+ Effects
+
+ Effects
+
+ 50
+
+ Shutdown
+
+ 49
+
+ -9 Movement Points
+
+ 48
+
+ +7 Modifier to Fire
+
+ 47
+
+ Pilot damage, avoid on -10+
+
+ 46
+
+ Shutdown, avoid on 20+
+
+ 45
+
+ Ammo Explosion
+
+ 44
+
+ System failure, avoid on 10+
+
+ 43
+
+ -8 Movement Points
+
+ 42
+
+ Shutdown, avoid on 18+
+
+ 41
+
+ +6 Modifier to Fire
+
+ 40
+
+ Ammo Exp, avoid on 12+
+
+ 39
+
+ Pilot damage, avoid on 10+
+
+ 38
+
+ Shutdown, avoid on 16+
+
+ 37
+
+ -7 Movement Points
+
+ 36
+
+ System failure, avoid on 8+
+
+ 35
+
+ Ammo Exp, avoid on 10+
+
+ 34
+
+ Shutdown, avoid on 14+
+
+ 33
+
+ +5 Modifier to Fire
+
+ 32
+
+ Pilot damage, avoid on 8+
+
+ 31
+
+ -6 Movement Points
+
+ 30
+
+ Shutdown, avoid on 12+
+
+ 28
+
+ Ammo Exp, avoid on 8+
+
+ 26
+
+ Shutdown, avoid on 10+
+
+ 25
+
+ -5 Movement Points
+
+ /Rand. Movement 10+
+
+ 24
+
+ +4 Modifier to Fire
+
+ 23
+
+ Ammo Exp, avoid on 6+
+
+ 22
+
+ Shutdown, avoid on 8+
+
+ 20
+
+ -4 Movement Points
+
+ /Rand. Movement 8+
+
+ 19
+
+ Ammo Exp, avoid on 4+
+
+ 18
+
+ Shutdown, avoid on 6+
+
+ 17
+
+ +3 Modifier to Fire
+
+ 15
+
+ -3 Movement Points
+
+ /Rand. Movement 7+
+
+ 14
+
+ Shutdown, avoid on 4+
+
+ 13
+
+ +2 Modifier to Fire
+
+ 10
+
+ -2 Movement Points
+
+ /Rand. Movement 6+
+
+ 8
+
+ +1 Modifier to Fire
+
+ 5
+
+ -1 Movement Points
+
+ /Rand. Movement 5+
+
+ Heat Sinks:
+
+ 10
+
+ (AirMech +3)
+
+
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_quad_default.svg b/megameklab/data/images/recordsheets/templates_us/mek_quad_default.svg
index 5b721068a..3d3ad4a2c 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_quad_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_quad_default.svg
@@ -1,2096 +1,6765 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_quad_toheat.svg b/megameklab/data/images/recordsheets/templates_us/mek_quad_toheat.svg
index 3cd2585ed..e4405c1af 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_quad_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_quad_toheat.svg
@@ -1,2302 +1,5960 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RECORD SHEET
+
+
+
+
+
+
+
+
+ 'MECH DATA
+
+
+
+ Type:
+
+ Lorem Ipsum
+
+ Movement Points:
+
+ Walking:
+
+ 0
+
+ Running:
+
+ 0
+
+ Jumping:
+
+ 0
+
+ Tonnage:
+
+ 0
+
+ Tech Base:
+
+ Inner Sphere
+
+ Rules Level:
+
+ Standard
+
+ Role:
+
+ Lorem Ipsum
+
+ Engine Type:
+
+ Lorem Ipsum
+
+
+ Weapons & Equipment Inventory
+
+ (hexes)
+
+
+
+ BV:
+
+ 0
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+
+
+
+
+ ARMOR DIAGRAM
+
+
+ Standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Center Torso Rear
+
+ Torso Rear
+
+ RightLeft
+
+ Torso Rear
+
+ Right
+
+ Rear Leg
+
+ Right
+
+ Front Leg
+
+
+
+ Center
+
+ Torso
+
+
+
+ Left
+
+ Torso
+
+ Right
+
+ Torso
+
+
+
+ Head
+
+
+
+ Left
+
+ Rear Leg
+
+ Left
+
+ Front Leg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRITICAL TABLE
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+
+ Engine Hits
+
+
+
+
+ Gyro Hits
+
+
+
+
+ Sensor Hits
+
+
+
+ Life Support
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Damage Transfer
+
+ Diagram
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INTERNAL STRUCTURE DIAGRAM
+
+
+
+ Standard
+ Structure
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+ Center
+
+ Torso
+
+ Left
+
+ Front Leg
+
+ Right
+
+ Front Leg
+
+ Left
+
+ Rear Leg
+
+ Right
+
+ Rear Leg
+
+ Left
+
+ Torso
+
+ Right
+
+ Torso
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HEAT DATA
+
+
+
+ Heat
+
+ Heat
+
+ Level*
+
+ Level*
+
+ Effects
+
+ Effects
+
+ 50
+
+ Shutdown
+
+ 49
+
+ -9 Movement Points
+
+ 48
+
+ +7 Modifier to Fire
+
+ 47
+
+ Pilot damage, avoid on -10+
+
+ 46
+
+ Shutdown, avoid on 20+
+
+ 45
+
+ Ammo Explosion
+
+ 44
+
+ System failure, avoid on 10+
+
+ 43
+
+ -8 Movement Points
+
+ 42
+
+ Shutdown, avoid on 18+
+
+ 41
+
+ +6 Modifier to Fire
+
+ 40
+
+ Ammo Exp, avoid on 12+
+
+ 39
+
+ Pilot damage, avoid on 10+
+
+ 38
+
+ Shutdown, avoid on 16+
+
+ 37
+
+ -7 Movement Points
+
+ 36
+
+ System failure, avoid on 8+
+
+ 35
+
+ Ammo Exp, avoid on 10+
+
+ 34
+
+ Shutdown, avoid on 14+
+
+ 33
+
+ +5 Modifier to Fire
+
+ 32
+
+ Pilot damage, avoid on 8+
+
+ 31
+
+ -6 Movement Points
+
+ 30
+
+ Shutdown, avoid on 12+
+
+ 28
+
+ Ammo Exp, avoid on 8+
+
+ 26
+
+ Shutdown, avoid on 10+
+
+ 25
+
+ -5 Movement Points
+
+ 24
+
+ +4 Modifier to Fire
+
+ 23
+
+ Ammo Exp, avoid on 6+
+
+ 22
+
+ Shutdown, avoid on 8+
+
+ 20
+
+ -4 Movement Points
+
+ 19
+
+ Ammo Exp, avoid on 4+
+
+ 18
+
+ Shutdown, avoid on 6+
+
+ 17
+
+ +3 Modifier to Fire
+
+ 15
+
+ -3 Movement Points
+
+ 14
+
+ Shutdown, avoid on 4+
+
+ 13
+
+ +2 Modifier to Fire
+
+ 10
+
+ -2 Movement Points
+
+ 8
+
+ +1 Modifier to Fire
+
+ 5
+
+ -1 Movement Points
+
+ Heat Sinks:
+
+ 10
+
+ (Partial Wing +3)
+
+
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_quadvee_default.svg b/megameklab/data/images/recordsheets/templates_us/mek_quadvee_default.svg
index 194016dd0..d0c92199d 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_quadvee_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_quadvee_default.svg
@@ -1,2214 +1,7110 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_quadvee_toheat.svg b/megameklab/data/images/recordsheets/templates_us/mek_quadvee_toheat.svg
index 9a8980639..0d7b9f167 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_quadvee_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_quadvee_toheat.svg
@@ -1,2420 +1,5212 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RECORD SHEET
+
+
+
+
+
+
+
+
+ 'MECH DATA
+
+
+
+ Type:
+
+ Lorem Ipsum
+
+ Movement Points:
+
+ Walking:
+
+ 0
+
+ Running:
+
+ 0
+
+ Jumping:
+
+ 0
+
+ Vehicle:
+
+ Cruising:
+
+ 0
+
+ Flanking:
+
+ 0
+
+ Tonnage:
+
+ 0
+
+ Tech Base:
+
+ Inner Sphere
+
+ Rules Level:
+
+ Standard
+
+ Role:
+
+ Lorem Ipsum
+
+ Engine Type:
+
+ Lorem Ipsum
+
+
+ Weapons & Equipment Inventory
+
+ (hexes)
+
+
+
+ BV:
+
+ 0
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+
+
+
+
+ ARMOR DIAGRAM
+
+
+ Standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Right
+
+ Rear Leg
+
+ Right
+
+ Front Leg
+
+
+
+ Center Torso Rear
+
+ Torso Rear
+
+ RightLeft
+
+ Torso Rear
+
+
+
+ Center
+
+ Torso
+
+
+
+ Left
+
+ Torso
+
+
+
+ Right
+
+ Torso
+
+
+
+ Head
+
+
+
+ Left
+
+ Rear Leg
+
+ Left
+
+ Front Leg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRITICAL TABLE
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+
+ Engine Hits
+
+
+
+
+ Gyro Hits
+
+
+
+
+ Sensor Hits
+
+
+
+ Life Support
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Damage Transfer
+
+ Diagram
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INTERNAL STRUCTURE DIAGRAM
+
+
+
+ Standard
+ Structure
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+ Center
+
+ Torso
+
+ Left
+
+ Front Leg
+
+ Right
+
+ Front Leg
+
+ Left
+
+ Rear Leg
+
+ Right
+
+ Rear Leg
+
+
+
+ Left
+
+ Torso
+
+
+
+ Right
+
+ Torso
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HEAT DATA
+
+
+
+ Heat
+
+ Heat
+
+ Level*
+
+ Level*
+
+ Effects
+
+ Effects
+
+ 50
+
+ Shutdown
+
+ 49
+
+ -9 Movement Points
+
+ 48
+
+ +7 Modifier to Fire
+
+ 47
+
+ Pilot damage, avoid on -10+
+
+ 46
+
+ Shutdown, avoid on 20+
+
+ 45
+
+ Ammo Explosion
+
+ 44
+
+ System failure, avoid on 10+
+
+ 43
+
+ -8 Movement Points
+
+ 42
+
+ Shutdown, avoid on 18+
+
+ 41
+
+ +6 Modifier to Fire
+
+ 40
+
+ Ammo Exp, avoid on 12+
+
+ 39
+
+ Pilot damage, avoid on 10+
+
+ 38
+
+ Shutdown, avoid on 16+
+
+ 37
+
+ -7 Movement Points
+
+ 36
+
+ System failure, avoid on 8+
+
+ 35
+
+ Ammo Exp, avoid on 10+
+
+ 34
+
+ Shutdown, avoid on 14+
+
+ 33
+
+ +5 Modifier to Fire
+
+ 32
+
+ Pilot damage, avoid on 8+
+
+ 31
+
+ -6 Movement Points
+
+ 30
+
+ Shutdown, avoid on 12+
+
+ 28
+
+ Ammo Exp, avoid on 8+
+
+ 26
+
+ Shutdown, avoid on 10+
+
+ 25
+
+ -5 Movement Points
+
+ 24
+
+ +4 Modifier to Fire
+
+ 23
+
+ Ammo Exp, avoid on 6+
+
+ 22
+
+ Shutdown, avoid on 8+
+
+ 20
+
+ -4 Movement Points
+
+ 19
+
+ Ammo Exp, avoid on 4+
+
+ 18
+
+ Shutdown, avoid on 6+
+
+ 17
+
+ +3 Modifier to Fire
+
+ 15
+
+ -3 Movement Points
+
+ 14
+
+ Shutdown, avoid on 4+
+
+ 13
+
+ +2 Modifier to Fire
+
+ 10
+
+ -2 Movement Points
+
+ 8
+
+ +1 Modifier to Fire
+
+ 5
+
+ -1 Movement Points
+
+ Heat Sinks:
+
+ 10
+
+ (Partial Wing +3)
+
+
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_tripod_default.svg b/megameklab/data/images/recordsheets/templates_us/mek_tripod_default.svg
index eaed2957e..e0b01432f 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_tripod_default.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_tripod_default.svg
@@ -1,2688 +1,9086 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/mek_tripod_toheat.svg b/megameklab/data/images/recordsheets/templates_us/mek_tripod_toheat.svg
index 9d6f43577..a0f8f084c 100644
--- a/megameklab/data/images/recordsheets/templates_us/mek_tripod_toheat.svg
+++ b/megameklab/data/images/recordsheets/templates_us/mek_tripod_toheat.svg
@@ -1,2894 +1,6926 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RECORD SHEET
+
+
+
+
+
+
+
+
+ 'MECH DATA
+
+
+
+ Type:
+
+ Lorem Ipsum
+
+ Movement Points:
+
+ Walking:
+
+ 0
+
+ Running:
+
+ 0
+
+ Jumping:
+
+ 0
+
+ Tonnage:
+
+ 0
+
+ Tech Base:
+
+ Inner Sphere
+
+ Rules Level:
+
+ Standard
+
+ Role:
+
+ Lorem Ipsum
+
+ Engine Type:
+
+ Lorem Ipsum
+
+
+ Weapons & Equipment Inventory
+
+ (hexes)
+
+
+
+ BV:
+
+ 0
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+
+
+
+
+
+ WARRIOR DATA
+
+
+
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+ Name:
+
+ Lorem Ipsum
+
+
+ Gunnery Skill:
+
+ 0
+
+
+ Piloting Skill:
+
+ 0
+
+
+
+
+
+ 1
+
+ 3
+
+ 2
+
+ 5
+
+ 3
+
+ 7
+
+ 4
+
+ 10
+
+ 5
+
+ 11
+
+ 6
+
+ Dead
+
+ Hits Taken
+
+ Consciousness #
+
+
+
+
+
+
+
+ ARMOR DIAGRAM
+
+
+ Standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DC
+
+ DA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DC
+
+ DA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+
+
+ Center
+
+ Torso
+
+
+
+ Right Torso
+
+ Left Torso
+
+ Right
+
+ Leg
+
+
+
+ Center Torso Rear
+
+ Torso Rear
+
+ RightLeft
+
+ Torso Rear
+
+
+
+ Left
+
+ Leg
+
+
+
+ Left Arm
+
+
+
+ Right Arm
+
+
+
+ Center
+
+ Leg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRITICAL TABLE
+
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+ 1-3
+
+ 4-6
+
+
+
+
+
+
+ 1-3
+
+ 4-6
+
+
+
+ Engine Hits
+
+
+
+
+ Gyro Hits
+
+
+
+
+ Sensor Hits
+
+
+
+ Life Support
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Damage
+
+ Transfer
+
+ Diagram
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INTERNAL STRUCTURE DIAGRAM
+
+
+
+ Standard
+ Structure
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Head
+
+ Center
+
+ Torso
+
+ Left
+
+ Arm
+
+ Right
+
+ Arm
+
+ Left TorsoRight Torso
+
+ Left
+
+ Leg
+
+
+
+ Center
+
+ Leg
+
+
+
+ Right
+
+ Leg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+ ( 0 )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HEAT DATA
+
+
+
+ Heat
+
+ Heat
+
+ Level*
+
+ Level*
+
+ Effects
+
+ Effects
+
+ 50
+
+ Shutdown
+
+ 49
+
+ -9 Movement Points
+
+ 48
+
+ +7 Modifier to Fire
+
+ 47
+
+ Pilot damage, avoid on -10+
+
+ 46
+
+ Shutdown, avoid on 20+
+
+ 45
+
+ Ammo Explosion
+
+ 44
+
+ System failure, avoid on 10+
+
+ 43
+
+ -8 Movement Points
+
+ 42
+
+ Shutdown, avoid on 18+
+
+ 41
+
+ +6 Modifier to Fire
+
+ 40
+
+ Ammo Exp, avoid on 12+
+
+ 39
+
+ Pilot damage, avoid on 10+
+
+ 38
+
+ Shutdown, avoid on 16+
+
+ 37
+
+ -7 Movement Points
+
+ 36
+
+ System failure, avoid on 8+
+
+ 35
+
+ Ammo Exp, avoid on 10+
+
+ 34
+
+ Shutdown, avoid on 14+
+
+ 33
+
+ +5 Modifier to Fire
+
+ 32
+
+ Pilot damage, avoid on 8+
+
+ 31
+
+ -6 Movement Points
+
+ 30
+
+ Shutdown, avoid on 12+
+
+ 28
+
+ Ammo Exp, avoid on 8+
+
+ 26
+
+ Shutdown, avoid on 10+
+
+ 25
+
+ -5 Movement Points
+
+ 24
+
+ +4 Modifier to Fire
+
+ 23
+
+ Ammo Exp, avoid on 6+
+
+ 22
+
+ Shutdown, avoid on 8+
+
+ 20
+
+ -4 Movement Points
+
+ 19
+
+ Ammo Exp, avoid on 4+
+
+ 18
+
+ Shutdown, avoid on 6+
+
+ 17
+
+ +3 Modifier to Fire
+
+ 15
+
+ -3 Movement Points
+
+ 14
+
+ Shutdown, avoid on 4+
+
+ 13
+
+ +2 Modifier to Fire
+
+ 10
+
+ -2 Movement Points
+
+ 8
+
+ +1 Modifier to Fire
+
+ 5
+
+ -1 Movement Points
+
+ Heat Sinks:
+
+ 10
+
+ (Partial Wing +3)
+
+
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+ Heat
+
+ Scale
+
+
+ Overflow
+
+
+ 50
+
+
+ 49
+
+
+ 48
+
+
+ 47
+
+
+ 46
+
+
+ 45
+
+
+ 44
+
+
+ 43
+
+
+ 42
+
+
+ 41
+
+
+ 40
+
+
+ 39
+
+
+ 38
+
+
+ 37
+
+
+ 36
+
+
+ 35
+
+
+ 34
+
+
+ 33
+
+
+ 32
+
+
+ 31
+
+
+ 30*
+
+
+ 29
+
+
+ 28*
+
+
+ 27
+
+
+ 26*
+
+
+ 25*
+
+
+ 24*
+
+
+ 23*
+
+
+ 22*
+
+
+ 21
+
+
+ 20*
+
+
+ 19*
+
+
+ 18*
+
+
+ 17*
+
+
+ 16
+
+
+ 15*
+
+
+ 14*
+
+
+ 13*
+
+
+ 12
+
+
+ 11
+
+
+ 10*
+
+
+ 9
+
+
+ 8*
+
+
+ 7
+
+
+ 6
+
+
+ 5*
+
+
+ 4
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+ 0
+
+
+
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/naval_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_us/naval_noturret_standard.svg
index d6bd18659..c2d4b4236 100644
--- a/megameklab/data/images/recordsheets/templates_us/naval_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/naval_noturret_standard.svg
@@ -9,7 +9,7 @@
version="1.0"
id="svg465"
sodipodi:docname="naval_noturret_standard.svg"
- inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+ inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -26,15 +26,15 @@
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
- inkscape:zoom="1.5515873"
- inkscape:cx="287.76982"
- inkscape:cy="378"
- inkscape:window-width="2560"
- inkscape:window-height="1369"
- inkscape:window-x="3832"
- inkscape:window-y="-8"
+ inkscape:zoom="2.2371848"
+ inkscape:cx="392.90452"
+ inkscape:cy="353.56937"
+ inkscape:window-width="1920"
+ inkscape:window-height="1128"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="rs_template" />
+ inkscape:current-layer="structurePipsGrouped" />
@@ -1856,7 +1856,7 @@
y="264.952" />
+ id="ArmorDiagram">
@@ -1972,36 +1972,18 @@
y="0"
height="10"
id="armorFRRow00" />
-
-
-
+
+
+ id="structurePipsRSgrouped"
+ transform="matrix(0, 1, -1, 0, 515, 190)">
-
-
-
-
-
-
-
-
+ id="rect100" />
+ id="structurePipsLSgrouped"
+ transform="matrix(0, 1, 1, 0, 464, 190)">
-
-
-
-
-
-
-
-
+ id="rect230" />
diff --git a/megameklab/data/images/recordsheets/templates_us/naval_turret_standard.svg b/megameklab/data/images/recordsheets/templates_us/naval_turret_standard.svg
index 231cf9f85..5d5748648 100644
--- a/megameklab/data/images/recordsheets/templates_us/naval_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/naval_turret_standard.svg
@@ -9,7 +9,7 @@
version="1.0"
id="svg469"
sodipodi:docname="naval_turret_standard.svg"
- inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+ inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -26,15 +26,15 @@
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
- inkscape:zoom="1.5515873"
- inkscape:cx="287.76982"
- inkscape:cy="378"
- inkscape:window-width="2560"
- inkscape:window-height="1369"
- inkscape:window-x="3832"
- inkscape:window-y="-8"
+ inkscape:zoom="4.287792"
+ inkscape:cx="424.92732"
+ inkscape:cy="254.67653"
+ inkscape:window-width="1920"
+ inkscape:window-height="1128"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="rs_template" />
+ inkscape:current-layer="armor_diagram_naval_turret" />
@@ -2069,36 +2069,18 @@
y="0"
height="10"
id="armorFRRow00" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3230,6 +3298,42 @@
id="structurePipsTU08" />
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/submarine_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_us/submarine_noturret_standard.svg
index f79aa8436..14ba24d0e 100644
--- a/megameklab/data/images/recordsheets/templates_us/submarine_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/submarine_noturret_standard.svg
@@ -9,7 +9,7 @@
version="1.0"
id="svg492"
sodipodi:docname="submarine_noturret_standard.svg"
- inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+ inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -27,14 +27,14 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="1.5515873"
- inkscape:cx="287.76982"
- inkscape:cy="378"
- inkscape:window-width="2560"
- inkscape:window-height="1369"
- inkscape:window-x="3832"
- inkscape:window-y="-8"
+ inkscape:cx="287.44757"
+ inkscape:cy="165.63683"
+ inkscape:window-width="1920"
+ inkscape:window-height="1128"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="rs_template" />
+ inkscape:current-layer="armorPips" />
@@ -1972,36 +1972,18 @@
y="0"
height="10"
id="armorFRRow00" />
-
-
-
+
+
+
+
+
+
+
+
+ inkscape:current-layer="armorPips" />
@@ -2069,36 +2069,18 @@
y="0"
height="10"
id="armorFRRow00" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3230,6 +3298,42 @@
id="structurePipsTU08" />
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/vehicle_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_us/vehicle_noturret_standard.svg
index ab3d7b5ee..4bfc306cc 100644
--- a/megameklab/data/images/recordsheets/templates_us/vehicle_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/vehicle_noturret_standard.svg
@@ -1,1316 +1,3297 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/vehicle_turret_standard.svg b/megameklab/data/images/recordsheets/templates_us/vehicle_turret_standard.svg
index 1f31ccc31..30bf99941 100644
--- a/megameklab/data/images/recordsheets/templates_us/vehicle_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/vehicle_turret_standard.svg
@@ -1,1413 +1,3545 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/vtol_noturret_standard.svg b/megameklab/data/images/recordsheets/templates_us/vtol_noturret_standard.svg
index 8f644d002..6bf948027 100644
--- a/megameklab/data/images/recordsheets/templates_us/vtol_noturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/vtol_noturret_standard.svg
@@ -1,1281 +1,3190 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/vtol_turret_standard.svg b/megameklab/data/images/recordsheets/templates_us/vtol_turret_standard.svg
index 66ba937c1..02418ea27 100644
--- a/megameklab/data/images/recordsheets/templates_us/vtol_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/vtol_turret_standard.svg
@@ -1,1556 +1,4222 @@
-
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/wige_dualturret_standard.svg b/megameklab/data/images/recordsheets/templates_us/wige_dualturret_standard.svg
index b29864a96..291358833 100644
--- a/megameklab/data/images/recordsheets/templates_us/wige_dualturret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/wige_dualturret_standard.svg
@@ -1159,6 +1159,26 @@
/>
+
+
+
+
+
+
-
-
+
+
diff --git a/megameklab/data/images/recordsheets/templates_us/wige_turret_standard.svg b/megameklab/data/images/recordsheets/templates_us/wige_turret_standard.svg
index 8aaa8b46b..0db738378 100644
--- a/megameklab/data/images/recordsheets/templates_us/wige_turret_standard.svg
+++ b/megameklab/data/images/recordsheets/templates_us/wige_turret_standard.svg
@@ -1,1302 +1,3173 @@
-
-
-
+
+
diff --git a/megameklab/resources/megameklab/resources/Dialogs.properties b/megameklab/resources/megameklab/resources/Dialogs.properties
index 888ad212c..b516eee11 100644
--- a/megameklab/resources/megameklab/resources/Dialogs.properties
+++ b/megameklab/resources/megameklab/resources/Dialogs.properties
@@ -26,6 +26,11 @@ ConfigurationDialog.chkColor.text=Use color
ConfigurationDialog.chkColor.tooltip=Use color on the record sheet.
ConfigurationDialog.chkRowShading.text=Improve table readability by shading rows
ConfigurationDialog.chkRowShading.tooltip=Add grey shading to alternating rows of certain tables to make them more readable.
+ConfigurationDialog.chkAlternateArmorGrouping.text=!EXPERIMENTAL! Group armor pips into groups of 5
+ConfigurationDialog.chkAlternateArmorGrouping.tooltip=Attempt to use an alternate method for placing armor pips which makes groups of 5.
\
+ Only some unit types are supported. This feature is currently experimental and may fail to draw armor pips correctly, please report any errors.
+ConfigurationDialog.chkFrameless.text=Frameless
+ConfigurationDialog.chkFrameless.tooltip=If you don't know what this option is for, leave it unchecked.
ConfigurationDialog.cbFont.text=Font Family:
ConfigurationDialog.cbFont.tooltip=Select the typeface to use when printing record sheets.
\
Additional truetype fonts can be made available to MML by placing the font file in the data/fonts directory.
diff --git a/megameklab/src/megameklab/printing/ArmorPipLayout.java b/megameklab/src/megameklab/printing/ArmorPipLayout.java
index 580707a15..3066ae660 100644
--- a/megameklab/src/megameklab/printing/ArmorPipLayout.java
+++ b/megameklab/src/megameklab/printing/ArmorPipLayout.java
@@ -15,13 +15,9 @@
import static megameklab.printing.PrintRecordSheet.DEFAULT_PIP_SIZE;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -111,9 +107,11 @@ class ArmorPipLayout {
* @param pipType The shape of pip to add
* @param strokeWidth The width of the pip outline stroke
* @param fill The color to use for the inside of the pip
+ * @param alternateMethod If the armor pips should be attempted to be grouped in 5s
*/
static void addPips(PrintRecordSheet sheet, Element group, int pipCount,
- PrintRecordSheet.PipType pipType, double strokeWidth, String fill) {
+ PrintRecordSheet.PipType pipType, double strokeWidth,
+ String fill, boolean alternateMethod) {
if (pipCount > 0) {
boolean multi = false;
final String multiVal = PrintRecordSheet.parseStyle(group, IdConstants.MML_MULTISECTION);
@@ -161,14 +159,14 @@ static void addPips(PrintRecordSheet sheet, Element group, int pipCount,
}
for (int s = 0; s < sections.size(); s++) {
if (pipCounts.get(s) > 0) {
- sections.get(s).process(pipCounts.get(s));
+ sections.get(s).process(pipCounts.get(s), alternateMethod);
}
}
} else {
ArmorPipLayout layout = new ArmorPipLayout(sheet, group,
pipType, strokeWidth, fill);
if (!layout.regions.isEmpty()) {
- layout.process(pipCount);
+ layout.process(pipCount, alternateMethod);
}
}
}
@@ -179,16 +177,16 @@ static void addPips(PrintRecordSheet sheet, Element group, int pipCount,
* at each marked point and adds pip elements to the group layed out in a
* symmetric pattern.
*
- * @param sheet The record sheet being printed.
- * @param group The group element that contains the rect elements that
- * mark the dimensions of the area on the armor or structure
- * diagram.
- * @param pipCount The number of armor or structure pips to add
- * @param pipType The shape of pip to add
+ * @param sheet The record sheet being printed.
+ * @param group The group element that contains the rect elements that
+ * mark the dimensions of the area on the armor or structure diagram.
+ * @param pipCount The number of armor or structure pips to add
+ * @param pipType The shape of pip to add
+ * @param alternateMethod If the armor pips should be attempted to be grouped in 5s
*/
static void addPips(PrintRecordSheet sheet, Element group, int pipCount,
- PrintRecordSheet.PipType pipType) {
- addPips(sheet, group, pipCount, pipType, 0.55, PrintRecordSheet.FILL_WHITE);
+ PrintRecordSheet.PipType pipType, boolean alternateMethod) {
+ addPips(sheet, group, pipCount, pipType, 0.55, PrintRecordSheet.FILL_WHITE, alternateMethod);
}
/**
@@ -197,15 +195,15 @@ static void addPips(PrintRecordSheet sheet, Element group, int pipCount,
* a symmetric
* pattern.
*
- * @param sheet The record sheet being printed.
- * @param group The group element that contains the rect elements that
- * mark the dimensions of the area on the armor or structure
- * diagram.
- * @param pipCount The number of armor or structure pips to add
+ * @param sheet The record sheet being printed.
+ * @param group The group element that contains the rect elements that
+ * mark the dimensions of the area on the armor or structure diagram.
+ * @param pipCount The number of armor or structure pips to add
+ * @param alternateMethod If the armor pips should be attempted to be grouped in 5s
*/
- static void addPips(PrintRecordSheet sheet, Element group, int pipCount) {
+ static void addPips(PrintRecordSheet sheet, Element group, int pipCount, boolean alternateMethod) {
addPips(sheet, group, pipCount, PrintRecordSheet.PipType.CIRCLE, 0.5,
- PrintRecordSheet.FILL_WHITE);
+ PrintRecordSheet.FILL_WHITE, alternateMethod);
}
private ArmorPipLayout(PrintRecordSheet sheet, Element group, PrintRecordSheet.PipType pipType,
@@ -298,14 +296,109 @@ private Bounds processRegions() {
return null;
}
+ private Iterable iterateRegionsFromMiddle() {
+ return () -> new Iterator<>() {
+ private Bounds[] r = regions.values().toArray(new Bounds[0]);
+ private int left = regions.size() / 2 - 1;
+ private int right = regions.size() / 2;
+ private boolean nextRight = true;
+
+ @Override
+ public boolean hasNext() {
+ if (nextRight) {
+ return right < r.length;
+ } else {
+ return left >= 0;
+ }
+ }
+
+ @Override
+ public Bounds next() {
+ Bounds ret;
+ if (nextRight) {
+ ret = r[right++];
+ } else {
+ ret = r[left--];
+ }
+ nextRight = !nextRight;
+ return ret;
+ }
+ };
+ }
+
+ void process(int pipCount, boolean alternate) {
+ if (!alternate) {
+ process(pipCount);
+ return;
+ }
+ int attempts = 0;
+ double diameter = regions.firstEntry().getValue().height();
+ double originalDiameter = diameter;
+
+ int remaining;
+ List pips;
+ do {
+ remaining = pipCount;
+ pips = new ArrayList<>(pipCount);
+ for (Bounds bbox : iterateRegionsFromMiddle()) {
+ int capacity = (int)(bbox.width() / diameter);
+ capacity -= capacity / 6;
+
+ int groups = Math.min(remaining / 5, capacity / 5);
+ remaining -= groups * 5;
+ capacity -= groups * 5;
+ int leftovers = 0;
+ if ((remaining % 5 != 0) && (capacity >= remaining % 5)) {
+ leftovers = remaining % 5;
+ remaining -= leftovers;
+ }
+
+ double totalWidth = groups * diameter * 6;
+ if (leftovers > 0) {
+ totalWidth += leftovers * diameter;
+ } else {
+ totalWidth -= diameter;
+ }
+
+ double posY = bbox.top;
+ double posX = bbox.centerX() - totalWidth / 2;
+ for (int i = 0; i < groups; i++) {
+ for (int j = 0; j < 5; j++) {
+ pips.add(new Point2D.Double(posX, posY));
+ posX += diameter;
+ }
+ posX += diameter;
+ }
+ for (int i = 0; i < leftovers; i++) {
+ pips.add(new Point2D.Double(posX, posY));
+ posX += diameter;
+ }
+ if (remaining == 0) {
+ break;
+ }
+ }
+ if (remaining > 0) {
+ attempts++;
+ if (attempts > 5) {
+ process(pipCount);
+ return;
+ }
+ diameter *= 0.9;
+ }
+ } while (remaining > 0);
+
+ for (var pip : pips) {
+ group.appendChild(sheet.createPip(pip.x, pip.y + (originalDiameter / 2 - diameter / 2.2), diameter / 2.2, strokeWidth, pipType, fill));
+ }
+ }
+
/**
* Performs the calculations to lay out the pips and adds them to the document.
*
* @param pipCount The number of pips to place in the region
*/
- void process(int pipCount) {
- /*
- * Estimate the number of rows required by finding the height of a rectangle
+ private void process(int pipCount) {
+ /* Estimate the number of rows required by finding the height of a rectangle
* with an area of pipCount that has the same aspect ratio as the bounding box.
*/
int nRows = Math.max(1, (int) Math.round(Math.sqrt(pipCount * bounds.height() / bounds.width())));
diff --git a/megameklab/src/megameklab/printing/IdConstants.java b/megameklab/src/megameklab/printing/IdConstants.java
index cf9a9dbc9..18d9249d7 100644
--- a/megameklab/src/megameklab/printing/IdConstants.java
+++ b/megameklab/src/megameklab/printing/IdConstants.java
@@ -29,6 +29,7 @@ public interface IdConstants {
String TITLE = "title";
String UNIT_SCALE = "unitScale";
String ROW_SHADING = "tableshading";
+ String FRAME = "frame";
String TYPE = "type";
String TYPE2 = "type2";
diff --git a/megameklab/src/megameklab/printing/PrintAero.java b/megameklab/src/megameklab/printing/PrintAero.java
index 553479519..fbe13f5d5 100644
--- a/megameklab/src/megameklab/printing/PrintAero.java
+++ b/megameklab/src/megameklab/printing/PrintAero.java
@@ -136,10 +136,10 @@ protected void writeTextFields() {
@Override
protected void drawArmorStructurePips() {
super.drawArmorStructurePips();
- Element element = getSVGDocument().getElementById(SI_PIPS);
+ Element element = getElementById(SI_PIPS);
if (null != element) {
ArmorPipLayout.addPips(this, element, aero.get0SI(),
- PipType.CIRCLE, 0.5, FILL_WHITE);
+ PipType.CIRCLE, 0.5, FILL_WHITE, useAlternateArmorGrouping());
}
}
@@ -277,6 +277,11 @@ protected String formatRun() {
return Integer.toString(getEntity().getRunMP());
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ return true;
+ }
+
@Override
protected boolean includeReferenceCharts() {
return options.showReferenceCharts();
diff --git a/megameklab/src/megameklab/printing/PrintBattleArmor.java b/megameklab/src/megameklab/printing/PrintBattleArmor.java
index 0c510ca98..dceee3a8d 100644
--- a/megameklab/src/megameklab/printing/PrintBattleArmor.java
+++ b/megameklab/src/megameklab/printing/PrintBattleArmor.java
@@ -140,6 +140,11 @@ protected String formatWalk() {
}
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ return false;
+ }
+
@Override
public String formatMiscNotes() {
final StringJoiner sj = new StringJoiner(" ");
diff --git a/megameklab/src/megameklab/printing/PrintCapitalShip.java b/megameklab/src/megameklab/printing/PrintCapitalShip.java
index fb97656f8..f311aae3b 100644
--- a/megameklab/src/megameklab/printing/PrintCapitalShip.java
+++ b/megameklab/src/megameklab/printing/PrintCapitalShip.java
@@ -371,4 +371,9 @@ private Element createPip(double pipWidth, double pipHeight, String fillColor,
box.setAttributeNS(null, SVGConstants.SVG_FILL_ATTRIBUTE, fillColor);
return box;
}
+
+ @Override
+ public boolean supportsAlternateArmorGrouping() {
+ return false;
+ }
}
diff --git a/megameklab/src/megameklab/printing/PrintDropship.java b/megameklab/src/megameklab/printing/PrintDropship.java
index ef68d1aa2..6ea841343 100644
--- a/megameklab/src/megameklab/printing/PrintDropship.java
+++ b/megameklab/src/megameklab/printing/PrintDropship.java
@@ -356,4 +356,9 @@ public String formatFeatures() {
}
return sj.toString();
}
+
+ @Override
+ public boolean supportsAlternateArmorGrouping() {
+ return true;
+ }
}
diff --git a/megameklab/src/megameklab/printing/PrintEntity.java b/megameklab/src/megameklab/printing/PrintEntity.java
index ee92b22f6..e037a2324 100644
--- a/megameklab/src/megameklab/printing/PrintEntity.java
+++ b/megameklab/src/megameklab/printing/PrintEntity.java
@@ -397,18 +397,19 @@ protected void drawArmorStructurePips() {
Element element;
for (int loc = firstArmorLocation(); loc < getEntity().locations(); loc++) {
if ((getEntity() instanceof Mek) && getEntity().isSuperHeavy() && (loc == Mek.LOC_HEAD)) {
- element = getSVGDocument().getElementById(ARMOR_PIPS + getEntity().getLocationAbbr(loc) + "_SH");
+ element = getElementById(ARMOR_PIPS + getEntity().getLocationAbbr(loc) + "_SH");
} else {
- element = getSVGDocument().getElementById(ARMOR_PIPS + getEntity().getLocationAbbr(loc));
+ element = getElementById(ARMOR_PIPS + getEntity().getLocationAbbr(loc));
}
if (null != element) {
ArmorPipLayout.addPips(this, element, getEntity().getOArmor(loc),
- PipType.forAT(getEntity().getArmorType(loc)), 0.5, FILL_WHITE);
+ PipType.forAT(getEntity().getArmorType(loc)), 0.5, FILL_WHITE, useAlternateArmorGrouping());
}
- element = getSVGDocument().getElementById(STRUCTURE_PIPS + getEntity().getLocationAbbr(loc));
+
+ element = getElementById(STRUCTURE_PIPS + getEntity().getLocationAbbr(loc));
if (null != element) {
ArmorPipLayout.addPips(this, element, getEntity().getOInternal(loc),
- PipType.CIRCLE, 0.5, structurePipFill());
+ PipType.CIRCLE, 0.5, structurePipFill(), useAlternateArmorGrouping());
}
}
}
@@ -620,4 +621,20 @@ private String entityName() {
+ (StringUtility.isNullOrBlank(getEntity().getModel()) ? "" : " " + getEntity().getModel());
}
+ protected boolean useAlternateArmorGrouping() {
+ return options.useAlternateArmorGrouping() && supportsAlternateArmorGrouping();
+ }
+
+ protected abstract boolean supportsAlternateArmorGrouping();
+
+ protected Element getElementById(String id) {
+ Element e = null;
+ if (useAlternateArmorGrouping()) {
+ e = getSVGDocument().getElementById(id + "grouped");
+ }
+ if (e == null) {
+ e = getSVGDocument().getElementById(id);
+ }
+ return e;
+ }
}
diff --git a/megameklab/src/megameklab/printing/PrintInfantry.java b/megameklab/src/megameklab/printing/PrintInfantry.java
index 4813b1f72..2cf85b2e3 100644
--- a/megameklab/src/megameklab/printing/PrintInfantry.java
+++ b/megameklab/src/megameklab/printing/PrintInfantry.java
@@ -434,6 +434,11 @@ protected void drawArmor() {
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ return false;
+ }
+
private static final int[][] RANGE_MODS = {
{ 0 },
{ -2, 0, 2, 4 },
diff --git a/megameklab/src/megameklab/printing/PrintMek.java b/megameklab/src/megameklab/printing/PrintMek.java
index 2eb3acc89..cd677ff8e 100644
--- a/megameklab/src/megameklab/printing/PrintMek.java
+++ b/megameklab/src/megameklab/printing/PrintMek.java
@@ -32,6 +32,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.svg.GetSVGDocument;
import org.w3c.dom.svg.SVGRectElement;
import megamek.common.*;
@@ -179,12 +180,12 @@ private void printShields() {
element = getSVGDocument().getElementById(SHIELD_DC + loc);
if (null != element) {
ArmorPipLayout.addPips(this, element, m.getCurrentDamageCapacity(mek, m.getLocation()),
- PipType.CIRCLE);
+ PipType.CIRCLE, useAlternateArmorGrouping());
}
element = getSVGDocument().getElementById(SHIELD_DA + loc);
if (null != element) {
ArmorPipLayout.addPips(this, element, m.getDamageAbsorption(mek, m.getLocation()),
- PipType.DIAMOND);
+ PipType.DIAMOND, useAlternateArmorGrouping());
}
}
}
@@ -350,45 +351,47 @@ private boolean copyPipPattern(NodeList nl, String parentName) {
@Override
protected void drawArmorStructurePips() {
final String FORMAT = "( %d )";
+ boolean alternateMethod = useAlternateArmorGrouping();
Element element;
- boolean structComplete = (mek instanceof BipedMek) && loadISPips();
+ boolean structComplete = !alternateMethod && (mek instanceof BipedMek) && loadISPips();
for (int loc = 0; loc < mek.locations(); loc++) {
boolean frontComplete = false;
boolean rearComplete = false;
if (mek.isSuperHeavy() && (loc == Mek.LOC_HEAD)) {
- element = getSVGDocument().getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc) + "_SH");
+ element = getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc) + "_SH");
} else {
// For consistency, only use the canon pip layout on non-superheavies.
// Otherwise superheavies may get a mix of pattern types.
- if (!mek.isSuperHeavy() && (mek instanceof BipedMek)) {
+ if (!mek.isSuperHeavy() && (mek instanceof BipedMek) && !alternateMethod) {
frontComplete = loadArmorPips(loc, false);
rearComplete = !mek.hasRearArmor(loc) || loadArmorPips(loc, true);
if (frontComplete && rearComplete) {
continue;
}
}
- element = getSVGDocument().getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc));
+ element = getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc));
}
+
if ((null != element) && !frontComplete) {
ArmorPipLayout.addPips(this, element, mek.getOArmor(loc),
- PipType.forAT(mek.getArmorType(loc)));
+ PipType.forAT(mek.getArmorType(loc)), alternateMethod);
}
if ((loc > Mek.LOC_HEAD) && !structComplete) {
- element = getSVGDocument().getElementById(IS_PIPS + mek.getLocationAbbr(loc));
+ element = getElementById(IS_PIPS + mek.getLocationAbbr(loc));
if (null != element) {
- ArmorPipLayout.addPips(this, element, mek.getOInternal(loc));
+ ArmorPipLayout.addPips(this, element, mek.getOInternal(loc), alternateMethod);
}
}
if (mek.hasRearArmor(loc) && !rearComplete) {
- element = getSVGDocument().getElementById(TEXT_ARMOR + mek.getLocationAbbr(loc) + "R");
+ element = getElementById(TEXT_ARMOR + mek.getLocationAbbr(loc) + "R");
if (null != element) {
element.setTextContent(String.format(FORMAT, mek.getOArmor(loc, true)));
}
- element = getSVGDocument().getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc) + "R");
+ element = getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc) + "R");
if (null != element) {
ArmorPipLayout.addPips(this, element, mek.getOArmor(loc, true),
- PipType.forAT(mek.getArmorType(loc)));
+ PipType.forAT(mek.getArmorType(loc)), alternateMethod);
}
}
@@ -640,6 +643,11 @@ protected String formatJump() {
}
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ return true;
+ }
+
private String formatHeatSinkType() {
if (mek.hasLaserHeatSinks()) {
return "Laser Heat Sinks:";
diff --git a/megameklab/src/megameklab/printing/PrintProtoMek.java b/megameklab/src/megameklab/printing/PrintProtoMek.java
index ae909e7a8..343fbb94a 100644
--- a/megameklab/src/megameklab/printing/PrintProtoMek.java
+++ b/megameklab/src/megameklab/printing/PrintProtoMek.java
@@ -170,6 +170,11 @@ protected String formatRun() {
}
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ return false;
+ }
+
@Override
protected void drawArmor() {
super.drawArmor();
diff --git a/megameklab/src/megameklab/printing/PrintRecordSheet.java b/megameklab/src/megameklab/printing/PrintRecordSheet.java
index 83062aa79..c3d45c8c6 100644
--- a/megameklab/src/megameklab/printing/PrintRecordSheet.java
+++ b/megameklab/src/megameklab/printing/PrintRecordSheet.java
@@ -31,18 +31,14 @@
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import java.util.function.Consumer;
import javax.imageio.ImageIO;
import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.anim.dom.SVGLocatableSupport;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgentAdapter;
@@ -270,6 +266,27 @@ private void shadeTableRows() {
}
}
+ private void makeFrameless() {
+ for (Element e : getElementsByClass(FRAME)) {
+ hideElement(e.getAttributes().getNamedItem("id").getNodeValue(), options.isFrameless());
+ if (options.isFrameless()) {
+ // I have no idea with this loop is necessary
+ // Hiding a parent should hide its children
+ // But without it pilot data sneaks onto the sheet
+ for (int i = 0; i < e.getChildNodes().getLength(); i++) {
+ var c = e.getChildNodes().item(i);
+ if (!(c instanceof SVGOMElement child)) {
+ continue;
+ }
+ if (child.getId() == null) {
+ child.setId(UUID.randomUUID().toString());
+ }
+ hideElement(child.getId(), true);
+ }
+ }
+ }
+ }
+
/**
* Creates a {@link Document} from an svg image file
*
@@ -367,6 +384,7 @@ public boolean createDocument(int pageIndex, PageFormat pageFormat, boolean addM
}
processImage(pageIndex - firstPage, pageFormat);
shadeTableRows();
+ makeFrameless();
return true;
}
diff --git a/megameklab/src/megameklab/printing/PrintTank.java b/megameklab/src/megameklab/printing/PrintTank.java
index c546ac2c6..e8ff0cfd4 100644
--- a/megameklab/src/megameklab/printing/PrintTank.java
+++ b/megameklab/src/megameklab/printing/PrintTank.java
@@ -169,6 +169,17 @@ protected String formatRun() {
}
}
+ @Override
+ protected boolean supportsAlternateArmorGrouping() {
+ if (tank.isSuperHeavy() && !(tank instanceof VTOL)) {
+ return false;
+ }
+ if (tank.isNaval() && !tank.hasNoDualTurret()) {
+ return false;
+ }
+ return true;
+ }
+
@Override
public String formatFeatures() {
StringJoiner sj = new StringJoiner(", ");
diff --git a/megameklab/src/megameklab/printing/RecordSheetOptions.java b/megameklab/src/megameklab/printing/RecordSheetOptions.java
index 90d181c76..22541eacc 100644
--- a/megameklab/src/megameklab/printing/RecordSheetOptions.java
+++ b/megameklab/src/megameklab/printing/RecordSheetOptions.java
@@ -17,7 +17,7 @@
/**
* A set of options for controlling what is displayed on the record sheet
- *
+ *
* @author neoancient
*
*/
@@ -35,6 +35,8 @@ public class RecordSheetOptions {
private boolean referenceCharts;
private boolean condensedReferenceCharts;
private boolean rowShading;
+ private boolean alternateArmorGrouping;
+ private boolean frameless;
public RecordSheetOptions() {
String paper = CConfig.getParam(CConfig.RS_PAPER_SIZE, PaperSize.US_LETTER.name());
@@ -54,6 +56,8 @@ public RecordSheetOptions() {
this.referenceCharts = CConfig.getBooleanParam(CConfig.RS_REFERENCE);
this.condensedReferenceCharts = CConfig.getBooleanParam(CConfig.RS_CONDENSED_REFERENCE);
this.rowShading = CConfig.getBooleanParam(CConfig.RS_ROW_SHADING);
+ this.alternateArmorGrouping = CConfig.getBooleanParam(CConfig.RS_ARMOR_GROUPING);
+ this.frameless = CConfig.getBooleanParam(CConfig.RS_FRAMELESS);
}
public RecordSheetOptions(RecordSheetOptions options) {
@@ -69,6 +73,8 @@ public RecordSheetOptions(RecordSheetOptions options) {
referenceCharts = options.referenceCharts;
condensedReferenceCharts = options.condensedReferenceCharts;
rowShading = options.rowShading;
+ alternateArmorGrouping = options.alternateArmorGrouping;
+ frameless = options.frameless;
}
public PaperSize getPaperSize() {
@@ -94,11 +100,11 @@ public boolean showRole() {
public boolean showHeatProfile() {
return heatProfile;
}
-
+
public void setPilotData(boolean pilotData) {
this.pilotData = pilotData;
}
-
+
public boolean showEraIcon() {
return eraIcon;
}
@@ -123,6 +129,14 @@ public boolean useRowShading() {
return rowShading;
}
+ public boolean useAlternateArmorGrouping() {
+ return alternateArmorGrouping;
+ }
+
+ public boolean isFrameless() {
+ return frameless;
+ }
+
public void setPaperSize(PaperSize paperSize) {
this.paperSize = paperSize;
}
@@ -130,7 +144,7 @@ public void setPaperSize(PaperSize paperSize) {
public void setColor(boolean color) {
this.color = color;
}
-
+
public void setEraIcon(boolean eraIcon) {
this.eraIcon = eraIcon;
}
@@ -162,4 +176,12 @@ public void setCondensedReferenceCharts(boolean charts) {
public void setRowShading(boolean rowShading) {
this.rowShading = rowShading;
}
+
+ public void setAlternateArmorGrouping(boolean alternateArmorGrouping) {
+ this.alternateArmorGrouping = alternateArmorGrouping;
+ }
+
+ public void setFrameless(boolean frameless) {
+ this.frameless = frameless;
+ }
}
diff --git a/megameklab/src/megameklab/ui/dialog/settings/ExportSettingsPanel.java b/megameklab/src/megameklab/ui/dialog/settings/ExportSettingsPanel.java
index f0796a4b9..55afa512a 100644
--- a/megameklab/src/megameklab/ui/dialog/settings/ExportSettingsPanel.java
+++ b/megameklab/src/megameklab/ui/dialog/settings/ExportSettingsPanel.java
@@ -58,6 +58,8 @@ class ExportSettingsPanel extends JPanel {
private final MMComboBox mekChassis =
new MMComboBox<>("Mek Names", MekChassisArrangement.values());
private final JCheckBox chkRowShading = new JCheckBox();
+ private final JCheckBox chkAlternateArmorGrouping = new JCheckBox();
+ private final JCheckBox chkFrameless = new JCheckBox();
ExportSettingsPanel() {
ResourceBundle resourceMap = ResourceBundle.getBundle("megameklab.resources.Dialogs");
@@ -103,6 +105,14 @@ class ExportSettingsPanel extends JPanel {
chkColor.setToolTipText(resourceMap.getString("ConfigurationDialog.chkColor.tooltip"));
chkColor.setSelected(CConfig.getBooleanParam(CConfig.RS_COLOR));
+ chkAlternateArmorGrouping.setText(resourceMap.getString("ConfigurationDialog.chkAlternateArmorGrouping.text"));
+ chkAlternateArmorGrouping.setToolTipText(resourceMap.getString("ConfigurationDialog.chkAlternateArmorGrouping.tooltip"));
+ chkAlternateArmorGrouping.setSelected(CConfig.getBooleanParam(CConfig.RS_ARMOR_GROUPING));
+
+ chkFrameless.setText(resourceMap.getString("ConfigurationDialog.chkFrameless.text"));
+ chkFrameless.setToolTipText(resourceMap.getString("ConfigurationDialog.chkFrameless.tooltip"));
+ chkFrameless.setSelected(CConfig.getBooleanParam(CConfig.RS_FRAMELESS));
+
chkRowShading.setText(resourceMap.getString("ConfigurationDialog.chkRowShading.text"));
chkRowShading.setToolTipText(resourceMap.getString("ConfigurationDialog.chkRowShading.tooltip"));
chkRowShading.setSelected(CConfig.getBooleanParam(CConfig.RS_ROW_SHADING));
@@ -183,9 +193,11 @@ class ExportSettingsPanel extends JPanel {
gridPanel.add(chkShowRole);
gridPanel.add(chkHeatProfile);
gridPanel.add(chkTacOpsHeat);
+ gridPanel.add(chkAlternateArmorGrouping);
+ gridPanel.add(chkFrameless);
gridPanel.add(mekNameLine);
gridPanel.add(scalePanel);
- SpringUtilities.makeCompactGrid(gridPanel, 15, 1, 0, 0, 15, 8);
+ SpringUtilities.makeCompactGrid(gridPanel, 17, 1, 0, 0, 15, 6);
gridPanel.setBorder(new EmptyBorder(20, 30, 20, 30));
setLayout(new FlowLayout(FlowLayout.LEFT));
add(gridPanel);
@@ -210,6 +222,8 @@ Map getRecordSheetSettings() {
recordSheetSettings.put(CConfig.RS_SCALE_FACTOR, Integer.toString(txtScale.getIntVal(getDefaultScale())));
recordSheetSettings.put(CConfig.RS_MEK_NAMES,
Objects.requireNonNullElse(mekChassis.getSelectedItem(), MekChassisArrangement.CLAN_IS).name());
+ recordSheetSettings.put(CConfig.RS_ARMOR_GROUPING, Boolean.toString(chkAlternateArmorGrouping.isSelected()));
+ recordSheetSettings.put(CConfig.RS_FRAMELESS, Boolean.toString(chkFrameless.isSelected()));
return recordSheetSettings;
}
@@ -238,4 +252,4 @@ public Component getListCellRendererComponent(JList list, Object value, int i
private String displayName(Object value) {
return (value instanceof MekChassisArrangement) ? ((MekChassisArrangement) value).getDisplayName() : "";
}
-}
\ No newline at end of file
+}
diff --git a/megameklab/src/megameklab/util/CConfig.java b/megameklab/src/megameklab/util/CConfig.java
index a0e49d283..4ef5df454 100644
--- a/megameklab/src/megameklab/util/CConfig.java
+++ b/megameklab/src/megameklab/util/CConfig.java
@@ -112,6 +112,8 @@ public final class CConfig {
public static final String RS_SCALE_FACTOR = "rs_scale_factor";
public static final String RS_SCALE_UNITS = "rs_scale_units";
public static final String RS_MEK_NAMES = "rs_mek_names";
+ public static final String RS_ARMOR_GROUPING = "rs_armor_grouping";
+ public static final String RS_FRAMELESS = "rs_frameless";
public static final String NAG_EQUIPMENT_CTRLCLICK = "nag_equipment_ctrlclick";
public static final String NAG_IMPORT_SETTINGS = "nag_import_settings";