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

Spell/ShapeshiftForms

Browse Source 
* move all localized strings to class Lang
 * added missing negation in flag check, causing stances not to be displayed
This commit is contained in:
Sarjuuk
2017-05-15 15:14:12 +02:00
parent bf6bf20ae4
commit 94321ea178
11 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,7 +475,7 @@ class SpellList extends BaseType
'typeId' => 0,
'displayId' => $st['model2'] ? $st['model'.rand(1, 2)] : $st['model1'],
'creatureType' => $st['creatureType'],
'displayName' => Util::localizedString($st, 'name')
'displayName' => Lang::game('st', $effMV)
);
}
}

2
localization/lang.class.php
View File

@@ -257,7 +257,7 @@ class Lang
public static function getStances($stanceMask)
{
$stanceMask &= 0xFC27909F; // clamp to available stances/forms..
$stanceMask &= 0xFF37F6FF; // clamp to available stances/forms..
$tmp = [];
$i = 1;

8
localization/locale_dede.php
View File

@@ -274,10 +274,10 @@ $lang = array(
'rep' => ["Hasserfüllt", "Feindselig", "Unfreundlich", "Neutral", "Freundlich", "Wohlwollend", "Respektvoll", "Ehrfürchtig"],
'st' => array(
"Vorgabe", "Katzengestalt", "Baum des Lebens", "Reisegestalt", "Wassergestalt", "Bärengestalt",
null, null, "Terrorbärengestalt", null, null, null,
null, "Schattentanz", null, null, "Geisterwolf", "Kampfhaltung",
"Verteidigungshaltung", "Berserkerhaltung", null, null, "Metamorphosis", null,
null, null, null, "Schnelle Fluggestalt", "Schattengestalt", "Fluggestalt",
"Umgebung", "Ghul", "Terrorbärengestalt", "Steves Ghul", "Skelett von Tharon'ja", "Dunkelmond-Test der Stärke",
"BLB Spieler", "Schattentanz", "Kreatur - Bär", "Kreatur - Katze", "Geisterwolf", "Kampfhaltung",
"Verteidigungshaltung", "Berserkerhaltung", "Test", "Zombie", "Metamorphosis", null,
null, "Untotes Wesen", "Raserei", "Schnelle Fluggestalt", "Schattengestalt", "Fluggestalt",
"Verstohlenheit", "Mondkingestalt", "Geist der Erlösung"
),
'me' => array(

10
localization/locale_enus.php
View File

@@ -272,12 +272,12 @@ $lang = array(
'cl' => [null, "Warrior", "Paladin", "Hunter", "Rogue", "Priest", "Death Knight", "Shaman", "Mage", "Warlock", null, "Druid"], // ChrClasses.dbc
'ra' => [-2 => "Horde", -1 => "Alliance", "Both", "Human", "Orc", "Dwarf", "Night Elf", "Undead", "Tauren", "Gnome", "Troll", null, "Blood Elf", "Draenei"], // ChrRaces.dbc
'rep' => ["Hated", "Hostile", "Unfriendly", "Neutral", "Friendly", "Honored", "Revered", "Exalted"], // FACTION_STANDING_LABEL*
'st' => array( // SpellShapeshiftForm.dbc
'st' => array( // SpellShapeshiftForm.dbc // with minor deviations on 27, 28
"Default", "Cat Form", "Tree of Life", "Travel Form", "Aquatic Form", "Bear From",
null, null, "Dire Bear Form", null, null, null,
null, "Shadowdance", null, null, "Ghostwolf", "Battle Stance",
"Defensive Stance", "Berserker Stance", null, null, "Metamorphosis", null,
null, null, null, "Swift Flight Form", "Shadow Form", "Flight Form",
"Ambient", "Ghoul", "Dire Bear Form", "Steve's Ghoul", "Tharon'ja Skeleton", "Darkmoon - Test of Strength",
"BLB Player", "Shadowdance", "Creature - Bear", "Creature - Cat", "Ghostwolf", "Battle Stance",
"Defensive Stance", "Berserker Stance", "Test", "Zombie", "Metamorphosis", null,
null, "Undead", "Frenzy", "Swift Flight Form", "Shadow Form", "Flight Form",
"Stealth", "Moonkin Form", "Spirit of Redemption"
),
'me' => array( // SpellMechanic.dbc .. not quite

8
localization/locale_eses.php
View File

@@ -274,10 +274,10 @@ $lang = array(
'rep' => ["Odiado", "Hostil", "Adverso", "Neutral", "Amistoso", "Honorable", "Reverenciado", "Exaltado"],
'st' => array(
"Defecto", "Forma felina", "Árbol de vida", "Forma de viaje", "Forma acuática", "Forma de oso",
null, null, "Forma de oso temible", null, null, null,
null, "Danza de las Sombras", null, null, "Lobo fantasmal", "Actitud de batalla",
"Actitud defensiva", "Actitud rabiosa", null, null, "Metamorfosis", null,
null, null, null, "Forma de vuelo presto", "Forma de las Sombras", "Forma de vuelo",
"Ambiente", "Necrófago", "Forma de oso temible", "Steve's Ghoul", "Esqueleto Tharon'ja", "Luna Negra - Prueba de fuerza",
"BLB Player", "Danza de las Sombras", "Criatura: oso", "Criatura: felino", "Lobo fantasmal", "Actitud de batalla",
"Actitud defensiva", "Actitud rabiosa", "Test", "Zombi", "Metamorfosis", null,
null, "No-muerto", "Furia", "Forma de vuelo presto", "Forma de las Sombras", "Forma de vuelo",
"Sigilo", "Forma de lechúcico lunar", "Espíritu redentor"
),
'me' => array(

8
localization/locale_frfr.php
View File

@@ -274,10 +274,10 @@ $lang = array(
'rep' => ["Détesté", "Hostile", "Inamical", "Neutre", "Amical", "Honoré", "Révéré", "Exalté"],
'st' => array(
"Défaut", "Forme de félin", "Arbre de vie", "Forme de voyage", "Forme aquatique", "Forme d'ours",
null, null, "Forme d'ours redoutable", null, null, null,
null, "Danse de l'ombre", null, null, "Loup fantôme", "Posture de combat",
"Posture défensive", "Posture berserker", null, null, "Métamorphe", null,
null, null, null, "Forme de vol rapide", "Forme d'Ombre", "Forme de vol",
"Ambiant", "Goule", "Forme d'ours redoutable", "Goule de Steve", "Squelette de Tharon'ja", "Sombrelune - épreuve de force",
"Joueur BLB", "Danse de l'ombre", "Créature - Ours", "Créature - Félin", "Loup fantôme", "Posture de combat",
"Posture défensive", "Posture berserker", "Test", "Zombie", "Métamorphe", null,
null, "Mort-vivant", "Frénésie", "Forme de vol rapide", "Forme d'Ombre", "Forme de vol",
"Camouflage", "Forme de sélénien", "Esprit de rédemption"
),
'me' => array(

8
localization/locale_ruru.php
View File

@@ -274,10 +274,10 @@ $lang = array(
'rep' => array("Ненависть", "Враждебность", "Неприязнь", "Равнодушие", "Дружелюбие", "Уважение", "Почтение", "Превознесение"),
'st' => array(
"По-умолчанию", "Облик кошки", "TОблик Древа жизни", "Походный облик", "Водный облик", "Облик медведя",
null, null, "Облик лютого медведя", null, null, null,
null, "Танец теней", null, null, "Призрачный волк", "Боевая стойка",
"Оборонительная стойка", "Стойка берсерка", null, null, "Метаморфоза", null,
null, null, null, "Облик стремительной птицы", "Облик Тьмы", "Облик птицы",
"Фауна", "Вурдалак", "Облик лютого медведя", "Вурдалак Стива", "Скелет Тарон'джа", "Ярмарка Новолуния - испытание силы",
"BLB Player", "Танец теней", "Существо: медведь", "Существо: кошка", "Призрачный волк", "Боевая стойка",
"Оборонительная стойка", "Стойка берсерка", "Тест", "Зомби", "Метаморфоза", null,
null, "Нежить", "Бешенство", "Облик стремительной птицы", "Облик Тьмы", "Облик птицы",
"Незаметность", "Облик лунного совуха", "Дух воздаяния"
),
'me' => array(

2
pages/spell.php
View File

@@ -280,7 +280,7 @@ class SpellPage extends GenericPage
if ($_ = $this->subject->getField('rangeMinHostile'))
$this->range = $_.' - '.$this->range;
if ($this->subject->getField('attributes2') & 0x80000)
if (!($this->subject->getField('attributes2') & 0x80000))
$this->stances = Lang::getStances($this->subject->getField('stanceMask'));
if (($_ = $this->subject->getField('recoveryTime')) && $_ > 0)

6
setup/db_structure.sql
View File

@@ -1858,11 +1858,6 @@ DROP TABLE IF EXISTS `aowow_shapeshiftforms`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `aowow_shapeshiftforms` (
`Id` bigint(20) NOT NULL,
`name_loc0` text NOT NULL,
`name_loc2` text NOT NULL,
`name_loc3` text NOT NULL,
`name_loc6` text NOT NULL,
`name_loc8` text NOT NULL,
`flags` bigint(20) NOT NULL,
`creatureType` bigint(20) NOT NULL,
`displayIdA` bigint(20) NOT NULL,
@@ -1875,6 +1870,7 @@ CREATE TABLE `aowow_shapeshiftforms` (
`spellId6` bigint(20) NOT NULL,
`spellId7` bigint(20) NOT NULL,
`spellId8` bigint(20) NOT NULL,
`comment` varchar(30) NULL,
PRIMARY KEY (`Id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

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

@@ -20,7 +20,7 @@ $reqDBC = ['spellshapeshiftform'];
function shapeshiftforms()
{
DB::Aowow()->query('REPLACE INTO ?_shapeshiftforms SELECT * FROM dbc_spellshapeshiftform');
DB::Aowow()->query('REPLACE INTO ?_shapeshiftforms SELECT id, flags, creatureType, displayIdA, displayIdH, spellId1, spellId2, spellId3, spellId4, spellId5, spellId6, spellId7, spellId8, IF(name_loc0 = "", IF(name_loc2 = "", IF(name_loc3 = "", IF(name_loc6 = "", IF(name_loc8 = "", "???", name_loc8), name_loc6), name_loc3), name_loc2), name_loc0) FROM dbc_spellshapeshiftform');
return true;
}

7
setup/updates/1494853933_01.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE `aowow_shapeshiftforms`
ADD COLUMN `comment` VARCHAR(30) NULL AFTER `spellId8`,
DROP COLUMN `name_loc0`,
DROP COLUMN `name_loc2`,
DROP COLUMN `name_loc3`,
DROP COLUMN `name_loc6`,
DROP COLUMN `name_loc8`;