mirror of
https://github.com/Sarjuuk/aowow.git
synced 2025-11-29 15:58:16 +08:00
Emotes
* have creature emotes in the same system (on a negeative index) as SAI links were uselessly pointing to player emotes before * player emotes are now gendered * display two more cases of who points at whom when using a player emote * use and link event sound from emote * display more misc info
This commit is contained in:
Sarjuuk
@@ -62,8 +62,8 @@ class DBC
|
||||
'durabilitycosts' => 'niiiiiiiiixiiiiiiiiiiixiiiixix',
|
||||
'durabilityquality' => 'nf',
|
||||
'dungeonencounter' => 'niiiisxsssxsxsxxxxxxxxx',
|
||||
'emotes' => 'nxixxxx',
|
||||
'emotestext' => 'nsiixxxixixxxxxxxxx',
|
||||
'emotes' => 'nsiiiii',
|
||||
'emotestext' => 'nsiiiixixixiixxixxx',
|
||||
'emotestextdata' => 'nsxsssxsxsxxxxxxxx',
|
||||
'emotestextsound' => 'niiii',
|
||||
'faction' => 'niiiiiiiiiiiiiixxxiffixsxsssxsxsxxxxxxxxxxxxxxxxxxxxxxxxx',
|
||||
@@ -167,8 +167,8 @@ class DBC
|
||||
'durabilitycosts' => 'id,w0,w1,w2,w3,w4,w5,w6,w7,w8,w10,w11,w12,w13,w14,w15,w16,w17,w18,w19,w20,a1,a2,a3,a4,a6',
|
||||
'durabilityquality' => 'id,mod',
|
||||
'dungeonencounter' => 'id,map,mode,order,bit,name_loc0,name_loc2,name_loc3,name_loc4,name_loc6,name_loc8',
|
||||
'emotes' => 'id,animationId',
|
||||
'emotestext' => 'id,command,emoteId,targetId,noTargetId,selfId',
|
||||
'emotes' => 'id,name,animationId,flags,state,stateParam,soundId',
|
||||
'emotestext' => 'id,command,emoteId,etd0,etd1,etd2,etd4,etd6,etd8,etd9,etd12',
|
||||
'emotestextsound' => 'id,emotesTextId,raceId,gender,soundId',
|
||||
'emotestextdata' => 'id,text_loc0,text_loc2,text_loc3,text_loc4,text_loc6,text_loc8',
|
||||
'faction' => 'id,repIdx,baseRepRaceMask1,baseRepRaceMask2,baseRepRaceMask3,baseRepRaceMask4,baseRepClassMask1,baseRepClassMask2,baseRepClassMask3,baseRepClassMask4,baseRepValue1,baseRepValue2,baseRepValue3,baseRepValue4,repFlags1,parentFaction,spilloverRateIn,spilloverRateOut,spilloverMaxRank,name_loc0,name_loc2,name_loc3,name_loc4,name_loc6,name_loc8',
|
||||
|
||||
@@ -13,6 +13,71 @@ SqlGen::register(new class extends SetupScript
|
||||
|
||||
protected $dbcSourceFiles = ['emotes', 'emotestext', 'emotestextdata'];
|
||||
|
||||
private $textData = [];
|
||||
|
||||
private function mergeGenderedStrings(int $maleTextId, int $femaleTextId, int $locale) : string
|
||||
{
|
||||
$maleText = $this->textData[$maleTextId][$locale] ?? '';
|
||||
$femaleText = $this->textData[$femaleTextId][$locale] ?? '';
|
||||
|
||||
if (!$maleText && !$femaleText)
|
||||
return '';
|
||||
else if (!$maleText)
|
||||
return $femaleText;
|
||||
else if (!$femaleText)
|
||||
return $maleText;
|
||||
else if ($maleText == $femaleText)
|
||||
return $maleText;
|
||||
|
||||
$front = $back = [];
|
||||
|
||||
$m = explode(' ', $maleText);
|
||||
$f = explode(' ', $femaleText);
|
||||
$n = max(count($m), count($f));
|
||||
|
||||
// advance from left until diff -> store common string
|
||||
// advance from right until diff -> store common string
|
||||
// merge leftovers as gendered switch and recombine string
|
||||
|
||||
$i = 0;
|
||||
for (; $i < $n; $i++)
|
||||
{
|
||||
if (!isset($m[$i]) || !isset($f[$i]))
|
||||
break;
|
||||
else if ($m[$i] != $f[$i])
|
||||
break;
|
||||
else
|
||||
$front[] = $m[$i];
|
||||
}
|
||||
|
||||
if ($i + 1 == $n) // loop completed all elements
|
||||
return implode(' ', $m);
|
||||
|
||||
$m = array_reverse($m);
|
||||
$f = array_reverse($f);
|
||||
|
||||
$j = 0;
|
||||
for (; $j < $n - $i; $j++)
|
||||
{
|
||||
if (!isset($m[$j]) || !isset($f[$j]))
|
||||
break;
|
||||
else if ($m[$j] != $f[$j])
|
||||
break;
|
||||
else
|
||||
$back[] = $m[$j];
|
||||
}
|
||||
|
||||
$m = array_reverse($m);
|
||||
$f = array_reverse($f);
|
||||
|
||||
$midM = array_slice($m, $i, count($m) - $i - $j);
|
||||
$midF = array_slice($f, $i, count($f) - $i - $j);
|
||||
|
||||
$mid = '$g' . implode(' ', $midM ?? []) . ':' . implode(' ', $midF ?? []) . ';';
|
||||
|
||||
return implode(' ', array_merge($front, [$mid], array_reverse($back)));
|
||||
}
|
||||
|
||||
public function generate(array $ids = []) : bool
|
||||
{
|
||||
/**********/
|
||||
@@ -23,8 +88,13 @@ SqlGen::register(new class extends SetupScript
|
||||
$allOK = true;
|
||||
$locPath = [];
|
||||
|
||||
DB::Aowow()->query('TRUNCATE ?_emotes');
|
||||
DB::Aowow()->query('TRUNCATE ?_emotes_aliasses');
|
||||
|
||||
/*********************/
|
||||
/* Player controlled */
|
||||
/*********************/
|
||||
|
||||
foreach (CLISetup::$localeIds as $lId)
|
||||
{
|
||||
foreach (CLISetup::$expectedPaths as $xp => $locId)
|
||||
@@ -47,28 +117,43 @@ SqlGen::register(new class extends SetupScript
|
||||
$allOK = false;
|
||||
}
|
||||
|
||||
$_= DB::Aowow()->query('REPLACE INTO ?_emotes SELECT
|
||||
et.id,
|
||||
LOWER(et.command),
|
||||
IF(e.animationId, 1, 0),
|
||||
0, -- cuFlags
|
||||
etdT.text_loc0, etdT.text_loc2, etdT.text_loc3, etdT.text_loc4, etdT.text_loc6, etdT.text_loc8,
|
||||
etdNT.text_loc0, etdNT.text_loc2, etdNT.text_loc3, etdNT.text_loc4, etdNT.text_loc6, etdNT.text_loc8,
|
||||
etdS.text_loc0, etdS.text_loc2, etdS.text_loc3, etdS.text_loc4, etdS.text_loc6, etdS.text_loc8
|
||||
FROM
|
||||
dbc_emotestext et
|
||||
LEFT JOIN
|
||||
dbc_emotes e ON e.id = et.emoteId
|
||||
LEFT JOIN
|
||||
dbc_emotestextdata etdT ON etdT.id = et.targetId
|
||||
LEFT JOIN
|
||||
dbc_emotestextdata etdNT ON etdNT.id = et.noTargetId
|
||||
LEFT JOIN
|
||||
dbc_emotestextdata etdS ON etdS.id = et.selfId'
|
||||
);
|
||||
/* EmotesText Data offsets
|
||||
gender seenBy hasTarget mergedWith example
|
||||
0 male others yes 8 %s raises <his/her> fist in anger at %s.
|
||||
1 male self yes 9 %s raises <his/her> fist in anger at you.
|
||||
2 self self yes You raise your fist in anger at %s.
|
||||
4 male others no 12 %s raises <his/her> fist in anger.
|
||||
6 self self no You raise your fist in anger.
|
||||
8 female others yes 0 -
|
||||
9 female self yes 1 -
|
||||
12 female others no 4 -
|
||||
*/
|
||||
|
||||
if (!$_)
|
||||
$allOK = false;
|
||||
$this->textData = DB::Aowow()->select('SELECT id AS ARRAY_KEY, text_loc0 AS "0", text_loc2 AS "2", text_loc3 AS "3", text_loc4 AS "4", text_loc6 AS "6", text_loc8 AS "8" FROM dbc_emotestextdata');
|
||||
|
||||
$texts = DB::Aowow()->select('SELECT et.id AS ARRAY_KEY, LOWER(command) AS `cmd`, IF(e.animationId, 1, 0) AS `anim`, -emoteId AS "parent", e.soundId, etd0, etd1, etd2, etd4, etd6, etd8, etd9, etd12 FROM dbc_emotestext et LEFT JOIN dbc_emotes e ON e.id = et.emoteId');
|
||||
foreach ($texts AS $id => $t)
|
||||
{
|
||||
DB::Aowow()->query(
|
||||
'INSERT INTO ?_emotes (
|
||||
`id`, `cmd`, `isAnimated`, `parentEmote`, `soundId`,
|
||||
`extToExt_loc0`, `extToMe_loc0`, `meToExt_loc0`, `extToNone_loc0`, `meToNone_loc0`,
|
||||
`extToExt_loc2`, `extToMe_loc2`, `meToExt_loc2`, `extToNone_loc2`, `meToNone_loc2`,
|
||||
`extToExt_loc3`, `extToMe_loc3`, `meToExt_loc3`, `extToNone_loc3`, `meToNone_loc3`,
|
||||
`extToExt_loc4`, `extToMe_loc4`, `meToExt_loc4`, `extToNone_loc4`, `meToNone_loc4`,
|
||||
`extToExt_loc6`, `extToMe_loc6`, `meToExt_loc6`, `extToNone_loc6`, `meToNone_loc6`,
|
||||
`extToExt_loc8`, `extToMe_loc8`, `meToExt_loc8`, `extToNone_loc8`, `meToNone_loc8`)
|
||||
VALUES
|
||||
(?d, ?, ?d, ?d, ?d, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
|
||||
$id, $t['cmd'], $t['anim'], $t['parent'], $t['soundId'],
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_EN), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_EN), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_EN), $this->textData[$t['etd2']][LOCALE_EN] ?? '', $this->textData[$t['etd6']][LOCALE_EN] ?? '',
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_FR), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_FR), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_FR), $this->textData[$t['etd2']][LOCALE_FR] ?? '', $this->textData[$t['etd6']][LOCALE_FR] ?? '',
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_DE), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_DE), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_DE), $this->textData[$t['etd2']][LOCALE_DE] ?? '', $this->textData[$t['etd6']][LOCALE_DE] ?? '',
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_CN), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_CN), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_CN), $this->textData[$t['etd2']][LOCALE_CN] ?? '', $this->textData[$t['etd6']][LOCALE_CN] ?? '',
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_ES), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_ES), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_ES), $this->textData[$t['etd2']][LOCALE_ES] ?? '', $this->textData[$t['etd6']][LOCALE_ES] ?? '',
|
||||
$this->mergeGenderedStrings($t['etd0'], $t['etd8'], LOCALE_RU), $this->mergeGenderedStrings($t['etd1'], $t['etd9'], LOCALE_RU), $this->mergeGenderedStrings($t['etd4'], $t['etd12'], LOCALE_RU), $this->textData[$t['etd2']][LOCALE_RU] ?? '', $this->textData[$t['etd6']][LOCALE_RU] ?? ''
|
||||
);
|
||||
}
|
||||
|
||||
// i have no idea, how the indexing in this file works.
|
||||
// sometimes the \d+ after EMOTE is the emoteTextId, but not nearly often enough
|
||||
@@ -78,23 +163,31 @@ SqlGen::register(new class extends SetupScript
|
||||
if (preg_match('/^EMOTE(\d+)_CMD\d+\s=\s\"\/([^"]+)\";$/', $line, $m))
|
||||
$aliasses[$m[1]][] = [$lId, $m[2]];
|
||||
|
||||
|
||||
$emotes = DB::Aowow()->selectCol('SELECT id AS ARRAY_KEY, cmd FROM ?_emotes');
|
||||
|
||||
foreach($emotes as $eId => $cmd)
|
||||
{
|
||||
foreach ($aliasses as $gsId => $data)
|
||||
foreach ($aliasses as $data)
|
||||
{
|
||||
if (in_array($cmd, array_column($data, 1)))
|
||||
{
|
||||
foreach ($data as $d)
|
||||
DB::Aowow()->query('INSERT IGNORE INTO ?_emotes_aliasses VALUES (?d, ?d, ?) ON DUPLICATE KEY UPDATE locales = locales | ?d', $eId, (1 << $d[0]), strtolower($d[1]), (1 << $d[0]));
|
||||
|
||||
break;
|
||||
continue 2;
|
||||
}
|
||||
}
|
||||
|
||||
DB::Aowow()->query('UPDATE ?_emotes SET `cuFlags` = `cuFlags` | ?d WHERE `id` = ?d', CUSTOM_EXCLUDE_FOR_LISTVIEW | EMOTE_CU_MISSING_CMD, $eId);
|
||||
}
|
||||
|
||||
/*********************/
|
||||
/* Server controlled */
|
||||
/*********************/
|
||||
|
||||
DB::Aowow()->query('INSERT INTO ?_emotes (`id`, `cmd`, `flags`, `isAnimated`, `parentEmote`, `soundId`, `state`, `stateParam`, `cuFlags`) SELECT -`id`, `name`, `flags`, IF(`animationId`, 1, 0), 0, `soundId`, `state`, `stateParam`, ?d FROM dbc_emotes WHERE 1', CUSTOM_EXCLUDE_FOR_LISTVIEW);
|
||||
|
||||
|
||||
$this->reapplyCCFlags('emotes', Type::EMOTE);
|
||||
|
||||
return $allOK;
|
||||
|
||||
Reference in New Issue
Block a user