Welcome to the Kancolle Wiki!
If you have any questions regarding site content, account registration, etc., please visit the KanColle Wiki Discord

Difference between revisions of "Template:Equipmentlist"

From Kancolle Wiki

Jump to navigation Jump to search

Latest revision as of 23:38, 9 November 2024

[Expand all] [Collapse all] [Toggle all]

Equipment List

Gallery • By Stats • Equipment Types & Icons • Development • Improvement

Main Guns

Small

12cm Single Gun Mount (Kai 2) • 12.7cm Twin Gun Mount (Model A • Model A Kai 2 • Proto Long-barrel Model A Kai 4 • Model B Kai 2 • Model C Kai 2 • Model C Kai 3 • Model C Kai 3 H • Model D Kai 2 • Model D Kai 3)

Foreign	12.7cm Single Gun Mount (Ger) • 120mm/50 Twin Gun Mount (Mod.1936 • Kai A.mod.1937) (Ita) • QF 4.7inch Gun Mk.XII Kai (UK) • 130mm B-13 Twin Gun Mount (Sov) • 13.8cm Twin Gun Mount (Kai) (Fr)

Small HA

10cm Twin HA Gun Mount (+ AAFD • Kai + AAFD Kai) • 12cm Single HA Gun Mount (Model E • Model E Kai) • 12.7cm HA Gun Mount (Single LM • Twin LM • Single Kai 2 • Twin Kai 2) • 12.7cm Twin HA Gun Mount (Model A Kai 3 + AAFD • Model B Kai 4 + AAFD)

Foreign	5inch Single Gun Mount Mk.30 (Mk.30 Kai • Mk.30 Kai + GFCS) (US) • Local Mod. 12.7cm Twin HA Gun Mount (CN) • Local Mod. 10cm Twin HA Gun Mount (CN)

Medium

14 cm	14cm Single Gun Mount • 14cm Twin Gun Mount (Kai • Kai 2)

15-15.5 cm/6 inch	15.2cm Twin Gun Mount (Kai • Kai 2) • 15.5cm Triple Gun Mount (Kai) • 152mm/55 Triple Rapid Fire Gun Mount (Kai) (Ita) • 6inch Triple Rapid Fire Gun Mount Mk.16 (Mk.16 mod.2) (US) • 6inch Mk.XXIII Triple Gun Mount (UK) • 15.2cm Triple Main Gun Mount (Kai) (Fr) • Bofors 15.2cm Twin Gun Mount Model 1930 (Swe) • Bofors 15cm Twin Rapid Fire Gun Mount Mk.9 Model 1938 (Mk.9 Kai + Single Mk.10 Kai) (Swe/NL) • 6inch Twin Rapid Fire Gun Mount Mk.XXI (UK/Au)

20-20.3 cm/8 inch	20.3cm Twin Gun Mount (No.2 • No.3 • Proto No.4) • SKC34 20.3cm Twin Gun Mount (Ger) • 203mm/53 Twin Gun Mount (Ita) • 8inch Triple Gun Mount Mk.9 (Mk.9 mod.2) (US)

Medium HA

5inch Twin DP Gun Mount (CD) (+ GFCS) (US)

Large

30.5-32 cm	305mm/46 Gun Mount (Twin • Triple) (Ita) • 320mm/44 Gun Mount (Twin • Triple) (Ita) • 30.5cm Triple Gun Mount (Kai) (Sov)

35.6 cm/14 inch	35.6cm Twin Gun Mount (Dazzle Camo • Kai • Kai 2 • Kai 3/Dazzle Camo • Kai 3 C • Kai 4) • Prototype 35.6cm Triple Gun Mount • 35.6cm Triple Gun Mount Kai (Dazzle Camouflage) • 14inch/45 Gun Mount (Twin • Triple) (US)

38-38.1 cm	38cm Twin Gun Mount (Kai) (Ger) • 381mm/50 Triple Gun Mount (Kai) (Ita) • 38.1cm Mk.I Twin Gun Mount (Mk.I/N Kai) (UK) • 38cm Quadruple Gun Mount (Kai • Deux) (Fr)

41 cm/16 inch	41cm Twin Gun Mount (Kai 2) • 41cm Triple Gun Mount (Proto • Kai • Kai 2) • 16inch Twin Gun Mount (Mk.I • Mk.V • Mk.VIII Kai) (US) • 16inch Triple Gun Mount (Mk.6 • Mk.6 + GFCS • Mk.6 mod.2 • Mk.7 • Mk.7 + GFCS) (US) • 16inch Triple Gun Mount (Mk.I • Mk.I + AFCT Kai • Mk.I Kai + FCR Type 284) (UK)

46 cm	Prototype 46cm Twin Gun Mount • 46cm Triple Gun Mount (Kai)

Very Large

Prototype 51cm Twin Gun Mount • 51cm Twin Gun Mount • Prototype 51cm Triple Gun Mount

Secondary Guns

Surface

15.2cm Single Gun Mount • 15.5cm Triple Gun Mount (Kai • Kai 2) • 15cm Twin Gun Mount (Ger) • OTO 152mm Triple Rapid Fire Gun Mount (Ita) • 15.2cm Triple Gun Mount (Fr)

High-Angle

8cm HA Gun (+ Add. MG) • 10cm Twin HA Gun Mount (Carriage) (Kai + Add. MG) • 12.7cm Twin HA Gun Mount (+ AAFD) • 10cm Twin HA Gun Mount Battery CD • 12cm Single HA Gun Mount + 25mm MG

Foreign	10.5cm Twin Gun Mount (Ger) • 65mm/64 Single Rapid Fire Gun Mount Kai (Ita) • 90mm Single HA Gun Mount (Ita) • 5inch Single HA Gun Mount Battery (US) • 5inch Twin Gun Mount Mk.28 mod.2 (US)

Large Secondary (HA)

5inch Twin Gun Mount (Secondary Armament) CD (US)

Anti-Air

AA Guns/Rocket Launchers	7.7mm Machinegun • 12.7mm Machinegun • 25mm Autocannon Mount (Single • Twin • Triple • Triple CD) • 25mm Anti-aircraft Autocannon Mount & Machine Guns • Bi Type 40mm Twin Autocannon Mount (UK) • 12cm 30-tube Rocket Launcher (Kai 2) • 2cm Flakvierling 38 (Ger) • 3.7cm FlaK M42 (Ger) • Bofors 40mm Quadruple Autocannon Mount (Swe/US) • QF 2-pounder Octuple Pom-pom Gun Mount (UK) • 20-tube 7inch UP Rocket Launchers (UK)

Anti-Aircraft Fire Directors	Type 91 AAFD • Type 94 AAFD

Torpedo Weapons

Surface	53cm Twin Torpedo Mount • 53cm Bow O2 Torpedoes • 61cm Torpedo Mount (Triple • Triple O2 • Triple O2 LM • Quad • Quad O2 • Quad O2 LM • Quintuple O2 • Proto Sext O2) • 533mm Quint Torpedo Mount (Initial Model • Late Model) (US) • 533mm Triple Torpedo Mount (Model 53-39) (Sov)

Submarine	Late Model Bow Torpedo Mount (4 tubes) (+ Skilled Sonar Personnel) • Late Model Bow Torpedo Mount (6 tubes) (+ Skilled Sonar Personnel) • Submarine 53cm Bow Torpedo Mount (8 tubes) (Late Model) • Prototype FaT Type 95 Oxygen Torpedo Kai (IJN/Ger) • 21inch 4-tube Bow Torpedo Launcher (Initial Model • Late Model) (US) • 21inch 6-tube Bow Torpedo Launcher (Initial Model • Late Model) (US) • Submarine 4-tube Stern Torpedo Launcher (Initial Model • Late Model) (US)

Midget Submarines	Kouhyouteki (Type A • Type C • Type D Kai)

Carrier-Based Planes

Fighters

Zero	Model 21 (Skilled) • Model 32 (Skilled) • Model 52 (Skilled) • Model 64 • Model 52C (601) • Model 21 (Iwamoto) • Model 52A (Iwamoto) • Model 53 (Iwamoto) • Model 52C (Iwai) • Model 52C (Hachiman)

Other (IJN)	Type 96 (Kai) • Shiden (Kai 2 • Kai 4) • Reppuu (Prototype LM • Model 11 • 601 • Kai • Kai 2 • Kai 2 (CD1/Skilled)) • Prototype Jinpuu • Shinden Kai

Foreign	Bf 109 T Kai (IJN/Ger) • Fw190 (T Kai • A-5 Kai (Skilled)) (IJN/Ger) • Reggiane (2001 OR Kai • 2005 Kai) (IJN/Ita) • Wildcat (F4F-3 • F4F-4) (US) • Hellcat (F6F-3 • F6F-5) (US) • XF5U (US) • FR-1 Fireball (US) • Fulmar (UK) • Seafire Mk.III Kai (UK) • Corsair Mk.II (Ace) (UK/US)

Night	Reppuu Kai 2 Model E (CD1/Skilled) • Hellcat (F6F-3N • F6F-5N) (US) • F4U-2 Night Corsair (US)

Dive Bombers

Type 99 (Skilled • Model 22 • Model 22/Skilled • Egusa) • Suisei (Model 12A (w/ Cluster Bombs • w/ Photo Fuze Bombs) • Model 22 (634 • 634/Skilled) • 601 • Egusa) • Prototype Nanzan

Foreign	Ju.87C (Kai • Kai 2 KMX • Kai 2 KMX/Skilled) (IJN/Ger) • Re.2001 CB Kai (IJN/Ita) • SBD (Yellow Wings • VB-2 Bomber Squad) (US) • SBD-5 (US) • Helldiver (SB2C-3 • SB2C-5) (US) • Corsair (F4U-1D (US) • F4U-4 (US) • AU-1 (US) • F4U-7 (Fr/US)) • FM-2 (US) • Skua (UK)

Fighter-bombers	Type 0 (Model 62 FB (Iwai) • Model 63 FB • Model 64 KMX • Model 64 (Skilled FB))

Torpedo Bombers

Type 97 (Skilled • 931 • 931/Skilled • Tomonaga • Murata) • Tenzan (601 • 931 • Model 12A • Tomonaga • Murata) • Ryuusei (Kai • Kai Skilled • 601 • CD1 • CD1/Skilled)

Foreign	Re.2001 G Kai (IJN/Ita) • TBD (Yellow Wings) (US) • TBF (US) • Swordfish (Mk.II Skilled • Mk.III Skilled) (UK) • Barracuda (Mk.II • Mk.III) (UK) • Mosquito TR Mk.33 (UK)

Night	Type 97 Model E (Skilled) • Tenzan Model 12A Kai (Skilled • Murata) • TBM-3D (US) • TBM-3W+3S (JMSDF/US)

Jets

Jet Keiun Kai • Kikka Kai

Recons

Saiun (4th Recon • East Caroline) • Type 2 • SBD VS-2 (Reconnaissance Squadron) (US) • Fulmar (Reconnaissance Fighter/Skilled) (UK)

Large	Prototype Keiun

Land-Based Planes

Bombers

Attackers	Type 96 • Type 1 (Model 22A • Model 34 • Nonaka • Hachiman) • Ginga (Skilled • Egusa) • Type 1 Hayabusa Model III Kai (65) (IJA) • Type 4 Heavy Bomber Hiryuu (Skilled • + No.1 Model 1A Guided Missile • Skilled + No.1 Model 1A Guided Missile) (IJA) • Do 17 Z-2 (Ger) • Do 217 (E-5 + Hs293 • K-2 + Fritz-X) (Ger) • SM.79 (bis • Skilled) (Ita) • B-25 (US) • Mosquito FB Mk.VI (UK)

Patrol	Toukai (Proto • 901)

Assault	Ki-102 B (+ No.1 Model 1B Guided Missile) (IJA)

Heavy	Shinzan (Kai)

Interceptors

"Army"	Type 1 Fighter Hayabusa (Model II • Model II (64) • Model IIIA • Model IIIA (54)) (IJA) • Type 3 Fighter Hien (Model 1D • 244) (IJA) • Type 4 Fighter Hayate (IJA) • Type 2 Two-seat Fighter Toryuu (Model C) (IJA) • Ki-96 (IJA) • Fw 190 D-9 (Ger) • Spitfire (Mk.I • Mk.V • Mk.IX Skilled) (UK)

"Navy"	Raiden • Shiden (Model 11 • Kai • Kai 343/301 • Kai 343/407 • Kai 343/701) • Type 0 Fighter (Model 22 (251) • Model 21 (Tainan) • Model 32 (Tainan)) • Reppuu Kai (352/Skilled)

Jets	Me 262 A-1a/R1 (Ger)

Canard	Prototype Shinden (Land-based Fighter)

HA	Me 163B (Ger) • Shuusui (Proto)

Recons

Type 2 Recon (Skilled) • Mosquito PR Mk.IV (UK)

Seaplanes

Recons

Type 0 Reconnaissance Seaplane (Model 11B • Model 11B Skilled) • Type 0 Observation Seaplane • Type 0 Small Reconnaissance Seaplane (Skilled) • Shiun (Skilled) • Ar196 Kai (IJN/Ger) • Ro.43 Reconnaissance Seaplane (Ita) • SOC Seagull (LM Skilled) (US) • OS2U (US) • SO3C Seamew Kai (US) • Swordfish Mk.II Kai (UK) • Fairey Seafox Kai (UK/Swe) • S9 Osprey (UK/Swe)

Night	Type 98 Reconnaissance Seaplane (Night Recon) • Type 0 Reconnaissance Seaplane (11B Kai Night Recon • 11A Kai 2) • Loire 130M (Kai Skilled) (Fr) • Walrus (UK) • Sea Otter (UK)

Bombers

Zuiun (631 • 634 • 634/Skilled • Model 12 • Model 12 (634) • Kai 2 (634) • Kai 2 (634/Skilled)) • Seiran (Prototype • 631) • Swordfish (Mk.III Kai • Mk.III Kai Skilled) (UK/Swe) • Laté 298B (Fr)

Night	Prototype Night Zuiun (Attack Equipment)

Fighters

Type 2 Kai (Skilled) • Kyoufuu (Kai • Kai 2) • Ro.44 Seaplane Fighter (bis) (Ita)

Large Flying Boats

Type 2 Large Flying Boat • PBY-5A Catalina (US)

Radars

Small	Type 13 Air Radar (Kai • Kai LM) • Type 22 Surface Radar (Kai 4 • Kai 4 Calibrated LM • Kai 4 LM + Passive Radiolocator (E27)) • Type 33 Surface Radar • Radar Equipment Mast (Type 13 Kai + Type 22 Radar Kai 4) • SG Radar (Initial Model • Late Model) (US) • GFCS Mk.37 (US)

