Merge pull request #8795 from Naios/db_dbc

[4.3.4] Core/DataStores: Upgraded spelldifficulty_dbc & achievement_dbc to 4.3.4

4 files changed, 423 insertions, 4 deletions

diff --git a/sql/updates/world/2012_12_27_00_world_spelldifficulty_dbc_434.sql b/sql/updates/world/2012_12_27_00_world_spelldifficulty_dbc_434.sql
new file mode 100644
index 00000000000..569e6eb7178
--- /dev/null
+++ b/sql/updates/world/2012_12_27_00_world_spelldifficulty_dbc_434.sql
@@ -0,0 +1 @@
+DELETE FROM `spelldifficulty_dbc` WHERE `id` IN(3000,3001,3002,3003,3004,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3049,3050,3051,3052,3053,3054,3062,3064,3065,3066,3067,3068,3069,3070,3071,3072,3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3108,3109,3111,3112,3113,3114,3115,3116,3117,3118,3120,3121,3122,3123,3124,3125,3126,3127,3128,3129,3130,3131,3133,3137,3138,3139,3140,3141,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,3157,3158,3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,3173,3174,3175,3176,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,3188,3189,3190,3191,3192,3193,3194,3200,3201,3202,3203,3204,3205,3206,3240,3241,3242,3243,3244,3245,3246,3247,3248,3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,3265,3266,3267,3268,3269,3270);
diff --git a/sql/updates/world/2012_12_27_01_world_achievement_dbc_434.sql b/sql/updates/world/2012_12_27_01_world_achievement_dbc_434.sql
new file mode 100644
index 00000000000..8229f489add
--- /dev/null
+++ b/sql/updates/world/2012_12_27_01_world_achievement_dbc_434.sql
@@ -0,0 +1,418 @@
+TRUNCATE TABLE `achievement_dbc`;
+INSERT INTO `achievement_dbc` (`ID`, `flags`, `count`) VALUES
+(3376,0x2,1),
+(3377,0x2,1),
+(3378,0x2,1),
+(3379,0x2,1),
+(3380,0x2,1),
+(3381,0x2,1),
+(3382,0x2,1),
+(3383,0x2,1),
+(3384,0x2,1),
+(3385,0x2,1),
+(3386,0x2,1),
+(3387,0x2,1),
+(3388,0x2,1),
+(3390,0x2,1),
+(3389,0x2,1),
+(3391,0x2,1),
+(3392,0x2,1),
+(3393,0x2,1),
+(3394,0x2,1),
+(3396,0x2,1),
+(3398,0x2,1),
+(3395,0x2,1),
+(3397,0x2,1),
+(3399,0x2,1),
+(3400,0x2,1),
+(3401,0x2,1),
+(3402,0x2,1),
+(3403,0x2,1),
+(3404,0x2,1),
+(3405,0x2,1),
+(3406,0x2,1),
+(3407,0x2,1),
+(3408,0x2,1),
+(3409,0x2,1),
+(3410,0x2,1),
+(3411,0x2,1),
+(3696,0x2,1),
+(4056,0x2,1),
+(4276,0x2,1),
+(4277,0x2,1),
+(4278,0x2,1),
+(4279,0x2,1),
+(4280,0x2,1),
+(4281,0x2,1),
+(4282,0x2,1),
+(4283,0x2,1),
+(4284,0x2,1),
+(4285,0x2,1),
+(4057,0x2,1),
+(4058,0x2,1),
+(4059,0x2,1),
+(4060,0x2,1),
+(4061,0x2,1),
+(4063,0x2,1),
+(4062,0x2,1),
+(4064,0x2,1),
+(4065,0x2,1),
+(4066,0x2,1),
+(4067,0x2,1),
+(4068,0x2,1),
+(4070,0x2,1),
+(4069,0x2,1),
+(4071,0x2,1),
+(4072,0x2,1),
+(4073,0x2,1),
+(4076,0x2,1),
+(4077,0x2,1),
+(4376,0x2,1),
+(4416,0x2,1),
+(4417,0x2,1),
+(4689,0x2,1),
+(4690,0x2,1),
+(4691,0x2,1),
+(4692,0x2,1),
+(4693,0x2,1),
+(4694,0x2,1),
+(4695,0x2,1),
+(4696,0x2,1),
+(4697,0x2,1),
+(4698,0x2,1),
+(4699,0x2,1),
+(4700,0x2,1),
+(4701,0x2,1),
+(4702,0x2,1),
+(4703,0x2,1),
+(4704,0x2,1),
+(4705,0x2,1),
+(4706,0x2,1),
+(4707,0x2,1),
+(4708,0x2,1),
+(4709,0x2,1),
+(4712,0x2,1),
+(4710,0x2,1),
+(4711,0x2,1),
+(4731,0x2,1),
+(4732,0x2,1),
+(4733,0x2,1),
+(4734,0x2,1),
+(4735,0x2,1),
+(4736,0x2,1),
+(4737,0x2,1),
+(4738,0x2,1),
+(4739,0x2,1),
+(4740,0x2,1),
+(4741,0x2,1),
+(4742,0x2,1),
+(4743,0x2,1),
+(4744,0x2,1),
+(4745,0x2,1),
+(4746,0x2,1),
+(4747,0x2,1),
+(4748,0x2,1),
+(4749,0x2,1),
+(4750,0x2,1),
+(4751,0x2,1),
+(4752,0x2,1),
+(4753,0x2,1),
+(4754,0x2,1),
+(4755,0x2,1),
+(4756,0x2,1),
+(4757,0x2,1),
+(4758,0x2,1),
+(4759,0x2,1),
+(4760,0x2,1),
+(4761,0x2,1),
+(4762,0x2,1),
+(4763,0x2,1),
+(4764,0x2,1),
+(4765,0x2,1),
+(4766,0x2,1),
+(4767,0x2,1),
+(4768,0x2,1),
+(4769,0x2,1),
+(4770,0x2,1),
+(4771,0x2,1),
+(4772,0x2,1),
+(4773,0x2,1),
+(4774,0x2,1),
+(4775,0x2,1),
+(4776,0x2,1),
+(4788,0x2,1),
+(4789,0x2,1),
+(4791,0x2,1),
+(4792,0x2,1),
+(4793,0x2,1),
+(4794,0x2,1),
+(4795,0x2,1),
+(5544,0x2,1),
+(5545,0x2,1),
+(5579,0x2,1),
+(5580,0x2,1),
+(5581,0x2,1),
+(5582,0x2,1),
+(5583,0x2,1),
+(5584,0x2,1),
+(5585,0x2,1),
+(5586,0x2,1),
+(5587,0x2,1),
+(5588,0x2,1),
+(5589,0x2,1),
+(5590,0x2,1),
+(5591,0x2,1),
+(5593,0x2,1),
+(5592,0x2,1),
+(5594,0x2,1),
+(5595,0x2,1),
+(5596,0x2,1),
+(5597,0x2,1),
+(5598,0x2,1),
+(5599,0x2,1),
+(5601,0x2,1),
+(5600,0x2,1),
+(5602,0x2,1),
+(5603,0x2,1),
+(5604,0x2,1),
+(5605,0x2,1),
+(5606,0x2,1),
+(5607,0x2,1),
+(5608,0x2,1),
+(5609,0x2,1),
+(5610,0x2,1),
+(5611,0x2,1),
+(5612,0x2,1),
+(5613,0x2,1),
+(5614,0x2,1),
+(5615,0x2,1),
+(5616,0x2,1),
+(5618,0x2,1),
+(5617,0x2,1),
+(5619,0x2,1),
+(5620,0x2,1),
+(5621,0x2,1),
+(5622,0x2,1),
+(5623,0x2,1),
+(5624,0x2,1),
+(5625,0x2,1),
+(5626,0x2,1),
+(5627,0x2,1),
+(5629,0x2,1),
+(5628,0x2,1),
+(5630,0x2,1),
+(5651,0x2,1),
+(5652,0x2,1),
+(5653,0x2,1),
+(5654,0x2,1),
+(5655,0x2,1),
+(5656,0x2,1),
+(5657,0x2,1),
+(5658,0x2,1),
+(5659,0x2,1),
+(5660,0x2,1),
+(5661,0x2,1),
+(5662,0x2,1),
+(5663,0x2,1),
+(5664,0x2,1),
+(5665,0x2,1),
+(5666,0x2,1),
+(5667,0x2,1),
+(5668,0x2,1),
+(5669,0x2,1),
+(5670,0x2,1),
+(5671,0x2,1),
+(5672,0x2,1),
+(5673,0x2,1),
+(5674,0x2,1),
+(5675,0x2,1),
+(5676,0x2,1),
+(5677,0x2,1),
+(5678,0x2,1),
+(5679,0x2,1),
+(5680,0x2,1),
+(5681,0x2,1),
+(5682,0x2,1),
+(5683,0x2,1),
+(5684,0x2,1),
+(5685,0x2,1),
+(5686,0x2,1),
+(5687,0x2,1),
+(5688,0x2,1),
+(5689,0x2,1),
+(5690,0x2,1),
+(5691,0x2,1),
+(5696,0x2,1),
+(5697,0x2,1),
+(5698,0x2,1),
+(5699,0x2,1),
+(5700,0x2,1),
+(5701,0x2,1),
+(5702,0x2,1),
+(5703,0x2,1),
+(5704,0x2,1),
+(5705,0x2,1),
+(5706,0x2,1),
+(5707,0x2,1),
+(5763,0x2,1),
+(5775,0x2,1),
+(5776,0x2,1),
+(5777,0x2,1),
+(5778,0x2,1),
+(5792,0x2,1),
+(5125,0x2,1),
+(5825,0x2,1),
+(5826,0x2,1),
+(5831,0x2,1),
+(5832,0x2,1),
+(5893,0x2,1),
+(5894,0x2,1),
+(5895,0x2,1),
+(5896,0x2,1),
+(5897,0x2,1),
+(5898,0x2,1),
+(5899,0x2,1),
+(5900,0x2,1),
+(5909,0x2,1),
+(5910,0x2,1),
+(5911,0x2,1),
+(5912,0x2,1),
+(5913,0x2,1),
+(5914,0x2,1),
+(5915,0x2,1),
+(5916,0x2,1),
+(5917,0x2,1),
+(5918,0x2,1),
+(5919,0x2,1),
+(5920,0x2,1),
+(5921,0x2,1),
+(5922,0x2,1),
+(5923,0x2,1),
+(5924,0x2,1),
+(5925,0x2,1),
+(5926,0x2,1),
+(5927,0x2,1),
+(5928,0x2,1),
+(5929,0x2,1),
+(5930,0x2,1),
+(5931,0x2,1),
+(5932,0x2,1),
+(5933,0x2,1),
+(5934,0x2,1),
+(5935,0x2,1),
+(5936,0x2,1),
+(5937,0x2,1),
+(5938,0x2,1),
+(5939,0x2,1),
+(5940,0x2,1),
+(5941,0x2,1),
+(5942,0x2,1),
+(5943,0x2,1),
+(5944,0x2,1),
+(5945,0x2,1),
+(5946,0x2,1),
+(5947,0x2,1),
+(5948,0x2,1),
+(5949,0x2,1),
+(5950,0x2,1),
+(5951,0x2,1),
+(5952,0x2,1),
+(5953,0x2,1),
+(5954,0x2,1),
+(5955,0x2,1),
+(5956,0x2,1),
+(5957,0x2,1),
+(5958,0x2,1),
+(5959,0x2,1),
+(5960,0x2,1),
+(5961,0x2,1),
+(5962,0x2,1),
+(5963,0x2,1),
+(5986,0x2,1),
+(5987,0x2,1),
+(6186,0x2,1),
+(6187,0x2,1),
+(6188,0x2,1),
+(6189,0x2,1),
+(6190,0x2,1),
+(6191,0x2,1),
+(6192,0x2,1),
+(6195,0x2,1),
+(6196,0x2,1),
+(6197,0x2,1),
+(6198,0x2,1),
+(6194,0x2,1),
+(6199,0x2,1),
+(6200,0x2,1),
+(6201,0x2,1),
+(6202,0x2,1),
+(6203,0x2,1),
+(6204,0x2,1),
+(6205,0x2,1),
+(6206,0x2,1),
+(6207,0x2,1),
+(6208,0x2,1),
+(6209,0x2,1),
+(6210,0x2,1),
+(6211,0x2,1),
+(6212,0x2,1),
+(6213,0x2,1),
+(6214,0x2,1),
+(6215,0x2,1),
+(6220,0x2,1),
+(6216,0x2,1),
+(6217,0x2,1),
+(6218,0x2,1),
+(6219,0x2,1),
+(6221,0x2,1),
+(6222,0x2,1),
+(6223,0x2,1),
+(6224,0x2,1),
+(6225,0x2,1),
+(6226,0x2,1),
+(6227,0x2,1),
+(6228,0x2,1),
+(6229,0x2,1),
+(6230,0x2,1),
+(6231,0x2,1),
+(6232,0x2,1),
+(6233,0x2,1),
+(6234,0x2,1),
+(6235,0x2,1),
+(6236,0x2,1),
+(6237,0x2,1),
+(6238,0x2,1),
+(6239,0x2,1),
+(6240,0x2,1),
+(6243,0x2,1),
+(6241,0x2,1),
+(6242,0x2,1),
+(6244,0x2,1),
+(6245,0x2,1),
+(6246,0x2,1),
+(6247,0x2,1),
+(6248,0x2,1),
+(6249,0x2,1),
+(6250,0x2,1),
+(6251,0x2,1),
+(6252,0x2,1),
+(6253,0x2,1),
+(6254,0x2,1),
+(6255,0x2,1),
+(6256,0x2,1),
+(6257,0x2,1),
+(6258,0x2,1),
+(6259,0x2,1),
+(6260,0x2,1),
+(6261,0x2,1),
+(6262,0x2,1),
+(6263,0x2,1),
+(6264,0x2,1),
+(6265,0x2,1),
+(6266,0x2,1),
+(6267,0x2,1),
+(6268,0x2,1),
+(6269,0x2,1),
+(6270,0x2,1),
+(6271,0x2,1),
+(6313,0x2,1);
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 8a647bacfea..c8f77d45922 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -325,7 +325,7 @@ void LoadDBCStores(const std::string& dataPath)
         }
     }
 
