refactor(Core/Scripts): restyle scripts lib with astyle (#3467)

This commit is contained in:
Kargatum
2020-10-11 15:35:34 +07:00
committed by GitHub
parent 4cca286a4d
commit 5e20b46812
538 changed files with 92888 additions and 91297 deletions

View File

@@ -68,38 +68,38 @@ struct MechanicImmune
MechanicImmune const mechanicImmunes[MAX_MECHANIC] =
{
{ MECHANIC_NONE , "MECHANIC_NONE" },
{ MECHANIC_CHARM , "MECHANIC_CHARM" },
{ MECHANIC_DISORIENTED , "MECHANIC_DISORIENTED" },
{ MECHANIC_DISARM , "MECHANIC_DISARM" },
{ MECHANIC_DISTRACT , "MECHANIC_DISTRACT" },
{ MECHANIC_FEAR , "MECHANIC_FEAR" },
{ MECHANIC_GRIP , "MECHANIC_GRIP" },
{ MECHANIC_ROOT , "MECHANIC_ROOT" },
{ MECHANIC_SLOW_ATTACK , "MECHANIC_SLOW_ATTACK" },
{ MECHANIC_SILENCE , "MECHANIC_SILENCE" },
{ MECHANIC_SLEEP , "MECHANIC_SLEEP" },
{ MECHANIC_SNARE , "MECHANIC_SNARE" },
{ MECHANIC_STUN , "MECHANIC_STUN" },
{ MECHANIC_FREEZE , "MECHANIC_FREEZE" },
{ MECHANIC_KNOCKOUT , "MECHANIC_KNOCKOUT" },
{ MECHANIC_BLEED , "MECHANIC_BLEED" },
{ MECHANIC_BANDAGE , "MECHANIC_BANDAGE" },
{ MECHANIC_POLYMORPH , "MECHANIC_POLYMORPH" },
{ MECHANIC_BANISH , "MECHANIC_BANISH" },
{ MECHANIC_SHIELD , "MECHANIC_SHIELD" },
{ MECHANIC_SHACKLE , "MECHANIC_SHACKLE" },
{ MECHANIC_MOUNT , "MECHANIC_MOUNT" },
{ MECHANIC_INFECTED , "MECHANIC_INFECTED" },
{ MECHANIC_TURN , "MECHANIC_TURN" },
{ MECHANIC_HORROR , "MECHANIC_HORROR" },
{ MECHANIC_INVULNERABILITY , "MECHANIC_INVULNERABILITY" },
{ MECHANIC_INTERRUPT , "MECHANIC_INTERRUPT" },
{ MECHANIC_DAZE , "MECHANIC_DAZE" },
{ MECHANIC_DISCOVERY , "MECHANIC_DISCOVERY" },
{ MECHANIC_IMMUNE_SHIELD , "MECHANIC_IMMUNE_SHIELD" },
{ MECHANIC_SAPPED , "MECHANIC_SAPPED" },
{ MECHANIC_ENRAGED , "MECHANIC_ENRAGED" },
{ MECHANIC_NONE, "MECHANIC_NONE" },
{ MECHANIC_CHARM, "MECHANIC_CHARM" },
{ MECHANIC_DISORIENTED, "MECHANIC_DISORIENTED" },
{ MECHANIC_DISARM, "MECHANIC_DISARM" },
{ MECHANIC_DISTRACT, "MECHANIC_DISTRACT" },
{ MECHANIC_FEAR, "MECHANIC_FEAR" },
{ MECHANIC_GRIP, "MECHANIC_GRIP" },
{ MECHANIC_ROOT, "MECHANIC_ROOT" },
{ MECHANIC_SLOW_ATTACK, "MECHANIC_SLOW_ATTACK" },
{ MECHANIC_SILENCE, "MECHANIC_SILENCE" },
{ MECHANIC_SLEEP, "MECHANIC_SLEEP" },
{ MECHANIC_SNARE, "MECHANIC_SNARE" },
{ MECHANIC_STUN, "MECHANIC_STUN" },
{ MECHANIC_FREEZE, "MECHANIC_FREEZE" },
{ MECHANIC_KNOCKOUT, "MECHANIC_KNOCKOUT" },
{ MECHANIC_BLEED, "MECHANIC_BLEED" },
{ MECHANIC_BANDAGE, "MECHANIC_BANDAGE" },
{ MECHANIC_POLYMORPH, "MECHANIC_POLYMORPH" },
{ MECHANIC_BANISH, "MECHANIC_BANISH" },
{ MECHANIC_SHIELD, "MECHANIC_SHIELD" },
{ MECHANIC_SHACKLE, "MECHANIC_SHACKLE" },
{ MECHANIC_MOUNT, "MECHANIC_MOUNT" },
{ MECHANIC_INFECTED, "MECHANIC_INFECTED" },
{ MECHANIC_TURN, "MECHANIC_TURN" },
{ MECHANIC_HORROR, "MECHANIC_HORROR" },
{ MECHANIC_INVULNERABILITY, "MECHANIC_INVULNERABILITY" },
{ MECHANIC_INTERRUPT, "MECHANIC_INTERRUPT" },
{ MECHANIC_DAZE, "MECHANIC_DAZE" },
{ MECHANIC_DISCOVERY, "MECHANIC_DISCOVERY" },
{ MECHANIC_IMMUNE_SHIELD, "MECHANIC_IMMUNE_SHIELD" },
{ MECHANIC_SAPPED, "MECHANIC_SAPPED" },
{ MECHANIC_ENRAGED, "MECHANIC_ENRAGED" },
};
class npc_commandscript : public CommandScript
@@ -442,15 +442,15 @@ public:
{
if (((Pet*)creature)->getPetType() == HUNTER_PET)
{
creature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr->GetXPForLevel(lvl)/4);
creature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr->GetXPForLevel(lvl) / 4);
creature->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
}
((Pet*)creature)->GivePetLevel(lvl);
}
else
{
creature->SetMaxHealth(100 + 30*lvl);
creature->SetHealth(100 + 30*lvl);
creature->SetMaxHealth(100 + 30 * lvl);
creature->SetHealth(100 + 30 * lvl);
creature->SetLevel(lvl);
creature->SaveToDB();
}
@@ -722,7 +722,7 @@ public:
uint32 nativeid = target->GetNativeDisplayId();
uint32 Entry = target->GetEntry();
int64 curRespawnDelay = target->GetRespawnTimeEx()-time(nullptr);
int64 curRespawnDelay = target->GetRespawnTimeEx() - time(nullptr);
if (curRespawnDelay < 0)
curRespawnDelay = 0;
std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), true);
@@ -791,8 +791,7 @@ public:
handler->PSendSysMessage(LANG_CREATURE_LIST_CHAT, guid, guid, creatureTemplate->Name.c_str(), x, y, z, mapId);
++count;
}
while (result->NextRow());
} while (result->NextRow());
}
handler->PSendSysMessage(LANG_COMMAND_NEAR_NPC_MESSAGE, distance, count);
@@ -1122,7 +1121,7 @@ public:
}
MovementGeneratorType mtype = IDLE_MOTION_TYPE;
if (option >0.0f)
if (option > 0.0f)
mtype = RANDOM_MOTION_TYPE;
Creature* creature = handler->getSelectedCreature();
@@ -1214,9 +1213,15 @@ public:
char lastchar = args[strlen(args) - 1];
switch (lastchar)
{
case '?': creature->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION); break;
case '!': creature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break;
default: creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK); break;
case '?':
creature->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION);
break;
case '!':
creature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
break;
default:
creature->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
break;
}
return true;
@@ -1386,7 +1391,7 @@ public:
// place pet before player
float x, y, z;
player->GetClosePoint (x, y, z, creatureTarget->GetObjectSize(), CONTACT_DISTANCE);
pet->Relocate(x, y, z, M_PI-player->GetOrientation());
pet->Relocate(x, y, z, M_PI - player->GetOrientation());
// set pet to defensive mode by default (some classes can't control controlled pets in fact).
pet->SetReactState(REACT_DEFENSIVE);
@@ -1442,7 +1447,7 @@ public:
group_member = new FormationInfo;
group_member->follow_angle = (creature->GetAngle(chr) - chr->GetOrientation()) * 180 / M_PI;
group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - creature->GetPositionX(), int(2))+pow(chr->GetPositionY() - creature->GetPositionY(), int(2)));
group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - creature->GetPositionX(), int(2)) + pow(chr->GetPositionY() - creature->GetPositionY(), int(2)));
group_member->leaderGUID = leaderGUID;
group_member->groupAI = 0;