Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Rename db2 fields to official name

Browse Source
This commit is contained in:
funjoker
2021-11-07 19:50:55 +01:00
parent 732a8ee261
commit 65aee484b9
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql Normal file
View File

@@ -0,0 +1,3 @@
ALTER TABLE `chr_races` CHANGE COLUMN `NameS` `LoreName` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `NameFemaleLowercase`, CHANGE COLUMN `NameFemaleS` `LoreNameFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreName`, CHANGE COLUMN `NameLowercaseS` `LoreNameLower` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameFemale`, CHANGE COLUMN `NameFemaleLowercaseS` `LoreNameLowerFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameLower`, CHANGE COLUMN `RaceFantasyDescription` `LoreDescription` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameLowerFemale`, CHANGE COLUMN `NameL` `ShortName` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreDescription`, CHANGE COLUMN `NameFemaleL` `ShortNameFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortName`, CHANGE COLUMN `NameLowercaseL` `ShortNameLower` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortNameFemale`, CHANGE COLUMN `NameFemaleLowercaseL` `ShortNameLowerFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortNameLower`;
ALTER TABLE `chr_classes` CHANGE COLUMN `ChatColorR` `ClassColorR` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `SpellClassSet`, CHANGE COLUMN `ChatColorG` `ClassColorG` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `ClassColorR`, CHANGE COLUMN `ChatColorB` `ClassColorB` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `ClassColorG`;

6
src/server/database/Database/Implementation/HotfixDatabase.cpp
View File

