mirror of
https://github.com/Sarjuuk/aowow.git
synced 2025-11-29 15:58:16 +08:00
implementation of Sound DB
Client sounds are cross-referenced with as many other DB-Types as possible. Including, but not limited to: * Character VOs (Errors, Emotes) * Creature VOs (Boss Dialogue) * Zone Music and Ambience * Sounds triggerd by spells * Sounds from general item/spell usage, creature behavior Restrictions: * only one locale is supported. Choose wisely!
This commit is contained in:
Sarjuuk
@@ -9,10 +9,14 @@ if (!CLI)
|
||||
|
||||
$customData = array(
|
||||
);
|
||||
$reqDBC = ['emotes', 'emotestext', 'emotestextdata' /*, 'emotestextsound' */];
|
||||
$reqDBC = ['emotes', 'emotestext', 'emotestextdata'];
|
||||
|
||||
function emotes(/*array $ids = [] */)
|
||||
{
|
||||
/**********/
|
||||
/* Basics */
|
||||
/**********/
|
||||
|
||||
$globStrPath = CLISetup::$srcDir.'%sInterface/FrameXML/GlobalStrings.lua';
|
||||
$allOK = true;
|
||||
$locPath = [];
|
||||
|
||||
@@ -33,9 +33,11 @@ function items(array $ids = [])
|
||||
it.entry,
|
||||
class, class as classBak,
|
||||
subclass, subclass AS subClassBak,
|
||||
SoundOverrideSubclass,
|
||||
IFNULL(sg.id, 0) AS subSubClass,
|
||||
name, IFNULL(li.name_loc2, ""), IFNULL(li.name_loc3, ""), IFNULL(li.name_loc6, ""), IFNULL(li.name_loc8, ""),
|
||||
displayid,
|
||||
0 AS spellVisualId,
|
||||
Quality,
|
||||
Flags, FlagsExtra,
|
||||
BuyCount, BuyPrice, SellPrice,
|
||||
@@ -86,6 +88,7 @@ function items(array $ids = [])
|
||||
LanguageID,
|
||||
startquest,
|
||||
lockid,
|
||||
Material,
|
||||
IF(RandomProperty > 0, RandomProperty, -RandomSuffix) AS randomEnchant,
|
||||
itemset,
|
||||
MaxDurability,
|
||||
@@ -107,6 +110,10 @@ function items(array $ids = [])
|
||||
FoodType,
|
||||
0 AS gemEnchantmentId,
|
||||
minMoneyLoot, maxMoneyLoot,
|
||||
0 AS pickUpSoundId,
|
||||
0 AS dropDownSoundId,
|
||||
0 AS sheatheSoundId,
|
||||
0 AS unsheatheSoundId,
|
||||
flagsCustom
|
||||
FROM
|
||||
item_template it
|
||||
|
||||
@@ -25,6 +25,10 @@ $reqDBC = ['chrraces', 'charbaseinfo'];
|
||||
|
||||
function races()
|
||||
{
|
||||
/**********/
|
||||
/* Basics */
|
||||
/**********/
|
||||
|
||||
$baseQuery = '
|
||||
REPLACE INTO
|
||||
?_races
|
||||
|
||||
426
setup/tools/sqlgen/sounds.func.php
Normal file
426
setup/tools/sqlgen/sounds.func.php
Normal file
@@ -0,0 +1,426 @@
|
||||
<?php
|
||||
|
||||
if (!defined('AOWOW_REVISION'))
|
||||
die('illegal access');
|
||||
|
||||
if (!CLI)
|
||||
die('not in cli mode');
|
||||
|
||||
|
||||
$customData = array(
|
||||
15407 => ['cat' => 10] // UR_Algalon_Summon03 (this is not an item pickup)
|
||||
);
|
||||
$reqDBC = array(
|
||||
// base emotes race
|
||||
'soundentries', 'emotestextsound', 'vocaluisounds',
|
||||
// creatures
|
||||
'npcsounds', 'creaturesounddata', 'creaturedisplayinfo', 'creaturemodeldata',
|
||||
// spells
|
||||
'spell', 'spellvisual', 'spellvisualkit',
|
||||
// zones
|
||||
'soundambience', 'zonemusic', 'zoneintromusictable', 'worldstatezonesounds', 'areatable',
|
||||
// items
|
||||
'material', 'itemgroupsounds', 'itemdisplayinfo', 'weaponimpactsounds', 'itemsubclass', 'weaponswingsounds2' /*, 'sheathesoundlookups' data is redundant with material..? */
|
||||
);
|
||||
|
||||
|
||||
function sounds(/*array $ids = [] */)
|
||||
{
|
||||
/*
|
||||
okay, here's the thing. WMOAreaTable.dbc references WMO-files to get its position in the world (AreTable) and has sparse information on the related AreaTables themself.
|
||||
Though it has sets for ZoneAmbience, ZoneMusic and ZoneIntroMusic, these can't be linked for this very reason and are omitted for now.
|
||||
content: e.g. Tavern Music
|
||||
*/
|
||||
|
||||
// WMOAreaTable.dbc/Id => AreaTable.dbc/Id
|
||||
$worldStateZoneSoundFix = array(
|
||||
18153 => 2119,
|
||||
18154 => 2119,
|
||||
47321 => 4273, // The Spark of Imagination
|
||||
43600 => 4273, // The Celestial Planetarium
|
||||
47478 => 4273 // The Prison of Yogg-Saron
|
||||
);
|
||||
|
||||
|
||||
/***********/
|
||||
/* M A I N */
|
||||
/***********/
|
||||
|
||||
CLISetup::log(' - sounds main data');
|
||||
|
||||
// file extraction and conversion in build step. data here is purely structural
|
||||
// reality check ... thats probably gigabytes worth of sound.. only growing in size with every locale added on top (RedRocketSite didn't do it. Should i then?)
|
||||
|
||||
// .wav => audio/ogg; codecs="vorbis"
|
||||
// .mp3 => audio/mpeg
|
||||
|
||||
$query = '
|
||||
SELECT Id AS `id`, `type` AS `cat`, `name`, 0 AS cuFlags,
|
||||
`file1` AS soundFile1, `file2` AS soundFile2, `file3` AS soundFile3, `file4` AS soundFile4, `file5` AS soundFile5,
|
||||
`file6` AS soundFile6, `file7` AS soundFile7, `file8` AS soundFile8, `file9` AS soundFile9, `file10` AS soundFile10,
|
||||
path, flags
|
||||
FROM dbc_soundentries
|
||||
WHERE id > ?d LIMIT ?d
|
||||
';
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_sounds');
|
||||
DB::Aowow()->query('TRUNCATE ?_sounds_files');
|
||||
|
||||
$lastMax = 0;
|
||||
$soundFileIdx = 0;
|
||||
$soundIndex = [];
|
||||
while ($sounds = DB::Aowow()->select($query, $lastMax, SqlGen::$stepSize))
|
||||
{
|
||||
$newMax = max(array_column($sounds, 'id'));
|
||||
|
||||
CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
|
||||
|
||||
$lastMax = $newMax;
|
||||
|
||||
$groupSets = [];
|
||||
foreach ($sounds as $s)
|
||||
{
|
||||
/* attention!
|
||||
|
||||
one sound can be used in 20 or more locations but may appear as multiple files,
|
||||
because of different cases, path being attached to file and other shenanigans
|
||||
|
||||
build a usable path and create full index to compensate
|
||||
25.6k raw files => expect ~21k filtered files
|
||||
*/
|
||||
|
||||
$fileSets = [];
|
||||
$hasDupes = false;
|
||||
for ($i = 1; $i < 11; $i++)
|
||||
{
|
||||
$nicePath = CLISetup::nicePath($s['soundFile'.$i], $s['path']);
|
||||
if ($s['soundFile'.$i] && array_key_exists($nicePath, $soundIndex))
|
||||
{
|
||||
$s['soundFile'.$i] = $soundIndex[$nicePath];
|
||||
$hasDupes = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
// convert to something web friendly => ogg
|
||||
if (stristr($s['soundFile'.$i], '.wav'))
|
||||
{
|
||||
$soundIndex[$nicePath] = ++$soundFileIdx;
|
||||
|
||||
$fileSets[] = array(
|
||||
$soundFileIdx,
|
||||
strtolower($s['soundFile'.$i]),
|
||||
strtolower($s['path']),
|
||||
SOUND_TYPE_OGG
|
||||
);
|
||||
$s['soundFile'.$i] = $soundFileIdx;
|
||||
}
|
||||
// mp3 .. keep as is
|
||||
else if (stristr($s['soundFile'.$i], '.mp3'))
|
||||
{
|
||||
$soundIndex[$nicePath] = ++$soundFileIdx;
|
||||
|
||||
$fileSets[] = array(
|
||||
$soundFileIdx,
|
||||
strtolower($s['soundFile'.$i]),
|
||||
strtolower($s['path']),
|
||||
SOUND_TYPE_MP3
|
||||
);
|
||||
$s['soundFile'.$i] = $soundFileIdx;
|
||||
}
|
||||
// i call bullshit
|
||||
else if ($s['soundFile'.$i])
|
||||
{
|
||||
CLISetup::log(' - sound group #'.$s['id'].' "'.$s['name'].'" has invalid sound file "'.$s['soundFile'.$i].'" on index '.$i.'! Skipping...', CLISetup::LOG_WARN);
|
||||
$s['soundFile'.$i] = null;
|
||||
}
|
||||
// empty case
|
||||
else
|
||||
$s['soundFile'.$i] = null;
|
||||
}
|
||||
|
||||
if (!$fileSets && !$hasDupes)
|
||||
{
|
||||
CLISetup::log(' - sound group #'.$s['id'].' "'.$s['name'].'" contains no sound files! Skipping...', CLISetup::LOG_WARN);
|
||||
continue;
|
||||
}
|
||||
else if ($fileSets)
|
||||
DB::Aowow()->query('INSERT INTO ?_sounds_files VALUES (?a)', array_values($fileSets));
|
||||
|
||||
unset($s['path']);
|
||||
|
||||
$groupSets[] = array_values($s);
|
||||
}
|
||||
|
||||
DB::Aowow()->query('REPLACE INTO ?_sounds VALUES (?a)', array_values($groupSets));
|
||||
}
|
||||
|
||||
|
||||
/******************/
|
||||
/* VocalUI Sounds */
|
||||
/******************/
|
||||
|
||||
CLISetup::log(' - linking to race');
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_races_sounds');
|
||||
DB::Aowow()->query('INSERT IGNORE INTO ?_races_sounds SELECT raceId, soundIdMale, 1 FROM dbc_vocaluisounds WHERE soundIdMale <> soundIdFemale AND soundIdMale > 0');
|
||||
DB::Aowow()->query('INSERT IGNORE INTO ?_races_sounds SELECT raceId, soundIdFemale, 2 FROM dbc_vocaluisounds WHERE soundIdMale <> soundIdFemale AND soundIdFemale > 0');
|
||||
|
||||
// ps: im too dumb to union this
|
||||
|
||||
|
||||
/***************/
|
||||
/* Emote Sound */
|
||||
/***************/
|
||||
|
||||
CLISetup::log(' - linking to emotes');
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_emotes_sounds');
|
||||
DB::Aowow()->query('INSERT IGNORE INTO ?_emotes_sounds SELECT emotesTextId, raceId, gender + 1, soundId FROM dbc_emotestextsound');
|
||||
|
||||
|
||||
/*******************/
|
||||
/* Creature Sounds */
|
||||
/*******************/
|
||||
|
||||
CLISetup::log(' - linking to creatures');
|
||||
|
||||
// currently ommitting:
|
||||
// * footsteps (matrix of: creature + terrain + humidity)
|
||||
// * fidget2 through 5
|
||||
// * customattack2 through 3
|
||||
// in case of conflicting data CreatureDisplayInfo overrides CreatureModelData (seems to be more specialized (Thral > MaleOrc / Maiden > FemaleTitan))
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_creature_sounds');
|
||||
DB::Aowow()->query('
|
||||
INSERT INTO
|
||||
?_creature_sounds (`id`, `greeting`, `farewell`, `angry`, `exertion`, `exertioncritical`, `injury`, `injurycritical`, `death`, `stun`, `stand`, `aggro`, `wingflap`, `wingglide`, `alert`, `fidget`, `customattack`, `loop`, `jumpstart`, `jumpend`, `petattack`, `petorder`, `petdismiss`, `birth`, `spellcast`, `submerge`, `submerged`)
|
||||
SELECT
|
||||
cdi.Id,
|
||||
IFNULL(ns.greetSoundId, 0),
|
||||
IFNULL(ns.byeSoundId, 0),
|
||||
IFNULL(ns.angrySoundId, 0),
|
||||
IF(csdA.exertion, csdA.exertion, IFNULL(csdB.exertion, 0)),
|
||||
IF(csdA.exertionCritical, csdA.exertionCritical, IFNULL(csdB.exertionCritical, 0)),
|
||||
IF(csdA.injury, csdA.injury, IFNULL(csdB.injury, 0)),
|
||||
IF(csdA.injuryCritical, csdA.injuryCritical, IFNULL(csdB.injuryCritical, 0)),
|
||||
IF(csdA.death, csdA.death, IFNULL(csdB.death, 0)),
|
||||
IF(csdA.stun, csdA.stun, IFNULL(csdB.stun, 0)),
|
||||
IF(csdA.stand, csdA.stand, IFNULL(csdB.stand, 0)),
|
||||
IF(csdA.aggro, csdA.aggro, IFNULL(csdB.aggro, 0)),
|
||||
IF(csdA.wingFlap, csdA.wingFlap, IFNULL(csdB.wingFlap, 0)),
|
||||
IF(csdA.wingGlide, csdA.wingGlide, IFNULL(csdB.wingGlide, 0)),
|
||||
IF(csdA.alert, csdA.alert, IFNULL(csdB.alert, 0)),
|
||||
IF(csdA.fidget, csdA.fidget, IFNULL(csdB.fidget, 0)),
|
||||
IF(csdA.customAttack, csdA.customAttack, IFNULL(csdB.customAttack, 0)),
|
||||
IF(csdA.loop, csdA.loop, IFNULL(csdB.loop, 0)),
|
||||
IF(csdA.jumpStart, csdA.jumpStart, IFNULL(csdB.jumpStart, 0)),
|
||||
IF(csdA.jumpEnd, csdA.jumpEnd, IFNULL(csdB.jumpEnd, 0)),
|
||||
IF(csdA.petAttack, csdA.petAttack, IFNULL(csdB.petAttack, 0)),
|
||||
IF(csdA.petOrder, csdA.petOrder, IFNULL(csdB.petOrder, 0)),
|
||||
IF(csdA.petDismiss, csdA.petDismiss, IFNULL(csdB.petDismiss, 0)),
|
||||
IF(csdA.birth, csdA.birth, IFNULL(csdB.birth, 0)),
|
||||
IF(csdA.spellcast, csdA.spellcast, IFNULL(csdB.spellcast, 0)),
|
||||
IF(csdA.submerge, csdA.submerge, IFNULL(csdB.submerge, 0)),
|
||||
IF(csdA.submerged, csdA.submerged, IFNULL(csdB.submerged, 0))
|
||||
FROM
|
||||
dbc_creaturedisplayinfo cdi
|
||||
LEFT JOIN
|
||||
dbc_creaturemodeldata cmd ON cmd.Id = cdi.modelId
|
||||
LEFT JOIN
|
||||
dbc_creaturesounddata csdA ON cdi.creatureSoundId = csdA.Id
|
||||
LEFT JOIN
|
||||
dbc_creaturesounddata csdB ON cmd.creatureSoundId = csdB.Id
|
||||
LEFT JOIN
|
||||
dbc_npcsounds ns ON cdi.npcSoundId = ns.Id
|
||||
');
|
||||
|
||||
|
||||
/****************/
|
||||
/* Spell Sounds */
|
||||
/****************/
|
||||
|
||||
CLISetup::log(' - linking to spells');
|
||||
|
||||
// issues: (probably because of 335-data)
|
||||
// * animate is probably wrong
|
||||
// * missile and impactarea not in js
|
||||
// * ready, castertargeting, casterstate and targetstate not in dbc
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_spell_sounds');
|
||||
DB::Aowow()->query('
|
||||
INSERT INTO
|
||||
?_spell_sounds (`Id`, `precast`, `cast`, `impact`, `state`, `statedone`, `channel`, `missile`, `animation`, `casterimpact`, `targetimpact`, `missiletargeting`, `instantarea`, `impactarea`, `persistentarea`)
|
||||
SELECT
|
||||
sv.Id,
|
||||
IFNULL(svk1.soundId, 0),
|
||||
IFNULL(svk2.soundId, 0),
|
||||
IFNULL(svk3.soundId, 0),
|
||||
IFNULL(svk4.soundId, 0),
|
||||
IFNULL(svk5.soundId, 0),
|
||||
IFNULL(svk6.soundId, 0),
|
||||
missileSoundId,
|
||||
animationSoundId,
|
||||
IFNULL(svk7.soundId, 0),
|
||||
IFNULL(svk8.soundId, 0),
|
||||
IFNULL(svk9.soundId, 0),
|
||||
IFNULL(svk10.soundId, 0),
|
||||
IFNULL(svk11.soundId, 0),
|
||||
IFNULL(svk12.soundId, 0)
|
||||
FROM
|
||||
dbc_spellvisual sv
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk1 ON svk1.Id = sv.precastKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk2 ON svk2.Id = sv.castKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk3 ON svk3.Id = sv.impactKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk4 ON svk4.Id = sv.stateKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk5 ON svk5.Id = sv.statedoneKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk6 ON svk6.Id = sv.channelKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk7 ON svk7.Id = sv.casterImpactKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk8 ON svk8.Id = sv.targetImpactKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk9 ON svk9.Id = sv.missileTargetingKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk10 ON svk10.Id = sv.instantAreaKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk11 ON svk11.Id = sv.impactAreaKitId
|
||||
LEFT JOIN
|
||||
dbc_spellvisualkit svk12 ON svk12.Id = sv.persistentAreaKitId
|
||||
');
|
||||
|
||||
|
||||
/***************/
|
||||
/* Zone Sounds */
|
||||
/***************/
|
||||
|
||||
CLISetup::log(' - linking to zones');
|
||||
|
||||
// omiting data from WMOAreaTable, as its at the moment impossible to link to actual zones
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_zones_sounds');
|
||||
DB::Aowow()->query('
|
||||
INSERT INTO
|
||||
?_zones_sounds (id, ambienceDay, ambienceNight, musicDay, musicNight, intro, worldStateId, worldStateValue)
|
||||
SELECT
|
||||
a.id,
|
||||
IFNULL(sa1.soundIdDay, 0),
|
||||
IFNULL(sa1.soundIdNight, 0),
|
||||
IFNULL(zm1.soundIdDay, 0),
|
||||
IFNULL(zm1.soundIdNight, 0),
|
||||
IFNULL(zimt1.soundId, 0),
|
||||
0,
|
||||
0
|
||||
FROM
|
||||
dbc_areatable a
|
||||
LEFT JOIN
|
||||
dbc_soundambience sa1 ON sa1.id = a.soundAmbience
|
||||
LEFT JOIN
|
||||
dbc_zonemusic zm1 ON zm1.id = a.zoneMusic
|
||||
LEFT JOIN
|
||||
dbc_zoneintromusictable zimt1 ON zimt1.id = a.zoneIntroMusic
|
||||
WHERE
|
||||
a.soundAmbience > 0 OR a.zoneMusic > 0 OR a.zoneIntroMusic
|
||||
UNION
|
||||
SELECT
|
||||
IF(wszs.areaId, wszs.areaId, wszs.wmoAreaId),
|
||||
IFNULL(sa2.soundIdDay, 0),
|
||||
IFNULL(sa2.soundIdNight, 0),
|
||||
IFNULL(zm2.soundIdDay, 0),
|
||||
IFNULL(zm2.soundIdNight, 0),
|
||||
IFNULL(zimt2.soundId, 0),
|
||||
wszs.stateId,
|
||||
wszs.value
|
||||
FROM
|
||||
dbc_worldstatezonesounds wszs
|
||||
LEFT JOIN
|
||||
dbc_soundambience sa2 ON sa2.id = wszs.soundAmbienceId
|
||||
LEFT JOIN
|
||||
dbc_zonemusic zm2 ON zm2.id = wszs.zoneMusicId
|
||||
LEFT JOIN
|
||||
dbc_zoneintromusictable zimt2 ON zimt2.id = wszs.zoneIntroMusicId
|
||||
WHERE
|
||||
wszs.zoneMusicId > 0 AND (wszs.areaId OR wszs.wmoAreaId IN (?a))
|
||||
', array_keys($worldStateZoneSoundFix));
|
||||
|
||||
// apply post-fix
|
||||
foreach ($worldStateZoneSoundFix as $old => $new)
|
||||
DB::Aowow()->query('UPDATE ?_zones_sounds SET id = ?d WHERE id = ?d', $new, $old);
|
||||
|
||||
|
||||
/***************/
|
||||
/* Item Sounds */
|
||||
/***************/
|
||||
|
||||
CLISetup::log(' - linking to items');
|
||||
|
||||
DB::Aowow()->query('
|
||||
UPDATE
|
||||
?_items i
|
||||
LEFT JOIN
|
||||
dbc_itemdisplayinfo idi ON
|
||||
idi.id = i.displayId
|
||||
LEFT JOIN
|
||||
dbc_itemgroupsounds igs ON
|
||||
igs.id = idi.groupSoundId
|
||||
LEFT JOIN
|
||||
dbc_material m ON
|
||||
m.id = i.material
|
||||
SET
|
||||
i.spellVisualId = IFNULL(idi.spellVisualId, 0),
|
||||
i.pickUpSoundId = IFNULL(igs.pickUpSoundId, 0),
|
||||
i.dropDownSoundId = IFNULL(igs.dropDownSoundId, 0),
|
||||
i.sheatheSoundId = IFNULL(m.sheatheSoundId, 0),
|
||||
i.unsheatheSoundId = IFNULL(m.unsheatheSoundId, 0)
|
||||
');
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_items_sounds');
|
||||
|
||||
$fields = ['hit', 'crit'];
|
||||
foreach ($fields as $f)
|
||||
{
|
||||
for ($i = 1; $i <= 10; $i++)
|
||||
{
|
||||
DB::Aowow()->query('
|
||||
INSERT INTO
|
||||
?_items_sounds
|
||||
SELECT
|
||||
?#,
|
||||
(1 << wis.subClass)
|
||||
FROM
|
||||
dbc_weaponimpactsounds wis
|
||||
WHERE
|
||||
?# > 0
|
||||
ON DUPLICATE KEY UPDATE
|
||||
subClassMask = subClassMask | (1 << wis.subClass)
|
||||
', $f.$i, $f.$i);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
DB::Aowow()->query('
|
||||
INSERT INTO
|
||||
?_items_sounds
|
||||
SELECT
|
||||
wss.soundId,
|
||||
(1 << isc.subClass)
|
||||
FROM
|
||||
dbc_itemsubclass isc
|
||||
JOIN
|
||||
dbc_weaponswingsounds2 wss ON
|
||||
wss.weaponSize = isc.weaponSize
|
||||
WHERE
|
||||
isc.class = 2
|
||||
ON DUPLICATE KEY UPDATE
|
||||
subClassMask = subClassMask | (1 << isc.subClass)
|
||||
');
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
?>
|
||||
@@ -23,7 +23,7 @@ if (!CLI)
|
||||
|
||||
$customData = array(
|
||||
);
|
||||
$reqDBC = ['worldmaparea', 'map', 'worldmaptransforms', 'dungeonmap', 'taxipathnode'];
|
||||
$reqDBC = ['worldmaparea', 'map', 'dungeonmap', 'taxipathnode', 'soundemitters'];
|
||||
|
||||
function spawns() // and waypoints
|
||||
{
|
||||
@@ -98,15 +98,19 @@ function spawns() // and waypoints
|
||||
'FROM gameobject c',
|
||||
' - assembling '.CLISetup::bold('gameobject').' spawns'];
|
||||
|
||||
$query[3] = ['SELECT c.guid, w.entry AS "npcOrPath", w.pointId AS "point", c.zoneId AS areaId, c.map, w.waittime AS "wait", w.location_y AS `posX`, w.location_x AS `posY` ' .
|
||||
$query[3] = ['SELECT Id AS "guid", 19 AS "type", soundId AS typeId, 0 AS respawn, 0 AS phaseMask, 0 AS areaId, mapId AS "map", 0 AS pathId, posX, posY ' .
|
||||
'FROM dbc_soundemitters',
|
||||
' - assembling '.CLISetup::bold('sound emitter').' spawns'];
|
||||
|
||||
$query[4] = ['SELECT c.guid, w.entry AS "npcOrPath", w.pointId AS "point", c.zoneId AS areaId, c.map, w.waittime AS "wait", w.location_y AS `posX`, w.location_x AS `posY` ' .
|
||||
'FROM creature c JOIN script_waypoint w ON c.id = w.entry',
|
||||
' - assembling waypoints from '.CLISetup::bold('script_waypoint')];
|
||||
|
||||
$query[4] = ['SELECT c.guid, w.entry AS "npcOrPath", w.pointId AS "point", c.zoneId AS areaId, c.map, 0 AS "wait", w.position_y AS `posX`, w.position_x AS `posY` ' .
|
||||
$query[5] = ['SELECT c.guid, w.entry AS "npcOrPath", w.pointId AS "point", c.zoneId AS areaId, c.map, 0 AS "wait", w.position_y AS `posX`, w.position_x AS `posY` ' .
|
||||
'FROM creature c JOIN waypoints w ON c.id = w.entry',
|
||||
' - assembling waypoints from '.CLISetup::bold('waypoints')];
|
||||
|
||||
$query[5] = ['SELECT c.guid, -w.id AS "npcOrPath", w.point, c.zoneId AS areaId, c.map, w.delay AS "wait", w.position_y AS `posX`, w.position_x AS `posY` ' .
|
||||
$query[6] = ['SELECT c.guid, -w.id AS "npcOrPath", w.point, c.zoneId AS areaId, c.map, w.delay AS "wait", w.position_y AS `posX`, w.position_x AS `posY` ' .
|
||||
'FROM creature c JOIN creature_addon ca ON ca.guid = c.guid JOIN waypoint_data w ON w.id = ca.path_id WHERE ca.path_id <> 0',
|
||||
' - assembling waypoints from '.CLISetup::bold('waypoint_data')];
|
||||
|
||||
@@ -118,7 +122,7 @@ function spawns() // and waypoints
|
||||
'FROM dbc_worldmaparea wma ' .
|
||||
'LEFT JOIN dbc_dungeonmap dm ON dm.mapId = IF(?d AND (wma.mapId NOT IN (0, 1, 530, 571) OR wma.areaId = 4395), wma.mapId, -1) ' .
|
||||
'WHERE wma.mapId = ?d AND IF(?d, wma.areaId = ?d, wma.areaId <> 0) ' .
|
||||
'HAVING (`posX` BETWEEN 0.1 AND 99.9 AND `posY` BETWEEN 0.1 AND 99.9) AND (dm.Id IS NULL OR ?d) ' .
|
||||
'HAVING (`posX` BETWEEN 0.1 AND 99.9 AND `posY` BETWEEN 0.1 AND 99.9) ' . // AND (dm.Id IS NULL OR ?d) ' .
|
||||
'ORDER BY quality ASC';
|
||||
|
||||
|
||||
@@ -149,7 +153,13 @@ function spawns() // and waypoints
|
||||
|
||||
$n = 0;
|
||||
$sum = 0;
|
||||
foreach (DB::World()->select($q[0]) as $spawn)
|
||||
|
||||
if ($idx == 3)
|
||||
$queryResult = DB::Aowow()->select($q[0]);
|
||||
else
|
||||
$queryResult = DB::World()->select($q[0]);
|
||||
|
||||
foreach ($queryResult as $spawn)
|
||||
{
|
||||
if (!$n)
|
||||
CLISetup::log(' * sets '.($sum + 1).' - '.($sum += SqlGen::$stepSize));
|
||||
@@ -167,20 +177,20 @@ function spawns() // and waypoints
|
||||
$spawn['map'] = $transports[$spawn['map']]['mapId'];
|
||||
}
|
||||
|
||||
$points = DB::Aowow()->select($queryPost, $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], 1, $spawn['map'], $spawn['areaId'], $spawn['areaId'], $spawn['areaId'] ? 1 : 0);
|
||||
$points = DB::Aowow()->select($queryPost, $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], 1, $spawn['map'], $spawn['areaId'], $spawn['areaId'] /*, $spawn['areaId'] ? 1 : 0*/);
|
||||
if (!$points) // retry: TC counts pre-instance subareas as instance-maps .. which have no map file
|
||||
$points = DB::Aowow()->select($queryPost, $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], 0, $spawn['map'], 0, 0, 1);
|
||||
$points = DB::Aowow()->select($queryPost, $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], $spawn['posX'], $spawn['posX'], $spawn['posY'], $spawn['posY'], 0, $spawn['map'], 0, 0 /*, 1*/);
|
||||
|
||||
if (!$points) // still impossible (there are areas that are intentionally off the map (e.g. the isles south of tanaris))
|
||||
{
|
||||
CLISetup::log('GUID '.$spawn['guid'].($idx < 3 ? '' : ' on path/point '.$spawn['npcOrPath'].'/'.$spawn['point']).' could not be matched to displayable area [A:'.$spawn['areaId'].'; X:'.$spawn['posY'].'; Y:'.$spawn['posX'].']', CLISetup::LOG_WARN);
|
||||
CLISetup::log('GUID '.$spawn['guid'].($idx < 4 ? '' : ' on path/point '.$spawn['npcOrPath'].'/'.$spawn['point']).' could not be matched to displayable area [A:'.$spawn['areaId'].'; X:'.$spawn['posY'].'; Y:'.$spawn['posX'].']', CLISetup::LOG_WARN);
|
||||
continue;
|
||||
}
|
||||
|
||||
// if areaId is set, area was determined by TC .. we're fine .. mostly
|
||||
$final = $spawn['areaId'] ? $points[0] : $checkCoords($points);
|
||||
|
||||
if ($idx < 3)
|
||||
if ($idx < 4)
|
||||
{
|
||||
$set = array(
|
||||
'guid' => $spawn['guid'],
|
||||
|
||||
@@ -85,6 +85,7 @@ function spell()
|
||||
EffectSpellClassMaskA1, EffectSpellClassMaskA2, EffectSpellClassMaskA3,
|
||||
EffectSpellClassMaskB1, EffectSpellClassMaskB2, EffectSpellClassMaskB3,
|
||||
EffectSpellClassMaskC1, EffectSpellClassMaskC2, EffectSpellClassMaskC3,
|
||||
0 AS spellVisualId1, 0 AS spellVisualId2,
|
||||
0 AS iconId, 0 AS iconIdActive,
|
||||
CONCAT("Serverside - ",Comment) AS name_loc0,CONCAT("Serverside - ",Comment) AS name_loc2,CONCAT("Serverside - ",Comment) AS name_loc3,CONCAT("Serverside - ",Comment) AS name_loc6,CONCAT("Serverside - ",Comment) AS name_loc8,
|
||||
"" AS rank_loc0, "" AS rank_loc2, "" AS rank_loc3, "" AS rank_loc6, "" AS rank_loc8,
|
||||
@@ -176,6 +177,7 @@ function spell()
|
||||
effect1BonusMultiplier, effect2BonusMultiplier, effect3BonusMultiplier,
|
||||
iconId, 0 AS iconIdAlt,
|
||||
0 AS rankId,
|
||||
spellVisualId1,
|
||||
name_loc0, name_loc2, name_loc3, name_loc6, name_loc8,
|
||||
rank_loc0, rank_loc2, rank_loc3, rank_loc6, rank_loc8,
|
||||
description_loc0, description_loc2, description_loc3, description_loc6, description_loc8,
|
||||
|
||||
Reference in New Issue
Block a user