Skip to content

Commit 97f9387

Browse files
leprasmurfleprasmurf
committed
Whitespace fixes
1 parent 3502f40 commit 97f9387

File tree

8 files changed

+75
-80
lines changed

8 files changed

+75
-80
lines changed

‎src/modules/Bots/playerbot/strategy/deathknight/BloodDKStrategy.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class BloodDKStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
5353
/*A*/ NULL,
5454
/*C*/ NULL);
5555
}
56-
5756
};
5857

5958
BloodDKStrategy::BloodDKStrategy(PlayerbotAI* ai) : GenericDKStrategy(ai)
@@ -94,7 +93,4 @@ triggers.push_back(new TriggerNode(
9493
new NextAction("blood tap", ACTION_HIGH + 5),
9594
new NextAction("vampiric blood", ACTION_HIGH + 3),
9695
new NextAction("death strike", ACTION_HIGH + 4), NULL)));
97-
98-
99-
10096
}

‎src/modules/Bots/playerbot/strategy/deathknight/DKActions.h‎

Lines changed: 56 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,35 @@
44

55
namespace ai
66
{
7-
class CastBloodPresenceAction : public CastBuffSpellAction {
7+
class CastBloodPresenceAction : public CastBuffSpellAction
8+
{
89
public:
910
CastBloodPresenceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blood presence") {}
1011
};
1112

12-
class CastFrostPresenceAction : public CastBuffSpellAction {
13+
class CastFrostPresenceAction : public CastBuffSpellAction
14+
{
1315
public:
1416
CastFrostPresenceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "frost presence") {}
1517
};
1618

17-
class CastUnholyPresenceAction : public CastBuffSpellAction {
19+
class CastUnholyPresenceAction : public CastBuffSpellAction
20+
{
1821
public:
1922
CastUnholyPresenceAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "unholy presence") {}
2023
};
2124

22-
class CastDeathchillAction : public CastBuffSpellAction {
25+
class CastDeathchillAction : public CastBuffSpellAction
26+
{
2327
public:
2428
CastDeathchillAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "deathchill") {}
2529
virtual NextAction** getPrerequisites() {
2630
return NextAction::merge(NextAction::array(0, new NextAction("frost presence"), NULL), CastSpellAction::getPrerequisites());
2731
}
2832
};
2933

30-
class CastDarkCommandAction : public CastBuffSpellAction {
34+
class CastDarkCommandAction : public CastBuffSpellAction
35+
{
3136
public:
3237
CastDarkCommandAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "dark command") {}
3338
virtual NextAction** getPrerequisites() {
@@ -49,7 +54,8 @@ namespace ai
4954

5055

5156
// Frost presence
52-
class CastFrostMeleeSpellAction : public CastMeleeSpellAction {
57+
class CastFrostMeleeSpellAction : public CastMeleeSpellAction
58+
{
5359
public:
5460
CastFrostMeleeSpellAction(PlayerbotAI* ai, string spell) : CastMeleeSpellAction(ai, spell) {}
5561
virtual NextAction** getPrerequisites() {
@@ -58,15 +64,17 @@ namespace ai
5864
};
5965

6066
// Blood presence
61-
class CastBloodMeleeSpellAction : public CastMeleeSpellAction {
67+
class CastBloodMeleeSpellAction : public CastMeleeSpellAction
68+
{
6269
public:
6370
CastBloodMeleeSpellAction(PlayerbotAI* ai, string spell) : CastMeleeSpellAction(ai, spell) {}
6471
virtual NextAction** getPrerequisites() {
6572
return NextAction::merge(NextAction::array(0, new NextAction("blood presence"), NULL), CastMeleeSpellAction::getPrerequisites());
6673
}
6774
};
68-
// a
69-
class CastRuneStrikeAction : public CastMeleeSpellAction {
75+
// a
76+
class CastRuneStrikeAction : public CastMeleeSpellAction
77+
{
7078
public:
7179
CastRuneStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "rune strike") {}
7280
};
@@ -83,7 +91,7 @@ namespace ai
8391
END_SPELL_ACTION()
8492

8593

86-
class CastIcyTouchOnAttackerAction : public CastDebuffSpellOnAttackerAction
94+
class CastIcyTouchOnAttackerAction : public CastDebuffSpellOnAttackerAction
8795
{
8896
public:
8997
CastIcyTouchOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "icy touch") {}
@@ -94,7 +102,7 @@ namespace ai
94102
END_SPELL_ACTION()
95103

96104

97-
class CastPlagueStrikeOnAttackerAction : public CastDebuffSpellOnAttackerAction
105+
class CastPlagueStrikeOnAttackerAction : public CastDebuffSpellOnAttackerAction
98106
{
99107
public:
100108
CastPlagueStrikeOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "plague strike") {}
@@ -104,25 +112,25 @@ namespace ai
104112
BEGIN_DEBUFF_ACTION(CastMarkOfBloodAction, "mark of blood")
105113
END_SPELL_ACTION()
106114

107-
class CastMarkOfBloodOnAttackerAction : public CastDebuffSpellOnAttackerAction
115+
class CastMarkOfBloodOnAttackerAction : public CastDebuffSpellOnAttackerAction
108116
{
109117
public:
110118
CastMarkOfBloodOnAttackerAction(PlayerbotAI* ai) : CastDebuffSpellOnAttackerAction(ai, "mark of blood") {}
111119
};
112120

113-
class CastUnholyBlightAction : public CastBuffSpellAction
121+
class CastUnholyBlightAction : public CastBuffSpellAction
114122
{
115123
public:
116124
CastUnholyBlightAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "unholy blight") {}
117125
};
118126

119-
class CastSummonGargoyleAction : public CastBuffSpellAction
127+
class CastSummonGargoyleAction : public CastBuffSpellAction
120128
{
121129
public:
122130
CastSummonGargoyleAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "summon gargoyle") {}
123131
};
124132

125-
class CastGhoulFrenzyAction : public CastBuffSpellAction
133+
class CastGhoulFrenzyAction : public CastBuffSpellAction
126134
{
127135
public:
128136
CastGhoulFrenzyAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "ghoul frenzy") {}
@@ -139,57 +147,68 @@ namespace ai
139147
END_SPELL_ACTION()
140148

141149

142-
class CastChainsOfIceAction : public CastSpellAction {
150+
class CastChainsOfIceAction : public CastSpellAction
151+
{
143152
public:
144153
CastChainsOfIceAction(PlayerbotAI* ai) : CastSpellAction(ai, "chains of ice") {}
145154
};
146155

147-
class CastHungeringColdAction : public CastMeleeSpellAction {
156+
class CastHungeringColdAction : public CastMeleeSpellAction
157+
{
148158
public:
149159
CastHungeringColdAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "hungering cold") {}
150160
};
151161

152-
class CastHeartStrikeAction : public CastMeleeSpellAction {
162+
class CastHeartStrikeAction : public CastMeleeSpellAction
163+
{
153164
public:
154165
CastHeartStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "heart strike") {}
155166
};
156167

157-
class CastBloodStrikeAction : public CastMeleeSpellAction {
168+
class CastBloodStrikeAction : public CastMeleeSpellAction
169+
{
158170
public:
159171
CastBloodStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "blood strike") {}
160172
};
161-
162-
class CastFrostStrikeAction : public CastMeleeSpellAction {
173+
174+
class CastFrostStrikeAction : public CastMeleeSpellAction
175+
{
163176
public:
164177
CastFrostStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "frost strike") {}
165178
};
166179

167-
class CastObliterateAction : public CastMeleeSpellAction {
180+
class CastObliterateAction : public CastMeleeSpellAction
181+
{
168182
public:
169183
CastObliterateAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "obliterate") {}
170184
};
171185

172-
class CastDeathStrikeAction : public CastMeleeSpellAction {
186+
class CastDeathStrikeAction : public CastMeleeSpellAction
187+
{
173188
public:
174189
CastDeathStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "death strike") {}
175190
};
176191

177-
class CastScourgeStrikeAction : public CastMeleeSpellAction {
192+
class CastScourgeStrikeAction : public CastMeleeSpellAction
193+
{
178194
public:
179195
CastScourgeStrikeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "scorgue strike") {}
180196
};
181197

182-
class CastDeathCoilAction : public CastSpellAction {
198+
class CastDeathCoilAction : public CastSpellAction
199+
{
183200
public:
184201
CastDeathCoilAction(PlayerbotAI* ai) : CastSpellAction(ai, "death coill") {}
185202
};
186203

187-
class CastBloodBoilAction : public CastBuffSpellAction {
204+
class CastBloodBoilAction : public CastBuffSpellAction
205+
{
188206
public:
189207
CastBloodBoilAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "blood boil") {}
190208
};
191209

192-
class CastDeathAndDecayAction : public CastSpellAction {
210+
class CastDeathAndDecayAction : public CastSpellAction
211+
{
193212
public:
194213
CastDeathAndDecayAction(PlayerbotAI* ai) : CastSpellAction(ai, "death and decay") {}
195214
};
@@ -242,7 +261,6 @@ namespace ai
242261
CastArmyOfTheDeadAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "army of the dead") {}
243262
};
244263

245-
246264
class CastRaiseDeadAction : public CastBuffSpellAction
247265
{
248266
public:
@@ -272,13 +290,15 @@ namespace ai
272290
public:
273291
CastVampiricBloodAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "vampiric blood") {}
274292
};
275-
276-
class CastMindFreezeAction : public CastMeleeSpellAction {
293+
294+
class CastMindFreezeAction : public CastMeleeSpellAction
295+
{
277296
public:
278297
CastMindFreezeAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "mind freeze") {}
279298
};
280299

281-
class CastStrangulateAction : public CastMeleeSpellAction {
300+
class CastStrangulateAction : public CastMeleeSpellAction
301+
{
282302
public:
283303
CastStrangulateAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "strangulate") {}
284304
};
@@ -289,12 +309,14 @@ namespace ai
289309
CastMindFreezeOnEnemyHealerAction(PlayerbotAI* ai) : CastSpellOnEnemyHealerAction(ai, "mind freeze") {}
290310
};
291311

292-
class CastRuneTapAction : public CastMeleeSpellAction {
312+
class CastRuneTapAction : public CastMeleeSpellAction
313+
{
293314
public:
294315
CastRuneTapAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "rune tap") {}
295-
296316
};
297-
class CastBloodTapAction : public CastMeleeSpellAction {
317+
318+
class CastBloodTapAction : public CastMeleeSpellAction
319+
{
298320
public:
299321
CastBloodTapAction(PlayerbotAI* ai) : CastMeleeSpellAction(ai, "blood tap") {}
300322
};

‎src/modules/Bots/playerbot/strategy/deathknight/DKAiObjectContext.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
using namespace ai;
1515

16-
1716
namespace ai
1817
{
1918
namespace DK
@@ -61,7 +60,6 @@ namespace ai
6160
public:
6261
DKBuffStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
6362
{
64-
6563
creators["bdps"] = &DK::DKBuffStrategyFactoryInternal::bdps;
6664
}
6765

@@ -81,7 +79,7 @@ namespace ai
8179
class TriggerFactoryInternal : public NamedObjectContext<Trigger>
8280
{
8381
public:
84-
TriggerFactoryInternal()
82+
TriggerFactoryInternal()
8583
{
8684
creators["bone shield"] = &TriggerFactoryInternal::bone_shield;
8785
creators["pestilence"] = &TriggerFactoryInternal::pestilence;
@@ -121,8 +119,6 @@ namespace ai
121119
static Trigger* blood_tap(PlayerbotAI* ai) { return new BloodTapTrigger(ai); }
122120
static Trigger* raise_dead(PlayerbotAI* ai) { return new RaiseDeadTrigger(ai); }
123121
static Trigger* chains_of_ice(PlayerbotAI* ai) { return new ChainsOfIceSnareTrigger(ai); }
124-
125-
126122
};
127123
};
128124
};
@@ -139,7 +135,6 @@ namespace ai
139135
public:
140136
AiObjectContextInternal()
141137
{
142-
143138
// Unholy
144139
creators["bone shield"] = &AiObjectContextInternal::bone_shield;
145140
creators["plague strike"] = &AiObjectContextInternal::plague_strike;
@@ -196,7 +191,6 @@ namespace ai
196191
}
197192

198193
private:
199-
200194
// Unholy
201195
static Action* bone_shield(PlayerbotAI* ai) { return new CastBoneShieldAction(ai); }
202196
static Action* plague_strike(PlayerbotAI* ai) { return new CastPlagueStrikeAction(ai); }
@@ -251,7 +245,6 @@ namespace ai
251245
static Action* dancing_weapon(PlayerbotAI* ai) { return new CastDancingWeaponAction(ai); }
252246
static Action* dark_command(PlayerbotAI* ai) { return new CastDarkCommandAction(ai); }
253247
static Action* mind_freeze_on_enemy_healer(PlayerbotAI* ai) { return new CastMindFreezeOnEnemyHealerAction(ai); }
254-
255248
};
256249
};
257250
};

‎src/modules/Bots/playerbot/strategy/deathknight/DKMultipliers.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#pragma once
22

33
namespace ai
4-
{
5-
6-
}
4+
{ }

‎src/modules/Bots/playerbot/strategy/deathknight/DKTriggers.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace ai
55
{
6-
76
BUFF_TRIGGER(HornOfWinterTrigger, "horn of winter");
87
BUFF_TRIGGER(BoneShieldTrigger, "bone shield");
98
BUFF_TRIGGER(ImprovedIcyTalonsTrigger, "improved icy talons");

‎src/modules/Bots/playerbot/strategy/deathknight/FrostDKStrategy.cpp‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,47 @@ class FrostDKStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
3030
}
3131

3232
private:
33-
34-
3533
static ActionNode* obliterate(PlayerbotAI* ai)
3634
{
37-
return new ActionNode("obliterate",
35+
return new ActionNode("obliterate",
3836
/*P*/ NextAction::array(0, new NextAction("blood presence"), NULL),
3937
/*A*/ NextAction::array(0, new NextAction("frost strike"), NULL),
4038
/*C*/ NULL);
4139
}
4240
static ActionNode* rune_strike(PlayerbotAI* ai)
4341
{
44-
return new ActionNode("rune strike",
42+
return new ActionNode("rune strike",
4543
/*P*/ NextAction::array(0, new NextAction("blood presence"), NULL),
4644
/*A*/ NextAction::array(0, new NextAction("melee"), NULL),
4745
/*C*/ NULL);
4846
}
4947
static ActionNode* frost_strike(PlayerbotAI* ai)
5048
{
51-
return new ActionNode("frost strike",
49+
return new ActionNode("frost strike",
5250
/*P*/ NextAction::array(0, new NextAction("blood presence"), NULL),
5351
/*A*/ NULL,
5452
/*C*/ NULL);
5553
}
5654
static ActionNode* howling_blast(PlayerbotAI* ai)
5755
{
58-
return new ActionNode("howling blast",
56+
return new ActionNode("howling blast",
5957
/*P*/ NextAction::array(0, new NextAction("blood presence"), NULL),
6058
/*A*/ NextAction::array(0, new NextAction("icy touch"), NULL),
61-
/*C*/ NULL);
59+
/*C*/ NULL);
6260
}
6361
};
6462

65-
FrostDKStrategy::FrostDKStrategy(PlayerbotAI* ai) : GenericDKStrategy(ai)
66-
{
63+
FrostDKStrategy::FrostDKStrategy(PlayerbotAI* ai) : GenericDKStrategy(ai)
64+
{
6765
actionNodeFactories.Add(new FrostDKStrategyActionNodeFactory());
68-
}
66+
}
6967

7068

71-
NextAction** FrostDKStrategy::getDefaultActions()
72-
{
69+
NextAction** FrostDKStrategy::getDefaultActions()
70+
{
7371
return NextAction::array(0, new NextAction("melee", ACTION_NORMAL), new NextAction("frost strike", ACTION_NORMAL + 5),
7472
new NextAction("obliterate", ACTION_NORMAL + 4), NULL);
75-
}
73+
}
7674

7775
void FrostDKStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
7876
{

0 commit comments

Comments
 (0)