@@ -321,7 +321,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
"MaleCharacterCreationIdleVisualFallback, FemaleCharacterCreationVisualFallback, FemaleCharacterCreationIdleVisualFallback, "
"CharacterCreationIdleGroundVisualFallback, CharacterCreationGroundVisualFallback, AlteredFormCharacterCreationIdleVisualFallback, "
"CharacterCreationAnimLoopWaitTimeMsFallback, CinematicSequenceID, DefaultSpec, PrimaryStatPriority, DisplayPower, "
"RangedAttackPowerPerAgility, AttackPowerPerAgility, AttackPowerPerStrength, SpellClassSet, ChatColorR, ChatColorG, ChatColorB"
"RangedAttackPowerPerAgility, AttackPowerPerAgility, AttackPowerPerStrength, SpellClassSet, ClassColorR, ClassColorG, ClassColorB"
" FROM chr_classes WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CLASSES, "SELECT MAX(ID) + 1 FROM chr_classes", CONNECTION_SYNCH);
PREPARE_LOCALE_STMT(HOTFIX_SEL_CHR_CLASSES, "SELECT ID, Name_lang, NameMale_lang, NameFemale_lang, Description_lang, RoleInfoString_lang, "
@@ -382,8 +382,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_RACE_X_CHR_MODEL, "SELECT MAX(ID) + 1 FROM chr_race_x_chr_model", CONNECTION_SYNCH);
// ChrRaces.db2
PrepareStatement(HOTFIX_SEL_CHR_RACES, "SELECT ID, ClientPrefix, ClientFileString, Name, NameFemale, NameLowercase, NameFemaleLowercase, NameS, "
"NameFemaleS, NameLowercaseS, NameFemaleLowercaseS, RaceFantasyDescription, NameL, NameFemaleL, NameLowercaseL, NameFemaleLowercaseL, Flags, "
PrepareStatement(HOTFIX_SEL_CHR_RACES, "SELECT ID, ClientPrefix, ClientFileString, Name, NameFemale, NameLowercase, NameFemaleLowercase, LoreName, "
"LoreNameFemale, LoreNameLower, LoreNameLowerFemale, LoreDescription, ShortName, ShortNameFemale, ShortNameLower, ShortNameLowerFemale, Flags, "
"FactionID, CinematicSequenceID, ResSicknessSpellID, SplashSoundID, Alliance, RaceRelated, UnalteredVisualRaceID, DefaultClassID, "
"CreateScreenFileDataID, SelectScreenFileDataID, NeutralRaceID, LowResScreenFileDataID, AlteredFormStartVisualKitID1, "
"AlteredFormStartVisualKitID2, AlteredFormStartVisualKitID3, AlteredFormFinishVisualKitID1, AlteredFormFinishVisualKitID2, "

24
src/server/game/DataStores/DB2LoadInfo.h
View File

@@ -1049,9 +1049,9 @@ struct ChrClassesLoadInfo
{ false, FT_BYTE, "AttackPowerPerAgility" },
{ false, FT_BYTE, "AttackPowerPerStrength" },
{ false, FT_BYTE, "SpellClassSet" },
{ false, FT_BYTE, "ChatColorR" },
{ false, FT_BYTE, "ChatColorG" },
{ false, FT_BYTE, "ChatColorB" },
{ false, FT_BYTE, "ClassColorR" },
{ false, FT_BYTE, "ClassColorG" },
{ false, FT_BYTE, "ClassColorB" },
};
static DB2LoadInfo const loadInfo(&fields[0], std::extent<decltype(fields)>::value, ChrClassesMeta::Instance(), HOTFIX_SEL_CHR_CLASSES);
return &loadInfo;
@@ -1253,15 +1253,15 @@ struct ChrRacesLoadInfo
{ false, FT_STRING, "NameFemale" },
{ false, FT_STRING, "NameLowercase" },
{ false, FT_STRING, "NameFemaleLowercase" },
{ false, FT_STRING, "NameS" },
{ false, FT_STRING, "NameFemaleS" },
{ false, FT_STRING, "NameLowercaseS" },
{ false, FT_STRING, "NameFemaleLowercaseS" },
{ false, FT_STRING, "RaceFantasyDescription" },
{ false, FT_STRING, "NameL" },
{ false, FT_STRING, "NameFemaleL" },
{ false, FT_STRING, "NameLowercaseL" },
{ false, FT_STRING, "NameFemaleLowercaseL" },
{ false, FT_STRING, "LoreName" },
{ false, FT_STRING, "LoreNameFemale" },
{ false, FT_STRING, "LoreNameLower" },
{ false, FT_STRING, "LoreNameLowerFemale" },
{ false, FT_STRING, "LoreDescription" },
{ false, FT_STRING, "ShortName" },
{ false, FT_STRING, "ShortNameFemale" },
{ false, FT_STRING, "ShortNameLower" },
{ false, FT_STRING, "ShortNameLowerFemale" },
{ true, FT_INT, "Flags" },
{ true, FT_INT, "FactionID" },
{ true, FT_INT, "CinematicSequenceID" },

24
src/server/game/DataStores/DB2Structure.h
View File

@@ -633,9 +633,9 @@ struct ChrClassesEntry
uint8 AttackPowerPerAgility;
uint8 AttackPowerPerStrength;
uint8 SpellClassSet;
uint8 ChatColorR;
uint8 ChatColorG;
uint8 ChatColorB;
uint8 ClassColorR;
uint8 ClassColorG;
uint8 ClassColorB;
};
struct ChrClassesXPowerTypesEntry
@@ -754,15 +754,15 @@ struct ChrRacesEntry
LocalizedString NameFemale;
LocalizedString NameLowercase;
LocalizedString NameFemaleLowercase;
LocalizedString NameS;
LocalizedString NameFemaleS;
LocalizedString NameLowercaseS;
LocalizedString NameFemaleLowercaseS;
LocalizedString RaceFantasyDescription;
LocalizedString NameL;
LocalizedString NameFemaleL;
LocalizedString NameLowercaseL;
LocalizedString NameFemaleLowercaseL;
LocalizedString LoreName;
LocalizedString LoreNameFemale;
LocalizedString LoreNameLower;
LocalizedString LoreNameLowerFemale;
LocalizedString LoreDescription;
LocalizedString ShortName;
LocalizedString ShortNameFemale;
LocalizedString ShortNameLower;
LocalizedString ShortNameLowerFemale;
int32 Flags;
int32 FactionID;
int32 CinematicSequenceID;