Large	Type 21 Air Radar (Kai • Kai 2) • Type 32 Surface Radar (Kai) • Type 42 Air Radar (Kai 2) • FuMO25 Radar (Ger) • SK Radar (+ SG) (US) • Type 281 Radar (UK) • Type 274 Fire Control Radar (UK)

Very Large	15m Duplex Rangefinder + Type 21 Radar Kai 2 ( + Skilled Fire Direction Center)

Submarine	Submarine Radar & Waterproof Telescope • Submarine Radar & Passive Radiolocator (E27) • Late Model Submarine Radar & Passive Radiolocator • Late Model Radar & Passive Radiolocator + Snorkel Equipment • SJ Radar + Submarine Conning Tower Equipment

Anti-Submarine Warfare

Sonars

Small	Type 93 Passive Sonar • Type 3 Active Sonar (Kai) • Type 4 Passive Sonar • ASDIC (Type 124 • Type 144/147 • Type 144/147 + HF/DF) (UK)

Large	Type 0 Passive Sonar

Depth Charges

Projectors‎	Type 94 Depth Charge Projector • Type 3 Depth Charge Projector (CD) • Prototype 15cm 9-tube ASW Rocket Launcher • RUR-4A Weapon Alpha Kai (US) • Mk.32 ASW Torpedo (Mk.2 Thrower) (US)

Racks	Type 95 Depth Charge • Type 2 Depth Charge (Kai 2) • Hedgehog (Initial Model) (UK) • Lightweight ASW Torpedo (Initial Test Model) (US)

Others	Type 2 12cm Mortar Kai (CD)

Rotorcraft

Ka Type Observation Autogyro (IJA) • O Type Observation Autogyro (Kai • Kai 2) (IJA) • S-51J (Kai) (JMSDF/US)

Liaison Aircraft

Type 3 Command Liaison Aircraft (ASW) (Kai/2) (IJA) • Type 1 Fighter Hayabusa (Model II Kai (20th Squadron) • Model III Kai (Skilled/20th Squadron)) (IJA)

Miscellaneous

Anti-Ground Rockets

WG42 (Wurfgerät 42) (Ger) • Type 4 20cm Anti-ground Rocket Launcher (CD)

Shells

Armor-Piercing	Type 91 AP Shell • Type 1 AP Shell (Kai)

Anti-Air	Type 3 Shell (Kai • Kai 2)

Engines

Improved Kanhon Type Turbine • Enhanced Kanhon Type Boiler • New Model High Temperature High Pressure Boiler

Landing Craft

Daihatsu Landing Craft (+ Type 89 & Landing Force • + Panzer II (IJN/Ger) • Armed) • Toku Daihatsu Landing Craft (+ 11th Tank Regiment • + Type 1 Gun Tank • + Panzer III (IJN/Ger) • + Panzer III Ausf.J (IJN/Ger) • + Chi-Ha • + Chi-Ha Kai ) • M4A1 DD (US) • Soukoutei (AB-Class) (IJA)

Amphibious Vehicles

Special Type 2 Amphibious Tank • Special Type 4 Amphibious Tank (Kai)

Landing Forces

Army Infantry Corps (+ Chi-Ha Kai) • Type 97 Medium Tank (Chi-Ha) (Kai)

Extra Armor

Medium	Anti-torpedo Bulge (Medium) • New Kanhon Design Anti-torpedo Bulge (Medium) • Arctic camouflage (+ Arctic equipment)

Large	Anti-torpedo Bulge (Large) • New Kanhon Design Anti-torpedo Bulge (Large) • Pugliese Underwater Protection Bulkhead (Ita)

Night Battle Aid

Searchlight • Type 96 150cm Searchlight • Star Shell

Facility & Crew

Ship Repair Facility

Skilled Lookouts	Skilled Lookouts (Torpedo Squadron)

Command Facilities	Fleet Command Facility (Striking Force • Elite Torpedo Squadron) • Fleet Communication Antenna • Communication Equipment & Personnel

Aviation Personnels	Skilled Carrier-based Aircraft Maintenance Personnel • Night Operation Aviation Personnel (+ Skilled Deckhands) • Arctic Gear & Deck Personnel • Skilled Deck Personnel (+ Aviation Maintenance Hands)

Surface Ship Equipment

Barrage Balloon

Smoke Generators	Smoke Generator (Smoke Screen) (Kai)

Consumables

Underway Replenishment

Repair Personnels	Emergency Repair Personnel • Emergency Repair Goddess

Rations	Combat Ration (Special Onigiri) • Canned Saury

Others

Drum Canister (Transport Use) • Saiun (Disassembled for Transport)

Unreleased & removed

SB2U

HA - High-Angle or High-Altitude; DP - Dual-Purpose; LM - Late Model; CD - Concentrated Deployment or Carrier Division

Retrieved from "https://en.kancollewiki.net/w/index.php?title=Template:Equipmentlist&oldid=184844"