-    LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementStore,            dbcPath, "Achievement.dbc"/*, &CustomAchievementfmt, &CustomAchievementIndex*/);//14545
+    LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementStore,            dbcPath, "Achievement.dbc", &CustomAchievementfmt, &CustomAchievementIndex);//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementCriteriaStore,    dbcPath, "Achievement_Criteria.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sAreaTriggerStore,            dbcPath, "AreaTrigger.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sAreaGroupStore,              dbcPath, "AreaGroup.dbc");//14545
@@ -514,7 +514,7 @@ void LoadDBCStores(const std::string& dataPath)
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellCategoriesStore,        dbcPath,"SpellCategories.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellEffectStore,            dbcPath,"SpellEffect.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellCastTimesStore,         dbcPath, "SpellCastTimes.dbc");//14545
-    LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDifficultyStore,        dbcPath, "SpellDifficulty.dbc"/*, &CustomSpellDifficultyfmt, &CustomSpellDifficultyIndex*/);//14545
+    LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDifficultyStore,        dbcPath, "SpellDifficulty.dbc", &CustomSpellDifficultyfmt, &CustomSpellDifficultyIndex);//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDurationStore,          dbcPath, "SpellDuration.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellFocusObjectStore,       dbcPath, "SpellFocusObject.dbc");//14545
     LoadDBC(availableDbcLocales, bad_dbc_files, sSpellItemEnchantmentStore,   dbcPath, "SpellItemEnchantment.dbc");//14545
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 23f6798328f..599122d9eee 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -23,8 +23,8 @@
 // n - index (included), l - bool, p - field present in sql dbc, a - field absent in sql dbc
 
 char const Achievementfmt[]="niixsxiixixxii";
-//const std::string CustomAchievementfmt="pppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapapaaaaaaaaaaaaaaaaaapp";
-//const std::string CustomAchievementIndex = "ID";
+const std::string CustomAchievementfmt="pppaaaapapaapp";
+const std::string CustomAchievementIndex = "ID";
 char const AchievementCriteriafmt[]="niiiiiiiisiiiiixxiiiiii";
 char const AreaTableEntryfmt[]="iiinixxxxxisiiiiifxxxxxxxx";
 char const AreaGroupEntryfmt[]="niiiiiii";