From 4f6322e866dd2034f724d7a917a094db893ed17f Mon Sep 17 00:00:00 2001 From: Hash Borgir Date: Wed, 14 Jun 2023 13:56:16 -0600 Subject: [PATCH] optimize props generation --- src/D2ItemData.php | 426 +++++++++++++++++++++------------------------ 1 file changed, 203 insertions(+), 223 deletions(-) diff --git a/src/D2ItemData.php b/src/D2ItemData.php index f61870d..236b7c5 100755 --- a/src/D2ItemData.php +++ b/src/D2ItemData.php @@ -9,6 +9,7 @@ class D2ItemData { * @var */ public $strings; + /** * @var */ @@ -23,7 +24,7 @@ class D2ItemData { SELECT code,uniqueinvfile,invfile,type,type2 FROM misc UNION ALL SELECT code,uniqueinvfile,invfile,type,type2 FROM weapons"; - $res = PDO_FetchAll($sql); + $res = PDO_FetchAll($sql); $isc = null; foreach ($res as $r) { $isc1[$r['code']] = $r; @@ -44,54 +45,33 @@ class D2ItemData { public function uniqueItems($index, $doc = FALSE) { if (empty($this->images)) { $this->getImages(); - } + } // This is where we get props for each item $sql = "SELECT * FROM uniqueitems WHERE enabled='1' AND `index`=?"; - $res = (PDO_FetchRow($sql, [$index])); - - if (empty($res['uniqueinvfile'])){ - $sql = "SELECT InvGfx1 FROM itemtypes WHERE Code = '{$this->images[$res['code']]['type']}'"; + $res = (PDO_FetchRow($sql, [$index])); + + if (empty($res['uniqueinvfile'])) { + $sql = "SELECT InvGfx1 FROM itemtypes WHERE Code = '{$this->images[$res['code']]['type']}'"; $invfile = PDO_FetchOne($sql); - } - if (empty($invfile)){ + } + if (empty($invfile)) { $invfile = $this->images[$res['code']]['invfile']; } $res['invfile'] = $invfile; $return = $res; - - // for all props for this unique item, get ISC strings - $props = array_filter([ - "Prop1" => array_filter( - ["prop1" => $return['prop1'], "par1" => $return['par1'], "min1" => $return['min1'], "max1" => $return['max1']] - ), - "Prop2" => array_filter( - ["prop2" => $return['prop2'], "par1" => $return['par2'], "min1" => $return['min2'], "max1" => $return['max2']] - ), - "Prop3" => array_filter( - ["prop3" => $return['prop3'], "par1" => $return['par3'], "min1" => $return['min3'], "max1" => $return['max3']] - ), - "Prop4" => array_filter( - ["prop4" => $return['prop4'], "par1" => $return['par4'], "min1" => $return['min4'], "max1" => $return['max4']] - ), - "Prop5" => array_filter( - ["prop5" => $return['prop5'], "par1" => $return['par5'], "min1" => $return['min5'], "max1" => $return['max5']] - ), - "Prop6" => array_filter( - ["prop6" => $return['prop6'], "par1" => $return['par6'], "min1" => $return['min6'], "max1" => $return['max6']] - ), - "Prop7" => array_filter( - ["prop7" => $return['prop7'], "par1" => $return['par7'], "min1" => $return['min7'], "max1" => $return['max7']] - ), - "Prop8" => array_filter( - ["prop8" => $return['prop8'], "par1" => $return['par8'], "min1" => $return['min8'], "max1" => $return['max8']] - ), - "Prop9" => array_filter( - ["prop9" => $return['prop9'], "par1" => $return['par9'], "min1" => $return['min9'], "max1" => $return['max9']] - ), - "Prop10" => array_filter( - ["prop10" => $return['prop10'], "par1" => $return['par10'], "min1" => $return['min10'], "max1" => $return['max10']] - ) - ]); + + // For all props for this unique item, get ISC strings + $props = []; + + for ($i = 1; $i <= 10; $i++) { + $propName = "Prop$i"; + $props[$propName] = array_filter([ + "prop$i" => $return["prop$i"], + "par1" => $return["par$i"], + "min1" => $return["min$i"], + "max1" => $return["max$i"] + ]); + } // need par, min, max value for each prop // ( Also need func1 and val1 for each prop ) @@ -137,7 +117,7 @@ class D2ItemData { $sql = "SELECT func1,stat1 - + FROM properties WHERE code = ?"; $props[$key]['stat'] = PDO_FetchRow($sql, [$val['prop' . $counter]]); // if not empty, filter props key stat @@ -183,12 +163,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-min' || - $v['prop2'] == 'dmg-min' || - $v['prop3'] == 'dmg-min' || - $v['prop4'] == 'dmg-min' || - $v['prop5'] == 'dmg-min' || - $v['prop6'] == 'dmg-min' || - $v['prop7'] == 'dmg-min') { + $v['prop2'] == 'dmg-min' || + $v['prop3'] == 'dmg-min' || + $v['prop4'] == 'dmg-min' || + $v['prop5'] == 'dmg-min' || + $v['prop6'] == 'dmg-min' || + $v['prop7'] == 'dmg-min') { $params = [ 'string1' => " Minimum Damage", 'string2' => "", @@ -205,12 +185,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-max' || - $v['prop2'] == 'dmg-max' || - $v['prop3'] == 'dmg-max' || - $v['prop4'] == 'dmg-max' || - $v['prop5'] == 'dmg-max' || - $v['prop6'] == 'dmg-max' || - $v['prop7'] == 'dmg-max') { + $v['prop2'] == 'dmg-max' || + $v['prop3'] == 'dmg-max' || + $v['prop4'] == 'dmg-max' || + $v['prop5'] == 'dmg-max' || + $v['prop6'] == 'dmg-max' || + $v['prop7'] == 'dmg-max') { $params = [ 'string1' => "Maximum Damage", 'string2' => "", @@ -227,12 +207,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'res-all' || - $v['prop2'] == 'res-all' || - $v['prop3'] == 'res-all' || - $v['prop4'] == 'res-all' || - $v['prop5'] == 'res-all' || - $v['prop6'] == 'res-all' || - $v['prop7'] == 'res-all') { + $v['prop2'] == 'res-all' || + $v['prop3'] == 'res-all' || + $v['prop4'] == 'res-all' || + $v['prop5'] == 'res-all' || + $v['prop6'] == 'res-all' || + $v['prop7'] == 'res-all') { $params = [ 'string1' => "Resist All", 'string2' => "", @@ -249,12 +229,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'res-all-max' || - $v['prop2'] == 'res-all-max' || - $v['prop3'] == 'res-all-max' || - $v['prop4'] == 'res-all-max' || - $v['prop5'] == 'res-all-max' || - $v['prop6'] == 'res-all-max' || - $v['prop7'] == 'res-all-max') { + $v['prop2'] == 'res-all-max' || + $v['prop3'] == 'res-all-max' || + $v['prop4'] == 'res-all-max' || + $v['prop5'] == 'res-all-max' || + $v['prop6'] == 'res-all-max' || + $v['prop7'] == 'res-all-max') { $params = [ 'string1' => "Resist All Max", 'string2' => "", @@ -271,12 +251,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'fireskill' || - $v['prop2'] == 'fireskill' || - $v['prop3'] == 'fireskill' || - $v['prop4'] == 'fireskill' || - $v['prop5'] == 'fireskill' || - $v['prop6'] == 'fireskill' || - $v['prop7'] == 'fireskill') { + $v['prop2'] == 'fireskill' || + $v['prop3'] == 'fireskill' || + $v['prop4'] == 'fireskill' || + $v['prop5'] == 'fireskill' || + $v['prop6'] == 'fireskill' || + $v['prop7'] == 'fireskill') { $params = [ 'string1' => "to Fire Skills", 'string2' => "", @@ -293,12 +273,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-min' || - $v['prop2'] == 'dmg-min' || - $v['prop3'] == 'dmg-min' || - $v['prop4'] == 'dmg-min' || - $v['prop5'] == 'dmg-min' || - $v['prop6'] == 'dmg-min' || - $v['prop7'] == 'dmg-min') { + $v['prop2'] == 'dmg-min' || + $v['prop3'] == 'dmg-min' || + $v['prop4'] == 'dmg-min' || + $v['prop5'] == 'dmg-min' || + $v['prop6'] == 'dmg-min' || + $v['prop7'] == 'dmg-min') { $params = [ 'string1' => "Increased Chance of Finding Gems", 'string2' => "", @@ -315,12 +295,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'regen-dur' || - $v['prop2'] == 'regen-dur' || - $v['prop3'] == 'regen-dur' || - $v['prop4'] == 'regen-dur' || - $v['prop5'] == 'regen-dur' || - $v['prop6'] == 'regen-dur' || - $v['prop7'] == 'regen-dur') { + $v['prop2'] == 'regen-dur' || + $v['prop3'] == 'regen-dur' || + $v['prop4'] == 'regen-dur' || + $v['prop5'] == 'regen-dur' || + $v['prop6'] == 'regen-dur' || + $v['prop7'] == 'regen-dur') { $params = [ 'string1' => "Repair Durability", 'string2' => "", @@ -337,12 +317,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'gems%/lvl' || - $v['prop2'] == 'gems%/lvl' || - $v['prop3'] == 'gems%/lvl' || - $v['prop4'] == 'gems%/lvl' || - $v['prop5'] == 'gems%/lvl' || - $v['prop6'] == 'gems%/lvl' || - $v['prop7'] == 'gems%/lvl') { + $v['prop2'] == 'gems%/lvl' || + $v['prop3'] == 'gems%/lvl' || + $v['prop4'] == 'gems%/lvl' || + $v['prop5'] == 'gems%/lvl' || + $v['prop6'] == 'gems%/lvl' || + $v['prop7'] == 'gems%/lvl') { $params = [ 'string1' => "Increase chance of finding gems per character level", 'string2' => "", @@ -359,12 +339,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-slash' || - $v['prop2'] == 'dmg-slash' || - $v['prop3'] == 'dmg-slash' || - $v['prop4'] == 'dmg-slash' || - $v['prop5'] == 'dmg-slash' || - $v['prop6'] == 'dmg-slash' || - $v['prop7'] == 'dmg-slash') { + $v['prop2'] == 'dmg-slash' || + $v['prop3'] == 'dmg-slash' || + $v['prop4'] == 'dmg-slash' || + $v['prop5'] == 'dmg-slash' || + $v['prop6'] == 'dmg-slash' || + $v['prop7'] == 'dmg-slash') { $params = [ 'string1' => "Slashing Damage", 'string2' => "", @@ -381,12 +361,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-slash%' || - $v['prop2'] == 'dmg-slash%' || - $v['prop3'] == 'dmg-slash%' || - $v['prop4'] == 'dmg-slash%' || - $v['prop5'] == 'dmg-slash%' || - $v['prop6'] == 'dmg-slash%' || - $v['prop7'] == 'dmg-slash%') { + $v['prop2'] == 'dmg-slash%' || + $v['prop3'] == 'dmg-slash%' || + $v['prop4'] == 'dmg-slash%' || + $v['prop5'] == 'dmg-slash%' || + $v['prop6'] == 'dmg-slash%' || + $v['prop7'] == 'dmg-slash%') { $params = [ 'string1' => "% Slashing Damage", 'string2' => "", @@ -403,12 +383,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-crush' || - $v['prop2'] == 'dmg-crush' || - $v['prop3'] == 'dmg-crush' || - $v['prop4'] == 'dmg-crush' || - $v['prop5'] == 'dmg-crush' || - $v['prop6'] == 'dmg-crush' || - $v['prop7'] == 'dmg-crush') { + $v['prop2'] == 'dmg-crush' || + $v['prop3'] == 'dmg-crush' || + $v['prop4'] == 'dmg-crush' || + $v['prop5'] == 'dmg-crush' || + $v['prop6'] == 'dmg-crush' || + $v['prop7'] == 'dmg-crush') { $params = [ 'string1' => "Crushing Blow", 'string2' => "", @@ -425,12 +405,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-crush%' || - $v['prop2'] == 'dmg-crush%' || - $v['prop3'] == 'dmg-crush%' || - $v['prop4'] == 'dmg-crush%' || - $v['prop5'] == 'dmg-crush%' || - $v['prop6'] == 'dmg-crush%' || - $v['prop7'] == 'dmg-crush%') { + $v['prop2'] == 'dmg-crush%' || + $v['prop3'] == 'dmg-crush%' || + $v['prop4'] == 'dmg-crush%' || + $v['prop5'] == 'dmg-crush%' || + $v['prop6'] == 'dmg-crush%' || + $v['prop7'] == 'dmg-crush%') { $params = [ 'string1' => "% Crushing Blow", 'string2' => "", @@ -447,12 +427,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-thrust' || - $v['prop2'] == 'dmg-thrust' || - $v['prop3'] == 'dmg-thrust' || - $v['prop4'] == 'dmg-thrust' || - $v['prop5'] == 'dmg-thrust' || - $v['prop6'] == 'dmg-thrust' || - $v['prop7'] == 'dmg-thrust') { + $v['prop2'] == 'dmg-thrust' || + $v['prop3'] == 'dmg-thrust' || + $v['prop4'] == 'dmg-thrust' || + $v['prop5'] == 'dmg-thrust' || + $v['prop6'] == 'dmg-thrust' || + $v['prop7'] == 'dmg-thrust') { $params = [ 'string1' => "Thrust Damage", 'string2' => "", @@ -469,12 +449,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-thrust%' || - $v['prop2'] == 'dmg-thrust%' || - $v['prop3'] == 'dmg-thrust%' || - $v['prop4'] == 'dmg-thrust%' || - $v['prop5'] == 'dmg-thrust%' || - $v['prop6'] == 'dmg-thrust%' || - $v['prop7'] == 'dmg-thrust%') { + $v['prop2'] == 'dmg-thrust%' || + $v['prop3'] == 'dmg-thrust%' || + $v['prop4'] == 'dmg-thrust%' || + $v['prop5'] == 'dmg-thrust%' || + $v['prop6'] == 'dmg-thrust%' || + $v['prop7'] == 'dmg-thrust%') { $params = [ 'string1' => "% Thrust Damage", 'string2' => "", @@ -491,12 +471,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-slash' || - $v['prop2'] == 'abs-slash' || - $v['prop3'] == 'abs-slash' || - $v['prop4'] == 'abs-slash' || - $v['prop5'] == 'abs-slash' || - $v['prop6'] == 'abs-slash' || - $v['prop7'] == 'abs-slash') { + $v['prop2'] == 'abs-slash' || + $v['prop3'] == 'abs-slash' || + $v['prop4'] == 'abs-slash' || + $v['prop5'] == 'abs-slash' || + $v['prop6'] == 'abs-slash' || + $v['prop7'] == 'abs-slash') { $params = [ 'string1' => "Absorb Slashing Damage", 'string2' => "", @@ -513,12 +493,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-crush' || - $v['prop2'] == 'abs-crush' || - $v['prop3'] == 'abs-crush' || - $v['prop4'] == 'abs-crush' || - $v['prop5'] == 'abs-crush' || - $v['prop6'] == 'abs-crush' || - $v['prop7'] == 'abs-crush') { + $v['prop2'] == 'abs-crush' || + $v['prop3'] == 'abs-crush' || + $v['prop4'] == 'abs-crush' || + $v['prop5'] == 'abs-crush' || + $v['prop6'] == 'abs-crush' || + $v['prop7'] == 'abs-crush') { $params = [ 'string1' => "Absorb Crushing Damage", 'string2' => "", @@ -535,12 +515,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-thrust' || - $v['prop2'] == 'abs-thrust' || - $v['prop3'] == 'abs-thrust' || - $v['prop4'] == 'abs-thrust' || - $v['prop5'] == 'abs-thrust' || - $v['prop6'] == 'abs-thrust' || - $v['prop7'] == 'abs-thrust') { + $v['prop2'] == 'abs-thrust' || + $v['prop3'] == 'abs-thrust' || + $v['prop4'] == 'abs-thrust' || + $v['prop5'] == 'abs-thrust' || + $v['prop6'] == 'abs-thrust' || + $v['prop7'] == 'abs-thrust') { $params = [ 'string1' => "Absorb Thrusting Damage", 'string2' => "", @@ -557,12 +537,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-slash%' || - $v['prop2'] == 'abs-slash%' || - $v['prop3'] == 'abs-slash%' || - $v['prop4'] == 'abs-slash%' || - $v['prop5'] == 'abs-slash%' || - $v['prop6'] == 'abs-slash%' || - $v['prop7'] == 'abs-slash%') { + $v['prop2'] == 'abs-slash%' || + $v['prop3'] == 'abs-slash%' || + $v['prop4'] == 'abs-slash%' || + $v['prop5'] == 'abs-slash%' || + $v['prop6'] == 'abs-slash%' || + $v['prop7'] == 'abs-slash%') { $params = [ 'string1' => "% Absorb Slashing Damage", 'string2' => "", @@ -579,12 +559,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-crush%' || - $v['prop2'] == 'abs-crush%' || - $v['prop3'] == 'abs-crush%' || - $v['prop4'] == 'abs-crush%' || - $v['prop5'] == 'abs-crush%' || - $v['prop6'] == 'abs-crush%' || - $v['prop7'] == 'abs-crush%') { + $v['prop2'] == 'abs-crush%' || + $v['prop3'] == 'abs-crush%' || + $v['prop4'] == 'abs-crush%' || + $v['prop5'] == 'abs-crush%' || + $v['prop6'] == 'abs-crush%' || + $v['prop7'] == 'abs-crush%') { $params = [ 'string1' => "% Absorb Crushing Damage", 'string2' => "", @@ -601,12 +581,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'abs-thrust%' || - $v['prop2'] == 'abs-thrust%' || - $v['prop3'] == 'abs-thrust%' || - $v['prop4'] == 'abs-thrust%' || - $v['prop5'] == 'abs-thrust%' || - $v['prop6'] == 'abs-thrust%' || - $v['prop7'] == 'abs-thrust%') { + $v['prop2'] == 'abs-thrust%' || + $v['prop3'] == 'abs-thrust%' || + $v['prop4'] == 'abs-thrust%' || + $v['prop5'] == 'abs-thrust%' || + $v['prop6'] == 'abs-thrust%' || + $v['prop7'] == 'abs-thrust%') { $params = [ 'string1' => "% Absorb Thrusting Damage", 'string2' => "", @@ -623,12 +603,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg-mon' || - $v['prop2'] == 'dmg-mon' || - $v['prop3'] == 'dmg-mon' || - $v['prop4'] == 'dmg-mon' || - $v['prop5'] == 'dmg-mon' || - $v['prop6'] == 'dmg-mon' || - $v['prop7'] == 'dmg-mon') { + $v['prop2'] == 'dmg-mon' || + $v['prop3'] == 'dmg-mon' || + $v['prop4'] == 'dmg-mon' || + $v['prop5'] == 'dmg-mon' || + $v['prop6'] == 'dmg-mon' || + $v['prop7'] == 'dmg-mon') { $params = [ 'string1' => "Damage vs.", 'string2' => "", @@ -645,12 +625,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'dmg%-mon' || - $v['prop2'] == 'dmg%-mon' || - $v['prop3'] == 'dmg%-mon' || - $v['prop4'] == 'dmg%-mon' || - $v['prop5'] == 'dmg%-mon' || - $v['prop6'] == 'dmg%-mon' || - $v['prop7'] == 'dmg%-mon') { + $v['prop2'] == 'dmg%-mon' || + $v['prop3'] == 'dmg%-mon' || + $v['prop4'] == 'dmg%-mon' || + $v['prop5'] == 'dmg%-mon' || + $v['prop6'] == 'dmg%-mon' || + $v['prop7'] == 'dmg%-mon') { $params = [ 'string1' => "% Damage vs.", 'string2' => "", @@ -667,12 +647,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'att%-mon' || - $v['prop2'] == 'att%-mon' || - $v['prop3'] == 'att%-mon' || - $v['prop4'] == 'att%-mon' || - $v['prop5'] == 'att%-mon' || - $v['prop6'] == 'att%-mon' || - $v['prop7'] == 'att%-mon') { + $v['prop2'] == 'att%-mon' || + $v['prop3'] == 'att%-mon' || + $v['prop4'] == 'att%-mon' || + $v['prop5'] == 'att%-mon' || + $v['prop6'] == 'att%-mon' || + $v['prop7'] == 'att%-mon') { $params = [ 'string1' => "To Hit % vs. ", 'string2' => "", @@ -689,12 +669,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'ac-mon' || - $v['prop2'] == 'ac-mon' || - $v['prop3'] == 'ac-mon' || - $v['prop4'] == 'ac-mon' || - $v['prop5'] == 'ac-mon' || - $v['prop6'] == 'ac-mon' || - $v['prop7'] == 'ac-mon') { + $v['prop2'] == 'ac-mon' || + $v['prop3'] == 'ac-mon' || + $v['prop4'] == 'ac-mon' || + $v['prop5'] == 'ac-mon' || + $v['prop6'] == 'ac-mon' || + $v['prop7'] == 'ac-mon') { $params = [ 'string1' => "Defense against ", 'string2' => "", @@ -711,12 +691,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'ac%-mon' || - $v['prop2'] == 'ac%-mon' || - $v['prop3'] == 'ac%-mon' || - $v['prop4'] == 'ac%-mon' || - $v['prop5'] == 'ac%-mon' || - $v['prop6'] == 'ac%-mon' || - $v['prop7'] == 'ac%-mon') { + $v['prop2'] == 'ac%-mon' || + $v['prop3'] == 'ac%-mon' || + $v['prop4'] == 'ac%-mon' || + $v['prop5'] == 'ac%-mon' || + $v['prop6'] == 'ac%-mon' || + $v['prop7'] == 'ac%-mon') { $params = [ 'string1' => "% Defense against", 'string2' => "", @@ -733,12 +713,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'indestruct' || - $v['prop2'] == 'indestruct' || - $v['prop3'] == 'indestruct' || - $v['prop4'] == 'indestruct' || - $v['prop5'] == 'indestruct' || - $v['prop6'] == 'indestruct' || - $v['prop7'] == 'indestruct') { + $v['prop2'] == 'indestruct' || + $v['prop3'] == 'indestruct' || + $v['prop4'] == 'indestruct' || + $v['prop5'] == 'indestruct' || + $v['prop6'] == 'indestruct' || + $v['prop7'] == 'indestruct') { $params = [ 'string1' => "Indestructable", 'string2' => "", @@ -755,12 +735,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'ethereal' || - $v['prop2'] == 'ethereal' || - $v['prop3'] == 'ethereal' || - $v['prop4'] == 'ethereal' || - $v['prop5'] == 'ethereal' || - $v['prop6'] == 'ethereal' || - $v['prop7'] == 'ethereal') { + $v['prop2'] == 'ethereal' || + $v['prop3'] == 'ethereal' || + $v['prop4'] == 'ethereal' || + $v['prop5'] == 'ethereal' || + $v['prop6'] == 'ethereal' || + $v['prop7'] == 'ethereal') { $params = [ 'string1' => "Ethereal (Cannot be repaired)", 'string2' => "", @@ -777,12 +757,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'skill-rand' || - $v['prop2'] == 'skill-rand' || - $v['prop3'] == 'skill-rand' || - $v['prop4'] == 'skill-rand' || - $v['prop5'] == 'skill-rand' || - $v['prop6'] == 'skill-rand' || - $v['prop7'] == 'skill-rand') { + $v['prop2'] == 'skill-rand' || + $v['prop3'] == 'skill-rand' || + $v['prop4'] == 'skill-rand' || + $v['prop5'] == 'skill-rand' || + $v['prop6'] == 'skill-rand' || + $v['prop7'] == 'skill-rand') { $params = [ 'string1' => "+ to Random Skill", 'string2' => "", @@ -799,12 +779,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'aura-rand' || - $v['prop2'] == 'aura-rand' || - $v['prop3'] == 'aura-rand' || - $v['prop4'] == 'aura-rand' || - $v['prop5'] == 'aura-rand' || - $v['prop6'] == 'aura-rand' || - $v['prop7'] == 'aura-rand') { + $v['prop2'] == 'aura-rand' || + $v['prop3'] == 'aura-rand' || + $v['prop4'] == 'aura-rand' || + $v['prop5'] == 'aura-rand' || + $v['prop6'] == 'aura-rand' || + $v['prop7'] == 'aura-rand') { $params = [ 'string1' => "to Random Aura When Equipped", 'string2' => "", @@ -821,12 +801,12 @@ class D2ItemData { "max" => $return['max' . $counter], ]; } else if ($v['prop1'] == 'sock' || - $v['prop2'] == 'sock' || - $v['prop3'] == 'sock' || - $v['prop4'] == 'sock' || - $v['prop5'] == 'sock' || - $v['prop6'] == 'sock' || - $v['prop7'] == 'sock') { + $v['prop2'] == 'sock' || + $v['prop3'] == 'sock' || + $v['prop4'] == 'sock' || + $v['prop5'] == 'sock' || + $v['prop6'] == 'sock' || + $v['prop7'] == 'sock') { $params = [ 'string1' => "Sockets", 'string2' => "",