yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Spells/Reagents

Browse Source 
* try to fix wrong reagent amount in cases where one reagent requires multiples of itself and is triggered by an item
This commit is contained in:
Sarjuuk
2022-01-05 23:27:44 +01:00
parent 061449686d
commit 2ec4809c7f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/spell.php
View File

@@ -1234,12 +1234,7 @@ class SpellPage extends GenericPage
return false; return false;
$item = DB::Aowow()->selectRow(' $item = DB::Aowow()->selectRow('
SELECT name_loc0, name_loc2, name_loc3, name_loc6, name_loc8, i.id, ic.name AS iconString, quality, SELECT name_loc0, name_loc2, name_loc3, name_loc6, name_loc8, i.id, ic.name AS iconString, quality
IF ( (spellId1 > 0 AND spellCharges1 < 0) OR
(spellId2 > 0 AND spellCharges2 < 0) OR
(spellId3 > 0 AND spellCharges3 < 0) OR
(spellId4 > 0 AND spellCharges4 < 0) OR
(spellId5 > 0 AND spellCharges5 < 0), 1, 0) AS consumed
FROM ?_items i FROM ?_items i
LEFT JOIN ?_icons ic ON ic.id = i.iconId LEFT JOIN ?_icons ic ON ic.id = i.iconId
WHERE i.id = ?d', WHERE i.id = ?d',
@@ -1253,9 +1248,6 @@ class SpellPage extends GenericPage
$_level++; $_level++;
if ($item['consumed'])
$_qty++;
$data = array( $data = array(
'type' => TYPE_ITEM, 'type' => TYPE_ITEM,
'typeId' => $item['id'], 'typeId' => $item['id'],
@@ -1286,6 +1278,7 @@ class SpellPage extends GenericPage
SELECT reagent1, reagent2, reagent3, reagent4, reagent5, reagent6, reagent7, reagent8, SELECT reagent1, reagent2, reagent3, reagent4, reagent5, reagent6, reagent7, reagent8,
reagentCount1, reagentCount2, reagentCount3, reagentCount4, reagentCount5, reagentCount6, reagentCount7, reagentCount8, reagentCount1, reagentCount2, reagentCount3, reagentCount4, reagentCount5, reagentCount6, reagentCount7, reagentCount8,
name_loc0, name_loc2, name_loc3, name_loc6, name_loc8, name_loc0, name_loc2, name_loc3, name_loc6, name_loc8,
iconIdBak,
s.id AS ARRAY_KEY, ic.name AS iconString s.id AS ARRAY_KEY, ic.name AS iconString
FROM ?_spell s FROM ?_spell s
JOIN ?_icons ic ON s.iconId = ic.id JOIN ?_icons ic ON s.iconId = ic.id
@@ -1327,6 +1320,11 @@ class SpellPage extends GenericPage
if ($row['reagent'.$i] <= 0 || $row['reagentCount'.$i] <= 0) if ($row['reagent'.$i] <= 0 || $row['reagentCount'.$i] <= 0)
continue; continue;
// handle edge case elemental crafting material: Mote of X + Crystalized X
// on use items, that has require more reagents of itself
if ($row['reagentCount'.$i] == 9 && ($row['iconIdBak'] == 140 || $row['iconIdBak'] == 1921))
$row['reagentCount'.$i]++;
if ($this->appendReagentItem($reagentResult, $row['reagent'.$i], $row['reagentCount'.$i], $data['qty'], $data['level'], $data['path'], $_aU)) if ($this->appendReagentItem($reagentResult, $row['reagent'.$i], $row['reagentCount'.$i], $data['qty'], $data['level'], $data['path'], $_aU))
{ {
$hasUnusedReagents = true; $hasUnusedReagents = true;

2
static/css/global.css
View File

@@ -477,7 +477,7 @@
} }
.iconlist td { .iconlist td {
padding: 4px 0 6px 0 !important; padding: 4px 0 6px 0;
} }
.iconlist var { .iconlist var {