diff --git a/Medievo Oscuro/medievooscuro_v2.html b/Medievo Oscuro/medievooscuro_v2.html
index 55ac16c54e..e2c808c013 100644
--- a/Medievo Oscuro/medievooscuro_v2.html	
+++ b/Medievo Oscuro/medievooscuro_v2.html	
@@ -69,10 +69,10 @@
 		
 					 <div class="sheet-espaiprebotonegre2">  </div><!-- end .espaiprebotonegre --><div class="sheet-botonegre"> BASE </div><!-- end .botonegre --><div class="sheet-botonegre"> CC </div><!-- end .botonegre --><div class="sheet-botonegre"> PRO </div><!-- end .botonegre -->	
 					
-					<div class="sheet-titulos-pie3"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Medievo Oscuro/images/MO-Ataque-40px.jpg" alt="ataque"/><div class="sheet-secundarios-pie" >  <a class="button" href="#popupataque">ATAQUE</a> </div> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_base" title="Ataque Base"> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_cc" title="Ataque CC"> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_pro" title="Ataque PRO">
+					<div class="sheet-titulos-pie3"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Medievo Oscuro/images/MO-Ataque-40px.jpg" alt="ataque"/><div class="sheet-secundarios-pie" >  <a class="button" href="#popupataque">ATAQUE</a> </div> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_base" title="Ataque Base determinado por la profesión del PJ"> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_cc" title="Ataque CC: Base + Bono Cuerpo"> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_ataque_pro" title="Ataque PRO: Base + Bono Percepción">
 					</div><!-- end .titulos-pie3 -->
 				
-					<div class="sheet-titulos-pie3"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Medievo Oscuro/images/MO-Defensa-40px.jpg" alt="defensa"/><div class="sheet-secundarios-pie" >  <a class="button" href="#popupdefensa">DEFENSA</a> </div> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_defensa" title="Defensa base"> <input type="number" style=" margin-rigth: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_defensaarmadura" title="Defensa con Armadura">
+					<div class="sheet-titulos-pie3"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Medievo Oscuro/images/MO-Defensa-40px.jpg" alt="defensa"/><div class="sheet-secundarios-pie" >  <a class="button" href="#popupdefensa">DEFENSA</a> </div> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_defensa" title="Defensa base: 10 + Bono resistencia"> <input type="number" style=" margin-rigth: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_defensaarmadura" title="Defensa total: defensa base + protecciones y armadura">
 					</div><!-- end .titulos-pie3 -->
 														
 					<div class="sheet-titulos-pie3"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Medievo Oscuro/images/MO-Milagro-40px.jpg" alt="milagro"/><div class="sheet-secundarios-pie" > <a class="button" href="#popupmilagro">MILAGRO</a> </div> <input type="number" style=" margin-right: 5px; font-size: 18px; width: 60px; text-align: center;" name="attr_milagro" title="Milagro"><button style="height: 35px; max-height: 30px" type="roll" name="roll_milagro" value="@{tirada_secreta} &{template:moresult} {{title=TIRADA DE MILAGRO }} {{subtitle= @{character_name} }} {{dificultad=[[@{dificultad}]]}} {{rollResult= MILAGRO: [[@{milagro} + @{tipotirada}]]}}" ></button>
@@ -289,13 +289,18 @@
 	<fieldset class="repeating_armas"> 
   		<input type="text" name="attr_armaname"  style=" width: 220px;"/> 
 		<input type="number" name="attr_armarec" value="0" min="0" max="12" style="text-align: center; width: 50px;" /> 
-        <input type="text" name="attr_armadaño"  style=" text-align: center; width: 80px;"/> 
+        <input type="text" name="attr_armadaño"  value="0" style=" text-align: center; width: 80px;"/> 
 		
 		<select name="attr_armatipo" class="dtype"  style=" text-align: center; width: 65px;"> 
+            <option value="0">-</option>
     		<option value="@{ataque_cc}">CC</option>
 			<option value="@{ataque_pro}">PRO</option>
 		</select>
-		<button type="roll" name="roll_dañoarmabase" value="@{tirada_secreta} &{template:moatac} {{title=TIRADA DE ATAQUE }} {{subtitle= @{character_name} }} {{dificultad=[[@{dificultad}]]}} {{rollResult= @{armaname}: [[ @{tipotirada} + @{ataque_base} + @{armatipo}  ]]}}{{Daño=[[@{armadaño} + @{armatipo}  ]]}} {{gemas=@{armanombregema1}[[@{armadañogema1}]] @{armanombregema2}[[@{armadañogema2}]] @{armanombregema3}[[@{armadañogema3}]]}}" ></button>
+  
+        <input type="hidden" name="attr_bonodañocombate">
+        
+		<button type="roll" name="roll_dañoarmabase" value="@{tirada_secreta} &{template:moatac} {{title=TIRADA DE ATAQUE }} {{subtitle= @{character_name} }} {{dificultad=[[@{dificultad}]]}} {{rollResult= @{armaname}: [[ @{tipotirada} + @{armatipo} ]]}}{{Daño=[[ @{armadaño} + @{bonodañocombate} ]]}} {{gemas=@{armanombregema1}[[@{armadañogema1}]] @{armanombregema2}[[@{armadañogema2}]] @{armanombregema3}[[@{armadañogema3}]]}}" ></button>
+  
         
 		<select name="attr_armanombregema1" class="dtype"  style=" text-align: center; width: 110px;"> 
     		<option value=" "> </option>
