Skip to content

Commit aa22ab8

Browse files
FallenDevFallenDev
committed
Skill Refactorings
1 parent 79a14c7 commit aa22ab8

28 files changed

+551
-1132
lines changed

‎Zolian.Server.Base/GameScripts/Items/Consumable.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,6 @@ public override void OnUse(Sprite sprite, byte slot)
588588

589589
if (skill.Template.SkillType == SkillScope.Assail)
590590
aisling.Client.LastAssail = DateTime.UtcNow;
591-
script?.OnCleanup();
592591

593592
skill.InUse = false;
594593
}
@@ -661,7 +660,6 @@ public override void OnUse(Sprite sprite, byte slot)
661660

662661
if (skill.Template.SkillType == SkillScope.Assail)
663662
aisling.Client.LastAssail = DateTime.UtcNow;
664-
script?.OnCleanup();
665663

666664
skill.InUse = false;
667665
}
@@ -752,7 +750,6 @@ public override void OnUse(Sprite sprite, byte slot)
752750

753751
if (skill.Template.SkillType == SkillScope.Assail)
754752
aisling.Client.LastAssail = DateTime.UtcNow;
755-
script?.OnCleanup();
756753

757754
skill.InUse = false;
758755
}
@@ -870,7 +867,6 @@ public override void OnUse(Sprite sprite, byte slot)
870867

871868
if (skill.Template.SkillType == SkillScope.Assail)
872869
aisling.Client.LastAssail = DateTime.UtcNow;
873-
script?.OnCleanup();
874870

875871
skill.InUse = false;
876872
}

‎Zolian.Server.Base/GameScripts/Monsters/AdvancedMonsterAI.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ private void Bash()
286286
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
287287
s.Skill.NextAvailableUse = readyTime;
288288
}
289-
s.OnCleanup();
290289
s.Skill.InUse = false;
291290
});
292291
}
@@ -302,7 +301,6 @@ private void Ability()
302301

303302
if (Monster.AbilityScripts[abilityIdx] is null) return;
304303
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
305-
Monster.AbilityScripts[abilityIdx].OnCleanup();
306304
}
307305

308306
private void CastSpell()
@@ -852,7 +850,6 @@ private void Bash()
852850
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
853851
s.Skill.NextAvailableUse = readyTime;
854852
}
855-
s.OnCleanup();
856853
s.Skill.InUse = false;
857854
});
858855
}
@@ -868,7 +865,6 @@ private void Ability()
868865

869866
if (Monster.AbilityScripts[abilityIdx] is null) return;
870867
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
871-
Monster.AbilityScripts[abilityIdx].OnCleanup();
872868
}
873869

874870
private void SummonMonsterNearby()
@@ -1112,7 +1108,6 @@ private void Bash()
11121108
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
11131109
gatling.Skill.NextAvailableUse = readyTime;
11141110
}
1115-
gatling.OnCleanup();
11161111
gatling.Skill.InUse = false;
11171112
}
11181113

@@ -1381,7 +1376,6 @@ private void Bash()
13811376
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
13821377
s.Skill.NextAvailableUse = readyTime;
13831378
}
1384-
s.OnCleanup();
13851379
s.Skill.InUse = false;
13861380
});
13871381
}
@@ -1397,7 +1391,6 @@ private void Ability()
13971391

13981392
if (Monster.AbilityScripts[abilityIdx] is null) return;
13991393
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1400-
Monster.AbilityScripts[abilityIdx].OnCleanup();
14011394
}
14021395

14031396
private void CastSpell()
@@ -1680,7 +1673,6 @@ private void Bash()
16801673
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
16811674
s.Skill.NextAvailableUse = readyTime;
16821675
}
1683-
s.OnCleanup();
16841676
s.Skill.InUse = false;
16851677
});
16861678
}
@@ -1696,7 +1688,6 @@ private void Ability()
16961688

16971689
if (Monster.AbilityScripts[abilityIdx] is null) return;
16981690
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1699-
Monster.AbilityScripts[abilityIdx].OnCleanup();
17001691
}
17011692

17021693
private void CastSpell()
@@ -1980,7 +1971,6 @@ private void Bash()
19801971
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
19811972
s.Skill.NextAvailableUse = readyTime;
19821973
}
1983-
s.OnCleanup();
19841974
s.Skill.InUse = false;
19851975
});
19861976
}
@@ -1996,7 +1986,6 @@ private void Ability()
19961986

