Implement generic script loaders to greatly reduce code duplication

2017-07-20 19:43:24 -04:00
parent 19220d29d9
commit 2db988576a
89 changed files with 28255 additions and 36473 deletions
@@ -223,7 +223,8 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
                                    if (summon)
                                        AggroAllPlayers(summon);
                                }
-                            } else if (uiLesserChampions == 9)
+                            }
+                            else if (uiLesserChampions == 9)
                                StartGrandChampionsAttack();

                            break;
@@ -542,11 +543,6 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
            Position SpawnPosition = new Position(746.261f, 657.401f, 411.681f, 4.65f);
        }

-        public override CreatureAI GetAI(Creature creature)
-        {
-            return GetInstanceAI<npc_announcer_toc5AI>(creature);
-        }
-
        public override bool OnGossipHello(Player player, Creature creature)
        {
            InstanceScript instance = creature.GetInstanceScript();
@@ -583,5 +579,10 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion

            return true;
        }
+
+        public override CreatureAI GetAI(Creature creature)
+        {
+            return instance_trial_of_the_champion.GetTrialOfTheChampionAI<npc_announcer_toc5AI>(creature);
+        }
    }
 }