User:MateusinhoEX/Nightmare Infobox Draft: Difference between revisions

Latest revision as of 15:45, 10 February 2021

I'm using this [1] as a base for making the box. Don't know if all parameters are right. If you wish to help, feel free to edit the template. Now I am testing the full template.

{{{name}}}
{{{image}}}
Katakana
Game	'

User:MateusinhoEX/Nightmare Infobox Draft: Difference between revisions

Latest revision as of 15:45, 10 February 2021

Navigation menu

Page actions

Page actions

Personal tools

Navigation

Search

Community

Tools

@@ Line 1: / Line 1: @@
 <noinclude>I'm using this [http://i.imgur.com/AimpyFy.jpg|image] as a base for making the box. Don't know if all parameters are right. If you wish to help, feel free to edit the template. Now I am testing the full template.</noinclude>
-<div class="tabber goright" style="margin-left:5px">
+<div class="tabber goright" style="margin-left:20px">
 <div class="tabbertab" title="Profile" style="width:{{#if:{{{profileTabWidth|}}}|{{{profileTabWidth}}}|360px}}">
 {|style="float: right; border:solid 2px #000000;border-radius:10px; text-align:center" align="center"; width="350px"
@@ Line 65: / Line 65: @@
 {{!}}style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Romaji'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}''{{{romaji|}}}''
-}}{{#if:{{{japname|}}}|<nowiki/>
+}}{{#if:{{{jpname|}}}|<nowiki/>
 {{!}}-
 {{!}}style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Japanese'''
-{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{japname|}}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{jpname|}}}
 }}{{#if:{{{alias|}}}|<nowiki/>
 {{!}}-
@@ Line 98: / Line 98: @@
 {{!}}-
 {{!}}style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Voice actors'''
-{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#if:{{{java|}}}|<nowiki/>('''Ja:''') [[wikipedia:{{{java|}}}|{{{java|}}}]]{{#if:{{{javan|}}}|<nowiki/><small> {{{javan|}}}</small>}}{{#if:{{{java2|}}}|<nowiki/><br>[[wikipedia:{{{java2|}}}|{{{java2|}}}]]{{#if:{{{java2n|}}}|<nowiki/><small> {{{java2n|}}}</small>}}}}{{#if:{{{java3|}}}|<nowiki/><br>[[wikipedia:{{{java3|}}}|{{{java3|}}}]]{{#if:{{{java3n|}}}|<nowiki/><small> {{{java3n|}}}</small>}}}}{{#if:{{{java4|}}}|<nowiki/><br>[[wikipedia:{{{java4|}}}|{{{java4|}}}]]{{#if:{{{java4n|}}}|<nowiki/><small> {{{java4n|}}}</small>}}}}{{#if:{{{java5|}}}|<nowiki/><br>[[wikipedia:{{{java5|}}}|{{{java5|}}}]]{{#if:{{{java5n|}}}|<nowiki/><small> {{{java5n|}}}</small>}}}}{{#if:{{{java6|}}}|<nowiki/><br>[[wikipedia:{{{java6|}}}|{{{java6|}}}]]{{#if:{{{java6n|}}}|<nowiki/><small> {{{java6n|}}}</small>}}}}{{#if:{{{java7|}}}|<nowiki/><br>[[wikipedia:{{{java7|}}}|{{{java7|}}}]]{{#if:{{{java7n|}}}|<nowiki/><small> {{{java7n|}}}</small>}}}}<br>}}{{#if:{{{enva|}}}|<nowiki/>('''En:''') [[wikipedia:{{{enva|}}}|{{{enva|}}}]]{{#if:{{{envan|}}}|<nowiki/><small> {{{envan|}}}</small>}}{{#if:{{{enva2|}}}|<nowiki/><br>[[wikipedia:{{{enva2|}}}|{{{enva2|}}}]]{{#if:{{{enva2n|}}}|<nowiki/><small> {{{enva2n|}}}</small>}}}}{{#if:{{{enva3|}}}|<nowiki/><br>[[wikipedia:{{{enva3|}}}|{{{enva3|}}}]]{{#if:{{{enva3n|}}}|<nowiki/><small> {{{enva3n|}}}</small>}}}}{{#if:{{{enva4|}}}|<nowiki/><br>[[wikipedia:{{{enva4|}}}|{{{enva4|}}}]]{{#if:{{{enva4n|}}}|<nowiki/><small> {{{enva4n|}}}</small>}}}}{{#if:{{{enva5|}}}|<nowiki/><br>[[wikipedia:{{{enva5|}}}|{{{enva5|}}}]]{{#if:{{{enva5n|}}}|<nowiki/><small> {{{enva5n|}}}</small>}}}}{{#if:{{{enva6|}}}|<nowiki/><br>[[wikipedia:{{{enva6|}}}|{{{enva6|}}}]]{{#if:{{{enva6n|}}}|<nowiki/><small> {{{enva6n|}}}</small>}}}}{{#if:{{{enva7|}}}|<nowiki/><br>[[wikipedia:{{{enva7|}}}|{{{enva7|}}}]]{{#if:{{{enva7n|}}}|<nowiki/><small> {{{enva7n|}}}</small>}}}}<br>}}{{#if:{{{frva|}}}|<nowiki/>('''Fr:''') [[wikipedia:{{{frva|}}}|{{{frva|}}}]]<br>}}{{#if:{{{deva|}}}|<nowiki/>('''De:''') [[wikipedia:{{{deva|}}}|{{{deva|}}}]]<br>}}{{#if:{{{esva|}}}|<nowiki/>('''Es:''') [[wikipedia:{{{esva|}}}|{{{esva|}}}]]}}{{#if:{{{ptva|}}}|<nowiki/>('''Pt:''') [[wikipedia:{{{ptva|}}}|{{{ptva|}}}]]}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#if:{{{java|}}}|<nowiki/>('''Ja:''') {{w|{{{java|}}}|{{{java|}}}}}{{#if:{{{javan|}}}|<nowiki/><small> {{{javan|}}}</small>}}{{#if:{{{java2|}}}|<nowiki/><br>{{w|{{{java2|}}}|{{{java2|}}}}}{{#if:{{{java2n|}}}|<nowiki/><small> {{{java2n|}}}</small>}}}}{{#if:{{{java3|}}}|<nowiki/><br>{{w|{{{java3|}}}|{{{java3|}}}}}{{#if:{{{java3n|}}}|<nowiki/><small> {{{java3n|}}}</small>}}}}{{#if:{{{java4|}}}|<nowiki/><br>{{w|{{{java4|}}}|{{{java4|}}}}}{{#if:{{{java4n|}}}|<nowiki/><small> {{{java4n|}}}</small>}}}}{{#if:{{{java5|}}}|<nowiki/><br>{{w|{{{java5|}}}|{{{java5|}}}}}{{#if:{{{java5n|}}}|<nowiki/><small> {{{java5n|}}}</small>}}}}{{#if:{{{java6|}}}|<nowiki/><br>{{w|{{{java6|}}}|{{{java6|}}}}}{{#if:{{{java6n|}}}|<nowiki/><small> {{{java6n|}}}</small>}}}}{{#if:{{{java7|}}}|<nowiki/><br>{{w|{{{java7|}}}|{{{java7|}}}}}{{#if:{{{java7n|}}}|<nowiki/><small> {{{java7n|}}}</small>}}}}<br>}}{{#if:{{{enva|}}}|<nowiki/>('''En:''') {{w|{{{enva|}}}|{{{enva|}}}}}{{#if:{{{envan|}}}|<nowiki/><small> {{{envan|}}}</small>}}{{#if:{{{enva2|}}}|<nowiki/><br>{{w|{{{enva2|}}}|{{{enva2|}}}}}{{#if:{{{enva2n|}}}|<nowiki/><small> {{{enva2n|}}}</small>}}}}{{#if:{{{enva3|}}}|<nowiki/><br>{{w|{{{enva3|}}}|{{{enva3|}}}}}{{#if:{{{enva3n|}}}|<nowiki/><small> {{{enva3n|}}}</small>}}}}{{#if:{{{enva4|}}}|<nowiki/><br>{{w|{{{enva4|}}}|{{{enva4|}}}}}{{#if:{{{enva4n|}}}|<nowiki/><small> {{{enva4n|}}}</small>}}}}{{#if:{{{enva5|}}}|<nowiki/><br>{{w|{{{enva5|}}}|{{{enva5|}}}}}{{#if:{{{enva5n|}}}|<nowiki/><small> {{{enva5n|}}}</small>}}}}{{#if:{{{enva6|}}}|<nowiki/><br>{{w|{{{enva6|}}}|{{{enva6|}}}}}{{#if:{{{enva6n|}}}|<nowiki/><small> {{{enva6n|}}}</small>}}}}{{#if:{{{enva7|}}}|<nowiki/><br>{{w|{{{enva7|}}}|{{{enva7|}}}}}{{#if:{{{enva7n|}}}|<nowiki/><small> {{{enva7n|}}}</small>}}}}<br>}}{{#if:{{{frva|}}}|<nowiki/>('''Fr:''') {{w|{{{frva|}}}|{{{frva|}}}}}<br>}}{{#if:{{{deva|}}}|<nowiki/>('''De:''') {{w|{{{deva|}}}|{{{deva|}}}}}<br>}}{{#if:{{{esva|}}}|<nowiki/>('''Es:''') {{w|{{{esva|}}}|{{{esva|}}}}}}}{{#if:{{{ptva|}}}|<nowiki/>('''Pt:''') {{w|{{{ptva|}}}|{{{ptva|}}}}}}}
 }}{{#if:{{{charworld1|}}}|<nowiki/>
 {{!}}-
@@ Line 106: / Line 106: @@
 {{!}}-
 {{!}}style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Origin'''
-{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}''[[wikipedia:{{{origin|}}}|{{{torigin|{{{origin|}}}}}}]]''
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}''{{w|{{{origin|}}}|{{{torigin|{{{origin|}}}}}}}}''
 }}{{#if:{{{company|}}}|<nowiki/><includeonly>[[Category:{{{company|}}} characters|{{{name}}}]]</includeonly>|<includeonly>[[Category:Original characters|{{{name}}}]]</includeonly>
 }}
@@ Line 115: / Line 115: @@
 {{#if:{{{s1|}}}|
 {{!}}colspan=2 style="{{style|{{{spec|}}}|a|b}}"{{!}}
-{{{!}} class="collapsible collapsed" style="border-collapse: collapse;font-size: 100%;width:100%"
+{{{!}} class="mw-collapsible mw-collapsed" style="border-collapse: collapse;font-size: 100%;width:100%"
 ! style="{{style|{{{spec|}}}|a|b}};font-weight:normal;" align="left"{{!}}'''Variations'''
 {{!}}-
@@ Line 123: / Line 123: @@
 {{!}}-
 {{!}}colspan=2 style="{{style|{{{spec|}}}|a|b}}"{{!}}
-{{{!}} class="collapsible collapsed" style="border-collapse: collapse;font-size: 100%;width:100%"
+{{{!}} class="mw-collapsible mw-collapsed" style="border-collapse: collapse;font-size: 100%;width:100%"
 ! style="{{style|{{{spec|}}}|a|b}}; font-weight:normal;" align="left"{{!}}[[File:Music2.png|x20px]]
 {{#if:{{{KHnormalname|}}}{{{KHbattlename|}}}|<nowiki/>
@@ Line 297: / Line 297: @@
 {{#if:{{{journalKH|}}}|<nowiki/>
 {{!}}-
-{{!}}style="background:#C7E2EA;font-size:90%"{{!}}'''''[[Kingdom Hearts (game)|Kingdom Hearts]]'''''<hr/>
+{{!}}style="background:#C7E2EA;font-size:90%"{{!}}'''''{{c|Kingdom Hearts|game}}'''''<hr/>
 {{!}}-
 {{!}}style="background:#C7E2EA;"{{!}}''{{{journalKH|}}}''{{#if:{{{appearKH|}}}|<div style="text-align:right;"><small>{{{appearKH|}}}</small></div>}}
@@ Line 664: / Line 664: @@
 {{!}}colspan="5" style="{{style|{{{spec|}}}|a|b}}"{{!}}'''{{{ability|}}}'''
 {{!}}-
-{{!}}colspan="5"{{!}}[[Image:{{{name}}} (card).png]]
+{{!}}colspan="5"{{!}}[[File:{{{name}}} (card).png]]
 {{!}}-
 {{!}}colspan="5" style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Description'''
@@ Line 694: / Line 694: @@
 {{!}}colspan="4" style="{{style|{{{spec|}}}|a|b}};border-top-left-radius:0.5em;border-top-right-radius:0.5em;"{{!}}'''{{{REability|}}}'''
 {{!}}-
-{{!}}colspan="4"{{!}}[[Image:{{{name}}} (card).png]]
+{{!}}colspan="4"{{!}}[[File:{{{name}}} (card).png]]
 {{!}}-
 {{!}}colspan="4" style="{{style|{{{spec|}}}|a|b}}"{{!}}'''Description'''
@@ Line 2,245: / Line 2,245: @@
 {{#if:{{{DDDNloc1|}}}|<nowiki/>
 {{#if:{{{DDDNLVL1|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDNLVL2|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc1|}}}</font>]]{{#if:{{{DDDNenc1|}}}|<nowiki/> {{{DDDNenc1|}}}}}'''
+{{!}}{{#if:{{{DDDNLVL2|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc1|}}}</font>]]{{#if:{{{DDDNenc1|}}}|<nowiki/> {{{DDDNenc1|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDNLVL1|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{{DDDNLVL1|}}}*{{{DDDNHP|}}}/10 round 0.1}}
@@ Line 2,252: / Line 2,252: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL1|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL1|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL1|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL1|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL1|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL1|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL1|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL1|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDNLVL2|}}}|<nowiki/>
@@ Line 2,260: / Line 2,267: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL2|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL2|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL2|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL2|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL2|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL2|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL2|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL2|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDNloc2|}}}|<nowiki/>
 {{#if:{{{DDDNLVL3|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDNLVL4|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc2|}}}</font>]]{{#if:{{{DDDNenc2|}}}|<nowiki/> {{{DDDNenc2|}}}}}'''
+{{!}}{{#if:{{{DDDNLVL4|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc2|}}}</font>]]{{#if:{{{DDDNenc2|}}}|<nowiki/> {{{DDDNenc2|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDNLVL3|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{{DDDNLVL3|}}}*{{{DDDNHP|}}}/10 round 0.1}}
@@ Line 2,270: / Line 2,284: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL3|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL3|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL3|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL3|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL3|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL3|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL3|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL3|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDNLVL4|}}}|<nowiki/>
@@ Line 2,278: / Line 2,299: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL4|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL4|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL4|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL4|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL4|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL4|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL4|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL4|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDNloc3|}}}|<nowiki/>
 {{#if:{{{DDDNLVL5|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDNLVL6|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc3|}}}</font>]]{{#if:{{{DDDNenc3|}}}|<nowiki/> {{{DDDNenc3|}}}}}'''
+{{!}}{{#if:{{{DDDNLVL6|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc3|}}}</font>]]{{#if:{{{DDDNenc3|}}}|<nowiki/> {{{DDDNenc3|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDNLVL5|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{{DDDNLVL5|}}}*{{{DDDNHP|}}}/10 round 0.1}}
@@ Line 2,288: / Line 2,316: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL5|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL5|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL5|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL5|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL5|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL5|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL5|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL5|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDNLVL6|}}}|<nowiki/>
@@ Line 2,296: / Line 2,331: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL6|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL6|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL6|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL6|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL6|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL6|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL6|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL6|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDNloc4|}}}|<nowiki/>
 {{#if:{{{DDDNLVL7|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDNLVL8|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc4|}}}</font>]]{{#if:{{{DDDNenc4|}}}|<nowiki/> {{{DDDNenc4|}}}}}'''
+{{!}}{{#if:{{{DDDNLVL8|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDNLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDNloc4|}}}</font>]]{{#if:{{{DDDNenc4|}}}|<nowiki/> {{{DDDNenc4|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDNLVL7|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{{DDDNLVL7|}}}*{{{DDDNHP|}}}/10 round 0.1}}
@@ Line 2,306: / Line 2,348: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL7|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL7|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL7|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL7|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL7|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL7|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL7|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL7|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDNLVL8|}}}|<nowiki/>
@@ Line 2,314: / Line 2,363: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{{DDDNLVL8|}}}*{{{DDDNMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{{DDDNLVL8|}}}*{{{DDDNDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDNLVL8|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNHP|}}}+{{#expr:{{{DDDNLVL8|}}}+2}}*{{{DDDNHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDNLVL8|}}}+2}}|a}}*{{{DDDNEXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNSTR|}}}+{{#expr:{{{DDDNLVL8|}}}+2}}*{{{DDDNSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNMAG|}}}+{{#expr:{{{DDDNLVL8|}}}+2}}*{{{DDDNMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDNDEF|}}}+{{#expr:{{{DDDNLVL8|}}}+2}}*{{{DDDNDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}
@@ Line 2,390: / Line 2,446: @@
 {{#if:{{{DDDRloc1|}}}|<nowiki/>
 {{#if:{{{DDDRLVL1|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDRLVL2|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc1|}}}</font>]]{{#if:{{{DDDRenc1|}}}|<nowiki/> {{{DDDRenc1|}}}}}'''
+{{!}}{{#if:{{{DDDRLVL2|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc1|}}}</font>]]{{#if:{{{DDDRenc1|}}}|<nowiki/> {{{DDDRenc1|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDRLVL1|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{{DDDRLVL1|}}}*{{{DDDRHP|}}}/10 round 0.1}}
@@ Line 2,397: / Line 2,453: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL1|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL1|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL1|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL1|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL1|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL1|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL1|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL1|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDRLVL2|}}}|<nowiki/>
@@ Line 2,405: / Line 2,468: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL2|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL2|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL2|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL2|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL2|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL2|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL2|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL2|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDRloc2|}}}|<nowiki/>
 {{#if:{{{DDDRLVL3|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDRLVL4|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc2|}}}</font>]]{{#if:{{{DDDRenc2|}}}|<nowiki/> {{{DDDRenc2|}}}}}'''
+{{!}}{{#if:{{{DDDRLVL4|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc2|}}}</font>]]{{#if:{{{DDDRenc2|}}}|<nowiki/> {{{DDDRenc2|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDRLVL3|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{{DDDRLVL3|}}}*{{{DDDRHP|}}}/10 round 0.1}}
@@ Line 2,415: / Line 2,485: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL3|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL3|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL3|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL3|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL3|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL3|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL3|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL3|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDRLVL4|}}}|<nowiki/>
@@ Line 2,423: / Line 2,500: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL4|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL4|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL4|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL4|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL4|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL4|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL4|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL4|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDRloc3|}}}|<nowiki/>
 {{#if:{{{DDDRLVL5|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDRLVL6|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc3|}}}</font>]]{{#if:{{{DDDRenc3|}}}|<nowiki/> {{{DDDRenc3|}}}}}'''
+{{!}}{{#if:{{{DDDRLVL6|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc3|}}}</font>]]{{#if:{{{DDDRenc3|}}}|<nowiki/> {{{DDDRenc3|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDRLVL5|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{{DDDRLVL5|}}}*{{{DDDRHP|}}}/10 round 0.1}}
@@ Line 2,433: / Line 2,517: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL5|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL5|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL5|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL5|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL5|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL5|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL5|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL5|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDRLVL6|}}}|<nowiki/>
@@ Line 2,441: / Line 2,532: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL6|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL6|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL6|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL6|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL6|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL6|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL6|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL6|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}{{#if:{{{DDDRloc4|}}}|<nowiki/>
 {{#if:{{{DDDRLVL7|}}}|<nowiki/>
-{{!}}{{#if:{{{DDDRLVL8|}}}|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc4|}}}</font>]]{{#if:{{{DDDRenc4|}}}|<nowiki/> {{{DDDRenc4|}}}}}'''
+{{!}}{{#if:{{{DDDRLVL8|}}}|<nowiki/>rowspan="4"|<nowiki/>rowspan="2"}} style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDRLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDRloc4|}}}</font>]]{{#if:{{{DDDRenc4|}}}|<nowiki/> {{{DDDRenc4|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDRLVL7|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{{DDDRLVL7|}}}*{{{DDDRHP|}}}/10 round 0.1}}
@@ Line 2,451: / Line 2,549: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL7|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL7|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL7|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL7|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL7|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL7|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL7|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL7|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDRLVL8|}}}|<nowiki/>
@@ Line 2,459: / Line 2,564: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{{DDDRLVL8|}}}*{{{DDDRMAG|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{{DDDRLVL8|}}}*{{{DDDRDEF|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDRLVL8|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRHP|}}}+{{#expr:{{{DDDRLVL8|}}}+2}}*{{{DDDRHP|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDRLVL8|}}}+2}}|a}}*{{{DDDREXP|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRSTR|}}}+{{#expr:{{{DDDRLVL8|}}}+2}}*{{{DDDRSTR|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRMAG|}}}+{{#expr:{{{DDDRLVL8|}}}+2}}*{{{DDDRMAG|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDRDEF|}}}+{{#expr:{{{DDDRLVL8|}}}+2}}*{{{DDDRDEF|}}}/10 round 0.1}}
 {{!}}-
 }}}}
@@ Line 2,534: / Line 2,646: @@
 {{!}}-
 {{#if:{{{DDDBSloc1|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc1|}}}</font>]]{{#if:{{{DDDBSenc1|}}}|<nowiki/> {{{DDDBSenc1|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc1|}}}</font>]]{{#if:{{{DDDBSenc1|}}}|<nowiki/> {{{DDDBSenc1|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBSLVL1|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP1|}}}+{{{DDDBSLVL1|}}}*{{{DDDBSHP1|}}}/10 round 0.1}}
@@ Line 2,541: / Line 2,653: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG1|}}}+{{{DDDBSLVL1|}}}*{{{DDDBSMAG1|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF1|}}}+{{{DDDBSLVL1|}}}*{{{DDDBSDEF1|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBSLVL1|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP1|}}}+{{#expr:{{{DDDBSLVL1|}}}+2}}*{{{DDDBSHP1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBSLVL1|}}}+2}}|a}}*{{{DDDBSEXP1|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSSTR1|}}}+{{#expr:{{{DDDBSLVL1|}}}+2}}*{{{DDDBSSTR1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG1|}}}+{{#expr:{{{DDDBSLVL1|}}}+2}}*{{{DDDBSMAG1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF1|}}}+{{#expr:{{{DDDBSLVL1|}}}+2}}*{{{DDDBSDEF1|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBSloc2|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc2|}}}</font>]]{{#if:{{{DDDBSenc2|}}}|<nowiki/> {{{DDDBSenc2|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc2|}}}</font>]]{{#if:{{{DDDBSenc2|}}}|<nowiki/> {{{DDDBSenc2|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBSLVL2|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP2|}}}+{{{DDDBSLVL2|}}}*{{{DDDBSHP2|}}}/10 round 0.1}}
@@ Line 2,550: / Line 2,669: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG2|}}}+{{{DDDBSLVL2|}}}*{{{DDDBSMAG2|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF2|}}}+{{{DDDBSLVL2|}}}*{{{DDDBSDEF2|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBSLVL2|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP2|}}}+{{#expr:{{{DDDBSLVL2|}}}+2}}*{{{DDDBSHP2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBSLVL2|}}}+2}}|a}}*{{{DDDBSEXP2|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSSTR2|}}}+{{#expr:{{{DDDBSLVL2|}}}+2}}*{{{DDDBSSTR2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG2|}}}+{{#expr:{{{DDDBSLVL2|}}}+2}}*{{{DDDBSMAG2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF2|}}}+{{#expr:{{{DDDBSLVL2|}}}+2}}*{{{DDDBSDEF2|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBSloc3|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc3|}}}</font>]]{{#if:{{{DDDBSenc3|}}}|<nowiki/> {{{DDDBSenc3|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc3|}}}</font>]]{{#if:{{{DDDBSenc3|}}}|<nowiki/> {{{DDDBSenc3|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBSLVL3|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP3|}}}+{{{DDDBSLVL3|}}}*{{{DDDBSHP3|}}}/10 round 0.1}}
@@ Line 2,559: / Line 2,685: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG3|}}}+{{{DDDBSLVL3|}}}*{{{DDDBSMAG3|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF3|}}}+{{{DDDBSLVL3|}}}*{{{DDDBSDEF3|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBSLVL3|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP3|}}}+{{#expr:{{{DDDBSLVL3|}}}+2}}*{{{DDDBSHP3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBSLVL3|}}}+2}}|a}}*{{{DDDBSEXP3|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSSTR3|}}}+{{#expr:{{{DDDBSLVL3|}}}+2}}*{{{DDDBSSTR3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG3|}}}+{{#expr:{{{DDDBSLVL3|}}}+2}}*{{{DDDBSMAG3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF3|}}}+{{#expr:{{{DDDBSLVL3|}}}+2}}*{{{DDDBSDEF3|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBSloc4|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc4|}}}</font>]]{{#if:{{{DDDBSenc4|}}}|<nowiki/> {{{DDDBSenc4|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBSLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBSloc4|}}}</font>]]{{#if:{{{DDDBSenc4|}}}|<nowiki/> {{{DDDBSenc4|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBSLVL4|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP4|}}}+{{{DDDBSLVL4|}}}*{{{DDDBSHP4|}}}/10 round 0.1}}
@@ Line 2,568: / Line 2,701: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG4|}}}+{{{DDDBSLVL4|}}}*{{{DDDBSMAG4|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF4|}}}+{{{DDDBSLVL4|}}}*{{{DDDBSDEF4|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBSLVL4|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSHP4|}}}+{{#expr:{{{DDDBSLVL4|}}}+2}}*{{{DDDBSHP4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBSLVL4|}}}+2}}|a}}*{{{DDDBSEXP4|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSSTR4|}}}+{{#expr:{{{DDDBSLVL4|}}}+2}}*{{{DDDBSSTR4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSMAG4|}}}+{{#expr:{{{DDDBSLVL4|}}}+2}}*{{{DDDBSMAG4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBSDEF4|}}}+{{#expr:{{{DDDBSLVL4|}}}+2}}*{{{DDDBSDEF4|}}}/10 round 0.1}}
 {{!}}-
 }}
@@ Line 2,644: / Line 2,784: @@
 {{!}}-
 {{#if:{{{DDDBRloc1|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc1|}}}</font>]]{{#if:{{{DDDBRenc1|}}}|<nowiki/> {{{DDDBRenc1|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc1|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc1|}}}</font>]]{{#if:{{{DDDBRenc1|}}}|<nowiki/> {{{DDDBRenc1|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBRLVL1|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP1|}}}+{{{DDDBRLVL1|}}}*{{{DDDBRHP1|}}}/10 round 0.1}}
@@ Line 2,651: / Line 2,791: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG1|}}}+{{{DDDBRLVL1|}}}*{{{DDDBRMAG1|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF1|}}}+{{{DDDBRLVL1|}}}*{{{DDDBRDEF1|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBRLVL1|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP1|}}}+{{#expr:{{{DDDBRLVL1|}}}+2}}*{{{DDDBRHP1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBRLVL1|}}}+2}}|a}}*{{{DDDBREXP1|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRSTR1|}}}+{{#expr:{{{DDDBRLVL1|}}}+2}}*{{{DDDBRSTR1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG1|}}}+{{#expr:{{{DDDBRLVL1|}}}+2}}*{{{DDDBRMAG1|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF1|}}}+{{#expr:{{{DDDBRLVL1|}}}+2}}*{{{DDDBRDEF1|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBRloc2|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc2|}}}</font>]]{{#if:{{{DDDBRenc2|}}}|<nowiki/> {{{DDDBRenc2|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc2|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc2|}}}</font>]]{{#if:{{{DDDBRenc2|}}}|<nowiki/> {{{DDDBRenc2|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBRLVL2|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP2|}}}+{{{DDDBRLVL2|}}}*{{{DDDBRHP2|}}}/10 round 0.1}}
@@ Line 2,660: / Line 2,807: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG2|}}}+{{{DDDBRLVL2|}}}*{{{DDDBRMAG2|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF2|}}}+{{{DDDBRLVL2|}}}*{{{DDDBRDEF2|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBRLVL2|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP2|}}}+{{#expr:{{{DDDBRLVL2|}}}+2}}*{{{DDDBRHP2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBRLVL2|}}}+2}}|a}}*{{{DDDBREXP2|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRSTR2|}}}+{{#expr:{{{DDDBRLVL2|}}}+2}}*{{{DDDBRSTR2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG2|}}}+{{#expr:{{{DDDBRLVL2|}}}+2}}*{{{DDDBRMAG2|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF2|}}}+{{#expr:{{{DDDBRLVL2|}}}+2}}*{{{DDDBRDEF2|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBRloc3|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc3|}}}</font>]]{{#if:{{{DDDBRenc3|}}}|<nowiki/> {{{DDDBRenc3|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRloc3|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc3|}}}</font>]]{{#if:{{{DDDBRenc3|}}}|<nowiki/> {{{DDDBRenc3|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBRLVL3|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP3|}}}+{{{DDDBRLVL3|}}}*{{{DDDBRHP3|}}}/10 round 0.1}}
@@ Line 2,669: / Line 2,823: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG3|}}}+{{{DDDBRLVL3|}}}*{{{DDDBRMAG3|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF3|}}}+{{{DDDBRLVL3|}}}*{{{DDDBRDEF3|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBRLVL3|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP3|}}}+{{#expr:{{{DDDBRLVL3|}}}+2}}*{{{DDDBRHP3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBRLVL3|}}}+2}}|a}}*{{{DDDBREXP3|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRSTR3|}}}+{{#expr:{{{DDDBRLVL3|}}}+2}}*{{{DDDBRSTR3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG3|}}}+{{#expr:{{{DDDBRLVL3|}}}+2}}*{{{DDDBRMAG3|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF3|}}}+{{#expr:{{{DDDBRLVL3|}}}+2}}*{{{DDDBRDEF3|}}}/10 round 0.1}}
 {{!}}-
 }}{{#if:{{{DDDBRloc4|}}}|<nowiki/>
-{{!}}style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc4|}}}</font>]]{{#if:{{{DDDBRenc4|}}}|<nowiki/> {{{DDDBRenc4|}}}}}'''
+{{!}}rowspan="2" style="{{style|{{{spec|}}}|a|b}}; font-size:8pt"{{!}}'''[[{{{DDDBRLoc4|}}}|<font {{style2|{{{spec|}}}|a}}>{{{DDDBRloc4|}}}</font>]]{{#if:{{{DDDBRenc4|}}}|<nowiki/> {{{DDDBRenc4|}}}}}'''
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{{DDDBRLVL4|}}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP4|}}}+{{{DDDBRLVL4|}}}*{{{DDDBRHP4|}}}/10 round 0.1}}
@@ Line 2,678: / Line 2,839: @@
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG4|}}}+{{{DDDBRLVL4|}}}*{{{DDDBRMAG4|}}}/10 round 0.1}}
 {{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF4|}}}+{{{DDDBRLVL4|}}}*{{{DDDBRDEF4|}}}/10 round 0.1}}
+{{!}}-
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr:{{{DDDBRLVL4|}}}+2}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRHP4|}}}+{{#expr:{{{DDDBRLVL4|}}}+2}}*{{{DDDBRHP4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{DDDLV|{{#expr:{{{DDDBRLVL4|}}}+2}}|a}}*{{{DDDBREXP4|}}} round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRSTR4|}}}+{{#expr:{{{DDDBRLVL4|}}}+2}}*{{{DDDBRSTR4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRMAG4|}}}+{{#expr:{{{DDDBRLVL4|}}}+2}}*{{{DDDBRMAG4|}}}/10 round 0.1}}
+{{!}}style="{{style|{{{spec|}}}|c|d}}"{{!}}{{#expr: {{{DDDBRDEF4|}}}+{{#expr:{{{DDDBRLVL4|}}}+2}}*{{{DDDBRDEF4|}}}/10 round 0.1}}
 {{!}}-
 }}
@@ Line 2,747: / Line 2,915: @@
 }}
 </div>
+[[Category:Drafts]]