From fff6f18175ccb944de3f7f42e4754e2e301cc47d Mon Sep 17 00:00:00 2001 From: RaozSpaz Date: Sat, 4 May 2024 18:12:37 -0500 Subject: [PATCH] Turret Alpha V0.1.4.5 Factions 3145 Fixed Typo in Special Turret 3025/3039 RATs Removed initial space in all basic RATs in order to reduce log spam --- .../data/mechfiles/newturrets/Medium Sniper Turret 3075.blk | 2 +- megamek/data/rat/Turret RATs/2300/2300 A.txt | 1 - megamek/data/rat/Turret RATs/2300/2300 B.txt | 1 - megamek/data/rat/Turret RATs/2300/2300 C.txt | 1 - megamek/data/rat/Turret RATs/2300/2300 D.txt | 1 - megamek/data/rat/Turret RATs/2300/2300 F.txt | 1 - megamek/data/rat/Turret RATs/2750/2750 A.txt | 1 - megamek/data/rat/Turret RATs/2750/2750 B.txt | 1 - megamek/data/rat/Turret RATs/2750/2750 C.txt | 1 - megamek/data/rat/Turret RATs/2750/2750 D.txt | 1 - megamek/data/rat/Turret RATs/3025/3025 A.txt | 1 - megamek/data/rat/Turret RATs/3025/3025 B.txt | 1 - megamek/data/rat/Turret RATs/3025/3025 C.txt | 1 - megamek/data/rat/Turret RATs/3075/3075 A.txt | 1 - megamek/data/rat/Turret RATs/3075/3075 B.txt | 1 - megamek/data/rat/Turret RATs/3075/3075 C.txt | 1 - megamek/data/rat/Turret RATs/3075/3075 D.txt | 1 - megamek/data/rat/Turret RATs/3075/3075 F.txt | 1 - megamek/data/rat/Turret RATs/3085/3085 A.txt | 1 - megamek/data/rat/Turret RATs/3085/3085 B.txt | 1 - megamek/data/rat/Turret RATs/3085/3085 C.txt | 1 - megamek/data/rat/Turret RATs/3085/3085 D.txt | 1 - megamek/data/rat/Turret RATs/3085/3085 F.txt | 1 - megamek/data/rat/Turret RATs/3145/3145 A.txt | 1 - megamek/data/rat/Turret RATs/3145/3145 B.txt | 1 - megamek/data/rat/Turret RATs/3145/3145 C.txt | 1 - megamek/data/rat/Turret RATs/3145/3145 D.txt | 1 - megamek/data/rat/Turret RATs/3145/3145 F.txt | 1 - .../rat/Turret RATs/Actual Turrets/AntiAir Turrets 3075.txt | 4 ++-- .../rat/Turret RATs/Actual Turrets/Special Turrets 3025.txt | 4 ++-- .../rat/Turret RATs/Actual Turrets/Special Turrets 3039.txt | 4 ++-- 31 files changed, 7 insertions(+), 34 deletions(-) diff --git a/megamek/data/mechfiles/newturrets/Medium Sniper Turret 3075.blk b/megamek/data/mechfiles/newturrets/Medium Sniper Turret 3075.blk index f7cf609bb07..9927217ec00 100644 --- a/megamek/data/mechfiles/newturrets/Medium Sniper Turret 3075.blk +++ b/megamek/data/mechfiles/newturrets/Medium Sniper Turret 3075.blk @@ -13,7 +13,7 @@ GunEmplacement Medium Sniper Turret -(3075)) +(3075) 3075 diff --git a/megamek/data/rat/Turret RATs/2300/2300 A.txt b/megamek/data/rat/Turret RATs/2300/2300 A.txt index 26a412409a4..8c833b6e851 100644 --- a/megamek/data/rat/Turret RATs/2300/2300 A.txt +++ b/megamek/data/rat/Turret RATs/2300/2300 A.txt @@ -1,5 +1,4 @@ Turrets 2300 A - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 2300, 20 diff --git a/megamek/data/rat/Turret RATs/2300/2300 B.txt b/megamek/data/rat/Turret RATs/2300/2300 B.txt index 3579d7061c1..34894e8475e 100644 --- a/megamek/data/rat/Turret RATs/2300/2300 B.txt +++ b/megamek/data/rat/Turret RATs/2300/2300 B.txt @@ -1,5 +1,4 @@ Turrets 2300 B - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 2300, 20 diff --git a/megamek/data/rat/Turret RATs/2300/2300 C.txt b/megamek/data/rat/Turret RATs/2300/2300 C.txt index 597700ebfbd..92d737d6c29 100644 --- a/megamek/data/rat/Turret RATs/2300/2300 C.txt +++ b/megamek/data/rat/Turret RATs/2300/2300 C.txt @@ -1,5 +1,4 @@ Turrets 2300 C - @DirectFire Turrets 2300, 25 @InDirectFire Turrets 2300, 35 @AntiAir Turrets 2300, 25 diff --git a/megamek/data/rat/Turret RATs/2300/2300 D.txt b/megamek/data/rat/Turret RATs/2300/2300 D.txt index a86df3ad9e7..f20438a0d5d 100644 --- a/megamek/data/rat/Turret RATs/2300/2300 D.txt +++ b/megamek/data/rat/Turret RATs/2300/2300 D.txt @@ -1,5 +1,4 @@ Turrets 2300 D - @DirectFire Turrets 2300, 30 @InDirectFire Turrets 2300, 30 @AntiAir Turrets 2300, 30 diff --git a/megamek/data/rat/Turret RATs/2300/2300 F.txt b/megamek/data/rat/Turret RATs/2300/2300 F.txt index e9b4640605d..533686c716f 100644 --- a/megamek/data/rat/Turret RATs/2300/2300 F.txt +++ b/megamek/data/rat/Turret RATs/2300/2300 F.txt @@ -1,5 +1,4 @@ Turrets 2300 F - @DirectFire Turrets 2300, 50 @InDirectFire Turrets 2300, 20 @AntiAir Turrets 2300, 30 \ No newline at end of file diff --git a/megamek/data/rat/Turret RATs/2750/2750 A.txt b/megamek/data/rat/Turret RATs/2750/2750 A.txt index 07a072dfca9..de8d33cd882 100644 --- a/megamek/data/rat/Turret RATs/2750/2750 A.txt +++ b/megamek/data/rat/Turret RATs/2750/2750 A.txt @@ -1,5 +1,4 @@ Turrets 2750 A - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 2300, 20 diff --git a/megamek/data/rat/Turret RATs/2750/2750 B.txt b/megamek/data/rat/Turret RATs/2750/2750 B.txt index 6735da565be..b31f59d9404 100644 --- a/megamek/data/rat/Turret RATs/2750/2750 B.txt +++ b/megamek/data/rat/Turret RATs/2750/2750 B.txt @@ -1,5 +1,4 @@ Turrets 2750 B - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 2300, 20 diff --git a/megamek/data/rat/Turret RATs/2750/2750 C.txt b/megamek/data/rat/Turret RATs/2750/2750 C.txt index 1ca4bf75ad0..6fef546d0d9 100644 --- a/megamek/data/rat/Turret RATs/2750/2750 C.txt +++ b/megamek/data/rat/Turret RATs/2750/2750 C.txt @@ -1,5 +1,4 @@ Turrets 2750 C - @DirectFire Turrets 2300, 25 @InDirectFire Turrets 2300, 35 @AntiAir Turrets 2300, 25 diff --git a/megamek/data/rat/Turret RATs/2750/2750 D.txt b/megamek/data/rat/Turret RATs/2750/2750 D.txt index 3962e386395..34fb12aaee8 100644 --- a/megamek/data/rat/Turret RATs/2750/2750 D.txt +++ b/megamek/data/rat/Turret RATs/2750/2750 D.txt @@ -1,5 +1,4 @@ Turrets 2750 D - @DirectFire Turrets 2300, 30 @InDirectFire Turrets 2300, 30 @AntiAir Turrets 2300, 30 diff --git a/megamek/data/rat/Turret RATs/3025/3025 A.txt b/megamek/data/rat/Turret RATs/3025/3025 A.txt index 4f659967fbb..119ec25aa89 100644 --- a/megamek/data/rat/Turret RATs/3025/3025 A.txt +++ b/megamek/data/rat/Turret RATs/3025/3025 A.txt @@ -1,5 +1,4 @@ Turrets 3025 A - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 3025, 20 diff --git a/megamek/data/rat/Turret RATs/3025/3025 B.txt b/megamek/data/rat/Turret RATs/3025/3025 B.txt index 67029a26951..b7eaeca7f1f 100644 --- a/megamek/data/rat/Turret RATs/3025/3025 B.txt +++ b/megamek/data/rat/Turret RATs/3025/3025 B.txt @@ -1,5 +1,4 @@ Turrets 3025 B - @DirectFire Turrets 2300, 20 @InDirectFire Turrets 2300, 40 @AntiAir Turrets 3025, 20 diff --git a/megamek/data/rat/Turret RATs/3025/3025 C.txt b/megamek/data/rat/Turret RATs/3025/3025 C.txt index 196bae2aaec..4c42c74c3e7 100644 --- a/megamek/data/rat/Turret RATs/3025/3025 C.txt +++ b/megamek/data/rat/Turret RATs/3025/3025 C.txt @@ -1,5 +1,4 @@ Turrets 3025 C - @DirectFire Turrets 2300, 25 @InDirectFire Turrets 2300, 35 @AntiAir Turrets 3025, 25 diff --git a/megamek/data/rat/Turret RATs/3075/3075 A.txt b/megamek/data/rat/Turret RATs/3075/3075 A.txt index 0dc77a3a475..1e210f8f967 100644 --- a/megamek/data/rat/Turret RATs/3075/3075 A.txt +++ b/megamek/data/rat/Turret RATs/3075/3075 A.txt @@ -1,5 +1,4 @@ Turrets 3075 A - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 35 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3075/3075 B.txt b/megamek/data/rat/Turret RATs/3075/3075 B.txt index 4f601c02ea3..9d9572b18bd 100644 --- a/megamek/data/rat/Turret RATs/3075/3075 B.txt +++ b/megamek/data/rat/Turret RATs/3075/3075 B.txt @@ -1,5 +1,4 @@ Turrets 3075 B - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 40 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3075/3075 C.txt b/megamek/data/rat/Turret RATs/3075/3075 C.txt index 2b13ce7eb51..7fee17cceb0 100644 --- a/megamek/data/rat/Turret RATs/3075/3075 C.txt +++ b/megamek/data/rat/Turret RATs/3075/3075 C.txt @@ -1,5 +1,4 @@ Turrets 3075 C - @DirectFire Turrets 3075, 25 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 25 diff --git a/megamek/data/rat/Turret RATs/3075/3075 D.txt b/megamek/data/rat/Turret RATs/3075/3075 D.txt index 2fe1f0ac083..ad5603db692 100644 --- a/megamek/data/rat/Turret RATs/3075/3075 D.txt +++ b/megamek/data/rat/Turret RATs/3075/3075 D.txt @@ -1,5 +1,4 @@ Turrets 3075 D - @DirectFire Turrets 3075, 30 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 diff --git a/megamek/data/rat/Turret RATs/3075/3075 F.txt b/megamek/data/rat/Turret RATs/3075/3075 F.txt index 5b928c12afd..9169a28db54 100644 --- a/megamek/data/rat/Turret RATs/3075/3075 F.txt +++ b/megamek/data/rat/Turret RATs/3075/3075 F.txt @@ -1,5 +1,4 @@ Turrets 3075 F - @DirectFire Turrets 30675, 40 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 \ No newline at end of file diff --git a/megamek/data/rat/Turret RATs/3085/3085 A.txt b/megamek/data/rat/Turret RATs/3085/3085 A.txt index 7acc5c34fc9..914181d1e1b 100644 --- a/megamek/data/rat/Turret RATs/3085/3085 A.txt +++ b/megamek/data/rat/Turret RATs/3085/3085 A.txt @@ -1,5 +1,4 @@ Turrets 3085 A - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 35 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3085/3085 B.txt b/megamek/data/rat/Turret RATs/3085/3085 B.txt index 9b35c3e04e8..88314376a4b 100644 --- a/megamek/data/rat/Turret RATs/3085/3085 B.txt +++ b/megamek/data/rat/Turret RATs/3085/3085 B.txt @@ -1,5 +1,4 @@ Turrets 3085 B - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 40 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3085/3085 C.txt b/megamek/data/rat/Turret RATs/3085/3085 C.txt index d9c33955375..53027ad75eb 100644 --- a/megamek/data/rat/Turret RATs/3085/3085 C.txt +++ b/megamek/data/rat/Turret RATs/3085/3085 C.txt @@ -1,5 +1,4 @@ Turrets 3085 C - @DirectFire Turrets 3075, 25 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 25 diff --git a/megamek/data/rat/Turret RATs/3085/3085 D.txt b/megamek/data/rat/Turret RATs/3085/3085 D.txt index 1fc662dc5e2..535597b66c2 100644 --- a/megamek/data/rat/Turret RATs/3085/3085 D.txt +++ b/megamek/data/rat/Turret RATs/3085/3085 D.txt @@ -1,5 +1,4 @@ Turrets 3085 D - @DirectFire Turrets 3075, 30 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 diff --git a/megamek/data/rat/Turret RATs/3085/3085 F.txt b/megamek/data/rat/Turret RATs/3085/3085 F.txt index 6907d2c4544..9947cefda50 100644 --- a/megamek/data/rat/Turret RATs/3085/3085 F.txt +++ b/megamek/data/rat/Turret RATs/3085/3085 F.txt @@ -1,5 +1,4 @@ Turrets 3085 F - @DirectFire Turrets 30675, 40 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 diff --git a/megamek/data/rat/Turret RATs/3145/3145 A.txt b/megamek/data/rat/Turret RATs/3145/3145 A.txt index 7f32b41cca7..cc316ad37f1 100644 --- a/megamek/data/rat/Turret RATs/3145/3145 A.txt +++ b/megamek/data/rat/Turret RATs/3145/3145 A.txt @@ -1,5 +1,4 @@ Turrets 3145 A - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 35 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3145/3145 B.txt b/megamek/data/rat/Turret RATs/3145/3145 B.txt index 30f1a773cac..3ef8a5376cb 100644 --- a/megamek/data/rat/Turret RATs/3145/3145 B.txt +++ b/megamek/data/rat/Turret RATs/3145/3145 B.txt @@ -1,5 +1,4 @@ Turrets 3145 B - @DirectFire Turrets 3075, 20 @InDirectFire Turrets 3050, 40 @AntiAir Turrets 3075, 20 diff --git a/megamek/data/rat/Turret RATs/3145/3145 C.txt b/megamek/data/rat/Turret RATs/3145/3145 C.txt index d2121e94316..6c96fbfa8d2 100644 --- a/megamek/data/rat/Turret RATs/3145/3145 C.txt +++ b/megamek/data/rat/Turret RATs/3145/3145 C.txt @@ -1,5 +1,4 @@ Turrets 3145 C - @DirectFire Turrets 3075, 25 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 25 diff --git a/megamek/data/rat/Turret RATs/3145/3145 D.txt b/megamek/data/rat/Turret RATs/3145/3145 D.txt index 80ab1d7f627..102f68545a0 100644 --- a/megamek/data/rat/Turret RATs/3145/3145 D.txt +++ b/megamek/data/rat/Turret RATs/3145/3145 D.txt @@ -1,5 +1,4 @@ Turrets 3145 D - @DirectFire Turrets 3075, 30 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 diff --git a/megamek/data/rat/Turret RATs/3145/3145 F.txt b/megamek/data/rat/Turret RATs/3145/3145 F.txt index 589c3e878f9..c68cad2bbea 100644 --- a/megamek/data/rat/Turret RATs/3145/3145 F.txt +++ b/megamek/data/rat/Turret RATs/3145/3145 F.txt @@ -1,5 +1,4 @@ Turrets 3145 F - @DirectFire Turrets 30675, 40 @InDirectFire Turrets 3050, 30 @AntiAir Turrets 3075, 30 \ No newline at end of file diff --git a/megamek/data/rat/Turret RATs/Actual Turrets/AntiAir Turrets 3075.txt b/megamek/data/rat/Turret RATs/Actual Turrets/AntiAir Turrets 3075.txt index dad65ec4d24..62aa5aaed57 100644 --- a/megamek/data/rat/Turret RATs/Actual Turrets/AntiAir Turrets 3075.txt +++ b/megamek/data/rat/Turret RATs/Actual Turrets/AntiAir Turrets 3075.txt @@ -7,5 +7,5 @@ Heavy Flak Turret (3050), 8 Assault Flak Turret (3025), 4 #Air Defense Emplacements -Medium Air Defense Emplacement (3075), 12 -Assault Air Defense Emplacement (3075), 4 \ No newline at end of file +Medium Air Defense Missile Emplacement (3075), 12 +Assault Air Defense Missile Emplacement (3075), 4 \ No newline at end of file diff --git a/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3025.txt b/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3025.txt index 1d20f2cb685..bcf622325ac 100644 --- a/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3025.txt +++ b/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3025.txt @@ -1,7 +1,7 @@ Special Turrets 3025 #Command Towers -Blaze Medium Turret (3025), 40 -Blaze Heavy Turret (3025), 10 +Medium Blaze Turret (3025), 40 +Heavy Blaze Turret (3025), 10 Medium Command Tower (2300), 20 Calliope Turret (2800), 30 \ No newline at end of file diff --git a/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3039.txt b/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3039.txt index 43619a1ada7..32b40fd8fa0 100644 --- a/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3039.txt +++ b/megamek/data/rat/Turret RATs/Actual Turrets/Special Turrets 3039.txt @@ -1,7 +1,7 @@ Special Turrets 3039 #Command Towers -Blaze Medium Turret (3025), 40 -Blaze Heavy Turret (3025), 10 +Medium Blaze Turret (3025), 40 +Heavy Blaze Turret (3025), 10 Medium Command Tower (3039), 20 Calliope Turret (2800), 30 \ No newline at end of file