7,361
edits
- Welcome to the Kancolle Wiki!
- If you have any questions regarding site content, account registration, etc., please visit the KanColle Wiki Discord
Changes
Jump to navigation
Jump to search
Line 15:
Line 15: − + − + − + − + − + − + − + + + + + − + − + − + − + − + − + − + + + + + − + − + − + − + − + − + − + − + − + − + − + − + − + − + Line 69:
Line 77: + Line 76:
Line 85: − + + + Line 113:
Line 124: − + Line 121:
Line 132: − + Line 132:
Line 143: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Line 222:
Line 276: − + Line 230:
Line 284: − +
Partially added Secretary Ship Type functionality, still trying to figure out how to handle custom tooltips. Small fixes.
! colspan="7" align="center" {{!}} {{{Category}}}
! colspan="7" align="center" {{!}} {{{Category}}}
{{!}}-
{{!}}-
{{!}} align="center" rowspan="{{#ifeq:{{{R1Fuel|}}}|{{{R2Fuel|}}}|{{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel|}}}|{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Fuel}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Fuel|}}}|{{{R2Fuel}}}|{{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel|}}}|{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Fuel}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Ammo|}}}|{{{R2Ammo|}}}|{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo|}}}|{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Ammo}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Ammo|}}}|{{{R2Ammo}}}|{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo|}}}|{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Ammo}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Steel|}}}|{{{R2Steel|}}}|{{#ifeq:{{{R2Steel|}}}|{{{R3Steel|}}}|{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Steel}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Steel|}}}|{{{R2Steel}}}|{{#ifeq:{{{R2Steel|}}}|{{{R3Steel|}}}|{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Steel}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}|{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Bauxite}}}
{{!}} align="center" rowspan="{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite}}}|{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Bauxite}}}
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}|{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Secretary}}}
! align="center" rowspan="{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary}}}|{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}}|1}}" style="background-{{#switch:{{{R1Secretary|}}}
{{!}} rowspan="{{#ifeq:{{{R1Results|}}}|{{{R2Results|}}}|{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Results}}}
|Torpedo = color:#EEF5FF;" {{!}} {{ToolTip|text-align=default;background-color:#EEF5FF|{{ToolTip|Torpedo|{{colour|red|Does '''NOT''' include '''SSV'''}}}}|'''Secretary: Category Torpedo'''<hr>'''Ship Types included:'''<br>DE, DD, CL, CLT, SS, AP, CT or AO}}
{{!}} rowspan="{{#ifeq:{{{R1Notes|}}}|{{{R2Notes|}}}|{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Notes|}}}
|Heavy = color:#FFEEEE;" {{!}} {{ToolTip|text-align=default;background-color:#FFEEEE|{{ToolTip|Heavy|{{colour|red|Does '''NOT''' include '''CAV/BBV'''}}}}|'''Secretary: Category Heavy'''<hr>'''Ship Types included:'''<br>CA, FBB, BB, XBB or AR}}
|Aviation = color:#EEFFCC;" {{!}} {{ToolTip|text-align=default;background-color:#EEFFCC|Aviation|'''Secretary: Category Aviation'''<hr>'''Ship Types included:'''<br>CAV, CVL, BBV, CV, SSV, AV, LHA, CVB or AS}}
|color:{{{R1SecretaryColour}}};" {{!}} {{ToolTip|text-align=default;background-color:{{{R1SecretaryColour}}}|{{{R1Secretary}}}|'''Secretary: {{{R1Secretary}}}'''<hr>{{{R1SecretaryDescription}}}}}}}
{{!}} rowspan="{{#ifeq:{{{R1Results|}}}|{{{R2Results}}}|{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Results}}}
{{!}} rowspan="{{#ifeq:{{{R1Notes|}}}|{{{R2Notes}}}|{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Notes|}}}
{{!}}-
{{!}}-
{{#if:{{{R2Fuel|}}}{{{R2Ammo|}}}{{{R2Steel|}}}{{{R2Bauxite|}}}| {{#ifeq:{{{R1Fuel|}}}|{{{R2Fuel|}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel|}}}|{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Fuel}}} }}{{#ifeq:{{{R1Ammo|}}}|{{{R2Ammo|}}}||<br>
{{#if:{{{R2Fuel|}}}{{{R2Ammo|}}}{{{R2Steel|}}}{{{R2Bauxite|}}}| {{#ifeq:{{{R1Fuel|}}}|{{{R2Fuel}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel|}}}|{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Fuel}}} }}{{#ifeq:{{{R1Ammo|}}}|{{{R2Ammo|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo|}}}|{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Ammo}}} }}{{#ifeq:{{{R1Steel|}}}|{{{R2Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo}}}|{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Ammo}}} }}{{#ifeq:{{{R1Steel|}}}|{{{R2Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Steel|}}}|{{{R3Steel|}}}|{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Steel}}} }}{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Steel|}}}|{{{R3Steel}}}|{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Steel}}} }}{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Bauxite}}} }}{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Bauxite}}} }}{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}||<br>
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Secretary}}} }}{{#ifeq:{{{R1Results|}}}|{{{R2Results|}}}||<br>
! align="center" rowspan="{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|4|3}}|2}}|1}}" style="background-{{#switch:{{{R2Secretary|}}}
{{!}} rowspan="{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Results}}} }}{{#ifeq:{{{R1Notes|}}}|{{{R2Notes|}}}||<br>
|Torpedo = color:#EEF5FF;" {{!}} {{ToolTip|text-align=default;background-color:#EEF5FF|{{ToolTip|Torpedo|{{colour|red|Does '''NOT''' include '''SSV'''}}}}|'''Secretary: Category Torpedo'''<hr>'''Ship Types included:'''<br>DE, DD, CL, CLT, SS, AP, CT or AO}}
{{!}} rowspan="{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Notes|}}} }}
|Heavy = color:#FFEEEE;" {{!}} {{ToolTip|text-align=default;background-color:#FFEEEE|{{ToolTip|Heavy|{{colour|red|Does '''NOT''' include '''CAV/BBV'''}}}}|'''Secretary: Category Heavy'''<hr>'''Ship Types included:'''<br>CA, FBB, BB, XBB or AR}}
|Aviation = color:#EEFFCC;" {{!}} {{ToolTip|text-align=default;background-color:#EEFFCC|Aviation|'''Secretary: Category Aviation'''<hr>'''Ship Types included:'''<br>CAV, CVL, BBV, CV, SSV, AV, LHA, CVB or AS}}
|color:{{{R2SecretaryColour}}};" {{!}} {{ToolTip|text-align=default;background-color:{{{R2SecretaryColour}}}|{{{R2Secretary}}}|'''Secretary: {{{R2Secretary}}}'''<hr>{{{R2SecretaryDescription}}}}}}} }}{{#ifeq:{{{R1Results|}}}|{{{R2Results|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R2Results|}}}|{{{R3Results}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Results}}} }}{{#ifeq:{{{R1Notes|}}}|{{{R2Notes|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R2Notes|}}}|{{{R3Notes}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|4|3}}|2}}|1}}" {{!}} {{{R2Notes|}}} }}
{{!}}-
{{!}}-
{{#if:{{{R3Fuel|}}}{{{R3Ammo|}}}{{{R3Steel|}}}{{{R3Bauxite|}}}| {{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel|}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|3|2}}|1}}" {{!}} {{{R3Fuel}}} }}{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo|}}}||<br>
{{#if:{{{R3Fuel|}}}{{{R3Ammo|}}}{{{R3Steel|}}}{{{R3Bauxite|}}}| {{#ifeq:{{{R2Fuel|}}}|{{{R3Fuel}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}|{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|3|2}}|1}}" {{!}} {{{R3Fuel}}} }}{{#ifeq:{{{R2Ammo|}}}|{{{R3Ammo|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|3|2}}|1}}" {{!}} {{{R3Ammo}}} }}{{#ifeq:{{{R2Steel|}}}|{{{R3Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo}}}|{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|3|2}}|1}}" {{!}} {{{R3Ammo}}} }}{{#ifeq:{{{R2Steel|}}}|{{{R3Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|3|2}}|1}}" {{!}} {{{R3Steel}}} }}{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Steel|}}}|{{{R4Steel}}}|{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|3|2}}|1}}" {{!}} {{{R3Steel}}} }}{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|3|2}}|1}}" {{!}} {{{R3Bauxite}}} }}{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|3|2}}|1}}" {{!}} {{{R3Bauxite}}} }}{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}||<br>
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|3|2}}|1}}" {{!}} {{{R3Secretary}}} }}{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}||<br>
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|3|2}}|1}}" {{!}} {{{R3Secretary}}} }}{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|3|2}}|1}}" {{!}} {{{R3Results}}} }}{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R3Results|}}}|{{{R4Results}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|3|2}}|1}}" {{!}} {{{R3Results}}} }}{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|3|2}}|1}}" {{!}} {{{R3Notes|}}} }}
{{!}} rowspan="{{#ifeq:{{{R3Notes|}}}|{{{R4Notes}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|3|2}}|1}}" {{!}} {{{R3Notes|}}} }}
{{!}}-
{{!}}-
{{#if:{{{R4Fuel|}}}{{{R4Ammo|}}}{{{R4Steel|}}}{{{R4Bauxite|}}}| {{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel|}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|2|1}}" {{!}} {{{R4Fuel}}} }}{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}||<br>
{{#if:{{{R4Fuel|}}}{{{R4Ammo|}}}{{{R4Steel|}}}{{{R4Bauxite|}}}| {{#ifeq:{{{R3Fuel|}}}|{{{R4Fuel}}}||{{!}} align="center" rowspan="{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}|2|1}}" {{!}} {{{R4Fuel}}} }}{{#ifeq:{{{R3Ammo|}}}|{{{R4Ammo|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}|2|1}}" {{!}} {{{R4Ammo}}} }}{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo}}}|2|1}}" {{!}} {{{R4Ammo}}} }}{{#ifeq:{{{R3Steel|}}}|{{{R4Steel|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}|2|1}}" {{!}} {{{R4Steel}}} }}{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Steel|}}}|{{{R5Steel}}}|2|1}}" {{!}} {{{R4Steel}}} }}{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|2|1}}" {{!}} {{{R4Bauxite}}} }}{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}||<br>
{{!}} align="center" rowspan="{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite}}}|2|1}}" {{!}} {{{R4Bauxite}}} }}{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}||<br>
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|2|1}}" {{!}} {{{R4Secretary}}} }}{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}||<br>
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary}}}|2|1}}" {{!}} {{{R4Secretary}}} }}{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|2|1}}" {{!}} {{{R4Results}}} }}{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R4Results}}}|{{{R5Results}}}|2|1}}" {{!}} {{{R4Results}}} }}{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}||<br>
{{!}} rowspan="{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|2|1}}" {{!}} {{{R4Notes|}}} }}
{{!}} rowspan="{{#ifeq:{{{R4Notes}}}|{{{R5Notes}}}|2|1}}" {{!}} {{{R4Notes|}}} }}
{{!}}-
{{!}}-
{{#if:{{{R5Fuel|}}}{{{R5Ammo|}}}{{{R5Steel|}}}{{{R5Bauxite|}}}| {{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}||{{!}} align="center" {{!}} {{{R5Fuel}}} }}{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}||<br>
{{#if:{{{R5Fuel|}}}{{{R5Ammo|}}}{{{R5Steel|}}}{{{R5Bauxite|}}}| {{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}||{{!}} align="center" {{!}} {{{R5Fuel}}} }}{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}||<br>
|R1Bauxite= 40
|R1Bauxite= 40
|R1Secretary= A
|R1Secretary= A
|R1SecretaryColour=
|R1Results= 16% Penguin<br>2% {{Equipment/Link|Prototype Reppuu Late Model}}<br>2% {{Equipment/Link|Shiden Kai 2}}<br>2% {{Equipment/Link|Suisei Model 12A}}<br>2% {{Equipment/Link|Type 0 Fighter Model 62 (Fighter-bomber)}}<br>4% {{Equipment/Link|Ryuusei}}<br>2% {{Equipment/Link|Ryuusei Kai}}
|R1Results= 16% Penguin<br>2% {{Equipment/Link|Prototype Reppuu Late Model}}<br>2% {{Equipment/Link|Shiden Kai 2}}<br>2% {{Equipment/Link|Suisei Model 12A}}<br>2% {{Equipment/Link|Type 0 Fighter Model 62 (Fighter-bomber)}}<br>4% {{Equipment/Link|Ryuusei}}<br>2% {{Equipment/Link|Ryuusei Kai}}
|R1Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}'''
|R1Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}'''
|R2Steel= 30
|R2Steel= 30
|R2Bauxite= 50
|R2Bauxite= 50
|R2Secretary= Av
|R2Secretary= Italian DD/CA/BB
|R2SecretaryColour= Khaki
|R2SecretaryDescription= '''[[:Category:Maestrale Class|''Maestrale''-class]]'''<br>{{Ship/Banner|Maestrale|small=true}}{{Ship/Banner|Grecale|small=true}}{{Ship/Banner|Libeccio|small=true}}{{Ship/Banner|Scirocco|small=true}}<hr> '''[[:Category:Zara Class|''Zara''-class]]'''<br>{{Ship/Banner|Zara|small=true}}{{Ship/Banner|Pola|small=true}}<hr> '''[[:Category:Vittorio Veneto Class|''Vittorio Veneto''-class]]'''<br>{{Ship/Banner|Littorio|small=true}}{{Ship/Banner|Roma|small=true}}
|R2Results= +<br>4% {{Equipment/Link|Saiun}}
|R2Results= +<br>4% {{Equipment/Link|Saiun}}
|R2Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}} & {{Template:YellowPlane}}'''{{Equipment/Link|Saiun}}
|R2Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}} & {{Template:YellowPlane}}'''{{Equipment/Link|Saiun}}
|R1Steel= '''30'''
|R1Steel= '''30'''
|R1Bauxite= 40
|R1Bauxite= 40
|R1Secretary= Aviation
|R1Secretary= Torpedo
|R1Results= 16% Penguin<br>2% {{Equipment/Link|Prototype Reppuu Late Model}}<br>2% {{Equipment/Link|Shiden Kai 2}}<br>2% {{Equipment/Link|Suisei Model 12A}}<br>2% {{Equipment/Link|Type 0 Fighter Model 62 (Fighter-bomber)}}<br>4% {{Equipment/Link|Ryuusei}}<br>2% {{Equipment/Link|Ryuusei Kai}}
|R1Results= 16% Penguin<br>2% {{Equipment/Link|Prototype Reppuu Late Model}}<br>2% {{Equipment/Link|Shiden Kai 2}}<br>2% {{Equipment/Link|Suisei Model 12A}}<br>2% {{Equipment/Link|Type 0 Fighter Model 62 (Fighter-bomber)}}<br>4% {{Equipment/Link|Ryuusei}}<br>2% {{Equipment/Link|Ryuusei Kai}}
|R1Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}'''
|R1Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}'''
|R2Steel= '''30'''
|R2Steel= '''30'''
|R2Bauxite= 50
|R2Bauxite= 50
|R2Secretary= Aviation
|R2Secretary= Heavy
|R2Results= +<br>4% {{Equipment/Link|Saiun}}
|R2Results= +<br>4% {{Equipment/Link|Saiun}}
|R2Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}} & {{Template:YellowPlane}}'''{{Equipment/Link|Saiun}}
|R2Notes= '''All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}} & {{Template:YellowPlane}}'''{{Equipment/Link|Saiun}}
|R3Results= +<br>2% {{Equipment/Link|Type 2 Reconnaissance Aircraft}}
|R3Results= +<br>2% {{Equipment/Link|Type 2 Reconnaissance Aircraft}}
|R3Notes= All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}{{Template:YellowPlane}}
|R3Notes= All {{Template:GreenPlane}}{{Template:RedPlane}}{{Template:BluePlane}}{{Template:YellowPlane}}
}}
<!-- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -->
{{DevelopmentRecipes
|TitleIcons=
|Title=
|Category=
|R1Fuel= 20
|R1Ammo= 20
|R1Steel= '''30'''
|R1Bauxite= 40
|R1Secretary= British BB
|R1SecretaryColour= #AAFFCC
|R1SecretaryDescription= {{Ship/Banner|Warspite}}<br>{{Ship/Banner|Nelson}}
|R1Results= 4% {{Equipment/Link|Spitfire Mk.I}}
|R1Notes=
}}
{{DevelopmentRecipes
|TitleIcons=
|Title=
|Category=
|R1Fuel= 10
|R1Ammo= 10
|R1Steel= 10
|R1Bauxite= '''20'''
|R1Secretary= Italian CA/BB
|R1SecretaryColour= #AAFFCC
|R1SecretaryDescription= '''[[:Category:Zara Class|''Zara''-class]]'''<br>{{Ship/Banner|Zara}}{{Ship/Banner|Pola}}<hr> '''[[:Category:Vittorio Veneto Class|''Vittorio Veneto''-class]]'''<br>{{Ship/Banner|Littorio}}{{Ship/Banner|Roma}}
|R1Results= 72% Penguin<br>'''4% {{Equipment/Link|Ro.43 Reconnaissance Seaplane}}'''
|R1Notes=
|R2Fuel= 10
|R2Ammo= 30
|R2Steel= 10
|R2Bauxite= '''31'''
|R2Secretary= Italian DD
|R2SecretaryColour= #AAFFCC
|R2SecretaryDescription= '''[[:Category:Maestrale Class|''Maestrale''-class]]'''<br>{{Ship/Banner|Maestrale}}<br>{{Ship/Banner|Grecale}}<br>{{Ship/Banner|Libeccio}}<br>{{Ship/Banner|Scirocco}}
|R2Results= 34% Penguin<br>'''2% {{Equipment/Link|Ro.43 Reconnaissance Seaplane}}'''<br>2% {{Equipment/Link|Type 3 Active Sonar}}<!--<br>8% {{Equipment/Link|Type 93 Passive Sonar}}--><br>2% {{Equipment/Link|Type 3 Depth Charge Projector}}<!--<br>8% {{Equipment/Link|Type 94 Depth Charge Projector}}<br>4% {{Equipment/Link|Type 95 Depth Charge}}-->
|R2Notes= Lower chance for Ro.43<br>All {{Sonar}}{{DepthCharge}}.
}}
}}
|}
|}
|R1Ammo= 10
|R1Ammo= 10
|R1Steel= '''20'''
|R1Steel= '''20'''
|R1Bauxite= 10
|R1Bauxite= 20
|R1Secretary= Aviation
|R1Secretary= Aviation
|R1Results= 58/60% Penguin<br>2% {{Equipment/Link|Type 0 Observation Seaplane}}
|R1Results= 58/60% Penguin<br>2% {{Equipment/Link|Type 0 Observation Seaplane}}
|R2Ammo= 10
|R2Ammo= 10
|R2Steel= 10
|R2Steel= 10
|R2Bauxite= 10
|R2Bauxite= 20
|R2Secretary= Aviation
|R2Secretary= Aviation
|R2Results= 58/60% Penguin<br>2% {{Equipment/Link|Type 0 Observation Seaplane}}
|R2Results= 58/60% Penguin<br>2% {{Equipment/Link|Type 0 Observation Seaplane}}