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

Zones:

Browse Source 
- added questgivers to map
 - added listviews: Quests, Started By (Item), Quest Rewards
 - fixed error in setup: kalimdor zones are back from eastern kingdoms
This commit is contained in:
Sarjuuk
2015-05-31 18:33:37 +02:00
parent 3eecc3ec7c
commit 71110d432c
5 changed files with 202 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
includes/types/quest.class.php
View File

@@ -158,6 +158,31 @@ class QuestList extends BaseType
return $data;
}
public function getSOMData($side = SIDE_BOTH)
{
$data = [];
foreach ($this->iterate() as $__)
{
if (!(Util::sideByRaceMask($this->curTpl['reqRaceMask']) & $side))
continue;
$data[$this->id] = array(
'level' => $this->curTpl['level'] < 0 ? MAX_LEVEL : $this->curTpl['level'],
'name' => $this->getField('name', true),
'category' => $this->curTpl['cat1'],
'category2' => $this->curTpl['cat2'],
'series' => 0, // todo (med)
'first' => 0, // todo (med)
);
if ($this->isDaily())
$data[$this->id]['daily'] = 1;
}
return $data;
}
public function getListviewData($extraFactionId = 0) // i should formulate a propper parameter..
{
$data = [];

8
includes/utilities.php
View File

@@ -874,17 +874,17 @@ class Util
{
// Any
if (!$race || ($race & RACE_MASK_ALL) == RACE_MASK_ALL)
return 3;
return SIDE_BOTH;
// Horde
if ($race & RACE_MASK_HORDE && !($race & RACE_MASK_ALLIANCE))
return 2;
return SIDE_HORDE;
// Alliance
if ($race & RACE_MASK_ALLIANCE && !($race & RACE_MASK_HORDE))
return 1;
return SIDE_ALLIANCE;
return 3;
return SIDE_BOTH;
}
public static function getReputationLevelForPoints($pts)

223
pages/zone.php
View File

File diff suppressed because one or more lines are too long

2
setup/tools/sqlgen/zones.func.php
View File

@@ -44,7 +44,7 @@ function zones()
IF(m.areaType = 4, 9,
IF(m.isBG = 1, 6,
IF(a.mapId = 571, 10,
IF(a.mapId = 530, 8, 0))))))),
IF(a.mapId = 530, 8, a.mapId))))))),
a.flags,
IF(wma.id IS NULL AND m.areaType <> 4, ?d, 0), -- cuFlags,
IF(a.flags & 0x01000000, 5, -- g_zone_territories

2
setup/updates/1433023200_02.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE aowow_zones SET mapId = 1 WHERE id IN (14,15,16,17,141,148,215,331,332,357,361,377,400,405,406,440,457,490,493,616,618,876,1377,1637,1638,1657,1941,2159,2917,3478,3524,3525,3557);
UPDATE aowow_zones SET mapId = 1 WHERE parentArea IN (14,15,16,17,141,148,215,331,332,357,361,377,400,405,406,440,457,490,493,616,618,876,1377,1637,1638,1657,1941,2159,2917,3478,3524,3525,3557);