19971987
if (Monster.AbilityScripts[abilityIdx] is null) return;
19981988
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1999-
Monster.AbilityScripts[abilityIdx].OnCleanup();
20001989
}
20011990

20021991
private void CastSpell()
@@ -2286,7 +2275,6 @@ private void Bash()
22862275
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
22872276
s.Skill.NextAvailableUse = readyTime;
22882277
}
2289-
s.OnCleanup();
22902278
s.Skill.InUse = false;
22912279
});
22922280
}
@@ -2302,7 +2290,6 @@ private void Ability()
23022290

23032291
if (Monster.AbilityScripts[abilityIdx] is null) return;
23042292
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
2305-
Monster.AbilityScripts[abilityIdx].OnCleanup();
23062293
}
23072294

23082295
private void CastSpell()
@@ -2583,7 +2570,6 @@ private void Bash()
25832570
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
25842571
s.Skill.NextAvailableUse = readyTime;
25852572
}
2586-
s.OnCleanup();
25872573
s.Skill.InUse = false;
25882574
});
25892575
}
@@ -2599,7 +2585,6 @@ private void Ability()
25992585

26002586
if (Monster.AbilityScripts[abilityIdx] is null) return;
26012587
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
2602-
Monster.AbilityScripts[abilityIdx].OnCleanup();
26032588
}
26042589

26052590
private void CastSpell()
@@ -2878,7 +2863,6 @@ private void Bash()
28782863
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
28792864
s.Skill.NextAvailableUse = readyTime;
28802865
}
2881-
s.OnCleanup();
28822866
s.Skill.InUse = false;
28832867
});
28842868
}
@@ -2894,7 +2878,6 @@ private void Ability()
28942878

28952879
if (Monster.AbilityScripts[abilityIdx] is null) return;
28962880
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
2897-
Monster.AbilityScripts[abilityIdx].OnCleanup();
28982881
}
28992882

29002883
private void CastSpell()
@@ -3171,7 +3154,6 @@ private void Bash()
31713154
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
31723155
s.Skill.NextAvailableUse = readyTime;
31733156
}
3174-
s.OnCleanup();
31753157
s.Skill.InUse = false;
31763158
});
31773159
}
@@ -3187,7 +3169,6 @@ private void Ability()
31873169

31883170
if (Monster.AbilityScripts[abilityIdx] is null) return;
31893171
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
3190-
Monster.AbilityScripts[abilityIdx].OnCleanup();
31913172
}
31923173

31933174
private void CastSpell()

‎Zolian.Server.Base/GameScripts/Monsters/BossMonsterAI.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ private void Bash()
267267
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
268268
s.Skill.NextAvailableUse = readyTime;
269269
}
270-
s.OnCleanup();
271270
s.Skill.InUse = false;
272271
});
273272
}
@@ -283,7 +282,6 @@ private void Ability()
283282

284283
if (Monster.AbilityScripts[abilityIdx] is null) return;
285284
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
286-
Monster.AbilityScripts[abilityIdx].OnCleanup();
287285
}
288286

289287
private void CastSpell()
@@ -564,7 +562,6 @@ private void Bash()
564562
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
565563
s.Skill.NextAvailableUse = readyTime;
566564
}
567-
s.OnCleanup();
568565
s.Skill.InUse = false;
569566
});
570567
}
@@ -580,7 +577,6 @@ private void Ability()
580577

581578
if (Monster.AbilityScripts[abilityIdx] is null) return;
582579
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
583-
Monster.AbilityScripts[abilityIdx].OnCleanup();
584580
}
585581

586582
private void CastSpell()
@@ -922,7 +918,6 @@ private void Bash()
922918
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
923919
s.Skill.NextAvailableUse = readyTime;
924920
}
925-
s.OnCleanup();
926921
s.Skill.InUse = false;
927922
});
928923
}
@@ -938,7 +933,6 @@ private void Ability()
938933

939934
if (Monster.AbilityScripts[abilityIdx] is null) return;
940935
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
941-
Monster.AbilityScripts[abilityIdx].OnCleanup();
942936
}
943937

944938
private void CastSpell()
@@ -1263,7 +1257,6 @@ private void Bash()
12631257
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
12641258
s.Skill.NextAvailableUse = readyTime;
12651259
}
1266-
s.OnCleanup();
12671260
s.Skill.InUse = false;
12681261
});
12691262
}
@@ -1279,7 +1272,6 @@ private void Ability()
12791272

