diff options
| -rw-r--r-- | sql/updates/world/2013_08_25_01_world_sai.sql | 24 | ||||
| -rw-r--r-- | src/server/authserver/Authentication/TOTP.cpp | 3 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/wmo.cpp | 6 |
3 files changed, 29 insertions, 4 deletions
diff --git a/sql/updates/world/2013_08_25_01_world_sai.sql b/sql/updates/world/2013_08_25_01_world_sai.sql new file mode 100644 index 00000000000..4a95a804d05 --- /dev/null +++ b/sql/updates/world/2013_08_25_01_world_sai.sql @@ -0,0 +1,24 @@ +SET @NPC_BLUE_KC := 32242; -- Blue Sample KC Bunny +SET @NPC_GREEN_KC := 32244; -- Green Sample KC Bunny +SET @NPC_DARK_KC := 32245; -- Dark Sample KC Bunny +SET @SPELL_COLLECT := 60256; -- Collect Sample +SET @SPELL_WRITHING := 60310; -- Throw Writhing Mass +SET @NPC_MASS_KC := 32266; -- Writhing Mass KC Bunny +SET @ITEM_ESSENCE := 44301; -- Tainted Essence + +UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=128 WHERE `entry` IN (@NPC_BLUE_KC,@NPC_GREEN_KC,@NPC_DARK_KC); +UPDATE `creature` SET `MovementType`=0 WHERE `id` IN (@NPC_BLUE_KC,@NPC_GREEN_KC,@NPC_DARK_KC); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@NPC_BLUE_KC,@NPC_GREEN_KC,@NPC_DARK_KC) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@NPC_BLUE_KC,0,0,0,8,0,100,0,@SPELL_COLLECT,0,0,0,33,@NPC_BLUE_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Blue Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_BLUE_KC,0,1,2,8,0,100,0,@SPELL_WRITHING,0,0,0,33,@NPC_MASS_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Blue Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_BLUE_KC,0,2,0,61,0,100,0,0,0,0,0,11,60505,0,0,0,0,0,7,0,0,0,0,0,0,0,"Blue Sample KC Bunny - On Link - Cast Fury of the Fallen Cultist to Invoker"), +-- +(@NPC_GREEN_KC,0,0,0,8,0,100,0,@SPELL_COLLECT,0,0,0,33,@NPC_GREEN_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Green Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_GREEN_KC,0,1,2,8,0,100,0,@SPELL_WRITHING,0,0,0,33,@NPC_MASS_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Green Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_GREEN_KC,0,2,0,61,0,100,0,0,0,0,0,11,60506,0,0,0,0,0,7,0,0,0,0,0,0,0,"Green Sample KC Bunny - On Link - Cast Blood of the Fallen Cultist to Invoker"), +-- +(@NPC_DARK_KC,0,0,0,8,0,100,0,@SPELL_COLLECT,0,0,0,33,@NPC_DARK_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dark Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_DARK_KC,0,1,2,8,0,100,0,@SPELL_WRITHING,0,0,0,33,@NPC_MASS_KC,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dark Sample KC Bunny - On spellhit - Killed moster credit"), +(@NPC_DARK_KC,0,2,0,61,0,100,0,0,0,0,0,11,60504,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dark Sample KC Bunny - On Link - Cast Agony of the Fallen Cultist to Invoker"); diff --git a/src/server/authserver/Authentication/TOTP.cpp b/src/server/authserver/Authentication/TOTP.cpp index 43c97c296d9..51a21822bc0 100644 --- a/src/server/authserver/Authentication/TOTP.cpp +++ b/src/server/authserver/Authentication/TOTP.cpp @@ -16,6 +16,7 @@ */ #include "TOTP.h" +#include <cstring> int base32_decode(const char* encoded, char* result, int bufSize) { @@ -29,7 +30,7 @@ int base32_decode(const char* encoded, char* result, int bufSize) for (const char *ptr = encoded; count < bufSize && *ptr; ++ptr) { char ch = *ptr; - if (ch == ' ' || ch == ' ' || ch == '\r' || ch == '\n' || ch == '-') + if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == '-') continue; buffer <<= 5; diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 57161cb495a..c606f06f6db 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -139,9 +139,9 @@ bool WMORoot::ConvertToVMAPRootWmo(FILE* pOutfile) WMOGroup::WMOGroup(const std::string &filename) : filename(filename), MOPY(0), MOVI(0), MoviEx(0), MOVT(0), MOBA(0), MobaEx(0), hlq(0), LiquEx(0), LiquBytes(0), groupName(0), descGroupName(0), mogpFlags(0), - mopy_size(0), moba_size(0), LiquEx_size(0), nVertices(0), nTriangles(0), - moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), fogIdx(0), liquidType(0), - groupWMOID(0), liquflags(0) + moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), nBatchC(0), fogIdx(0), + liquidType(0), groupWMOID(0), mopy_size(0), moba_size(0), LiquEx_size(0), + nVertices(0), nTriangles(0), liquflags(0) { memset(bbcorn1, 0, sizeof(bbcorn1)); memset(bbcorn2, 0, sizeof(bbcorn2)); |