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

Misc/Fixup

Browse Source 
* Conditions: loot rows initially have no 'id'
 * fixed building talent string for hunter pets (different talents can occupy the same row/col spot)
 * added keys loot cols on creature table
 * fixed trying to show itemset type for itemsets without type
 * fixed waypoint calculation when moving entity between floors
This commit is contained in:
Sarjuuk
2024-06-02 20:47:01 +02:00
parent efab0bad32
commit f861886fdf
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/ajaxHandler/admin.class.php
View File

@@ -423,8 +423,9 @@ class AjaxAdmin extends AjaxHandler
'areaId' => $point[0]['areaId'], 'areaId' => $point[0]['areaId'],
'floor' => $point[0]['floor'] 'floor' => $point[0]['floor']
); );
DB::Aowow()->query('UPDATE ?_creature_waypoints SET ?a WHERE `creatureOrPath` = ?d AND `point` = ?d', $p, $w['entry'], $w['pointId']);
} }
DB::Aowow()->query('UPDATE ?_creature_waypoints SET ?a WHERE `creatureOrPath` = ?d AND `point` = ?d', $p, $w['entry'], $w['pointId']);
} }
} }
} }

2
includes/conditions.class.php
View File

@@ -344,7 +344,7 @@ class Conditions
$success = false; $success = false;
foreach ($lvRows as $key => &$row) foreach ($lvRows as $key => &$row)
{ {
$key = $row['id'].':'.$srcEntry; // it's a listview row .. if it doesn't have a numeric id something truely fucked up happened. ... also its past 2a.m. $key = ($row['id'] ?? $key).':'.$srcEntry; // loot rows don't have an 'id' while being generated, but they have a usable $key
while (substr_count($key, ':') < 3) // pad with missing srcEntry, SrcId, cndTarget to group key while (substr_count($key, ':') < 3) // pad with missing srcEntry, SrcId, cndTarget to group key
$key .= ':0'; $key .= ':0';

2
includes/profiler.class.php
View File

@@ -560,7 +560,7 @@ class Profiler
$petData['entry'] $petData['entry']
); );
$_ = DB::Aowow()->selectCol('SELECT `spell` AS ARRAY_KEY, MAX(IF(`spell` IN (?a), `rank`, 0)) FROM ?_talents WHERE `class` = 0 AND `petTypeMask` = ?d GROUP BY `id` ORDER BY `row`, `col` ASC', $petSpells ?: [0], 1 << $morePet['type']); $_ = DB::Aowow()->selectCol('SELECT `spell` AS ARRAY_KEY, MAX(IF(`spell` IN (?a), `rank`, 0)) FROM ?_talents WHERE `class` = 0 AND `petTypeMask` = ?d GROUP BY `row`, `col` ORDER BY `row`, `col` ASC', $petSpells ?: [0], 1 << $morePet['type']);
$pet = array( $pet = array(
'id' => $petGuid, 'id' => $petGuid,
'owner' => $profileId, 'owner' => $profileId,

2
includes/types/itemset.class.php
View File

@@ -113,7 +113,7 @@ class ItemsetList extends BaseType
if ($_ = $this->getField('contentGroup')) if ($_ = $this->getField('contentGroup'))
$x .= Lang::itemset('notes', $_).($this->getField('heroic') ? ' <i class="q2">('.Lang::item('heroic').')</i>' : '').'<br />'; $x .= Lang::itemset('notes', $_).($this->getField('heroic') ? ' <i class="q2">('.Lang::item('heroic').')</i>' : '').'<br />';
if (!$nCl || !$this->getField('contentGroup')) if (!$nCl || !$this->getField('type'))
$x.= Lang::itemset('types', $this->getField('type')).'<br />'; $x.= Lang::itemset('types', $this->getField('type')).'<br />';
if ($bonuses = $this->getBonuses()) if ($bonuses = $this->getBonuses())

7
setup/db_structure.sql
View File

@@ -556,7 +556,10 @@ CREATE TABLE `aowow_creature` (
KEY `idx_name` (`name_loc0`), KEY `idx_name` (`name_loc0`),
KEY `difficultyEntry1` (`difficultyEntry1`), KEY `difficultyEntry1` (`difficultyEntry1`),
KEY `difficultyEntry2` (`difficultyEntry2`), KEY `difficultyEntry2` (`difficultyEntry2`),
KEY `difficultyEntry3` (`difficultyEntry3`) KEY `difficultyEntry3` (`difficultyEntry3`),
KEY `idx_loot` (`lootId`),
KEY `idx_pickpocketloot` (`pickpocketLootId`),
KEY `idx_skinloot` (`skinLootId`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3225,7 +3228,7 @@ UNLOCK TABLES;
LOCK TABLES `aowow_dbversion` WRITE; LOCK TABLES `aowow_dbversion` WRITE;
/*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */; /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */;
INSERT INTO `aowow_dbversion` VALUES (1717076299,0,NULL,NULL); INSERT INTO `aowow_dbversion` VALUES (1717354215,0,NULL,NULL);
/*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */; /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;

4
setup/updates/1717354214_01.sql Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE aowow_creature
ADD KEY `idx_loot` (`lootId`),
ADD KEY `idx_pickpocketloot` (`pickpocketLootId`),
ADD KEY `idx_skinloot` (`skinLootId`);