@@ -1574,27 +1579,27 @@
 <div class="sheet-columna-daus">
   
         <div class="sheet-dau-box-1d4">
-            <button type="roll" name="roll_1d4" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D4 }} {{subtitle= @{character_name} }} {{color=}} {{1D4=[[{1d4}]]}}" class="sheet-d4" ></button>
+            <button type="roll" name="roll_1d4" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D4 }} {{subtitle= @{character_name} }} {{color=}} {{1D4:=[[{1d4}]]}}" class="sheet-d4" ></button>
         </div><!-- end .columna-dau-box-1d4 --><div class="sheet-separador15"></div><!-- end .separador15 -->  
     
         <div class="sheet-dau-box-1d6">
-            <button type="roll" name="roll_1d6" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D6 }} {{subtitle= @{character_name} }} {{color=}} {{1D6=[[{1d6}]]}}" class="sheet-d6" ></button>
+            <button type="roll" name="roll_1d6" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D6 }} {{subtitle= @{character_name} }} {{color=}} {{1D6:=[[{1d6}]]}}" class="sheet-d6" ></button>
         </div><!-- end .columna-dau-box-1d6 --><div class="sheet-separador15"></div><!-- end .separador15 -->
     
         <div class="sheet-dau-box-1d8">
-            <button type="roll" name="roll_1d8" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D8 }} {{subtitle= @{character_name} }} {{color=}} {{1D8=[[{1d8}]]}}" class="sheet-d8" ></button>
+            <button type="roll" name="roll_1d8" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D8 }} {{subtitle= @{character_name} }} {{color=}} {{1D8:=[[{1d8}]]}}" class="sheet-d8" ></button>
         </div><!-- end .columna-dau-box-1d8 --><div class="sheet-separador15"></div><!-- end .separador15 -->
     
         <div class="sheet-dau-box-1d10">
-            <button type="roll" name="roll_1d10" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D10}} {{subtitle= @{character_name} }} {{color=}} {{1D10=[[{1d10}]]}}" class="sheet-d10" ></button>
+            <button type="roll" name="roll_1d10" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D10}} {{subtitle= @{character_name} }} {{color=}} {{1D10:=[[{1d10}]]}}" class="sheet-d10" ></button>
         </div><!-- end .columna-dau-box-1d10 --><div class="sheet-separador15"></div><!-- end .separador15 -->
         
         <div class="sheet-dau-box-1d12">
-            <button type="roll" name="roll_1d12" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D12 }} {{subtitle= @{character_name} }} {{color=}} {{1D12=[[{1d12}]]}}" class="sheet-d12" ></button>
+            <button type="roll" name="roll_1d12" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D12 }} {{subtitle= @{character_name} }} {{color=}} {{1D12:=[[{1d12}]]}}" class="sheet-d12" ></button>
         </div><!-- end .columna-dau-box-1d12 --><div class="sheet-separador15"></div><!-- end .separador15 -->
     
         <div class="sheet-dau-box-1d20">
-            <button type="roll" name="roll_1d20" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D20 }} {{subtitle= @{character_name} }} {{color=}} {{1D20=[[@{tipotirada}]]}}" class="sheet-d20" ></button>
+            <button type="roll" name="roll_1d20" value="@{tirada_secreta} &{template:mo} {{title=TIRADA DE 1D20 }} {{subtitle= @{character_name} }} {{color=}} {{1D20:=[[@{tipotirada}]]}}" class="sheet-d20" ></button>
         </div><!-- end .columna-dau-box-1d20 --><div class="sheet-separador15"></div><!-- end .separador15 -->
       TIRADAS D20
         <select name="attr_tipotirada" class="dtype" title="Este modificador afecta a todas las tiradas D20 " style=" text-align: center; width: 110px; padding: 2px 0px "> 
@@ -2159,6 +2164,44 @@ on("change:maldad change:bondad sheet:opened", function (event) {
 });
 
 
+/* DAÑO COMBATE BONO */
+on("change:repeating_armas:armatipo change:bono_cue change:bono_per sheet:opened", function() {
+
+    getSectionIDs("repeating_armas", function(ids) {
+
+        let attrs = ["bono_cue", "bono_per"];
+
+        ids.forEach(id => {
+            attrs.push(`repeating_armas_${id}_armatipo`);
+        });
+
+        getAttrs(attrs, function(values) {
+
+            let update = {};
+
+            ids.forEach(id => {
+                const tipo = values[`repeating_armas_${id}_armatipo`];
+
+                let bono = 0;
+
+                if (tipo === "@{ataque_cc}") {
+                    bono = parseInt(values["bono_cue"]) || 0;
+                } 
+                else if (tipo === "@{ataque_pro}") {
+                    bono = parseInt(values["bono_per"]) || 0;
+                } 
+                else {
+                    // caso "-"
+                    bono = 0;
+                }
+
+                update[`repeating_armas_${id}_bonodañocombate`] = bono;
+            });
+
+            setAttrs(update);
+        });
+    });
+});
 
 </script>	
 	
\ No newline at end of file