12801273
if (Monster.AbilityScripts[abilityIdx] is null) return;
12811274
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1282-
Monster.AbilityScripts[abilityIdx].OnCleanup();
12831275
}
12841276

12851277
private void CastSpell()
@@ -1605,7 +1597,6 @@ private void Bash()
16051597
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
16061598
s.Skill.NextAvailableUse = readyTime;
16071599
}
1608-
s.OnCleanup();
16091600
s.Skill.InUse = false;
16101601
});
16111602
}
@@ -1621,7 +1612,6 @@ private void Ability()
16211612

16221613
if (Monster.AbilityScripts[abilityIdx] is null) return;
16231614
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1624-
Monster.AbilityScripts[abilityIdx].OnCleanup();
16251615
}
16261616

16271617
private void CastSpell()

‎Zolian.Server.Base/GameScripts/Monsters/FriendlyMonsterAI.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ private void Bash()
273273
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
274274
s.Skill.NextAvailableUse = readyTime;
275275
}
276-
s.OnCleanup();
277276
s.Skill.InUse = false;
278277
});
279278
}
@@ -288,7 +287,6 @@ private void Ability()
288287
var abilityIdx = RandomNumberGenerator.GetInt32(Monster.AbilityScripts.Count);
289288
if (Monster.AbilityScripts[abilityIdx] is null) return;
290289
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
291-
Monster.AbilityScripts[abilityIdx].OnCleanup();
292290
}
293291

294292
private void CastSpell()

‎Zolian.Server.Base/GameScripts/Monsters/MonsterAI.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ private void Bash()
247247
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
248248
s.Skill.NextAvailableUse = readyTime;
249249
}
250-
s.OnCleanup();
251250
s.Skill.InUse = false;
252251
});
253252
}
@@ -264,7 +263,6 @@ private void Ability()
264263

265264
if (Monster.AbilityScripts[abilityIdx] is null) return;
266265
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
267-
Monster.AbilityScripts[abilityIdx].OnCleanup();
268266
}
269267

270268
private void CastSpell()
@@ -523,7 +521,6 @@ private void Bash()
523521
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
524522
s.Skill.NextAvailableUse = readyTime;
525523
}
526-
s.OnCleanup();
527524
s.Skill.InUse = false;
528525
});
529526
}
@@ -539,7 +536,6 @@ private void Ability()
539536

540537
if (Monster.AbilityScripts[abilityIdx] is null) return;
541538
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
542-
Monster.AbilityScripts[abilityIdx].OnCleanup();
543539
}
544540

545541
private void CastSpell()
@@ -973,7 +969,6 @@ private void Bash()
973969
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
974970
s.Skill.NextAvailableUse = readyTime;
975971
}
976-
s.OnCleanup();
977972
s.Skill.InUse = false;
978973
});
979974
}
@@ -989,7 +984,6 @@ private void Ability()
989984

990985
if (Monster.AbilityScripts[abilityIdx] is null) return;
991986
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
992-
Monster.AbilityScripts[abilityIdx].OnCleanup();
993987
}
994988

995989
private void CastSpell()
@@ -1248,7 +1242,6 @@ private void Bash()
12481242
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
12491243
s.Skill.NextAvailableUse = readyTime;
12501244
}
1251-
s.OnCleanup();
12521245
s.Skill.InUse = false;
12531246
});
12541247
}
@@ -1264,7 +1257,6 @@ private void Ability()
12641257

12651258
if (Monster.AbilityScripts[abilityIdx] is null) return;
12661259
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1267-
Monster.AbilityScripts[abilityIdx].OnCleanup();
12681260
}
12691261

12701262
private void CastSpell()
@@ -1523,7 +1515,6 @@ private void Bash()
15231515
readyTime = readyTime.AddMilliseconds(Monster.Template.AttackSpeed);
15241516
s.Skill.NextAvailableUse = readyTime;
15251517
}
1526-
s.OnCleanup();
15271518
s.Skill.InUse = false;
15281519
});
15291520
}
@@ -1539,7 +1530,6 @@ private void Ability()
15391530

15401531
if (Monster.AbilityScripts[abilityIdx] is null) return;
15411532
Monster.AbilityScripts[abilityIdx].OnUse(Monster);
1542-
Monster.AbilityScripts[abilityIdx].OnCleanup();
15431533
}
15441534

15451535
private void CastSpell()

0 commit comments

Comments
 (0)