@@ Line 1: / Line 1: @@
-<noinclude>{{CollapsibleToggle}}</noinclude>{{Navbox
+<noinclude>{{CollapsibleToggle}}</noinclude>{{#if:{{#var:wikipedia}}|
+*{{#var:wikipedia}}}}<!--Remove wikipedia link when [[Template:Equipment]] Properly rolls out-->
+{{Navbox
 |name = Template:Equipmentlist
 |state = mw-collapsed
 |title = [[Equipment|{{color|black|Equipment List}}]]
-|basestyle  = background-color:#eebb55;
+|basestyle  = background-color:#eebb55
-|titlestyle = color:black;
+|titlestyle = color:black
 |liststyle = border:0px none;padding-left:5px
-|groupstyle =  color:black
+|groupstyle = color:black
 |style = color:black; background-color:#FFFFFF; border:1px solid #1A5B70; width:100%; margin-top: 10px;
-|above = '''[[Equipment_List_(Image)|{{color|black|Gallery}}]]{{•}}[[Equipment_Ranking|{{color|black|By Stats}}]]{{•}}[[Glossary#Equipment_Icons|{{color|black|Equipment Types & Icons}}]]{{•}}[[Development|{{color|black|Development}}]]{{•}}[[Improvement|{{color|black|Improvement}}]]'''
+|above = '''[[Equipment_List_(Image)|{{color|black|Gallery}}]]{{•}}[[Equipment_Ranking|{{color|black|By Stats}}]]{{•}}[[Glossary#Equipment Categories, Types, Icons, and Mechanics|{{color|black|Equipment Types & Icons}}]]{{•}}[[Development|{{color|black|Development}}]]{{•}}[[Improvement|{{color|black|Improvement}}]]'''
 | abovestyle = background-color:#EECC88;
 |below = ''HA - '''High-Angle''' or '''High-Altitude'''; DP - '''Dual-Purpose'''; LM - '''Late Model'''; CD - '''Concentrated Deployment''' or '''Carrier Division'''''
@@ Line 15: / Line 17: @@
 |list1 = {{Navbox|child
   |name       = Main Guns
-  |title      = [[:Category:Main Gun|{{color|black|Main Guns}}]]
+  |title      = [[Main Gun|{{color|black|Main Guns}}]]
   |basestyle  = background-color:#EECC88;
-|group1 = [[:Category:Small Gun|{{color|black|Small}}]]
+|group1 = [[Small Caliber Main Gun|{{color|black|Small}}]]
 |list1 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |list1 = [[12cm Single Gun Mount|12cm Single Gun Mount]] <big>(</big>[[12cm Single Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}[[12.7cm Twin Gun Mount]] <big>(</big>[[12.7cm Twin Gun Mount Model A|Model A]]{{•}}[[12.7cm Twin Gun Mount Model A Kai 2|Model A Kai 2]]{{•}}[[Prototype Long-barrel 12.7cm Twin Gun Mount Model A Kai 4|Proto Long-barrel Model A Kai 4]]{{•}}[[12.7cm Twin Gun Mount Model B Kai 2|Model B Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model C Kai 2|Model C Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model C Kai 3|Model C Kai 3]]{{•}}[[12.7cm Twin Gun Mount Model D Kai 2|Model D Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model D Kai 3|Model D Kai 3]]<big>)</big>
+   |list1 = [[12cm Single Gun Mount]] <big>(</big>[[12cm Single Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}[[12.7cm Twin Gun Mount]] <big>(</big>[[12.7cm Twin Gun Mount Model A|Model A]]{{•}}[[12.7cm Twin Gun Mount Model A Kai 2|Model A Kai 2]]{{•}}[[Prototype Long-barrel 12.7cm Twin Gun Mount Model A Kai 4|Proto Long-barrel Model A Kai 4]]{{•}}[[12.7cm Twin Gun Mount Model B Kai 2|Model B Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model C Kai 2|Model C Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model C Kai 3|Model C Kai 3]]{{•}}[[12.7cm Twin Gun Mount Model C Kai 3 H|Model C Kai 3 H]]{{•}}[[12.7cm Twin Gun Mount Model D Kai 2|Model D Kai 2]]{{•}}[[12.7cm Twin Gun Mount Model D Kai 3|Model D Kai 3]]<big>)</big>
    |group2 = Foreign
-   |list2 = [[12.7cm Single Gun Mount]] <small>(Ger)</small>{{•}}[[120mm/50 Twin Gun Mount]] <big>(</big>[[120mm/50 Twin Gun Mount mod.1936|Mod.1936]]{{•}}[[120mm/50 Twin Gun Mount Kai A.mod.1937|Kai A.mod.1937]]<big>)</big> <small>(Ita)</small>{{•}}[[QF 4.7inch Gun Mk.XII Kai]] <small>(UK)</small>{{•}}[[130mm B-13 Twin Gun Mount]] <small>(Sov)</small>
+   |list2 = [[12.7cm Single Gun Mount]] <small>(Ger)</small>{{•}}[[120mm/50 Twin Gun Mount]] <big>(</big>[[120mm/50 Twin Gun Mount mod.1936|Mod.1936]]{{•}}[[120mm/50 Twin Gun Mount Kai A.mod.1937|Kai A.mod.1937]]<big>)</big> <small>(Ita)</small>{{•}}[[QF 4.7inch Gun Mk.XII Kai]] <small>(UK)</small>{{•}}[[130mm B-13 Twin Gun Mount]] <small>(Sov)</small>{{•}}[[13.8cm Twin Gun Mount]] <big>(</big>[[13.8cm Twin Gun Mount Kai|Kai]]<big>)</big> <small>(Fr)</small>
 }}
 <!---Small HA Guns--->
@@ Line 31: / Line 33: @@
    |basestyle  = background-color:#eeddbb;
 <!---|group1 = IJN--->
-   |list1 = [[10cm Twin High-angle Gun Mount|10cm Twin HA Gun Mount]] <big>(</big>[[10cm Twin High-angle Gun Mount + Anti-Aircraft Fire Director|+ AAFD]]<big>)</big>{{•}}[[12cm Single High-angle Gun Mount]] <big>(</big>[[12cm Single High-angle Gun Mount Model E|Model E]]<big>)</big>{{•}}12.7cm HA Gun Mount <big>(</big>[[12.7cm Single High-angle Gun Mount (Late Model)|Single LM]]{{•}}[[12.7cm Twin High-angle Gun Mount (Late Model)|Twin LM]]{{•}}[[12.7cm Single High-angle Gun Mount Kai 2|Single Kai 2]]{{•}}[[12.7cm Twin High-angle Gun Mount Kai 2|Twin Kai 2]]<big>)</big>{{•}}12.7cm Twin HA Gun Mount <big>(</big>[[12.7cm Twin Gun Mount Model A Kai 3 (Wartime Modification) + Anti-Aircraft Fire Director|Model A Kai 3 + AAFD]]{{•}}[[12.7cm Twin Gun Mount Model B Kai 4 (Wartime Modification) + Anti-Aircraft Fire Director|Model B Kai 4 + AAFD]]<big>)</big>
+   |list1 = [[10cm Twin High-angle Gun Mount|10cm Twin HA Gun Mount]] <big>(</big>[[10cm Twin High-angle Gun Mount + Anti-Aircraft Fire Director|+ AAFD]]{{•}}[[10cm Twin High-angle Gun Mount Kai + Anti-Aircraft Fire Director Kai|Kai + AAFD Kai]]<big>)</big>{{•}}[[12cm Single High-angle Gun Mount|12cm Single HA Gun Mount]] <big>(</big>[[12cm Single High-angle Gun Mount Model E|Model E]]{{•}}[[12cm Single High-angle Gun Mount Model E Kai|Model E Kai]]<big>)</big>{{•}}12.7cm HA Gun Mount <big>(</big>[[12.7cm Single High-angle Gun Mount (Late Model)|Single LM]]{{•}}[[12.7cm Twin High-angle Gun Mount (Late Model)|Twin LM]]{{•}}[[12.7cm Single High-angle Gun Mount Kai 2|Single Kai 2]]{{•}}[[12.7cm Twin High-angle Gun Mount Kai 2|Twin Kai 2]]<big>)</big>{{•}}12.7cm Twin HA Gun Mount <big>(</big>[[12.7cm Twin Gun Mount Model A Kai 3 (Wartime Modification) + Anti-Aircraft Fire Director|Model A Kai 3 + AAFD]]{{•}}[[12.7cm Twin Gun Mount Model B Kai 4 (Wartime Modification) + Anti-Aircraft Fire Director|Model B Kai 4 + AAFD]]<big>)</big>
    |group2 = Foreign
    |list2 = [[5inch Single Gun Mount Mk.30]] <big>(</big>[[5inch Single Gun Mount Mk.30 Kai|Mk.30 Kai]]{{•}}[[5inch Single Gun Mount Mk.30 Kai + GFCS Mk.37|Mk.30 Kai + GFCS]]<big>)</big> <small>(US)</small>{{•}}[[Locally Modified 12.7cm Twin High-angle Gun Mount|Local Mod. 12.7cm Twin HA Gun Mount]] <small>(CN)</small>{{•}}[[Locally Modified 10cm Twin High-angle Gun Mount|Local Mod. 10cm Twin HA Gun Mount]] <small>(CN)</small>
 }}
 <!---Medium Guns--->
-|group3 = [[:Category:Medium Gun|{{color|black|Medium}}]]
+|group3 = [[Medium Caliber Main Gun|{{color|black|Medium}}]]
 |list3 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |group1 = 14cm
+   |group1 = 14 cm
-   |list1 = [[14cm Single Gun Mount]]{{•}}[[14cm Twin Gun Mount]] <big>(</big>[[14cm Twin Gun Mount Kai|Kai]]<big>)</big>
+   |list1 = [[14cm Single Gun Mount]]{{•}}[[14cm Twin Gun Mount]] <big>(</big>[[14cm Twin Gun Mount Kai|Kai]]{{•}}[[14cm Twin Gun Mount Kai 2|Kai 2]]<big>)</big>
-   |group2 = 15-15.5cm/6inch
+   |group2 = 15-15.5 cm/6 inch
-   |list2 = [[15.2cm Twin Gun Mount]] <big>(</big>[[15.2cm Twin Gun Mount Kai|Kai]]{{•}}[[15.2cm Twin Gun Mount Kai Ni|Kai 2]]<big>)</big>{{•}}[[15.5cm Triple Gun Mount]] <big>(</big>[[15.5cm Triple Gun Mount Kai|Kai]]<big>)</big>{{•}}[[152mm/55 Triple Rapid Fire Gun Mount]] <big>(</big>[[152mm/55 Triple Rapid Fire Gun Mount Kai|Kai]]<big>)</big> <small>(Ita)</small>{{•}}[[6inch Triple Rapid Fire Gun Mount Mk.16]] <big>(</big>[[6inch Triple Rapid Fire Gun Mount Mk.16 mod.2|Mk.16 mod.2]]<big>)</big> <small>(US)</small> {{•}}[[6inch Mk.XXIII Triple Gun Mount]] <small>(UK)</small>{{•}}[[Bofors 15.2cm Twin Gun Mount Model 1930]] <small>(Swe)</small>{{•}}[[Bofors 15cm Twin Rapid Fire Gun Mount Mk.9 Model 1938]] <big>(</big>[[Bofors 15cm Twin Rapid Fire Gun Mount Mk.9 Kai + Single Rapid Fire Gun Mount Mk.10 Kai Model 1938|Mk.9 Kai + Single Mk.10 Kai]]<big>)</big> <small>(NL)</small>{{•}}[[6inch Twin Rapid Fire Gun Mount Mk.XXI]] <small>(AU)</small>
+   |list2 = [[15.2cm Twin Gun Mount]] <big>(</big>[[15.2cm Twin Gun Mount Kai|Kai]]{{•}}[[15.2cm Twin Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}[[15.5cm Triple Gun Mount]] <big>(</big>[[15.5cm Triple Gun Mount Kai|Kai]]<big>)</big>{{•}}[[152mm/55 Triple Rapid Fire Gun Mount]] <big>(</big>[[152mm/55 Triple Rapid Fire Gun Mount Kai|Kai]]<big>)</big> <small>(Ita)</small>{{•}}[[6inch Triple Rapid Fire Gun Mount Mk.16]] <big>(</big>[[6inch Triple Rapid Fire Gun Mount Mk.16 mod.2|Mk.16 mod.2]]<big>)</big> <small>(US)</small> {{•}}[[6inch Mk.XXIII Triple Gun Mount]] <small>(UK)</small>{{•}}[[15.2cm Triple Main Gun Mount]] <big>(</big>[[15.2cm Triple Main Gun Mount Kai|Kai]]<big>)</big> <small>(Fr)</small>{{•}}[[Bofors 15.2cm Twin Gun Mount Model 1930]] <small>(Swe)</small>{{•}}[[Bofors 15cm Twin Rapid Fire Gun Mount Mk.9 Model 1938]] <big>(</big>[[Bofors 15cm Twin Rapid Fire Gun Mount Mk.9 Kai + Single Rapid Fire Gun Mount Mk.10 Kai Model 1938|Mk.9 Kai + Single Mk.10 Kai]]<big>)</big> <small>(Swe/NL)</small>{{•}}[[6inch Twin Rapid Fire Gun Mount Mk.XXI]] <small>(UK/Au)</small>
-   |group3 = 20-20.3cm/8inch
+   |group3 = 20-20.3 cm/8 inch
-   |list3 = [[20.3cm Twin Gun Mount]] <big>(</big>[[20.3cm (No.2) Twin Gun Mount|No.2]]{{•}}[[20.3cm (No.3) Twin Gun Mount|No.3]]<big>)</big>{{•}}[[SKC34 20.3cm Twin Gun Mount]] <small>(Ger)</small> {{•}}[[203mm/53 Twin Gun Mount]] <small>(Ita)</small>{{•}}[[8inch Triple Gun Mount Mk.9]] <big>(</big>[[8inch Triple Gun Mount Mk.9 mod.2|Mk.9 mod.2]]<big>)</big> <small>(US)</small>
+   |list3 = [[20.3cm Twin Gun Mount]] <big>(</big>[[20.3cm (No.2) Twin Gun Mount|No.2]]{{•}}[[20.3cm (No.3) Twin Gun Mount|No.3]]{{•}}[[Prototype 20.3cm (No.4) Twin Gun Mount|Proto No.4]]<big>)</big>{{•}}[[SKC34 20.3cm Twin Gun Mount]] <small>(Ger)</small> {{•}}[[203mm/53 Twin Gun Mount]] <small>(Ita)</small>{{•}}[[8inch Triple Gun Mount Mk.9]] <big>(</big>[[8inch Triple Gun Mount Mk.9 mod.2|Mk.9 mod.2]]<big>)</big> <small>(US)</small>
 }}
 <!---Medium HA Guns--->
@@ Line 51: / Line 53: @@
 |list4 = [[5inch Twin Dual-purpose Gun Mount (Concentrated Deployment)|5inch Twin DP Gun Mount (CD)]] <big>(</big>[[GFCS Mk.37 + 5inch Twin Dual-purpose Gun Mount (Concentrated Deployment)|+ GFCS]]<big>)</big> <small>(US)</small>
 <!---Large Guns--->
-|group5 = [[:Category:Large Gun|{{color|black|Large}}]]
+|group5 = [[Large Caliber Main Gun|{{color|black|Large}}]]
 |list5 = {{Navbox|child
    |evenodd = swap
@@ Line 57: / Line 59: @@
    |group1 = 30.5-32 cm
    |list1 = 305mm/46 Gun Mount  <big>(</big>[[305mm/46 Twin Gun Mount|Twin]]{{•}}[[305mm/46 Triple Gun Mount|Triple]]<big>)</big>  <small>(Ita)</small>{{•}}320mm/44 Gun Mount  <big>(</big>[[320mm/44 Twin Gun Mount|Twin]]{{•}}[[320mm/44 Triple Gun Mount|Triple]]<big>)</big> <small>(Ita)</small>{{•}}[[30.5cm Triple Gun Mount]] <big>(</big>[[30.5cm Triple Gun Mount Kai|Kai]]<big>)</big> <small>(Sov)</small>
-   |group2 = 35.6cm
+   |group2 = 35.6 cm/14 inch
-   |list2 = [[35.6cm Twin Gun Mount]] <big>(</big>[[35.6cm Twin Gun Mount (Dazzle Camouflage)|Dazzle Camo]]{{•}}[[35.6cm Twin Gun Mount Kai|Kai]]{{•}}[[35.6cm Twin Gun Mount Kai Ni|Kai 2]]<big>)</big>{{•}}[[Prototype 35.6cm Triple Gun Mount]]{{•}}[[35.6cm Triple Gun Mount Kai (Dazzle Camouflage)]]
+   |list2 = [[35.6cm Twin Gun Mount]] <big>(</big>[[35.6cm Twin Gun Mount (Dazzle Camouflage)|Dazzle Camo]]{{•}}[[35.6cm Twin Gun Mount Kai|Kai]]{{•}}[[35.6cm Twin Gun Mount Kai 2|Kai 2]]{{•}}[[35.6cm Twin Gun Mount Kai 3 (Dazzle Camouflage)|Kai 3/Dazzle Camo]]{{•}}[[35.6cm Twin Gun Mount Kai 3 C|Kai 3 C]]{{•}}[[35.6cm Twin Gun Mount Kai 4|Kai 4]]<big>)</big>{{•}}[[Prototype 35.6cm Triple Gun Mount]]{{•}}[[35.6cm Triple Gun Mount Kai (Dazzle Camouflage)]]{{•}}14inch/45 Gun Mount <big>(</big>[[14inch/45 Twin Gun Mount|Twin]]{{•}}[[14inch/45 Triple Gun Mount|Triple]]<big>)</big> <small>(US)</small>
-   |group3 = 38-38.1cm
+   |group3 = 38-38.1 cm
    |list3 = [[38cm Twin Gun Mount]] <big>(</big>[[38cm Twin Gun Mount Kai|Kai]]<big>)</big> <small>(Ger)</small>{{•}}[[381mm/50 Triple Gun Mount]] <big>(</big>[[381mm/50 Triple Gun Mount Kai|Kai]]<big>)</big> <small>(Ita)</small>{{•}}[[38.1cm Mk.I Twin Gun Mount]] <big>(</big>[[38.1cm Mk.I/N Twin Gun Mount Kai|Mk.I/N Kai]]<big>)</big> <small>(UK)</small>{{•}}[[38cm Quadruple Gun Mount]] <big>(</big>[[38cm Quadruple Gun Mount Kai|Kai]]{{•}}[[38cm Quadruple Gun Mount Kai Deux|Deux]]<big>)</big> <small>(Fr)</small>
-   |group4 = 41cm/16inch
+   |group4 = 41 cm/16 inch
-   |list4 = [[41cm Twin Gun Mount]] <big>(</big>[[41cm Twin Gun Mount Kai Ni|Kai 2]]<big>)</big>{{•}}41cm Triple Gun Mount <big>(</big>[[Prototype 41cm Triple Gun Mount|Proto]]{{•}}[[41cm Triple Gun Mount Kai|Kai]]{{•}}[[41cm Triple Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}16inch Twin Gun Mount <big>(</big>[[16inch Mk.I Twin Gun Mount|Mk.I]]{{•}}[[16inch Mk.V Twin Gun Mount|Mk.V]]{{•}}[[16inch Mk.VIII Twin Gun Mount Kai|Mk.VIII Kai]]<big>)</big> <small>(US)</small>{{•}}16inch Triple Gun Mount <big>(</big>[[16inch Triple Gun Mount Mk.6|Mk.6]]{{•}}[[16inch Triple Gun Mount Mk.6 + GFCS|Mk.6 + GFCS]]{{•}}[[16inch Triple Gun Mount Mk.6 mod.2|Mk.6 mod.2]]{{•}}[[16inch Triple Gun Mount Mk.7|Mk.7]]{{•}}[[16inch Triple Gun Mount Mk.7 + GFCS|Mk.7 + GFCS]]<big>)</big> <small>(US)</small>{{•}}16inch Triple Gun Mount <big>(</big>[[16inch Mk.I Triple Gun Mount|Mk.I]]{{•}}[[16inch Mk.I Triple Gun Mount + AFCT Kai|Mk.I + AFCT Kai]]{{•}}[[16inch Mk.I Triple Gun Mount Kai + FCR Type 284|Mk.I Kai + FCR Type 284]]<big>)</big> <small>(UK)</small>
+   |list4 = [[41cm Twin Gun Mount]] <big>(</big>[[41cm Twin Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}41cm Triple Gun Mount <big>(</big>[[Prototype 41cm Triple Gun Mount|Proto]]{{•}}[[41cm Triple Gun Mount Kai|Kai]]{{•}}[[41cm Triple Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}16inch Twin Gun Mount <big>(</big>[[16inch Mk.I Twin Gun Mount|Mk.I]]{{•}}[[16inch Mk.V Twin Gun Mount|Mk.V]]{{•}}[[16inch Mk.VIII Twin Gun Mount Kai|Mk.VIII Kai]]<big>)</big> <small>(US)</small>{{•}}16inch Triple Gun Mount <big>(</big>[[16inch Triple Gun Mount Mk.6|Mk.6]]{{•}}[[16inch Triple Gun Mount Mk.6 + GFCS|Mk.6 + GFCS]]{{•}}[[16inch Triple Gun Mount Mk.6 mod.2|Mk.6 mod.2]]{{•}}[[16inch Triple Gun Mount Mk.7|Mk.7]]{{•}}[[16inch Triple Gun Mount Mk.7 + GFCS|Mk.7 + GFCS]]<big>)</big> <small>(US)</small>{{•}}16inch Triple Gun Mount <big>(</big>[[16inch Mk.I Triple Gun Mount|Mk.I]]{{•}}[[16inch Mk.I Triple Gun Mount + AFCT Kai|Mk.I + AFCT Kai]]{{•}}[[16inch Mk.I Triple Gun Mount Kai + FCR Type 284|Mk.I Kai + FCR Type 284]]<big>)</big> <small>(UK)</small>
-   |group5 = 46cm
+   |group5 = 46 cm
    |list5 = [[Prototype 46cm Twin Gun Mount]]{{•}}[[46cm Triple Gun Mount]] <big>(</big>[[46cm Triple Gun Mount Kai|Kai]]<big>)</big>
 }}
-|group6 = [[:Category:Very Large Gun|{{color|black|Very Large}}]]
+|group6 = [[Very Large Caliber Main Gun|{{color|black|Very Large}}]]
 |list6 = [[Prototype 51cm Twin Gun Mount]]{{•}}[[51cm Twin Gun Mount]]{{•}}[[Prototype 51cm Triple Gun Mount]]
 }}
 <!---Secondary Guns category--->
 |list2 = {{Navbox|child
-  |name       = [[:Category:Secondary Gun|{{color|black|Secondary Guns}}]]
+  |name       = [[Secondary Gun|{{color|black|Secondary Guns}}]]
-  |title      = [[:Category:Secondary Gun|{{color|black|Secondary Guns}}]]
+  |title      = [[Secondary Gun|{{color|black|Secondary Guns}}]]
   |basestyle  = background-color:#EECC88;
 <!---Surface guns--->
 |group1 = Surface
-|list1 = [[15.2cm Single Gun Mount]]{{•}}[[15.5cm Triple Secondary Gun Mount|15.5cm Triple Gun Mount]] <big>(</big>[[15.5cm Triple Secondary Gun Mount Kai|Kai]]{{•}}[[15.5cm Triple Secondary Gun Mount Kai Ni|Kai 2]]<big>)</big>{{•}}[[15cm Twin Secondary Gun Mount|15cm Twin Gun Mount]] <small>(Ger)</small>{{•}}[[OTO 152mm Triple Rapid Fire Gun Mount]] <small>(Ita)</small>{{•}}[[15.2cm Triple Gun Mount]] <small>(Fr)</small>
+|list1 = [[15.2cm Single Gun Mount]]{{•}}[[15.5cm Triple Secondary Gun Mount|15.5cm Triple Gun Mount]] <big>(</big>[[15.5cm Triple Secondary Gun Mount Kai|Kai]]{{•}}[[15.5cm Triple Secondary Gun Mount Kai 2|Kai 2]]<big>)</big>{{•}}[[15cm Twin Secondary Gun Mount|15cm Twin Gun Mount]] <small>(Ger)</small>{{•}}[[OTO 152mm Triple Rapid Fire Gun Mount]] <small>(Ita)</small>{{•}}[[15.2cm Triple Gun Mount]] <small>(Fr)</small>
 <!---Secondary HA Guns--->
 |group2 = [[:Category:Secondary High-Angle Gun|{{color|black|High-Angle}}]]
@@ Line 83: / Line 85: @@
    |basestyle  = background-color:#eeddbb;
 <!---|group1 = IJN--->
-   |list1 = [[8cm High-angle Mount]] <big>(</big>[[8cm High-angle Gun Kai + Additional Machine Guns|+ Add. Machineguns]]<big>)</big>{{•}}[[10cm Twin High-angle Gun Mount (Carriage)]] <big>(</big>[[10cm Twin High-angle Gun Mount Kai + Additional Machine Guns|Kai + Add. Machineguns]]<big>)</big>{{•}}[[12.7cm Twin High-angle Gun Mount]] <big>(</big>[[12.7cm High-angle Gun + Anti-Aircraft Fire Director|+ AAFD]]<big>)</big>{{•}}[[10cm Twin High-angle Gun Mount Battery Concentrated Deployment|10cm Twin High-angle Gun Mount Battery CD]]
+   |list1 = [[8cm High-angle Gun|8cm HA Gun]] <big>(</big>[[8cm High-angle Gun Kai + Additional Machine Guns|+ Add. MG]]<big>)</big>{{•}}[[10cm Twin High-angle Gun Mount (Carriage)|10cm Twin HA Gun Mount (Carriage)]] <big>(</big>[[10cm Twin High-angle Gun Mount Kai + Additional Machine Guns|Kai + Add. MG]]<big>)</big>{{•}}[[12.7cm Twin High-angle Gun Mount|12.7cm Twin HA Gun Mount]] <big>(</big>[[12.7cm High-angle Gun + Anti-Aircraft Fire Director|+ AAFD]]<big>)</big>{{•}}[[10cm Twin High-angle Gun Mount Battery Concentrated Deployment|10cm Twin HA Gun Mount Battery CD]]{{•}}[[12cm Single High-angle Gun Mount + 25mm Machine Guns Additions|12cm Single HA Gun Mount + 25mm MG]]
    |group2 = Foreign
-   |list2 = [[10.5cm Twin Gun Mount]] <small>(Ger)</small>{{•}}[[65mm/64 Single Rapid Fire Gun Mount Kai]] <small>(Ita)</small>{{•}}[[90mm Single High-angle Gun Mount|90mm Single HA Gun Mount]] <small>(Ita)</small>{{•}}[[5inch Single High-angle Gun Mount Battery]] <small>(US)</small>{{•}}[[5inch Twin Gun Mount Mk.28 mod.2]] <small>(US)</small>{{•}}[[5inch Twin Gun Mount (Secondary Armament) Concentrated Deployment|5inch Twin Gun Mount (Secondary Armament) CD]] <small>(US)</small>
+   |list2 = [[10.5cm Twin Gun Mount]] <small>(Ger)</small>{{•}}[[65mm/64 Single Rapid Fire Gun Mount Kai]] <small>(Ita)</small>{{•}}[[90mm Single High-angle Gun Mount|90mm Single HA Gun Mount]] <small>(Ita)</small>{{•}}[[5inch Single High-angle Gun Mount Battery|5inch Single HA Gun Mount Battery]] <small>(US)</small>{{•}}[[5inch Twin Gun Mount Mk.28 mod.2]] <small>(US)</small>
 }}
+<!---Large sec--->
+|group3 = [[:Category:Large Secondary Gun|{{color|black|Large Secondary (HA)}}]]
+|list3 = [[5inch Twin Gun Mount (Secondary Armament) Concentrated Deployment|5inch Twin Gun Mount (Secondary Armament) CD]] <small>(US)</small>
 }}
 <!---Anti-Air category--->
@@ Line 92: / Line 97: @@
 |list3 = {{Navbox|child
   |name       = Anti-Air
-  |title      = [[:Category:Anti-Air Gun|{{color|black|Anti-Air}}]]
+  |title      = [[AA Gun|{{color|black|Anti-Air}}]]
   |basestyle  = background-color:#EECC88;
 <!---AA guns--->
-|group1 = [[:Category:Anti-Air Gun|{{color|black|AA Guns/Rocket Launchers}}]]
+|group1 = [[AA Gun|{{color|black|AA Guns/Rocket Launchers}}]]
-|list1 = [[7.7mm Machine Gun|7.7mm Machinegun]]{{•}}[[12.7mm Single Machine Gun Mount|12.7mm Machinegun]]{{•}}25mm Autocannon Mount <big>(</big>[[25mm Single Autocannon Mount|Single]]{{•}}[[25mm Twin Autocannon Mount|Twin]]{{•}}[[25mm Triple Autocannon Mount|Triple]]{{•}}[[25mm Triple Autocannon Mount (Concentrated Deployment)|Triple CD]]<big>)</big>{{•}}[[Bi Type 40mm Twin Autocannon Mount]]{{•}}[[12cm 30-tube Rocket Launcher]] <big>(</big>[[12cm 30-tube Rocket Launcher Kai Ni|Kai 2]]<big>)</big>{{•}}[[2cm Flakvierling 38]] <small>(Ger)</small>{{•}}[[3.7cm FlaK M42]] <small>(Ger)</small>{{•}}[[Bofors 40mm Quadruple Autocannon Mount]] <small>(Swe/US)</small>{{•}}[[QF 2-pounder Octuple Pom-pom Gun Mount]] <small>(UK)</small>{{•}}[[20-tube 7inch UP Rocket Launchers]] <small>(UK)</small>
+|list1 = [[7.7mm Machine Gun|7.7mm Machinegun]]{{•}}[[12.7mm Single Machine Gun Mount|12.7mm Machinegun]]{{•}}25mm Autocannon Mount <big>(</big>[[25mm Single Autocannon Mount|Single]]{{•}}[[25mm Twin Autocannon Mount|Twin]]{{•}}[[25mm Triple Autocannon Mount|Triple]]{{•}}[[25mm Triple Autocannon Mount (Concentrated Deployment)|Triple CD]]<big>)</big>{{•}}[[25mm Anti-aircraft Autocannon Mount & Machine Guns]]{{•}}[[Bi Type 40mm Twin Autocannon Mount]] <small>(UK)</small>{{•}}[[12cm 30-tube Rocket Launcher]] <big>(</big>[[12cm 30-tube Rocket Launcher Kai 2|Kai 2]]<big>)</big>{{•}}[[2cm Flakvierling 38]] <small>(Ger)</small>{{•}}[[3.7cm FlaK M42]] <small>(Ger)</small>{{•}}[[Bofors 40mm Quadruple Autocannon Mount]] <small>(Swe/US)</small>{{•}}[[QF 2-pounder Octuple Pom-pom Gun Mount]] <small>(UK)</small>{{•}}[[20-tube 7inch UP Rocket Launchers]] <small>(UK)</small>
 <!---AAFDs--->
-|group2 = [[:Category:Anti-Aircraft Fire Director|{{color|black|Anti-Aircraft Fire Directors}}]]
+|group2 = [[AAFD|{{color|black|Anti-Aircraft Fire Directors}}]]
 |list2 = [[Type 91 Anti-Aircraft Fire Director|Type 91 AAFD]]{{•}}[[Type 94 Anti-Aircraft Fire Director|Type 94 AAFD]]
 }}
@@ Line 104: / Line 109: @@
 |list4 = {{Navbox|child
   |name       = Torpedo Weapon
-  |title      = [[:Category:Torpedoes|{{color|black|Torpedo Weapons}}]]
+  |title      = [[Torpedo|{{color|black|Torpedo Weapons}}]]
   |basestyle  = background-color:#EECC88;
 <!---Surface--->
-|group1 = [[:Category:Torpedoes|{{color|black|Surface}}]]
+|group1 = [[Torpedo|{{color|black|Surface}}]]
 |list1 = [[53cm Twin Torpedo Mount]]{{•}}[[53cm Bow (Oxygen) Torpedo Mount|53cm Bow O<small>2</small> Torpedoes]]{{•}}61cm Torpedo Mount <big>(</big>[[61cm Triple Torpedo Mount|Triple]]{{•}}[[61cm Triple (Oxygen) Torpedo Mount|Triple O<small>2</small>]]{{•}}[[61cm Triple (Oxygen) Torpedo Mount Late Model|Triple O<small>2</small> LM]]{{•}}[[61cm Quadruple Torpedo Mount|Quad]]{{•}}[[61cm Quad (Oxygen) Torpedo Mount|Quad O<small>2</small>]]{{•}}[[61cm Quadruple (Oxygen) Torpedo Mount Late Model|Quad O<small>2</small> LM]]{{•}}[[61cm Quintuple (Oxygen) Torpedo Mount|Quintuple O<small>2</small>]]{{•}}[[Prototype 61cm Sextuple (Oxygen) Torpedo Mount|Proto Sext O<small>2</small>]]<big>)</big>{{•}}533mm Quint Torpedo Mount <big>(</big>[[533mm Quintuple Torpedo Mount (Initial Model)|Initial Model]]{{•}}[[533mm Quintuple Torpedo Mount (Late Model)|Late Model]]<big>)</big> <small>(US)</small>{{•}}[[533mm Triple Torpedo Mount]] <big>(</big>[[533mm Triple Torpedo Mount (Model 53-39)|Model 53-39]]<big>)</big> <small>(Sov)</small>
 <!---Submarine--->
-|group2 = [[:Category:Submarine Torpedoes|{{color|black|Submarine}}]]
+|group2 = [[Submarine Torpedo|{{color|black|Submarine}}]]
-|list2 = [[Late Model Bow Torpedo Mount (4 tubes)]] <big>(</big>[[Skilled Sonar Personnel + Late Model Bow Torpedo Mount (4 tubes)|+ Skilled Sonar Personnel]]<big>)</big>{{•}}[[Late Model Bow Torpedo Mount (6 tubes)]] <big>(</big>[[Skilled Sonar Personnel + Late Model Bow Torpedo Mount (6 tubes)|+ Skilled Sonar Personnel]]<big>)</big>{{•}}[[Submarine 53cm Bow Torpedo Mount (8 tubes)]] <big>(</big>[[Late Model 53cm Bow Torpedo Mount (8 tubes)|Late Model]]<big>)</big>{{•}}[[Prototype FaT Type 95 Oxygen Torpedo Kai]] <small>(IJN/Ger)</small>{{•}}21inch 6-tube Bow Torpedo Launcher ([[21inch 6-tube Bow Torpedo Launcher (Initial Model)|Initial Model]]{{•}}[[21inch 6-tube Bow Torpedo Launcher (Late Model)|Late Model]]) <small>(US)</small>{{•}}Submarine 4-tube Stern Torpedo Launcher ([[Submarine 4-tube Stern Torpedo Launcher (Initial Model)|Initial Model]]{{•}}[[Submarine 4-tube Stern Torpedo Launcher (Late Model)|Late Model]]) <small>(US)</small>
+|list2 = [[Late Model Bow Torpedo Mount (4 tubes)]] <big>(</big>[[Skilled Sonar Personnel + Late Model Bow Torpedo Mount (4 tubes)|+ Skilled Sonar Personnel]]<big>)</big>{{•}}[[Late Model Bow Torpedo Mount (6 tubes)]] <big>(</big>[[Skilled Sonar Personnel + Late Model Bow Torpedo Mount (6 tubes)|+ Skilled Sonar Personnel]]<big>)</big>{{•}}[[Submarine 53cm Bow Torpedo Mount (8 tubes)]] <big>(</big>[[Late Model 53cm Bow Torpedo Mount (8 tubes)|Late Model]]<big>)</big>{{•}}[[Prototype FaT Type 95 Oxygen Torpedo Kai]] <small>(IJN/Ger)</small>{{•}}21inch 4-tube Bow Torpedo Launcher ([[21inch 4-tube Bow Torpedo Launcher (Initial Model)|Initial Model]]{{•}}[[21inch 4-tube Bow Torpedo Launcher (Late Model)|Late Model]]) <small>(US)</small>{{•}}21inch 6-tube Bow Torpedo Launcher ([[21inch 6-tube Bow Torpedo Launcher (Initial Model)|Initial Model]]{{•}}[[21inch 6-tube Bow Torpedo Launcher (Late Model)|Late Model]]) <small>(US)</small>{{•}}Submarine 4-tube Stern Torpedo Launcher ([[Submarine 4-tube Stern Torpedo Launcher (Initial Model)|Initial Model]]{{•}}[[Submarine 4-tube Stern Torpedo Launcher (Late Model)|Late Model]]) <small>(US)</small>
 <!---Kouhyouteki--->
-|group3 = [[:Category:Midget Submarine|{{color|black|Midget Submarines}}]]
+|group3 = [[Midget Submarine|{{color|black|Midget Submarines}}]]
 |list3 = Kouhyouteki <big>(</big>[[Type A Kouhyouteki|Type A]]{{•}}[[Type C Kouhyouteki|Type C]]{{•}}[[Type D Kouhyouteki Kai (Kouryuu Kai)|Type D Kai]]<big>)</big>
 }}
@@ Line 126: / Line 131: @@
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |group1 = Type 0
+   |group1 = [[Zero]]
-   |list1 = [[Type 0 Fighter Model 21|Model 21]] <big>(</big>[[Type 0 Fighter Model 21 (Skilled)|Skilled]]<big>)</big>{{•}}[[Type 0 Fighter Model 32|Model 32]] <big>(</big>[[Type 0 Fighter Model 32 (Skilled)|Skilled]]<big>)</big>{{•}}[[Type 0 Fighter Model 52|Model 52]] <big>(</big>[[Type 0 Fighter Model 52 (Skilled)|Skilled]]<big>)</big>{{•}}[[Zero Fighter Model 52C (601 Air Group)|Model 52C (601)]]{{•}}[[Zero Fighter Model 21 (w/ Iwamoto Flight)|Model 21 (Iwamoto)]]{{•}}[[Zero Fighter Model 52A (w/ Iwamoto Flight)|Model 52A (Iwamoto)]]{{•}}[[Type 0 Fighter Model 53 (Iwamoto Squadron)|Model 53 (Iwamoto)]]{{•}}[[Zero Fighter Model 52C (w/ Iwai Flight)|Model 52C (Iwai)]]
+   |list1 = [[Type 0 Fighter Model 21|Model 21]] <big>(</big>[[Type 0 Fighter Model 21 (Skilled)|Skilled]]<big>)</big>{{•}}[[Type 0 Fighter Model 32|Model 32]] <big>(</big>[[Type 0 Fighter Model 32 (Skilled)|Skilled]]<big>)</big>{{•}}[[Type 0 Fighter Model 52|Model 52]] <big>(</big>[[Type 0 Fighter Model 52 (Skilled)|Skilled]]<big>)</big>{{•}}[[Type 0 Fighter Model 64 (Air Superiority Fighter Specification)|Model 64]]{{•}}[[Zero Fighter Model 52C (601 Air Group)|Model 52C (601)]]{{•}}[[Zero Fighter Model 21 (w/ Iwamoto Flight)|Model 21 (Iwamoto)]]{{•}}[[Zero Fighter Model 52A (w/ Iwamoto Flight)|Model 52A (Iwamoto)]]{{•}}[[Type 0 Fighter Model 53 (Iwamoto Squadron)|Model 53 (Iwamoto)]]{{•}}[[Zero Fighter Model 52C (w/ Iwai Flight)|Model 52C (Iwai)]]{{•}}[[Zero Fighter Model 52C (Hachiman Force)|Model 52C (Hachiman)]]
    |group2 = Other (IJN)
-   |list2 = [[Type 96 Fighter|Type 96]] <big>(</big>[[Type 96 Fighter Kai|Kai]]<big>)</big>{{•}}Shiden <big>(</big>[[Shiden Kai 2|Kai 2]]{{•}}[[Shiden Kai 4|Kai 4]]<big>)</big>{{•}}Reppuu <big>(</big>[[Prototype Reppuu Late Model|Prototype LM]]{{•}}[[Reppuu Model 11|Model 11]]{{•}}[[Reppuu (601 Air Group)|601]]{{•}}[[Reppuu Kai (Prototype Carrier-based Model)|Kai]]{{•}}[[Reppuu Kai Ni|Kai 2]]{{•}}[[Reppuu Kai Ni (CarDiv 1/Skilled)|Kai 2 (CD1/Skilled)]]<big>)</big>{{•}}[[Shinden Kai]]{{•}}[[Prototype Jinpuu]]
+   |list2 = [[Type 96 Fighter|Type 96]] <big>(</big>[[Type 96 Fighter Kai|Kai]]<big>)</big>{{•}}Shiden <big>(</big>[[Shiden Kai 2|Kai 2]]{{•}}[[Shiden Kai 4|Kai 4]]<big>)</big>{{•}}Reppuu <big>(</big>[[Prototype Reppuu Late Model|Prototype LM]]{{•}}[[Reppuu Model 11|Model 11]]{{•}}[[Reppuu (601 Air Group)|601]]{{•}}[[Reppuu Kai (Prototype Carrier-based Model)|Kai]]{{•}}[[Reppuu Kai 2|Kai 2]]{{•}}[[Reppuu Kai 2 (CarDiv 1/Skilled)|Kai 2 (CD1/Skilled)]]<big>)</big>{{•}}[[Prototype Jinpuu]]{{•}}[[Shinden Kai]]
    |group3 = Foreign
-   |list3 = [[Bf109 T Kai]] <small>(Ger)</small>{{•}}Fw190 <big>(</big>[[Fw190 T Kai|T Kai]]{{•}}[[Fw 190 A-5 Kai (Skilled)|A-5 Kai (Skilled)]]<big>)</big> <small>(Ger)</small>{{•}}Reggiane <big>(</big>[[Re. 2001 OR Kai|2001 OR Kai]]{{•}}[[Re.2005 Kai|2005 Kai]]<big>)</big> <small>(Ita)</small>{{•}} Wildcat <big>(</big>[[F4F-3]]{{•}}[[F4F-4]]<big>)</big> <small>(US)</small>{{•}}Hellcat <big>(</big>[[F6F-3]]{{•}}[[F6F-5]]<big>)</big> <small>(US)</small>{{•}}[[XF5U]] <small>(US)</small>{{•}}[[FR-1 Fireball]] <small>(US)</small>{{•}}[[Fulmar]] <small>(UK)</small>{{•}}[[Seafire LF.Mk.III Kai|Seafire Mk.III Kai]] <small>(UK)</small>{{•}}[[Corsair Mk.II]] <big>(</big>[[Corsair Mk.II (Ace)|Ace]]<big>)</big> <small>(UK)</small>
+   |list3 = [[Bf 109 T Kai]] <small>(IJN/Ger)</small>{{•}}Fw190 <big>(</big>[[Fw 190 T Kai|T Kai]]{{•}}[[Fw 190 A-5 Kai (Skilled)|A-5 Kai (Skilled)]]<big>)</big> <small>(IJN/Ger)</small>{{•}}Reggiane <big>(</big>[[Re.2001 OR Kai|2001 OR Kai]]{{•}}[[Re.2005 Kai|2005 Kai]]<big>)</big> <small>(IJN/Ita)</small>{{•}} Wildcat <big>(</big>[[F4F-3]]{{•}}[[F4F-4]]<big>)</big> <small>(US)</small>{{•}}Hellcat <big>(</big>[[F6F-3]]{{•}}[[F6F-5]]<big>)</big> <small>(US)</small>{{•}}[[XF5U]] <small>(US)</small>{{•}}[[FR-1 Fireball]] <small>(US)</small>{{•}}[[Fulmar]] <small>(UK)</small>{{•}}[[Seafire Mk.III Kai]] <small>(UK)</small>{{•}}[[Corsair Mk.II]] <big>(</big>[[Corsair Mk.II (Ace)|Ace]]<big>)</big> <small>(UK/US)</small>
-  |group4 = [[:Category:Night Fighters|{{color|black|Night}}]]
+  |group4 = [[Night Fighter|{{color|black|Night}}]]
-   |list4 = [[Reppuu Kai Ni Model E|Reppuu Kai 2 Model E]] <big>(</big>[[Reppuu Kai Ni Model E (CarDiv 1/Skilled)|CD1/Skilled]]<big>)</big>{{•}}Hellcat <big>(</big>[[F6F-3N]]{{•}}[[F6F-5N]]<big>)</big> <small>(US)</small>{{•}}[[F4U-2 Night Corsair]] <small>(US)</small>
+   |list4 = [[Reppuu Kai 2 Model E|Reppuu Kai 2 Model E]] <big>(</big>[[Reppuu Kai 2 Model E (CarDiv 1/Skilled)|CD1/Skilled]]<big>)</big>{{•}}Hellcat <big>(</big>[[F6F-3N]]{{•}}[[F6F-5N]]<big>)</big> <small>(US)</small>{{•}}[[F4U-2 Night Corsair]] <small>(US)</small>
 }}
 <!---Dive Bombers--->
@@ Line 141: / Line 146: @@
    |basestyle  = background-color:#eeddbb;
 <!---|group1 = IJN--->
-   |list1 = [[Type 99 Dive Bomber|Type 99]] <big>(</big>[[Type 99 Dive Bomber (Skilled)|Skilled]]{{•}}[[Type 99 Dive Bomber Model 22|Model 22]]{{•}}[[Type 99 Dive Bomber Model 22 (Skilled)|Model 22/Skilled]]{{•}}[[Type 99 Dive Bomber (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Suisei]] <big>(</big>[[Suisei (601 Air Group)|601]]{{•}}[[Suisei Model 12A|Model 12A]] ([[Suisei Model 12 (634 Air Group w/ Type 3 Cluster Bombs)|w/ Cluster Bombs]]{{•}}[[Suisei Model 12 (w/ Type 31 Photoelectric Fuze Bombs)|w/ Photo Fuze Bombs]]){{•}}Model 22 ([[Suisei Model 22 (634 Air Group)|634]]{{•}}[[Suisei Model 22 (634 Air Group/Skilled)|634/Skilled]]){{•}}[[Suisei (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Prototype Nanzan]]
+   |list1 = [[Type 99 Dive Bomber|Type 99]] <big>(</big>[[Type 99 Dive Bomber (Skilled)|Skilled]]{{•}}[[Type 99 Dive Bomber Model 22|Model 22]]{{•}}[[Type 99 Dive Bomber Model 22 (Skilled)|Model 22/Skilled]]{{•}}[[Type 99 Dive Bomber (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Suisei]] <big>(</big>[[Suisei Model 12A|Model 12A]] ([[Suisei Model 12 (634 Air Group w/ Type 3 Cluster Bombs)|w/ Cluster Bombs]]{{•}}[[Suisei Model 12 (w/ Type 31 Photoelectric Fuze Bombs)|w/ Photo Fuze Bombs]]){{•}}Model 22 ([[Suisei Model 22 (634 Air Group)|634]]{{•}}[[Suisei Model 22 (634 Air Group/Skilled)|634/Skilled]]){{•}}[[Suisei (601 Air Group)|601]]{{•}}[[Suisei (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Prototype Nanzan]]
    |group2 = Foreign
-   |list2 = Ju.87C <big>(</big>[[Ju 87C Kai|Kai]]{{•}}[[Ju 87C Kai Ni (w/ KMX)| Kai 2 KMX]]{{•}}[[Ju 87C Kai Ni (w/ KMX/Skilled)|Kai 2 KMX / Skilled]]<big>)</big> <small>(Ger)</small>{{•}}[[Re.2001 CB Kai]] <small>(Ita)</small>{{•}}Dauntless <big>(</big>[[SBD]]{{•}}[[SBD-5]]<big>)</big> <small>(US)</small>{{•}}Helldiver <big>(</big>[[SB2C-3]]{{•}}[[SB2C-5]]<big>)</big> <small>(US)</small>{{•}}Corsair <big>(</big>[[F4U-1D]] <small>(US)</small>{{•}}[[F4U-4]] <small>(US)</small>{{•}}[[F4U-7]] <small>(Fr)</small><big>)</big>{{•}}[[FM-2]] <small>(US)</small>{{•}}[[Skua]] <small>(UK)</small>
+   |list2 = Ju.87C <big>(</big>[[Ju 87C Kai|Kai]]{{•}}[[Ju 87C Kai 2 (w/ KMX)| Kai 2 KMX]]{{•}}[[Ju 87C Kai 2 (w/ KMX/Skilled)|Kai 2 KMX/Skilled]]<big>)</big> <small>(IJN/Ger)</small>{{•}}[[Re.2001 CB Kai]] <small>(IJN/Ita)</small>{{•}}[[SBD]] <big>(</big>[[SBD (Yellow Wings)|Yellow Wings]]{{•}}[[SBD VB-2 (Bomber Squadron)|VB-2 Bomber Squad]]<big>)</big> <small>(US)</small>{{•}}[[SBD-5]] <small>(US)</small>{{•}}Helldiver <big>(</big>[[SB2C-3]]{{•}}[[SB2C-5]]<big>)</big> <small>(US)</small>{{•}}Corsair <big>(</big>[[F4U-1D]] <small>(US)</small>{{•}}[[F4U-4]] <small>(US)</small>{{•}}[[AU-1]] <small>(US)</small>{{•}}[[F4U-7]] <small>(Fr/US)</small><big>)</big>{{•}}[[FM-2]] <small>(US)</small>{{•}}[[Skua]] <small>(UK)</small>
-   |group3 = [[:Category:Fighter-Bombers|{{color|black|Fighter-bombers}}]]
+   |group3 = [[Fighter-Bomber|{{color|black|Fighter-bombers}}]]
-   |list3 = Type 0 <big>(</big>[[Type 0 Fighter Model 62 (Fighter-bomber)|Model 62 FB]] <big>(</big>[[Zero Fighter Model 62 (Fighter-bomber / Iwai Squadron)|Iwai]]<big>)</big>{{•}}[[Type 0 Fighter Model 63 (Fighter-bomber)|Model 63 FB]]{{•}}[[Type 0 Fighter Model 64 (Two-seat w/ KMX)|Model 64 KMX]]<big>)</big>{{•}}[[AU-1]]<small>(US)</small>
+   |list3 = Type 0 <big>(</big>[[Type 0 Fighter Model 62 (Fighter-bomber)|Model 62 FB]] <big>(</big>[[Zero Fighter Model 62 (Fighter-bomber / Iwai Squadron)|Iwai]]<big>)</big>{{•}}[[Type 0 Fighter Model 63 (Fighter-bomber)|Model 63 FB]]{{•}}[[Type 0 Fighter Model 64 (Two-seat w/ KMX)|Model 64 KMX]]{{•}}[[Type 0 Fighter Model 64 (Skilled Fighter-bomber)|Model 64 (Skilled FB)]]<big>)</big>
 }}
 <!---Torpedo Bombers--->
@@ Line 155: / Line 160: @@
    |list1 = [[Type 97 Torpedo Bomber|Type 97]] <big>(</big>[[Type 97 Torpedo Bomber (Skilled)|Skilled]]{{•}}[[Type 97 Torpedo Bomber (931 Air Group)|931]]{{•}}[[Type 97 Torpedo Bomber (931 Air Group/Skilled)|931/Skilled]]{{•}}[[Type 97 Torpedo Bomber (Tomonaga Squadron)|Tomonaga]]{{•}}[[Type 97 Torpedo Bomber (Murata Squadron)|Murata]]<big>)</big>{{•}}[[Tenzan]] <big>(</big>[[Tenzan (601 Air Group)|601]]{{•}}[[Tenzan (931 Air Group)|931]]{{•}}[[Tenzan Model 12A|Model 12A]]{{•}}[[Tenzan Model 12 (Tomonaga Squadron)|Tomonaga]]{{•}}[[Tenzan Model 12 (Murata Squadron)|Murata]]<big>)</big>{{•}}[[Ryuusei]] <big>(</big>[[Ryuusei Kai|Kai]]{{•}}[[Ryuusei Kai (Skilled)|Kai Skilled]]{{•}}[[Ryuusei (601 Air Group)|601]]{{•}}[[Ryuusei Kai (CarDiv 1)|CD1]]{{•}}[[Ryuusei Kai (CarDiv 1/Skilled)|CD1/Skilled]]<big>)</big>
    |group2 = Foreign
-   |list2 = [[Re. 2001 G Kai|Re.2001 G Kai]] <small>(Ita)</small>{{•}}[[TBD]] <small>(US)</small>{{•}}[[TBF]] <small>(US)</small>{{•}}[[Swordfish]] <big>(</big>[[Swordfish Mk. II (Skilled)|Mk.II Skilled]]{{•}}[[Swordfish Mk.III (Skilled)|Mk.III Skilled]]<big>)</big> <small>(UK)</small>{{•}}Barracuda <big>(</big>[[Barracuda Mk.II|Mk.II]]{{•}}[[Barracuda Mk.III|Mk.III]]<big>)</big> <small>(UK)</small>{{•}}[[Mosquito TR Mk.33]] <small>(UK)</small>
+   |list2 = [[Re.2001 G Kai|Re.2001 G Kai]] <small>(IJN/Ita)</small>{{•}}[[TBD]] <big>(</big>[[TBD (Yellow Wings)|Yellow Wings]]<big>)</big> <small>(US)</small>{{•}}[[TBF]] <small>(US)</small>{{•}}[[Swordfish]] <big>(</big>[[Swordfish Mk. II (Skilled)|Mk.II Skilled]]{{•}}[[Swordfish Mk.III (Skilled)|Mk.III Skilled]]<big>)</big> <small>(UK)</small>{{•}}Barracuda <big>(</big>[[Barracuda Mk.II|Mk.II]]{{•}}[[Barracuda Mk.III|Mk.III]]<big>)</big> <small>(UK)</small>{{•}}[[Mosquito TR Mk.33]] <small>(UK)</small>
-   |group3 = [[:Category:Night Bombers|{{color|black|Night}}]]
+   |group3 = [[Night Torpedo Bomber|{{color|black|Night}}]]
-   |list3 = [[Prototype Type 97 Torpedo Bomber Kai No. 3 Model E (w/ Type 6 Airborne Radar Kai)|Type 97 Model E]] <big>(</big>[[Prototype Type 97 Torpedo Bomber Kai (Skilled) No. 3 Model E (w/ Type 6 Airborne Radar Kai)|Skilled]]<big>)</big>{{•}}[[Tenzan Model 12A Kai (w/ Type 6 Airborne Radar Kai)|Tenzan Model 12A Kai]] <big>(</big>[[Tenzan Model 12A Kai (Skilled w/ Type 6 Airborne Radar Kai)|Skilled]]<big>)</big>{{•}}[[TBM-3D]] <small>(US)</small>{{•}}[[TBM-3W+3S]] <small>(JMSDF/US)</small>
+   |list3 = [[Prototype Type 97 Torpedo Bomber Kai No. 3 Model E (w/ Type 6 Airborne Radar Kai)|Type 97 Model E]] <big>(</big>[[Prototype Type 97 Torpedo Bomber Kai (Skilled) No. 3 Model E (w/ Type 6 Airborne Radar Kai)|Skilled]]<big>)</big>{{•}}[[Tenzan Model 12A Kai (w/ Type 6 Airborne Radar Kai)|Tenzan Model 12A Kai]] <big>(</big>[[Tenzan Model 12A Kai (Skilled w/ Type 6 Airborne Radar Kai)|Skilled]] {{•}}[[Tenzan Model 12A Kai 2 (Murata Squadron w/ Radar)|Murata]]<big>)</big>{{•}}[[TBM-3D]] <small>(US)</small>{{•}}[[TBM-3W+3S]] <small>(JMSDF/US)</small>
 }}
 <!---jets--->
@@ Line 163: / Line 168: @@
 |list4 = [[Jet Keiun Kai]]{{•}}[[Kikka Kai]]
 <!---Recon--->
-|group5 = [[:Category:Recon Aircraft|{{color|black|Recons}}]]
+|group5 = [[Carrier Recon|{{color|black|Recons}}]]
 |list5 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |list1 = [[Saiun]] <big>(</big>[[Saiun (4th Recon Squad)|4th Recon]]{{•}}[[Saiun (Eastern Caroline Air Group)|East Caroline]]<big>)</big>{{•}}[[Type 2 Reconnaissance Aircraft|Type 2]]{{•}}[[Fulmar (Reconnaissance Fighter/Skilled)]] <small>(UK)</small>
+   |list1 = [[Saiun]] <big>(</big>[[Saiun (4th Recon Squad)|4th Recon]]{{•}}[[Saiun (Eastern Caroline Air Group)|East Caroline]]<big>)</big>{{•}}[[Type 2 Reconnaissance Aircraft|Type 2]]{{•}}[[SBD VS-2 (Reconnaissance Squadron)]] <small>(US)</small>{{•}}[[Fulmar (Reconnaissance Fighter/Skilled)]] <small>(UK)</small>
-   |group2 = [[:Category:Recon Aircraft|{{color|black|Large}}]]
+   |group2 = [[Large Carrier-based Reconnaissance Aircraft|{{color|black|Large}}]]
    |list2 = [[Prototype Keiun (Carrier-based Reconnaissance Model)|Prototype Keiun]]
 }}
@@ Line 178: / Line 183: @@
   |basestyle  = background-color:#EECC88;
 <!---Attack Aircraft--->
-|group1 = [[:Category:Land Based Bombers|{{color|black|Bombers}}]]
+|group1 = [[Land Based Bomber|{{color|black|Bombers}}]]
 |list1 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |group1 = [[:Category:Land-Based Attackers|{{color|black|Attackers}}]]
+   |group1 = [[LB Attacker |{{color|black|Attackers}}]]
-   |list1 = [[Type 96 Land-based Attack Aircraft|Type 96]]{{•}}[[Type 1 Land-based Attack Aircraft|Type 1]] <big>(</big>[[Type 1 Land-based Attack Aircraft Model 22A|Model 22A]]{{•}}[[Type 1 Land-based Attack Aircraft Model 34|Model 34]]{{•}}[[Type 1 Land-based Attack Aircraft (Nonaka Squadron)|Nonaka]]<big>)</big>{{•}}[[Ginga]] <big>(</big>[[Ginga (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Bomb-carrying Type 1 Fighter Hayabusa Model III Kai (65th Squadron)|Type 1 Hayabusa Model III Kai (65)]] <small>(IJA)</small>{{•}}[[Type 4 Heavy Bomber Hiryuu]] <big>(</big>[[Type 4 Heavy Bomber Hiryuu (Skilled)|Skilled]]{{•}}[[Type 4 Heavy Bomber Hiryuu + No.1 Model 1A Guided Missile|+ No.1 Model 1A Guided Missile]]<big>)</big> <small>(IJA)</small>{{•}}[[Do 17 Z-2]] <small>(Ger)</small>{{•}}Do 217 <big>(</big>[[Do 217 E-5 + Hs293 Initial Model|E-5 + Hs293]]{{•}}[[Do 217 K-2 + Fritz-X|K-2 + Fritz-X]]<big>)</big> <small>(Ger)</small>{{•}}[[SM.79]] <big>(</big>[[SM.79 bis|bis]]{{•}}[[SM.79 bis (Skilled)|Skilled]]<big>)</big> <small>(Ita)</small>{{•}}[[B-25]] <small>(US)</small>{{•}}[[Mosquito FB Mk.VI]] <small>(UK)</small>
+   |list1 = [[Type 96 Land-based Attack Aircraft|Type 96]]{{•}}[[Type 1 Land-based Attack Aircraft|Type 1]] <big>(</big>[[Type 1 Land-based Attack Aircraft Model 22A|Model 22A]]{{•}}[[Type 1 Land-based Attack Aircraft Model 34|Model 34]]{{•}}[[Type 1 Land-based Attack Aircraft (Nonaka Squadron)|Nonaka]]{{•}}[[Type 1 Land-based Attack Aircraft (Hachiman Force)|Hachiman]]<big>)</big>{{•}}[[Ginga]] <big>(</big>[[Ginga (Skilled)|Skilled]]{{•}}[[Ginga (Egusa Squadron)|Egusa]]<big>)</big>{{•}}[[Bomb-carrying Type 1 Fighter Hayabusa Model III Kai (65th Squadron)|Type 1 Hayabusa Model III Kai (65)]] <small>(IJA)</small>{{•}}[[Type 4 Heavy Bomber Hiryuu]] <big>(</big>[[Type 4 Heavy Bomber Hiryuu (Skilled)|Skilled]]{{•}}[[Type 4 Heavy Bomber Hiryuu + No.1 Model 1A Guided Missile|+ No.1 Model 1A Guided Missile]]{{•}}[[Type 4 Heavy Bomber Hiryuu (Skilled) + No.1 Model 1A Guided Missile|Skilled + No.1 Model 1A Guided Missile]]<big>)</big> <small>(IJA)</small>{{•}}[[Do 17 Z-2]] <small>(Ger)</small>{{•}}Do 217 <big>(</big>[[Do 217 E-5 + Hs293 Initial Model|E-5 + Hs293]]{{•}}[[Do 217 K-2 + Fritz-X|K-2 + Fritz-X]]<big>)</big> <small>(Ger)</small>{{•}}[[SM.79]] <big>(</big>[[SM.79 bis|bis]]{{•}}[[SM.79 bis (Skilled)|Skilled]]<big>)</big> <small>(Ita)</small>{{•}}[[B-25]] <small>(US)</small>{{•}}[[Mosquito FB Mk.VI]] <small>(UK)</small>
-   |group2 = [[:Category:Land-Based ASW Bombers|{{color|black|Anti-Submarine}}]]
+   |group2 = [[LB Patrol|{{color|black|Patrol}}]]
    |list2 = Toukai <big>(</big>[[Prototype Toukai|Proto]]{{•}}[[Toukai (901 Air Group)|901]]<big>)</big>
-   |group3 = [[:Category:Land-Based Assault Aircraft|{{color|black|Assault}}]]
+   |group3 = [[LB Assault|{{color|black|Assault}}]]
    |list3 = [[Ki-102 B]] <big>(</big>[[Ki-102 B Kai + No.1 Model 1B Guided Missile|+ No.1 Model 1B Guided Missile]]<big>)</big> <small>(IJA)</small>
-   |group4 = [[:Category:Land-Based Heavy Bombers|{{color|black|Heavy}}]]
+   |group4 = [[LB Heavy|{{color|black|Heavy}}]]
    |list4 = [[Shinzan]] <big>(</big>[[Shinzan Kai|Kai]]<big>)</big>
 }}
@@ Line 195: / Line 200: @@
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
-   |group1 = Army
+   |group1 = "Army"
    |list1 = Type 1 Fighter Hayabusa <big>(</big>[[Type 1 Fighter Hayabusa Model II|Model II]]{{•}}[[Type 1 Fighter Hayabusa Model II (64th Squadron)|Model II (64)]]{{•}}[[Type 1 Fighter Hayabusa Model III A|Model IIIA]]{{•}}[[Type 1 Fighter Hayabusa Model III A (54th Squadron)|Model IIIA (54)]]<big>)</big> <small>(IJA)</small>{{•}}[[Type 3 Fighter Hien]] <big>(</big>[[Type 3 Fighter Hien Model 1D|Model 1D]]{{•}}[[Type 3 Fighter Hien (244th Air Combat Group)|244]]<big>)</big> <small>(IJA)</small>{{•}}[[Type 4 Fighter Hayate]] <small>(IJA)</small>{{•}}[[Type 2 Two-seat Fighter Toryuu]] <big>(</big>[[Type 2 Two-seat Fighter Toryuu Model C|Model C]]<big>)</big> <small>(IJA)</small>{{•}}[[Ki-96]] <small>(IJA)</small>{{•}}[[Fw 190 D-9]] <small>(Ger)</small>{{•}}Spitfire <big>(</big>[[Spitfire Mk.I|Mk.I]]{{•}}[[Spitfire Mk.V|Mk.V]]{{•}}[[Spitfire Mk.IX (Skilled)|Mk.IX Skilled]]<big>)</big> <small>(UK)</small>
-   |group2 = Navy
+   |group2 = "Navy"
-   |list2 = [[Raiden]]{{•}}Shiden <big>(</big>[[Shiden Model 11|Model 11]]{{•}}[[Shiden Model 21 Shiden Kai|Kai]]{{•}}[[Shiden Kai (343 Air Group) 301st Fighter Squadron|Kai 343/301]]{{•}}[[Shiden Kai (343 Air Group) 701st Fighter Squadron|Kai 343/701]]<big>)</big>{{•}}Type 0 Fighter <big>(</big>[[Type 0 Fighter Model 22 (251 Air Group)|Model 22 (251)]]{{•}}[[Type 0 Fighter Model 21 (Tainan Air Group)|Model 21 (Tainan)]]{{•}}[[Type 0 Fighter Model 32 (Tainan Air Group)|Model 32 (Tainan)]]<big>)</big>{{•}}[[Reppuu Kai]] <big>(</big>[[Reppuu Kai (352 Air Group/Skilled)|352/Skilled]]<big>)</big>
+   |list2 = [[Raiden]]{{•}}Shiden <big>(</big>[[Shiden Model 11|Model 11]]{{•}}[[Shiden Model 21 Shiden Kai|Kai]]{{•}}[[Shiden Kai (343 Air Group) 301st Fighter Squadron|Kai 343/301]]{{•}}[[Shiden Kai (343 Air Group) 407th Fighter Squadron|Kai 343/407]]{{•}}[[Shiden Kai (343 Air Group) 701st Fighter Squadron|Kai 343/701]]<big>)</big>{{•}}Type 0 Fighter <big>(</big>[[Type 0 Fighter Model 22 (251 Air Group)|Model 22 (251)]]{{•}}[[Type 0 Fighter Model 21 (Tainan Air Group)|Model 21 (Tainan)]]{{•}}[[Type 0 Fighter Model 32 (Tainan Air Group)|Model 32 (Tainan)]]<big>)</big>{{•}}[[Reppuu Kai]] <big>(</big>[[Reppuu Kai (352 Air Group/Skilled)|352/Skilled]]<big>)</big>
-   |group3 = HA
+   |group3 = Jets
-   |list3 = [[Me 163B]] <small>(Ger)</small>{{•}}[[Shuusui]] <big>(</big>[[Prototype Shuusui|Proto]]<big>)</big>
+  |list3 = [[Me 262 A-1a/R1]] <small>(Ger)</small>
+  |group4 = Canard
+  |list4 = [[Prototype Shinden (Land-based Fighter)]]
+  |group5 = HA
+   |list5 = [[Me 163B]] <small>(Ger)</small>{{•}}[[Shuusui]] <big>(</big>[[Prototype Shuusui|Proto]]<big>)</big>
 }}
-   |group4 = [[:Category:Recon Aircraft|{{color|black|Recons}}]]
+   |group4 = [[Recon Aircraft|{{color|black|Recons}}]]
    |list4 = [[Type 2 Land Based Reconnaissance Aircraft|Type 2 Recon]] <big>(</big>[[Type 2 Land-based Reconnaissance Aircraft (Skilled)|Skilled]]<big>)</big>{{•}}[[Mosquito PR Mk.IV]] <small>(UK)</small>
 }}
@@ Line 208: / Line 217: @@
 |list7 = {{Navbox|child
   |name       = Seaplanes
-  |title      = [[:Category:Seaplanes|{{color|black|Seaplanes}}]]
+  |title      = [[Seaplane|{{color|black|Seaplanes}}]]
   |basestyle  = background-color:#EECC88;
 |group1 = [[SPR|{{color|black|Recons}}]]
 |list1 = {{Navbox|child
-   |list1 = [[Type 0 Reconnaissance Seaplane]] <big>(</big>[[Type 0 Reconnaissance Seaplane Model 11B|Model 11B]]{{•}}[[Type 0 Reconnaissance Seaplane Model 11B (Skilled)|Model 11B Skilled]]<big>)</big>{{•}}[[Type 0 Observation Seaplane]]{{•}}[[Shiun]]{{•}}[[Ar196 Kai]] <small>(Ger)</small>{{•}}[[Ro.43 Reconnaissance Seaplane]] <small>(Ita)</small>{{•}}[[SOC Seagull]] <small>(US)</small>{{•}}[[OS2U]] <small>(US)</small>{{•}}[[SO3C Seamew Kai]] <small>(US)</small>{{•}}[[Swordfish Mk.II Kai (Reconnaissance Seaplane Model)|Swordfish Mk.II Kai]] <small>(UK)</small>{{•}}[[Fairey Seafox Kai]] <small>(UK/Swe)</small>{{•}}[[S9 Osprey]] <small>(UK/Swe)</small>
+   |list1 = [[Type 0 Reconnaissance Seaplane]] <big>(</big>[[Type 0 Reconnaissance Seaplane Model 11B|Model 11B]]{{•}}[[Type 0 Reconnaissance Seaplane Model 11B (Skilled)|Model 11B Skilled]]<big>)</big>{{•}}[[Type 0 Observation Seaplane]]{{•}}[[Type 0 Small Reconnaissance Seaplane]] <big>(</big>[[Type 0 Small Reconnaissance Seaplane (Skilled)|Skilled]]<big>)</big>{{•}}[[Shiun]] <big>(</big>[[Shiun (Skilled)|Skilled]]<big>)</big>{{•}}[[Ar196 Kai]] <small>(IJN/Ger)</small>{{•}}[[Ro.43 Reconnaissance Seaplane]] <small>(Ita)</small>{{•}}[[SOC Seagull]] <big>(</big>[[SOC Seagull Late Model (Skilled)|LM Skilled]]<big>)</big> <small>(US)</small>{{•}}[[OS2U]] <small>(US)</small>{{•}}[[SO3C Seamew Kai]] <small>(US)</small>{{•}}[[Swordfish Mk.II Kai (Reconnaissance Seaplane Model)|Swordfish Mk.II Kai]] <small>(UK)</small>{{•}}[[Fairey Seafox Kai]] <small>(UK/Swe)</small>{{•}}[[S9 Osprey]] <small>(UK/Swe)</small>
-   |group2 = [[:Category:Night Recon|{{color|black|Night}}]]
+   |group2 = [[Night Recon|{{color|black|Night}}]]
    |basestyle  = background-color:#eeddbb;
-   |list2 = [[Type 98 Reconnaissance Seaplane (Night Recon)]]{{•}}[[Type 0 Reconnaissance Seaplane Model 11B Kai (Night Recon)]]{{•}}[[Loire 130M]] <small>(Fr)</small>
+   |list2 = [[Type 98 Reconnaissance Seaplane (Night Recon)]]{{•}}Type 0 Reconnaissance Seaplane <big>(</big>[[Type 0 Reconnaissance Seaplane Model 11B Kai (Night Recon)|11B Kai Night Recon]]{{•}}[[Type 0 Reconnaissance Seaplane Model 11A Kai 2|11A Kai 2]]<big>)</big> {{•}}[[Loire 130M]] <big>(</big>[[Loire 130M Kai (Skilled)|Kai Skilled]]<big>)</big> <small>(Fr)</small>{{•}}[[Walrus]] <small>(UK)</small>{{•}}[[Sea Otter]] <small>(UK)</small>
 }}
 |group2 = [[SPB|{{color|black|Bombers}}]]
-|list2 = [[Zuiun]] <big>(</big>[[Zuiun (631 Air Group)|631]]{{•}}[[Zuiun (634 Air Group)|634]]{{•}}[[Zuiun (634 Air Group/Skilled)|634/Skilled]]{{•}}[[Zuiun Model 12|Model 12]]{{•}}[[Zuiun Model 12 (634 Air Group)|Model 12 (634)]]{{•}}[[Zuiun Kai Ni (634 Air Group)|Kai 2 (634)]]{{•}}[[Zuiun Kai Ni (634 Air Group/Skilled)|Kai 2 (634/Skilled)]]<big>)</big>{{•}}Seiran <big>(</big>[[Prototype Seiran|Prototype]]{{•}}[[Seiran (631 Air Group)|631]]<big>)</big>{{•}}[[Swordfish (Seaplane Model)|Swordfish]] <big>(</big>[[Swordfish Mk.III Kai (Seaplane Model)|Mk.III Kai]]{{•}}[[Swordfish Mk.III Kai (Seaplane Model/Skilled)|Mk.III Kai Skilled]]<big>)</big> <small>(UK/Swe)</small>{{•}}[[Laté 298B]] <small>(Fr)</small>
+|list2 = {{Navbox|child
+  |list1 = [[Zuiun]] <big>(</big>[[Zuiun (631 Air Group)|631]]{{•}}[[Zuiun (634 Air Group)|634]]{{•}}[[Zuiun (634 Air Group/Skilled)|634/Skilled]]{{•}}[[Zuiun Model 12|Model 12]]{{•}}[[Zuiun Model 12 (634 Air Group)|Model 12 (634)]]{{•}}[[Zuiun Kai 2 (634 Air Group)|Kai 2 (634)]]{{•}}[[Zuiun Kai 2 (634 Air Group/Skilled)|Kai 2 (634/Skilled)]]<big>)</big>{{•}}Seiran <big>(</big>[[Prototype Seiran|Prototype]]{{•}}[[Seiran (631 Air Group)|631]]<big>)</big>{{•}}[[Swordfish (Seaplane Model)|Swordfish]] <big>(</big>[[Swordfish Mk.III Kai (Seaplane Model)|Mk.III Kai]]{{•}}[[Swordfish Mk.III Kai (Seaplane Model/Skilled)|Mk.III Kai Skilled]]<big>)</big> <small>(UK/Swe)</small>{{•}}[[Laté 298B]] <small>(Fr)</small>
+  |group2 = [[NSPB|{{color|black|Night}}]]
+  |basestyle  = background-color:#eeddbb;
+  |list2 = [[Prototype Night Zuiun (Attack Equipment)]]
+}}
 |group3 = [[SPF|{{color|black|Fighters}}]]
-|list3 = [[Type 2 Seaplane Fighter Kai|Type 2 Kai]] <big>(</big>[[Type 2 Seaplane Fighter Kai (Skilled)|Skilled]]<big>)</big>{{•}}[[Kyoufuu Kai]]{{•}}[[Ro.44 Seaplane Fighter]] <big>(</big>[[Ro.44 Seaplane Fighter bis|bis]]<big>)</big> <small>(Ita)</small>
+|list3 = [[Type 2 Seaplane Fighter Kai|Type 2 Kai]] <big>(</big>[[Type 2 Seaplane Fighter Kai (Skilled)|Skilled]]<big>)</big>{{•}}Kyoufuu <big>(</big>[[Kyoufuu Kai|Kai]]{{•}}[[Kyoufuu Kai 2|Kai 2]]<big>)</big>{{•}}[[Ro.44 Seaplane Fighter]] <big>(</big>[[Ro.44 Seaplane Fighter bis|bis]]<big>)</big> <small>(Ita)</small>
-|group4 = [[:Category:Flying Boat|{{color|black|Flying Boats}}]]
+|group4 = [[LFB|{{color|black|Large Flying Boats}}]]
 |list4 = [[Type 2 Large Flying Boat]]{{•}}[[PBY-5A Catalina]] <small>(US)</small>
 }}
@@ Line 227: / Line 241: @@
 |list8 = {{Navbox|child
   |name       = Radars
-  |title      = [[:Category:Radar|{{color|black|Radars}}]]
+  |title      = [[Radar|{{color|black|Radars}}]]
   |basestyle  = background-color:#EECC88;
-|group1 = [[:Category:Small Radar|{{color|black|Small}}]]
+|group1 = [[Small Radar|{{color|black|Small}}]]
-|list1 = [[Type 13 Air Radar]] <big>(</big>[[Type 13 Air Radar Kai|Kai]]{{•}}[[Type 13 Air Radar Kai (Late Model)|Kai LM]]<big>)</big>{{•}}[[Type 22 Surface Radar]] <big>(</big>[[Type 22 Surface Radar Kai 4|Kai 4]]{{•}}[[Type 22 Surface Radar Kai 4 (Calibrated Late Model)|Kai 4 Calibrated LM]]<big>)</big>{{•}}[[Type 33 Surface Radar|Type 33 Surface Radar]]{{•}}SG Radar <big>(</big>[[SG Radar (Initial Model)|Initial Model]]{{•}}[[SG Radar (Late Model)|Late Model]]<big>)</big> <small>(US)</small>{{•}}[[GFCS Mk.37]] <small>(US)</small>
+|list1 = [[Type 13 Air Radar]] <big>(</big>[[Type 13 Air Radar Kai|Kai]]{{•}}[[Type 13 Air Radar Kai (Late Model)|Kai LM]]<big>)</big>{{•}}[[Type 22 Surface Radar]] <big>(</big>[[Type 22 Surface Radar Kai 4|Kai 4]]{{•}}[[Type 22 Surface Radar Kai 4 (Calibrated Late Model)|Kai 4 Calibrated LM]]{{•}}[[Passive Radiolocator (E27) + Type 22 Surface Radar Kai 4 (Calibrated Late Model)|Kai 4 LM + Passive Radiolocator (E27)]]<big>)</big>{{•}}[[Type 33 Surface Radar|Type 33 Surface Radar]]{{•}}[[Radar Equipment Mast (Type 13 Kai + Type 22 Radar Kai 4)]]{{•}}SG Radar <big>(</big>[[SG Radar (Initial Model)|Initial Model]]{{•}}[[SG Radar (Late Model)|Late Model]]<big>)</big> <small>(US)</small>{{•}}[[GFCS Mk.37]] <small>(US)</small>
-|group2 = [[:Category:Large Radar|{{color|black|Large}}]]
+|group2 = [[Large Radar|{{color|black|Large}}]]
-|list2 = [[Type 21 Air Radar]] <big>(</big>[[Type 21 Air Radar Kai|Kai]]{{•}}[[Type 21 Air Radar Kai Ni|Kai 2]]<big>)</big>{{•}}[[Type 32 Surface Radar]] <big>(</big>[[Type 32 Surface Radar Kai|Kai]]<big>)</big>{{•}}[[Type 42 Air Radar]] <big>(</big>[[Type 42 Air Radar Kai Ni|Kai 2]]<big>)</big>{{•}}[[FuMO25 Radar]] <small>(Ger)</small>{{•}}[[SK Radar]] <big>(</big>[[SK + SG Radar|+ SG]]<big>)</big> <small>(US)</small>
+|list2 = [[Type 21 Air Radar]] <big>(</big>[[Type 21 Air Radar Kai|Kai]]{{•}}[[Type 21 Air Radar Kai 2|Kai 2]]<big>)</big>{{•}}[[Type 32 Surface Radar]] <big>(</big>[[Type 32 Surface Radar Kai|Kai]]<big>)</big>{{•}}[[Type 42 Air Radar]] <big>(</big>[[Type 42 Air Radar Kai 2|Kai 2]]<big>)</big>{{•}}[[FuMO25 Radar]] <small>(Ger)</small>{{•}}[[SK Radar]] <big>(</big>[[SK + SG Radar|+ SG]]<big>)</big> <small>(US)</small>{{•}}[[Type 281 Radar]] <small>(UK)</small>{{•}}[[Type 274 Fire Control Radar]] <small>(UK)</small>
-|group3 = [[:Category:Very Large Radar|{{color|black|Very Large}}]]
+|group3 = [[Very Large Radar|{{color|black|Very Large}}]]
-|list3 = [[15m Duplex Rangefinder + Type 21 Radar Kai Ni]] <big>(</big>[[15m Duplex Rangefinder Kai + Type 21 Radar Kai Ni + Skilled Fire Direction Center| + Skilled Fire Direction Center]]<big>)</big>
+|list3 = [[15m Duplex Rangefinder + Type 21 Radar Kai 2]] <big>(</big>[[15m Duplex Rangefinder Kai + Type 21 Radar Kai 2 + Skilled Fire Direction Center| + Skilled Fire Direction Center]]<big>)</big>
-|group4 = [[:Category:Submarine Radar|{{color|black|Submarine}}]]
+|group4 = [[Submarine Radar|{{color|black|Submarine}}]]
-|list4 = [[Submarine Radar & Waterproof Telescope]]{{•}}[[Submarine Radar & Passive Radiolocator (E27)]]{{•}}[[Late Model Submarine Radar & Passive Radiolocator]]{{•}}[[Late Model Radar & Passive Radiolocator + Snorkel Equipment]]
+|list4 = [[Submarine Radar & Waterproof Telescope]]{{•}}[[Submarine Radar & Passive Radiolocator (E27)]]{{•}}[[Late Model Submarine Radar & Passive Radiolocator]]{{•}}[[Late Model Radar & Passive Radiolocator + Snorkel Equipment]]{{•}}[[SJ Radar + Submarine Conning Tower Equipment]]
 }}
 <!---ASW Equip--->
@@ Line 243: / Line 257: @@
   |title      = [[:Category:Anti-submarine Weaponry|{{color|black|Anti-Submarine Warfare}}]]
   |basestyle  = background-color:#EECC88;
-|group1 = [[:Category:Sonar|{{color|black|Sonars}}]]
+|group1 = [[Sonar|{{color|black|Sonars}}]]
    |list1 = {{Navbox|child
      |evenodd = swap
      |basestyle  = background-color:#eeddbb;
-     |group1 = [[:Category:Small Sonar|{{color|black|Small}}]]
+     |group1 = [[Small Sonar|{{color|black|Small}}]]
      |list1 = [[Type 93 Passive Sonar]]{{•}}[[Type 3 Active Sonar]] <big>(</big>[[Type 3 Active Sonar Kai|Kai]]<big>)</big>{{•}}[[Type 4 Passive Sonar]]{{•}} ASDIC <big>(</big>[[Type124 ASDIC|Type 124]]{{•}}[[Type144/147 ASDIC|Type 144/147]]{{•}}[[HF/DF + Type144/147 ASDIC|Type 144/147 + HF/DF]]<big>)</big> <small>(UK)</small>
-     |group2 = [[:Category:Large Sonar|{{color|black|Large}}]]
+     |group2 = [[Large Sonar|{{color|black|Large}}]]
      |list2 = [[Type 0 Passive Sonar]]
 }}
-|group2 = [[:Category:Depth Charges|{{color|black|Depth Charges}}]]
+|group2 = [[Depth Charge|{{color|black|Depth Charges}}]]
    |list2 = {{Navbox|child
      |evenodd = swap
      |basestyle  = background-color:#eeddbb;
-     |group1 = [[:Category:Depth Charge Projector|{{color|black|Projectors‎}}]]
+     |group1 = [[DCP|{{color|black|Projectors‎}}]]
      |list1 = [[Type 94 Depth Charge Projector]]{{•}}[[Type 3 Depth Charge Projector]] <big>(</big>[[Type 3 Depth Charge Projector (Concentrated Deployment)|CD]]<big>)</big>{{•}}[[Prototype 15cm 9-tube ASW Rocket Launcher]]{{•}}[[RUR-4A Weapon Alpha Kai]] <small>(US)</small>{{•}}[[Mk.32 ASW Torpedo (Mk.2 Thrower)]] <small>(US)</small>
-     |group2 = [[:Category:Depth Charges Racks|{{color|black|Racks}}]]
+     |group2 = [[DCR|{{color|black|Racks}}]]
-     |list2 = [[Type 95 Depth Charge]]{{•}}[[Type 2 Depth Charge]]{{•}}[[Hedgehog (Initial Model)]] <small>(UK)</small>{{•}}[[Lightweight ASW Torpedo (Initial Test Model)]] <small>(US)</small>
+     |list2 = [[Type 95 Depth Charge]]{{•}}[[Type 2 Depth Charge]] <big>(</big>[[Type 2 Depth Charge Kai 2|Kai 2]]<big>)</big>{{•}}[[Hedgehog (Initial Model)]] <small>(UK)</small>{{•}}[[Lightweight ASW Torpedo (Initial Test Model)]] <small>(US)</small>
-     |group3 = [[:Category:ASW Mortars|{{color|black|Others}}]]
+     |group3 = [[ASW Mortar|{{color|black|Others}}]]
      |list3 = [[Type 2 12cm Mortar Kai]] <big>(</big>[[Type 2 12cm Mortar Kai (Concentrated Deployment)|CD]]<big>)</big>
 }}
-|group3 = [[:Category:Rotorcraft|{{color|black|Rotorcraft}}]]
+|group3 = [[Rotorcraft|{{color|black|Rotorcraft}}]]
-|list3 = [[Ka Type Observation Autogyro]]{{•}}O Type Observation Autogyro <big>(</big>[[O Type Observation Autogyro Kai|Kai]]{{•}}[[O Type Observation Autogyro Kai Ni|Kai 2]]<big>)</big>{{•}}[[S-51J]] <big>(</big>[[S-51J Kai|Kai]]<big>)</big>
+|list3 = [[Ka Type Observation Autogyro]] <small>(IJA)</small>{{•}}O Type Observation Autogyro <big>(</big>[[O Type Observation Autogyro Kai|Kai]]{{•}}[[O Type Observation Autogyro Kai 2|Kai 2]]<big>)</big> <small>(IJA)</small>{{•}}[[S-51J]] <big>(</big>[[S-51J Kai|Kai]]<big>)</big> <small>(JMSDF/US)</small>
-|group4 = [[:Category:Liaison Aircrafts|{{color|black|Liaison Aircraft}}]]
+|group4 = [[Liaison Aircraft|{{color|black|Liaison Aircraft}}]]
-|list4 = [[Type 3 Command Liaison Aircraft (ASW)]] <big>(</big>[[Type 3 Command Liaison Aircraft Kai|Kai]]<big>)</big> <small>(IJA)</small>
+|list4 = [[Type 3 Command Liaison Aircraft (ASW)]] <big>(</big>[[Type 3 Command Liaison Aircraft Kai|Kai]]/[[Type 3 Command Liaison Aircraft Kai 2|2]]<big>)</big> <small>(IJA)</small>{{•}}Type 1 Fighter Hayabusa <big>(</big>[[Type 1 Fighter Hayabusa Model II Kai (20th Squadron)|Model II Kai (20th Squadron)]]{{•}}[[Type 1 Fighter Hayabusa Model III Kai (Skilled/20th Squadron)|Model III Kai (Skilled/20th Squadron)]]<big>)</big> <small>(IJA)</small>
 }}
 <!---Miscellaneous--->
@@ Line 273: / Line 287: @@
   |title      = Miscellaneous
   |basestyle  = background-color:#EECC88;
-|group1 = [[:Category:Anti-Ground Artillery|{{color|black|Anti-Ground Artillery}}]]
+|group1 = [[Anti-Ground Rocket|{{color|black|Anti-Ground Rockets}}]]
 |list1 = [[WG42 (Wurfgerät 42)]] <small>(Ger)</small>{{•}}[[Shipborne Model Type 4 20cm Anti-ground Rocket Launcher|Type 4 20cm Anti-ground Rocket Launcher]] <big>(</big>[[Type 4 20cm Anti-ground Rocket Launcher (Concentrated Deployment)|CD]]<big>)</big>
-|group2 = [[:Category:Shells|{{color|black|Shells}}]]
+|group2 = [[Shell|{{color|black|Shells}}]]
    |list2 = {{Navbox|child
      |evenodd = swap
      |basestyle  = background-color:#eeddbb;
-     |group1 = [[:Category:Armour-Piercing Shells|{{color|black|Armor-Piercing}}]]
+     |group1 = [[AP Shell|{{color|black|Armor-Piercing}}]]
      |list1 = [[Type 91 Armor-Piercing (AP) Shell|Type 91 AP Shell]]{{•}}[[Type 1 Armor-Piercing (AP) Shell|Type 1 AP Shell]] <big>(</big>[[Type 1 Armor-Piercing (AP) Shell Kai|Kai]]<big>)</big>
-     |group2 = [[:Category:Anti-Aircraft Shells|{{color|black|Anti-Air}}]]
+     |group2 = [[AA Shell|{{color|black|Anti-Air}}]]
-     |list2 = [[Type 3 Shell]] <big>(</big>[[Type 3 Shell Kai|Kai]]<big>)</big>
+     |list2 = [[Type 3 Shell]] <big>(</big>[[Type 3 Shell Kai|Kai]]{{•}}[[Type 3 Shell Kai 2|Kai 2]]<big>)</big>
 }}
-|group3 = [[:Category:Engines|{{color|black|Engines}}]]
+|group3 = [[Engine Improvement|{{color|black|Engines}}]]
 |list3 = [[Improved Kanhon Type Turbine]]{{•}}[[Enhanced Kanhon Type Boiler]]{{•}}[[New Model High Temperature High Pressure Boiler]]
-|group4 = [[:Category:Landing Craft|{{color|black|Landing Crafts}}]]
-  |list4 = {{Navbox|child
-    |evenodd = swap
-    |basestyle = background-color:#eeddbb;
-    |list1 = [[Daihatsu Landing Craft]] <big>(</big>[[Daihatsu Landing Craft (Type 89 Medium Tank & Landing Force)|+ Type 89 & Landing Force]]{{•}}[[Daihatsu Landing Craft (Panzer II/North African Specification)|Panzer II]]{{•}}[[Armed Daihatsu|Armed]]<big>)</big>{{•}}[[Toku Daihatsu Landing Craft]] <big>(</big>[[Toku Daihatsu Landing Craft + 11th Tank Regiment|+ 11th Tank Regiment]]{{•}}[[Toku Daihatsu Landing Craft + Type 1 Gun Tank|+ Type 1 Gun Tank]]{{•}}[[Toku Daihatsu Landing Craft + Panzer III (North African Specification)|+ Panzer III]]<big>)</big>{{•}}[[M4A1 DD]] <small>(US)</small>{{•}}[[Soukoutei (Armored Boat Class)|Soukoutei (AB-Class)]] <small>(IJA)</small>
-|group2 = [[:Category:Amphibious Tank|{{color|black|Tanks}}]]
+|group4 = [[Landing Craft|{{color|black|Landing Craft}}]]
-|list2 = [[Special Type 2 Amphibious Tank]]
+|list4 =  [[Daihatsu Landing Craft]] <big>(</big>[[Daihatsu Landing Craft (Type 89 Medium Tank & Landing Force)|+ Type 89 & Landing Force]]{{•}}[[Daihatsu Landing Craft (Panzer II/North African Specification)|+ Panzer II]] <small>(IJN/Ger)</small>{{•}}[[Armed Daihatsu|Armed]]<big>)</big>{{•}}[[Toku Daihatsu Landing Craft]] <big>(</big>[[Toku Daihatsu Landing Craft + 11th Tank Regiment|+ 11th Tank Regiment]]{{•}}[[Toku Daihatsu Landing Craft + Type 1 Gun Tank|+ Type 1 Gun Tank]]{{•}}[[Toku Daihatsu Landing Craft + Panzer III (North African Specification)|+ Panzer III]] <small>(IJN/Ger)</small>{{•}}[[Toku Daihatsu Landing Craft + Panzer III Type J|+ Panzer III Ausf.J]] <small>(IJN/Ger)</small>{{•}}[[Toku Daihatsu Landing Craft + Chi-Ha|+ Chi-Ha]]{{•}}[[Toku Daihatsu Landing Craft + Chi-Ha Kai|+ Chi-Ha Kai]] <big>)</big>{{•}}[[M4A1 DD]] <small>(US)</small>{{•}}[[Soukoutei (Armored Boat Class)|Soukoutei (AB-Class)]] <small>(IJA)</small>
-}}
-|group6 = [[:Category:Armor|{{color|black|Armor}}]]
+|group5 = [[Amphibious Vehicle|{{color|black|Amphibious Vehicles}}]]
-   |list6 = {{Navbox|child
+|list5 = [[Special Type 2 Amphibious Tank]]{{•}}[[Special Type 4 Amphibious Tank]] <big>(</big>[[Special Type 4 Amphibious Tank Kai|Kai]]<big>)</big>
+|group6 = [[Landing Force|{{color|black|Landing Forces}}]]
+|list6 = [[Army Infantry Corps]] <big>(</big>[[Army Infantry Corps + Chi-Ha Kai|+ Chi-Ha Kai]]<big>)</big>{{•}}[[Type 97 Medium Tank (Chi-Ha)]] <big>(</big>[[Type 97 Medium Tank New Turret (Chi-Ha Kai)|Kai]]<big>)</big>
+|group7 = [[Extra Armor|{{color|black|Extra Armor}}]]
+   |list7 = {{Navbox|child
      |evenodd = swap
      |basestyle  = background-color:#eeddbb;
@@ Line 302: / Line 317: @@
      |list1 = [[Anti-torpedo Bulge (Medium)]]{{•}}[[New Kanhon Design Anti-torpedo Bulge (Medium)]]{{•}}[[Arctic camouflage (+ Arctic equipment)]]
      |group2 = [[:Category:Large Armor|{{color|black|Large}}]]
-     |list2 = [[Anti-torpedo Bulge (Large)]]{{•}}[[New Kanhon Design Anti-torpedo Bulge (Large)]]{{•}}[[Pugliese Underwater Protection Bulkhead]]
+     |list2 = [[Anti-torpedo Bulge (Large)]]{{•}}[[New Kanhon Design Anti-torpedo Bulge (Large)]]{{•}}[[Pugliese Underwater Protection Bulkhead]] <small>(Ita)</small>
 }}
-|group7 = Night Battle Aid
+|group8 = Night Battle Aid
-|list7 = [[Searchlight]]{{•}}[[Type 96 150cm Searchlight]]{{•}}[[Star Shell]]
+|list8 = [[Searchlight]]{{•}}[[Type 96 150cm Searchlight]]{{•}}[[Star Shell]]
-|group8 = Facility & Crew
+|group9 = Facility & Crew
-|list8 = {{Navbox|child
+|list9 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
    |list1 = [[Ship Repair Facility]]
-   |group2 = [[:Category:Lookout|{{color|black|Skilled Lookouts}}]]
+   |group2 = [[Lookout|{{color|black|Skilled Lookouts}}]]
    |list2 = [[Skilled Lookouts]] <big>(</big>[[Torpedo Squadron Skilled Lookouts|Torpedo Squadron]]<big>)</big>
-   |group4 = [[:Category:Command Facilities|{{color|black|Command Facilities}}]]
+   |group4 = [[Command Facility|{{color|black|Command Facilities}}]]
-   |list4 = [[Fleet Command Facility]] <big>(</big>[[Striking Force Fleet Command Facility|Striking Force]]{{•}}[[Elite Torpedo Squadron Command Facility|Elite Torpedo Squadron]]<big>)</big>
+   |list4 = [[Fleet Command Facility]] <big>(</big>[[Striking Force Fleet Command Facility|Striking Force]]{{•}}[[Elite Torpedo Squadron Command Facility|Elite Torpedo Squadron]]<big>)</big>{{•}}[[Fleet Communication Antenna]]{{•}}[[Communication Equipment & Personnel]]
-   |group5 = [[:Category:Aviation Personnel|{{color|black|Aviation Personnels}}]]
+   |group5 = [[Aviation Personnel|{{color|black|Aviation Personnels}}]]
    |list5 = [[Skilled Carrier-based Aircraft Maintenance Personnel]]{{•}}[[Night Operation Aviation Personnel]] <big>(</big>[[Night Operation Aviation Personnel + Skilled Deckhands|+ Skilled Deckhands]]<big>)</big>{{•}}[[Arctic Gear & Deck Personnel]]{{•}}[[Skilled Deck Personnel]] <big>(</big>[[Skilled Deck Personnel + Aviation Maintenance Hands|+ Aviation Maintenance Hands]]<big>)</big>
 }}
-|group9 = Consumables
+|group10 = [[:Category:Surface Ship Equipment|{{color|black|Surface Ship Equipment}}]]
-|list9 = {{Navbox|child
+|list10 = {{Navbox|child
+  |evenodd = swap
+  |basestyle  = background-color:#eeddbb;
+  |list1 = [[Barrage Balloon]]
+  |group2 = [[Smoke Generator|{{color|black|Smoke Generators}}]]
+  |list2 = [[Smoke Generator (Smoke Screen)]] <big>(</big>[[Smoke Generator Kai (Smoke Screen)|Kai]]<big>)</big>
+}}
+|group11 = Consumables
+|list11 = {{Navbox|child
    |evenodd = swap
    |basestyle  = background-color:#eeddbb;
    |list1 = [[Underway Replenishment]]
-   |group2 = [[:Category:Repair Personnel|{{color|black|Repair Personnels}}]]
+   |group2 = [[Repair Personnel|{{color|black|Repair Personnels}}]]
    |list2 = [[Emergency Repair Personnel]]{{•}}[[Emergency Repair Goddess]]
-   |group4 = [[:Category:Ration|{{color|black|Rations}}]]
+   |group3 = [[Ration|{{color|black|Rations}}]]
-   |list4 = [[Combat Ration]] <big>(</big>[[Battle Ration (Special Onigiri)|Special Onigiri]]<big>)</big>{{•}}[[Canned Saury]]
+   |list3 = [[Combat Ration]] <big>(</big>[[Battle Ration (Special Onigiri)|Special Onigiri]]<big>)</big>{{•}}[[Canned Saury]]
 }}
-|group10 = Others
+|group12 = Others
-|list10 = [[Drum Canister (Transport Use)]]{{•}}[[Saiun (Disassembled for Transport)]]
+|list12 = [[Drum Canister (Transport Use)]]{{•}}[[Saiun (Disassembled for Transport)]]
 <!---Historical reasons--->
-|group11 = Unreleased & removed
+|group13 = Unreleased & removed
-|list11 = SB2U
+|list13 = [[SB2U]]
 }}
 }}

Difference between revisions of "Template:Equipmentlist"

Latest revision as of 23:38, 9 November 2024

Navigation menu

Search