Misc: Rename db2 fields to official name

4 files changed, 30 insertions, 27 deletions

diff --git a/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql b/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql
new file mode 100644
index 00000000000..6b45fad9839
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql
@@ -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`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index dee21715696..b7dbc75059c 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -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, "
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index c9612160e3c..10ab3244764 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -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" },
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 4809aaf14ef..66dd37fa2c4 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -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;