Merge branch 'master' into 'master'

Description Update

See merge request hydrawiki/extensions/pvxcode!12

Author: Michael Chaudhary

css/pvxcode.css

@@ -153,7 +153,7 @@ span.pvx_attrib_bg img {
     display:block;
     margin:0;
     padding:0;
-    padding-left:7px;
+    padding-left:1px;
 }
 
 /* Tooltips - Left column - sacrifice, energy, overcast, recharge, activation, adrenaline. */

extension.json

@@ -1,6 +1,6 @@
 {
 	"name": "PvX Code",
-	"version": "2.0.0.3",
+	"version": "2.0.0.4",
 	"author": [
 		"Hydra Wiki Platform Team",
 		"PvX Wiki 2010-2020 Contributors"

gwbbcode/constants.inc.php

@@ -1,6 +1,6 @@
 <?php
 //gwBBCode's version
-define('GWBBCODE_VERSION', '2.0.0.3');
+define('GWBBCODE_VERSION', '2.0.0.4');
 
 // DATABASE PATHS
 //  Skill ids to details

gwbbcode/databases/skill_db.php

@@ -8708,7 +8708,7 @@
 'recharge'=>25,
 'pve_only'=>0,
 'elite'=>1,
-'desc'=>'If Oath Shot hits, all of your skills except Oath Shot are recharged. If it misses, all of your skills are disabled for 10 seconds. (50% miss chance with Expertise 7 or less.)',
+'desc'=>'If Oath Shot hits, all of your skills except Oath Shot are recharged. If it misses, all of your skills are disabled for 10..4 seconds. (50% miss chance with Expertise 7 or less.)',
 'name_id'=>'oath shot',
 ),
 406=>

gwbbcode/gwbbcode.inc.php

@@ -644,7 +644,7 @@ function skill_replace($reg) {
 		if ($sacrifice != 0) {
 			$required[] = infuse_values($gwbbcode_tpl['requirement'], Array(
 				'type' => 'sacr',
-				'value' => $sacrifice
+				'value' => $sacrifice . '%'
 			));
 		}
 
@@ -1231,8 +1231,12 @@ function fork_val_pve_only($val_0, $val_15, $attr_lvl, $rank_limit) {
 function add_strength($desc, &$extra_desc, $attr_list, $type) {
 	if (isset($attr_list['Strength']) && $attr_list['Strength'] > 0 && strpos($type, 'Attack') !== false) {
 		// Strength does not stack with skills with inherent armor penetration
-		if (!preg_match('@[Tt]his (attack|axe attack) has ([0-9]+)% armor penetration@', $desc, $reg)) {
-			$extra_desc = 'This attack skill has <b>' . $attr_list['Strength'] . '</b>% armor penetration.';
+		if (preg_match('@[Tt]his (attack|axe attack) has ([0-9]+)% armor penetration@', $desc, $reg)) {
+			if ($reg[2] < $strength) {
+				$extra_desc = 'This attack skill has <b>' . $strength . '</b>% armor penetration. Its inherent armor penetration is overwritten.';
+			}
+		} else {
+			$extra_desc = 'This attack skill has <b>' . $strength . '</b>% armor penetration.';
 		}
 	}
 }