josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core:

Browse Source 
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+6 -6
View File
@@ -51,15 +51,15 @@ EndScriptData */
#define MOB_VOID_PORTAL 19224
#define SPELL_VOID_PORTAL_VISUAL 33569
float VorpilPosition[3] = {-252.8820,-264.3030,17.1};
float VorpilPosition[3] = {-252.8820f,-264.3030f,17.1f};
float VoidPortalCoords[5][3] =
{
{-283.5894, -239.5718, 12.7},
{-306.5853, -258.4539, 12.7},
{-295.8789, -269.0899, 12.7},
{-209.3401, -262.7564, 17.1},
{-261.4533, -297.3298, 17.1}
{-283.5894f, -239.5718f, 12.7f},
{-306.5853f, -258.4539f, 12.7f},
{-295.8789f, -269.0899f, 12.7f},
{-209.3401f, -262.7564f, 17.1f},
{-261.4533f, -297.3298f, 17.1f}
};
class mob_voidtraveler : public CreatureScript
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+33 -33
View File
@@ -69,7 +69,7 @@ const char* SAY_KILL2 = "This is too easy!";
/************** Spells *************/
// Normal Form
#define SPELL_SHEAR 37335 // 41032 is bugged, cannot be block/dodge/parry// Reduces Max. Health by 60% for 7 seconds. Can stack 19 times. 1.5 second cast
#define SPELL_SHEAR 37335 // 41032 is bugged, cannot be block/dodge/parry// Reduces Max. Health by 60% for 7 seconds. Can stack 19 times. 1.5f second cast
#define SPELL_FLAME_CRASH 40832 // Summons an invis/unselect passive mob that has an aura of flame in a circle around him.
#define SPELL_DRAW_SOUL 40904 // 5k Shadow Damage in front of him. Heals Illidan for 100k health (script effect)
#define SPELL_PARASITIC_SHADOWFIEND 41917 // DoT of 3k Shadow every 2 seconds. Lasts 10 seconds. (Script effect: Summon 2 parasites once the debuff has ticked off)
@@ -81,7 +81,7 @@ const char* SAY_KILL2 = "This is too easy!";
#define SPELL_THROW_GLAIVE 39635 // Throws a glaive on the ground
#define SPELL_THROW_GLAIVE2 39849 // Animation for the above spell
#define SPELL_GLAIVE_RETURNS 39873 // Glaive flies back to Illidan
#define SPELL_FIREBALL 40598 // 2.5k-3.5k damage in 10 yard radius. 2 second cast time.
#define SPELL_FIREBALL 40598 // 2.5fk-3.5fk damage in 10 yard radius. 2 second cast time.
#define SPELL_DARK_BARRAGE 40585 // 10 second channeled spell, 3k shadow damage per second.
// Demon Form
#define SPELL_DEMON_TRANSFORM_1 40511 // First phase of animations for transforming into Dark Illidan (fall to ground)
@@ -89,7 +89,7 @@ const char* SAY_KILL2 = "This is too easy!";
#define SPELL_DEMON_TRANSFORM_3 40510 // Final phase of animations (stand up and roar)
#define SPELL_DEMON_FORM 40506 // Transforms into Demon Illidan. Has an Aura of Dread on him.
#define SPELL_SHADOW_BLAST 41078 // 8k - 11k Shadow Damage. Targets highest threat. Has a splash effect, damaging anyone in 20 yards of the target.
#define SPELL_FLAME_BURST 41126 // Hurls fire at entire raid for ~3.5k damage every 10 seconds. Resistable. (Does not work: Script effect)
#define SPELL_FLAME_BURST 41126 // Hurls fire at entire raid for ~3.5fk damage every 10 seconds. Resistable. (Does not work: Script effect)
#define SPELL_FLAME_BURST_EFFECT 41131 // The actual damage. Have each player cast it on itself (workaround)
// Other Illidan spells
#define SPELL_KNEEL 39656 // Before beginning encounter, this is how he appears (talking to skully).
@@ -132,9 +132,9 @@ const char* SAY_KILL2 = "This is too easy!";
#define SPELL_FAN_BLADES 39954 // bugged visual
// Other defines
#define CENTER_X 676.740
#define CENTER_Y 305.297
#define CENTER_Z 353.192
#define CENTER_X 676.740f
#define CENTER_Y 305.297f
#define CENTER_Z 353.192f
#define FLAME_ENRAGE_DISTANCE 30
#define FLAME_CHARGE_DISTANCE 50
@@ -298,47 +298,47 @@ struct Locations
static Locations HoverPosition[]=
{
{657, 340, 355},
{657, 275, 355},
{705, 275, 355},
{705, 340, 355}
{657.0f, 340.0f, 355.0f},
{657.0f, 275.0f, 355.0f},
{705.0f, 275.0f, 355.0f},
{705.0f, 340.0f, 355.0f}
};
static Locations GlaivePosition[]=
{
{695.105, 305.303, 354.256},
{659.338, 305.303, 354.256},//the distance between two glaives is 36
{700.105, 305.303, 354.256},
{664.338, 305.303, 354.256}
{695.105f, 305.303f, 354.256f},
{659.338f, 305.303f, 354.256f},//the distance between two glaives is 36
{700.105f, 305.303f, 354.256f},
{664.338f, 305.303f, 354.256f}
};
static Locations EyeBlast[]=
{
{677, 350, 354},//start point, pass through glaive point
{677, 260, 354}
{677.0f, 350.0f, 354.0f},//start point, pass through glaive point
{677.0f, 260.0f, 354.0f}
};
static Locations AkamaWP[]=
{
{770.01, 304.50, 312.29}, // Bottom of the first stairs, at the doors
{780.66, 304.50, 319.74}, // Top of the first stairs
{790.13, 319.68, 319.76}, // Bottom of the second stairs (left from the entrance)
{787.17, 347.38, 341.42}, // Top of the second stairs
{781.34, 350.31, 341.44}, // Bottom of the third stairs
{762.60, 361.06, 353.60}, // Top of the third stairs
{756.35, 360.52, 353.27}, // Before the door-thingy
{743.82, 342.21, 353.00}, // Somewhere further
{732.69, 305.13, 353.00}, // In front of Illidan - (8)
{738.11, 365.44, 353.00}, // in front of the door-thingy (the other one!)
{792.18, 366.62, 341.42}, // Down the first flight of stairs
{796.84, 304.89, 319.76}, // Down the second flight of stairs
{782.01, 304.55, 319.76} // Final location - back at the initial gates. This is where he will fight the minions! (12)
{770.01f, 304.50f, 312.29f}, // Bottom of the first stairs, at the doors
{780.66f, 304.50f, 319.74f}, // Top of the first stairs
{790.13f, 319.68f, 319.76f}, // Bottom of the second stairs (left from the entrance)
{787.17f, 347.38f, 341.42f}, // Top of the second stairs
{781.34f, 350.31f, 341.44f}, // Bottom of the third stairs
{762.60f, 361.06f, 353.60f}, // Top of the third stairs
{756.35f, 360.52f, 353.27f}, // Before the door-thingy
{743.82f, 342.21f, 353.00f}, // Somewhere further
{732.69f, 305.13f, 353.00f}, // In front of Illidan - (8)
{738.11f, 365.44f, 353.00f}, // in front of the door-thingy (the other one!)
{792.18f, 366.62f, 341.42f}, // Down the first flight of stairs
{796.84f, 304.89f, 319.76f}, // Down the second flight of stairs
{782.01f, 304.55f, 319.76f} // Final location - back at the initial gates. This is where he will fight the minions! (12)
};
// 755.762, 304.0747, 312.1769 -- This is where Akama should be spawned
// 755.762f, 304.0747f, 312.1769f -- This is where Akama should be spawned
static Locations SpiritSpawns[]=
{
{755.5426, 309.9156, 312.2129},
{755.5426, 298.7923, 312.0834}
{755.5426f, 309.9156f, 312.2129f},
{755.5426f, 298.7923f, 312.0834f}
};
struct Animation // For the demon transformation
@@ -1024,7 +1024,7 @@ public:
break;
case EVENT_SHEAR:
// no longer exists in 3.0.2
// no longer exists in 3.0f.2
//DoCast(me->getVictim(), SPELL_SHEAR);
Timer[EVENT_SHEAR] = 25000 + (rand()%16 * 1000);
break;
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+7 -7
View File
@@ -69,13 +69,13 @@ struct Locations
static Locations TeleportPoint[]=
{
{959.996, 212.576, 193.843},
{932.537, 231.813, 193.838},
{958.675, 254.767, 193.822},
{946.955, 201.316, 192.535},
{944.294, 149.676, 197.551},
{930.548, 284.888, 193.367},
{965.997, 278.398, 195.777}
{959.996f, 212.576f, 193.843f},
{932.537f, 231.813f, 193.838f},
{958.675f, 254.767f, 193.822f},
{946.955f, 201.316f, 192.535f},
{944.294f, 149.676f, 197.551f},
{930.548f, 284.888f, 193.367f},
{965.997f, 278.398f, 195.777f}
};
class boss_mother_shahraz : public CreatureScript
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+6 -6
View File
@@ -93,12 +93,12 @@ struct Position2d
static Position2d Coords[]=
{
{450.4, 212.3},
{542.1, 212.3},
{542.1, 168.3},
{542.1, 137.4},
{450.4, 137.4},
{450.4, 168.3}
{450.4f, 212.3f},
{542.1f, 212.3f},
{542.1f, 168.3f},
{542.1f, 137.4f},
{450.4f, 137.4f},
{450.4f, 168.3f}
};
class npc_enslaved_soul : public CreatureScript
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+27 -27
View File
@@ -42,52 +42,52 @@ struct Location
static Location ChannelerLocations[]=
{
{463.161285, 401.219757, 3.141592},
{457.377625, 391.227661, 2.106461},
{446.012421, 391.227661, 1.071904},
{439.533783, 401.219757, 0.000000},
{446.012421, 411.211853, 5.210546},
{457.377625, 411.211853, 4.177494}
{463.161285f, 401.219757f, 3.141592f},
{457.377625f, 391.227661f, 2.106461f},
{446.012421f, 391.227661f, 1.071904f},
{439.533783f, 401.219757f, 0.000000f},
{446.012421f, 411.211853f, 5.210546f},
{457.377625f, 411.211853f, 4.177494f}
};
static Location SpawnLocations[]=
{
{498.652740, 461.728119, 0},
{498.505003, 339.619324, 0}
{498.652740f, 461.728119f, 0.0f},
{498.505003f, 339.619324f, 0.0f}
};
static Location AkamaWP[]=
{
{482.352448, 401.162720, 0, 112.783928},
{469.597443, 402.264404, 0, 118.537910}
{482.352448f, 401.162720f, 0.0f, 112.783928f},
{469.597443f, 402.264404f, 0.0f, 118.537910f}
};
static Location BrokenCoords[]=
{
{541.375916, 401.439575, M_PI, 112.783997}, // The place where Akama channels
{534.130005, 352.394531, 2.164150, 112.783737}, // Behind a 'pillar' which is behind the east alcove
{499.621185, 341.534729, 1.652856, 112.783730}, // East Alcove
{499.151093, 461.036438, 4.770888, 112.78370}, // West Alcove
{541.375916f, 401.439575f, M_PI, 112.783997f}, // The place where Akama channels
{534.130005f, 352.394531f, 2.164150f, 112.783737f}, // Behind a 'pillar' which is behind the east alcove
{499.621185f, 341.534729f, 1.652856f, 112.783730f}, // East Alcove
{499.151093f, 461.036438f, 4.770888f, 112.78370f}, // West Alcove
};
static Location BrokenWP[]=
{
{492.491638, 400.744690, 3.122336, 112.783737},
{494.335724, 382.221771, 2.676230, 112.783737},
{489.555939, 373.507202, 2.416263, 112.783737},
{491.136353, 427.868774, 3.519748, 112.783737},
{492.491638f, 400.744690f, 3.122336f, 112.783737f},
{494.335724f, 382.221771f, 2.676230f, 112.783737f},
{489.555939f, 373.507202f, 2.416263f, 112.783737f},
{491.136353f, 427.868774f, 3.519748f, 112.783737f},
};
// Locations
#define Z1 118.543144
#define Z2 120.783768
#define Z_SPAWN 113.537949
#define AGGRO_X 482.793182
#define AGGRO_Y 401.270172
#define AGGRO_Z 112.783928
#define AKAMA_X 514.583984
#define AKAMA_Y 400.601013
#define AKAMA_Z 112.783997
#define Z1 118.543144f
#define Z2 120.783768f
#define Z_SPAWN 113.537949f
#define AGGRO_X 482.793182f
#define AGGRO_Y 401.270172f
#define AGGRO_Z 112.783928f
#define AKAMA_X 514.583984f
#define AKAMA_Y 400.601013f
#define AKAMA_Z 112.783997f
// Spells
#define SPELL_VERTEX_SHADE_BLACK 39833
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+12 -12
View File
@@ -64,17 +64,17 @@ EndScriptData */
#define ENTRY_TAINTED_SPAWN 22036
#define ENTRY_BEAM_DUMMY 21934
#define HYDROSS_X -239.439
#define HYDROSS_Y -363.481
#define HYDROSS_X -239.439f
#define HYDROSS_Y -363.481f
#define SPAWN_X_DIFF1 6.934003
#define SPAWN_Y_DIFF1 -11.255012
#define SPAWN_X_DIFF2 -6.934003
#define SPAWN_Y_DIFF2 11.255012
#define SPAWN_X_DIFF3 -12.577011
#define SPAWN_Y_DIFF3 -4.72702
#define SPAWN_X_DIFF4 12.577011
#define SPAWN_Y_DIFF4 4.72702
#define SPAWN_X_DIFF1 6.934003f
#define SPAWN_Y_DIFF1 -11.255012f
#define SPAWN_X_DIFF2 -6.934003f
#define SPAWN_Y_DIFF2 11.255012f
#define SPAWN_X_DIFF3 -12.577011f
#define SPAWN_Y_DIFF3 -4.72702f
#define SPAWN_X_DIFF4 12.577011f
#define SPAWN_Y_DIFF4 4.72702f
class boss_hydross_the_unstable : public CreatureScript
{
@@ -137,7 +137,7 @@ public:
void SummonBeams()
{
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0);
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
@@ -145,7 +145,7 @@ public:
beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
beams[0]=beamer->GetGUID();
}
beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0);
beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+44 -44
View File
@@ -54,14 +54,14 @@ EndScriptData */
#define SPELL_TOXIC_SPORES 38575
#define SPELL_MAGIC_BARRIER 38112
#define MIDDLE_X 30.134
#define MIDDLE_Y -923.65
#define MIDDLE_Z 42.9
#define MIDDLE_X 30.134f
#define MIDDLE_Y -923.65f
#define MIDDLE_Z 42.9f
#define SPOREBAT_X 30.977156
#define SPOREBAT_Y -925.297761
#define SPOREBAT_Z 77.176567
#define SPOREBAT_O 5.223932
#define SPOREBAT_X 30.977156f
#define SPOREBAT_Y -925.297761f
#define SPOREBAT_Z 77.176567f
#define SPOREBAT_O 5.223932f
#define SHIED_GENERATOR_CHANNEL 19870
#define ENCHANTED_ELEMENTAL 21958
@@ -76,60 +76,60 @@ EndScriptData */
float ElementPos[8][4] =
{
{8.3, -835.3, 21.9, 5},
{53.4, -835.3, 21.9, 4.5},
{96, -861.9, 21.8, 4},
{96, -986.4, 21.4, 2.5},
{54.4, -1010.6, 22, 1.8},
{9.8, -1012, 21.7, 1.4},
{-35, -987.6, 21.5, 0.8},
{-58.9, -901.6, 21.5, 6}
{8.3f, -835.3f, 21.9f, 5.0f},
{53.4f, -835.3f, 21.9f, 4.5f},
{96.0f, -861.9f, 21.8f, 4.0f},
{96.0f, -986.4f, 21.4f, 2.5f},
{54.4f, -1010.6f, 22, 1.8f},
{9.8f, -1012, 21.7f, 1.4f},
{-35.0f, -987.6f, 21.5f, 0.8f},
{-58.9f, -901.6f, 21.5f, 6.0f}
};
float ElementWPPos[8][3] =
{
{71.700752, -883.905884, 41.097168},
{45.039848, -868.022827, 41.097015},
{14.585141, -867.894470, 41.097061},
{-25.415508, -906.737732, 41.097061},
{-11.801594, -963.405884, 41.097067},
{14.556657, -979.051514, 41.097137},
{43.466549, -979.406677, 41.097027},
{69.945908, -964.663940, 41.097054}
{71.700752f, -883.905884f, 41.097168f},
{45.039848f, -868.022827f, 41.097015f},
{14.585141f, -867.894470f, 41.097061f},
{-25.415508f, -906.737732f, 41.097061f},
{-11.801594f, -963.405884f, 41.097067f},
{14.556657f, -979.051514f, 41.097137f},
{43.466549f, -979.406677f, 41.097027f},
{69.945908f, -964.663940f, 41.097054f}
};
float SporebatWPPos[8][3] =
{
{31.6,-896.3,59.1},
{9.1, -913.9, 56},
{5.2, -934.4, 52.4},
{20.7, -946.9, 49.7},
{41, -941.9, 51},
{47.7, -927.3, 55},
{42.2, -912.4, 51.7},
{27, -905.9, 50}
{31.6f, -896.3f, 59.1f},
{9.1f, -913.9f, 56.0f},
{5.2f, -934.4f, 52.4f},
{20.7f, -946.9f, 49.7f},
{41.0f, -941.9f, 51.0f},
{47.7f, -927.3f, 55.0f},
{42.2f, -912.4f, 51.7f},
{27.0f, -905.9f, 50.0f}
};
float CoilfangElitePos[3][4] =
{
{28.84, -923.28, 42.9, 6},
{31.183281, -953.502625, 41.523602, 1.640957},
{58.895180, -923.124268, 41.545307, 3.152848}
{28.84f, -923.28f, 42.9f, 6.0f},
{31.183281f, -953.502625f, 41.523602f, 1.640957f},
{58.895180f, -923.124268f, 41.545307f, 3.152848f}
};
float CoilfangStriderPos[3][4] =
{
{66.427010, -948.778503, 41.262245, 2.584220},
{7.513962, -959.538208, 41.300422, 1.034629},
{-12.843201, -907.798401, 41.239620, 6.087094}
{66.427010f, -948.778503f, 41.262245f, 2.584220f},
{7.513962f, -959.538208f, 41.300422f, 1.034629f},
{-12.843201f, -907.798401f, 41.239620f, 6.087094f}
};
float ShieldGeneratorChannelPos[4][4] =
{
{49.6262, -902.181, 43.0975, 3.95683},
{10.988, -901.616, 42.5371, 5.4373},
{10.3859, -944.036, 42.5446, 0.779888},
{49.3126, -943.398, 42.5501, 2.40174}
{49.6262f, -902.181f, 43.0975f, 3.95683f},
{10.988f, -901.616f, 42.5371f, 5.4373f},
{10.3859f, -944.036f, 42.5446f, 0.779888f},
{49.3126f, -943.398f, 42.5501f, 2.40174f}
};
//Lady Vashj AI
@@ -603,8 +603,8 @@ public:
void Reset()
{
me->SetSpeed(MOVE_WALK,0.6);//walk
me->SetSpeed(MOVE_RUN,0.6);//run
me->SetSpeed(MOVE_WALK,0.6f);//walk
me->SetSpeed(MOVE_RUN,0.6f);//run
move = 0;
phase = 1;
@@ -649,7 +649,7 @@ public:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (phase == 1)
me->GetMotionMaster()->MovePoint(0, x, y, z);
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1))
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f))
phase = 2;
if (phase == 2)
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+9 -9
View File
@@ -55,15 +55,15 @@ EndScriptData */
float AddPos[9][3] =
{
{2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z
{12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z
{51.366653, -460.836060, -19.182686}, //MOVE_AMBUSHER_3 X, Y, Z
{62.597980, -457.433044, -19.182686}, //MOVE_AMBUSHER_4 X, Y, Z
{77.607452, -384.302765, -19.182686}, //MOVE_AMBUSHER_5 X, Y, Z
{63.897900, -378.984924, -19.182686}, //MOVE_AMBUSHER_6 X, Y, Z
{34.447250, -387.333618, -19.182686}, //MOVE_GUARDIAN_1 X, Y, Z
{14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z
{42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z
{2.8553810f, -459.823914f, -19.182686f}, //MOVE_AMBUSHER_1 X, Y, Z
{12.400000f, -466.042267f, -19.182686f}, //MOVE_AMBUSHER_2 X, Y, Z
{51.366653f, -460.836060f, -19.182686f}, //MOVE_AMBUSHER_3 X, Y, Z
{62.597980f, -457.433044f, -19.182686f}, //MOVE_AMBUSHER_4 X, Y, Z
{77.607452f, -384.302765f, -19.182686f}, //MOVE_AMBUSHER_5 X, Y, Z
{63.897900f, -378.984924f, -19.182686f}, //MOVE_AMBUSHER_6 X, Y, Z
{34.447250f, -387.333618f, -19.182686f}, //MOVE_GUARDIAN_1 X, Y, Z
{14.388216f, -423.468018f, -19.625271f}, //MOVE_GUARDIAN_2 X, Y, Z
{42.471519f, -445.115295f, -19.769423f} //MOVE_GUARDIAN_3 X, Y, Z
};
class boss_the_lurker_below : public CreatureScript
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+5 -5
View File
@@ -60,11 +60,11 @@ enum eKelidan
const float ShadowmoonChannelers[5][4]=
{
{302,-87,-24.4,0.157},
{321,-63.5,-24.6,4.887},
{346,-74.5,-24.6,3.595},
{344,-103.5,-24.5,2.356},
{316,-109,-24.6,1.257}
{302.0f,-87.0f,-24.4f,0.157f},
{321.0f,-63.5f,-24.6f,4.887f},
{346.0f,-74.5f,-24.6f,3.595f},
{344.0f,-103.5f,-24.5f,2.356f},
{316.0f,-109.0f,-24.6f,1.257f}
};
class boss_kelidan_the_breaker : public CreatureScript
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+2 -2
View File
@@ -64,7 +64,7 @@ enum eSays
EMOTE = -1543025,
};
const float VazrudenMiddle[3] = {-1406.5, 1746.5, 81.2};
const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f};
const float VazrudenRing[2][3] =
{
{-1430, 1705, 112},
@@ -371,7 +371,7 @@ class boss_vazruden_the_herald : public CreatureScript
{
CAST_AI(boss_nazan::boss_nazanAI, pSummoned->AI())->VazrudenGUID = VazrudenGUID;
pSummoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
pSummoned->SetSpeed(MOVE_FLIGHT, 2.5);
pSummoned->SetSpeed(MOVE_FLIGHT, 2.5f);
if (pVictim)
AttackStartNoMove(pVictim);
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+3 -3
View File
@@ -55,9 +55,9 @@ enum eCreatures
#define TARGET_NUM 5
float AssassEntrance[3] = {275.136,-84.29,2.3}; // y -8
float AssassExit[3] = {184.233,-84.29,2.3}; // y -8
float AddsEntrance[3] = {306.036,-84.29,1.93};
float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8
float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8
float AddsEntrance[3] = {306.036f,-84.29f,1.93f};
class boss_warchief_kargath_bladefist : public CreatureScript
{
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+7 -7
View File
@@ -47,12 +47,12 @@ enum eSpells
static float waypoint[6][3] =
{
{340.15, 58.65, 17.71},
{388.09, 31.54, 20.18},
{388.18, -32.85, 20.18},
{340.29, -60.19, 17.72},
{332, 0.01, 39}, // better not use the same xy coord
{331, 0.01, -2.39}
{340.15f, 58.65f, 17.71f},
{388.09f, 31.54f, 20.18f},
{388.18f, -32.85f, 20.18f},
{340.29f, -60.19f, 17.72f},
{332.0f, 0.01f, 39.0f}, // better not use the same xy coord
{331.0f, 0.01f, -2.39f}
};
enum WaitEventType
@@ -502,7 +502,7 @@ class mob_ember_of_alar : public CreatureScript
{
if (Unit* Alar = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALAR)))
{
int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03;
int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03f;
if (AlarHealth > 0)
Alar->SetHealth(AlarHealth);
else
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ const float LARGE_PORTAL_RADIUS = 26.0f;
const float PORTAL_Z = 17.005f;
// x, y, z, o
static float SolarianPos[4] = {432.909, -373.424, 17.9608, 1.06421};
static float SolarianPos[4] = {432.909f, -373.424f, 17.9608f, 1.06421f};
class boss_high_astromancer_solarian : public CreatureScript
{
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+8 -8
View File
@@ -426,15 +426,15 @@ class npc_warden_mellichar : public CreatureScript
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
case 3:
me->SummonCreature(ENTRY_MILLHOUSE,413.292,-148.378,42.56,6.27,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 4:
DoScriptText(YELL_RELEASE2B, me);
@@ -443,10 +443,10 @@ class npc_warden_mellichar : public CreatureScript
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
@@ -454,15 +454,15 @@ class npc_warden_mellichar : public CreatureScript
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
case 7:
me->SummonCreature(ENTRY_SKYRISS,445.763,-191.639,44.64,1.60,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
DoScriptText(YELL_WELCOME, me);
break;
}
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+6 -6
View File
@@ -52,12 +52,12 @@ enum eOthers
float treant_pos[6][3] =
{
{24.301233, 427.221100, -27.060635},
{16.795492, 359.678802, -27.355425},
{53.493484, 345.381470, -26.196192},
{61.867096, 439.362732, -25.921030},
{109.861877, 423.201630, -27.356019},
{106.780159, 355.582581, -27.593357}
{24.301233f, 427.221100f, -27.060635f},
{16.795492f, 359.678802f, -27.355425f},
{53.493484f, 345.381470f, -26.196192f},
{61.867096f, 439.362732f, -25.921030f},
{109.861877f, 423.201630f, -27.356019f},
{106.780159f, 355.582581f, -27.593357f}
};
/*#####
src/server/scripts/Outland/hellfire_peninsula.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ public:
bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
{
pGo->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000);
pGo->SummonCreature(C_AERANAS,-1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000);
return false;
}
src/server/scripts/Outland/nagrand.cpp
+4 -4
View File
@@ -73,9 +73,9 @@ public:
float y = me->GetPositionY();
float z = me->GetPositionZ();
Hitter->SummonCreature(18181,x+(0.7 * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
Hitter->SummonCreature(18181,x+(0.7f * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5 *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5f *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
me->setDeathState(CORPSE);
Spawn = true;
}
@@ -599,8 +599,8 @@ enum eMagharCaptive
NPC_MURK_PUTRIFIER = 18202
};
static float m_afAmbushA[]= {-1568.805786, 8533.873047, 1.958};
static float m_afAmbushB[]= {-1491.554321, 8506.483398, 1.248};
static float m_afAmbushA[]= {-1568.805786f, 8533.873047f, 1.958f};
static float m_afAmbushB[]= {-1491.554321f, 8506.483398f, 1.248f};
class npc_maghar_captive : public CreatureScript
{
src/server/scripts/Outland/netherstorm.cpp
+52 -52
View File
@@ -149,48 +149,48 @@ public:
case ENTRY_BNAAR_C_CONSOLE:
if (rand()%2)
{
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68,4162.55,164.00,1.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2927.36,4212.97,164.00);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68f,4162.55f,164.00f,1.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2927.36f,4212.97f,164.00f);
}
else
{
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36,4212.97,164.00,4.94,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2933.68,4162.55,164.00);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36f,4212.97f,164.00f,4.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2933.68f,4162.55f,164.00f);
}
Wave_Timer = 30000;
break;
case ENTRY_CORUU_C_CONSOLE:
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21,2765.26,134.49,3.93,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2424.21,2740.15,133.81);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86,2731.85,134.53,1.31,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2435.37,2766.04,133.81);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21f,2765.26f,134.49f,3.93f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2424.21f,2740.15f,133.81f);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86f,2731.85f,134.53f,1.31f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2435.37f,2766.04f,133.81f);
Wave_Timer = 20000;
break;
case ENTRY_DURO_C_CONSOLE:
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80,2205.36,165.37,3.74,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2985.15,2197.32,164.79);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91,2191.20,165.32,0.22,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2060.01,2185.27,164.67);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80f,2205.36f,165.37f,3.74f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2985.15f,2197.32f,164.79f);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91f,2191.20f,165.32f,0.22f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2060.01f,2185.27f,164.67f);
Wave_Timer = 15000;
break;
case ENTRY_ARA_C_CONSOLE:
if (rand()%2)
{
add = me->SummonCreature(ENTRY_ARA_TECH,4035.11,4038.97,194.27,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
add = me->SummonCreature(ENTRY_ARA_TECH,4033.66,4036.79,194.28,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
add = me->SummonCreature(ENTRY_ARA_TECH,4037.13,4037.30,194.23,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
add = me->SummonCreature(ENTRY_ARA_TECH,4035.11f,4038.97f,194.27f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
add = me->SummonCreature(ENTRY_ARA_TECH,4033.66f,4036.79f,194.28f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
add = me->SummonCreature(ENTRY_ARA_TECH,4037.13f,4037.30f,194.23f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
}
else
{
add = me->SummonCreature(ENTRY_ARA_TECH,3099.59,4049.30,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
add = me->SummonCreature(ENTRY_ARA_TECH,3999.72,4046.75,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
add = me->SummonCreature(ENTRY_ARA_TECH,3996.81,4048.26,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
add = me->SummonCreature(ENTRY_ARA_TECH,3099.59f,4049.30f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
add = me->SummonCreature(ENTRY_ARA_TECH,3999.72f,4046.75f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
add = me->SummonCreature(ENTRY_ARA_TECH,3996.81f,4048.26f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
}
Wave_Timer = 15000;
break;
@@ -201,30 +201,30 @@ public:
switch(pCreature->GetEntry())
{
case ENTRY_BNAAR_C_CONSOLE:
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52,4201.42,163.47,3.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2927.49,4192.81,163.00);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52f,4201.42f,163.47f,3.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2927.49f,4192.81f,163.00f);
break;
case ENTRY_CORUU_C_CONSOLE:
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88,2737.85,133.27,2.59,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62,2735.32,134.49,1.97,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73,2754.50,134.49,3.29,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88f,2737.85f,133.27f,2.59f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62f,2735.32f,134.49f,1.97f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73f,2754.50f,134.49f,3.29f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
break;
case ENTRY_DURO_C_CONSOLE:
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18,2202.85,165.32,5.45,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30,2211.50,165.32,4.55,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02,2217.45,164.16,4.96,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18f,2202.85f,165.32f,5.45f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30f,2211.50f,165.32f,4.55f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02f,2217.45f,164.16f,4.96f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
break;
case ENTRY_ARA_C_CONSOLE:
add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51,4020.46,192.18,0.91,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4008.35,4035.04,192.70);
add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56,4059.35,193.59,4.44,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4016.62,4039.89,193.46);
add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51f,4020.46f,192.18f,0.91f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4008.35f,4035.04f,192.70f);
add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56f,4059.35f,193.59f,4.44f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0,4016.62f,4039.89f,193.46f);
break;
}
}
@@ -318,22 +318,22 @@ public:
case 3726: //b'naar
if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) &&
pPlayer->HasItemCount(29366,1))
manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95f,4189.98f,161.88f,0.34f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break;
case 3730: //coruu
if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) &&
pPlayer->HasItemCount(29396,1))
manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77f,2750.38f,133.24f,2.14f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break;
case 3734: //duro
if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) &&
pPlayer->HasItemCount(29397,1))
manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48f,2183.29f,163.20f,1.85f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break;
case 3722: //ara
if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) &&
pPlayer->HasItemCount(29411,1))
manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71f,4028.76f,192.10f,1.25f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break;
}
@@ -546,7 +546,7 @@ public:
//Phase 4 Pathaleon spawns up to phase 9
case 4:
//spawn pathaleon's image
me->SummonCreature(CreatureEntry[2], 2325.851563, 2799.534668, 133.084229, 6.038996, TEMPSUMMON_TIMED_DESPAWN, 90000);
me->SummonCreature(CreatureEntry[2], 2325.851563f, 2799.534668f, 133.084229f, 6.038996f, TEMPSUMMON_TIMED_DESPAWN, 90000);
++Phase;
Phase_Timer = 500;
break;
@@ -897,14 +897,14 @@ public:
switch(i)
{
case 3: //first spawn
me->SummonCreature(SPAWN_FIRST, 2449.67, 2183.11, 96.85, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, 2449.53, 2184.43, 96.36, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, 2449.85, 2186.34, 97.57, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, 2449.53f, 2184.43f, 96.36f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_FIRST, 2449.85f, 2186.34f, 97.57f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 7:
me->SummonCreature(SPAWN_SECOND, 2309.64, 2186.24, 92.25, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND, 2309.25, 2183.46, 91.75, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND, 2309.64f, 2186.24f, 92.25f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(SPAWN_SECOND, 2309.25f, 2183.46f, 91.75f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 12:
src/server/scripts/Outland/shadowmoon_valley.cpp
+19 -19
View File
@@ -793,7 +793,7 @@ public:
{
me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
me->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83, 602.584, 85.2393, 4.92598, TEMPSUMMON_CORPSE_DESPAWN, 0);
Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83f, 602.584f, 85.2393f, 4.92598f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (Illidan)
{
IllidanGUID = Illidan->GetGUID();
@@ -825,7 +825,7 @@ public:
switch(Step)
{
case 0: return 0; break;
case 1: me->GetMotionMaster()->MovePoint(0, -5104.41, 595.297, 85.6838); return 9000; break;
case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break;
case 2: DoScriptText(OVERLORD_YELL_1, me, plr); return 4500; break;
case 3: me->SetInFront(plr); return 3200; break;
case 4: DoScriptText(OVERLORD_SAY_2, me, plr); return 2000; break;
@@ -909,7 +909,7 @@ public:
Yarzill->CastSpell(plr, 41540, true);
return 1000;}
break;
case 32: me->GetMotionMaster()->MovePoint(0, -5085.77, 577.231, 86.6719); return 5000; break;
case 32: me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000; break;
case 33: Reset(); return 100; break;
default : return 0;
@@ -1160,22 +1160,22 @@ struct Location
static Location SpawnLocation[]=
{
//Cords used for:
{-4615.8556, 1342.2532, 139.9, 1.612},//Illidari Soldier
{-4598.9365, 1377.3182, 139.9, 3.917},//Illidari Soldier
{-4598.4697, 1360.8999, 139.9, 2.427},//Illidari Soldier
{-4589.3599, 1369.1061, 139.9, 3.165},//Illidari Soldier
{-4608.3477, 1386.0076, 139.9, 4.108},//Illidari Soldier
{-4633.1889, 1359.8033, 139.9, 0.949},//Illidari Soldier
{-4623.5791, 1351.4574, 139.9, 0.971},//Illidari Soldier
{-4607.2988, 1351.6099, 139.9, 2.416},//Illidari Soldier
{-4633.7764, 1376.0417, 139.9, 5.608},//Illidari Soldier
{-4600.2461, 1369.1240, 139.9, 3.056},//Illidari Mind Breaker
{-4631.7808, 1367.9459, 139.9, 0.020},//Illidari Mind Breaker
{-4600.2461, 1369.1240, 139.9, 3.056},//Illidari Highlord
{-4631.7808, 1367.9459, 139.9, 0.020},//Illidari Highlord
{-4615.5586, 1353.0031, 139.9, 1.540},//Illidari Highlord
{-4616.4736, 1384.2170, 139.9, 4.971},//Illidari Highlord
{-4627.1240, 1378.8752, 139.9, 2.544} //Torloth The Magnificent
{-4615.8556f, 1342.2532f, 139.9f, 1.612f},//Illidari Soldier
{-4598.9365f, 1377.3182f, 139.9f, 3.917f},//Illidari Soldier
{-4598.4697f, 1360.8999f, 139.9f, 2.427f},//Illidari Soldier
{-4589.3599f, 1369.1061f, 139.9f, 3.165f},//Illidari Soldier
{-4608.3477f, 1386.0076f, 139.9f, 4.108f},//Illidari Soldier
{-4633.1889f, 1359.8033f, 139.9f, 0.949f},//Illidari Soldier
{-4623.5791f, 1351.4574f, 139.9f, 0.971f},//Illidari Soldier
{-4607.2988f, 1351.6099f, 139.9f, 2.416f},//Illidari Soldier
{-4633.7764f, 1376.0417f, 139.9f, 5.608f},//Illidari Soldier
{-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Mind Breaker
{-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Mind Breaker
{-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Highlord
{-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Highlord
{-4615.5586f, 1353.0031f, 139.9f, 1.540f},//Illidari Highlord
{-4616.4736f, 1384.2170f, 139.9f, 4.971f},//Illidari Highlord
{-4627.1240f, 1378.8752f, 139.9f, 2.544f} //Torloth The Magnificent
};
struct WaveData
src/server/scripts/Outland/terokkar_forest.cpp
+3 -3
View File
@@ -229,7 +229,7 @@ public:
{
if (CAST_PLR(who)->GetQuestStatus(10898) == QUEST_STATUS_INCOMPLETE)
{
float Radius = 10.0;
float Radius = 10.0f;
if (me->IsWithinDistInMap(who, Radius))
{
Start(false, false, who->GetGUID());
@@ -679,8 +679,8 @@ public:
switch(i)
{
case 3:
me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99,5420.33,-34.53,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55,5412.79,-34.53,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99f,5420.33f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55f,5412.79f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
break;
case 11:
if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)