DescFunc 14 done

This commit is contained in:
color.diff=auto 2021-05-02 20:52:31 -06:00
parent efa7f8f28e
commit 3a08d8c16c
9 changed files with 686 additions and 329 deletions

View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2021 Hash Borgir
@ -44,6 +45,8 @@ session_start();
include "../_pdo.php";
require_once "../src/D2Functions.php";
require_once "../src/D2ItemDesc.php";
require_once './D2AjaxFunctions.php';
define('DB_FILE', $_SESSION['modname'] . ".db");
define('TXT_PATH', $_SESSION['path']);
@ -51,3 +54,4 @@ define('TXT_PATH', $_SESSION['path']);
$db = dirname(getcwd()) . DIRECTORY_SEPARATOR . DB_FILE;
PDO_Connect("sqlite:" . $db);

View File

@ -1,6 +1,7 @@
<?php
include "./config.php";
$idesc = new D2ItemDesc();
/*
Copyright (C) 2021 Hash Borgir
@ -61,7 +62,6 @@ if ($cmd == "getUniqueItem") {
$sql = "SELECT * FROM `uniqueitems` WHERE `enabled`='1' AND `index`=\"{$_GET['index']}\"";
$res = PDO_FetchRow($sql);
if (empty($res['invfile'])) {
// if no invfile, get from other tables
@ -90,6 +90,90 @@ if ($cmd == "getUniqueItem") {
$return = $res;
}
// var_dump($return);
// 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']]
)
]);
// need par, min, max value for each prop
// for each prop, get stat
$counter = 1;
foreach ($props as $key => $val) {
// val = Prop1,Prop2 etc.
// for each propr, get all 7 stats in ISC
$sql = "SELECT stat1,stat2,stat3,stat4,stat5,stat6,stat7 FROM `properties` WHERE `code` = '{$val['prop' . $counter]}'";
$props[$key]['stat'] = array_filter(PDO_FetchRow($sql));
$counter++;
}
//each stat now goes into getIscStrings
foreach ($props as $k => $v) {
$props[$k]['desc'] = array_filter(getIscStrings($v['stat']['stat1']));
}
//var_dump($return);
// todo: put values in params, so I can get generated string for that prop
$counter = 1;
foreach ($props as $k => $v) { // for each property Prop1 Prop2
$value = $v['par1'] ?? $v['min1'];
$params = [
'string1' => $v['desc']['string1'],
'string2' => $v['desc']['string2'],
'descfunc' => $v['desc']['descfunc'],
'descval' => $v['desc']['descval'],
"par" => $return['par'.$counter],
"min" => $return['min'.$counter],
"max" => $return['max'.$counter]
];
if (!empty($v['desc'])) {
$props[$k]['string'][] = $idesc->getDesc($value, $params);
}
$counter++;
}
$return['props'] = $props;
//ddump($return);
header('Content-Type: application/json');
echo json_encode($return, JSON_INVALID_UTF8_IGNORE);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -113,22 +113,6 @@ if (!isset($_SESSION['modname']) || (!file_exists(APP_DB)) || (!file_exists($_SE
$prop = $parser->filterProps('Properties.txt');
foreach ($prop as $p) {
$sql = "SELECT stat1,stat2,stat3,stat4,stat5,stat6,stat7 FROM `properties` WHERE `code` = '$p'";
$isc[$p] = array_filter(PDO_FetchRow($sql));
}
foreach ($isc as $i) { // for each property $i
foreach ($i as $k){
//$params = $db->getIscStrings($k);
//var_dump($idesc->getDesc(100, $params));
}
}
// If there's data, process it and save
if (!empty($_POST)) {

View File

@ -142,6 +142,25 @@ $(document).ready(function () {
$(".item").attr("src", "/img/items/1.png");
$.get("/ajax/uniqueitems.php?cmd=getUniqueItem&index=" + this.value, function (data) {
props = data.props;
console.log(props);
$('.item_desc').html("<p></p>");
$.each(props, function (i, v) {
if (v.par1) {
$s1 = '';
}
if(v.string){
$('.item_desc p').append(v.string[0]+"<br>");
}
});
invImg = "/img/items/" + data.invfile + ".png";
$(".item").attr("src", invImg);

View File

@ -165,7 +165,21 @@ option {
margin: 15px 0;
}
.item {
.item_desc {
height: auto;
width: 420px;
position: absolute;
left: 110px;
top: 23px;
text-align: center;
background: black;
padding: 10px;
}
.item_desc p {
font-size: 14px;
color: #4169E1;
}

View File

@ -127,41 +127,6 @@ class D2Database {
return $res;
}
public function getIscStrings($iscStat) {
$sql = "
SELECT
(
SELECT String
FROM itemstatcost as i
LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
WHERE `Stat` = '$iscStat'
)
AS string1,
(
SELECT String
FROM itemstatcost as i
LEFT JOIN strings AS `s` ON `i`.DescStr2 = `s`.`Key`
WHERE `Stat` = '$iscStat'
)
AS string2,
(
SELECT descfunc
FROM itemstatcost as i
LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
WHERE `Stat` = '$iscStat'
)
AS descfunc,
(
SELECT descval
FROM itemstatcost as i
LEFT JOIN strings AS `s` ON `i`.descstrpos = `s`.`Key`
WHERE `Stat` = '$iscStat'
)
AS descval
";
return PDO_FetchRow($sql);
}
}

View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2021 Hash Borgir
@ -135,17 +136,67 @@ array (size=174)
*/
public $str = '';
// takes value, param.
// value == Value to show on this stat
//descfunc 14
public $skilltabsDesc;
public $skilltabsDescClean;
public $skilltabs = [
//ama
'0' => 'StrSklTabItem3',
'1' => 'StrSklTabItem2',
'2' => 'StrSklTabItem1',
// sor
'3' => 'StrSklTabItem15',
'4' => 'StrSklTabItem14',
'5' => 'StrSklTabItem13',
//nec
'6' => 'StrSklTabItem8',
'7' => 'StrSklTabItem7',
'8' => 'StrSklTabItem9',
//pal
'9' => 'StrSklTabItem6',
'10' => 'StrSklTabItem5',
'11' => 'StrSklTabItem4',
//bar
'12' => 'StrSklTabItem11',
'13' => 'StrSklTabItem12',
'14' => 'StrSklTabItem10',
//dru
'15' => 'StrSklTabItem16',
'16' => 'StrSklTabItem17',
'17' => 'StrSklTabItem18',
// ass
'18' => 'StrSklTabItem19',
'19' => 'StrSklTabItem20',
'20' => 'StrSklTabItem21'
];
public function getDesc($value, $params = []) {
if (empty($params)) return false;
if (empty($params))
return false;
$v = $value;
$v = '<span style="font-family: Lato; color: white; font-weight: 900">' . $value . "</span>";
$s1 = $params['string1'];
$s2 = $params['string2'];
$par = $params['par'];
$min = $params['min'];
$max = $params['max'];
foreach ($this->skilltabs as $s) {
$sql = "SELECT `String` FROM `strings` WHERE `Key`='$s'";
$this->skilltabsDesc[] = PDO_FetchRow($sql);
}
foreach ($this->skilltabsDesc as $s) {
$this->skilltabsDescClean[] = str_replace('+%d', '', $s);
}
//ddump($this->skilltabsDescClean);
if ($params['descval'] == 1 || $params['descval'] == '') {
if ($params['descfunc'] == 1) {
$this->str = "+$v $s1";
@ -199,7 +250,16 @@ array (size=174)
}
if ($params['descfunc'] == 14) {
$this->str = "+$v to [skilltab] Skill Levels ([class] Only)";
$sql = "SELECT class
FROM `charstats`
WHERE `StrSkillTab1`='{$this->skilltabs[$par]}' OR
`StrSkillTab2`='{$this->skilltabs[$par]}' OR
`StrSkillTab3`='{$this->skilltabs[$par]}'";
$x = PDO_FetchOne($sql);
$this->str = "+$min - $max{$this->skilltabsDescClean[$par]['String']} Skill Levels ([$x] Only)";
}
if ($params['descfunc'] == 15) {
$this->str = "[chance]% to case [slvl] [skill] on [event]";
@ -255,6 +315,228 @@ array (size=174)
if ($params['descfunc'] == 28) {
$this->str = "+$v to [skill] ";
}
} else if ($params['descval'] == 0) {
if ($params['descfunc'] == 1) {
$this->str = "$s1";
}
if ($params['descfunc'] == 2) {
$this->str = "$s1";
}
if ($params['descfunc'] == 3) {
$this->str = "$s1";
}
if ($params['descfunc'] == 4) {
$this->str = "$s1";
}
if ($params['descfunc'] == 5) {
$this->str = "$s1";
}
if ($params['descfunc'] == 6) {
$this->str = "$s1 $s2";
}
if ($params['descfunc'] == 7) {
$this->str = "$s1 $s2";
}
if ($params['descfunc'] == 8) {
$this->str = "$s1 $s2";
}
if ($params['descfunc'] == 9) {
$this->str = "$s1 $s2";
}
if ($params['descfunc'] == 10) {
$this->str = "$s1 $s2";
}
if ($params['descfunc'] == 11) {
$this->str = "Repairs 1 Durability In X seconds";
}
if ($params['descfunc'] == 12) {
$this->str = "$s1";
}
if ($params['descfunc'] == 13) {
$this->str = "to [class] Skill Levels";
}
if ($params['descfunc'] == 14) {
$this->str = "to [skilltab] Skill Levels ([class] Only)";
}
if ($params['descfunc'] == 15) {
$this->str = "[chance]to case [slvl] [skill] on [event]";
}
if ($params['descfunc'] == 16) {
$this->str = "Level [sLvl] [skill] Aura When Equipped ";
}
if ($params['descfunc'] == 17) {
$this->str = "$s1 (Increases near [time])";
}
if ($params['descfunc'] == 18) {
$this->str = "$s1 (Increases near [time])";
}
if ($params['descfunc'] == 19) {
$this->str = "";
}
if ($params['descfunc'] == 20) {
$this->str = "$s1";
}
if ($params['descfunc'] == 21) {
$this->str = "$s1";
}
if ($params['descfunc'] == 22) {
$this->str = "$s1 [MonType]";
}
if ($params['descfunc'] == 23) {
$this->str = "$s1 [Monster]";
}
if ($params['descfunc'] == 24) {
$this->str = "to Skill Charges Or Something";
}
if ($params['descfunc'] == 25) {
$this->str = "";
}
if ($params['descfunc'] == 26) {
$this->str = "";
}
if ($params['descfunc'] == 27) {
$this->str = "to [skill] ([class] Only)";
}
if ($params['descfunc'] == 28) {
$this->str = "to [skill] ";
}
} else if ($params['descval'] == 2) {
if ($params['descfunc'] == 1) {
$this->str = "$s1 +$v";
}
if ($params['descfunc'] == 2) {
$this->str = "$s1 $v%";
}
if ($params['descfunc'] == 3) {
$this->str = "$s1 $v";
}
if ($params['descfunc'] == 4) {
$this->str = "$s1 +$v%";
}
if ($params['descfunc'] == 5) {
$this->str = "$s1" . ($v * 100 / 128);
}
if ($params['descfunc'] == 6) {
$this->str = "$s1 $s2 +%v";
}
if ($params['descfunc'] == 7) {
$this->str = "$s1 $s2 $v% ";
}
if ($params['descfunc'] == 8) {
$this->str = "$s1 $s2 +$v% ";
}
if ($params['descfunc'] == 9) {
$this->str = "$s1 $s2 $v";
}
if ($params['descfunc'] == 10) {
$this->str = "$s1 $s2" . ($v * 100 / 128);
}
if ($params['descfunc'] == 11) {
$this->str = "Repairs 1 Durability In X seconds";
}
if ($params['descfunc'] == 12) {
$this->str = "$s1 +$v ";
}
if ($params['descfunc'] == 13) {
$this->str = "to [class] Skill Levels +$v";
}
if ($params['descfunc'] == 14) {
$this->str = "to [skilltab] Skill Levels ([class] Only) +$v ";
}
if ($params['descfunc'] == 15) {
$this->str = "[chance]% to case [slvl] [skill] on [event]";
}
if ($params['descfunc'] == 16) {
$this->str = "Level [sLvl] [skill] Aura When Equipped ";
}
if ($params['descfunc'] == 17) {
$this->str = "s1 (Increases near [time]) $v $";
}
if ($params['descfunc'] == 18) {
$this->str = "$s1 (Increases near [time]) $v% ";
}
if ($params['descfunc'] == 19) {
$this->str = "";
}
if ($params['descfunc'] == 20) {
$this->str = "% $s1" . ($v * -1);
}
if ($params['descfunc'] == 21) {
$this->str = "$s1" . ($v * -1);
}
if ($params['descfunc'] == 22) {
$this->str = "$s1 [MonType] $v% ";
}
if ($params['descfunc'] == 23) {
$this->str = "s1 [Monster] $v% $";
}
if ($params['descfunc'] == 24) {
$this->str = "to Skill Charges Or Something +$v ";
}
if ($params['descfunc'] == 25) {
$this->str = "";
}
if ($params['descfunc'] == 26) {
$this->str = "";
}
if ($params['descfunc'] == 27) {
$this->str = "+$v to [skill] ([class] Only)";
}
if ($params['descfunc'] == 28) {
$this->str = "+$v to [skill] ";
}
}
return $this->str;
}

View File

@ -2,10 +2,15 @@
<div class="row">
<div class="offset-6 col"><h3 style="font-family:fixed; font-size:80%;">Preview</h3>
<div class="" style="height: 117px; background: url(/img/items/bg.png) no-repeat">
<img style="" class="item" src="">
<div class="item_desc">
<p></p>
</div>
</div>
</div>
</div>
<div class="row" style="margin-bottom:40px;">
<div class="col" style="">
@ -42,7 +47,7 @@
<label for="sort_3" class="custom-control-label">Item Code</label>
</div>
<hr>
<p style="font-family:Exocet;">View Only: </p>
<p style="font-family:Exocet;">Filter By: </p>
<div class="custom-control custom-radio custom-control-inline">
<input name="view" id="view_0" type="radio" class="custom-control-input" value="rin">
<label for="view_0" class="custom-control-label">Rings</label>