Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes

Browse Source
This commit is contained in:
hondacrx
2022-02-28 14:16:57 -05:00
parent 03c646d2c8
commit b4a59ea746
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/CoreAI/CombatAI.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace Game.AI
DoCast(spellId); DoCast(spellId);
AISpellInfoType info = GetAISpellInfo(spellId, me.GetMap().GetDifficultyID()); AISpellInfoType info = GetAISpellInfo(spellId, me.GetMap().GetDifficultyID());
if (info != null) if (info != null)
_events.ScheduleEvent(spellId, info.cooldown + RandomHelper.Rand32() % info.cooldown); _events.ScheduleEvent(spellId, info.cooldown, info.cooldown * 2);
} }
else else
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
Source/Scripts/World/GameObject.cs
+8 -8
View File
@@ -290,12 +290,12 @@ namespace Scripts.World.GameObjects
{ {
// These Are In Seconds // These Are In Seconds
//Brewfestmusictime //Brewfestmusictime
public const uint EventBrewfestdwarf01Time = 95000; public static TimeSpan EventBrewfestdwarf01Time = TimeSpan.FromSeconds(95);
public const uint EventBrewfestdwarf02Time = 155000; public static TimeSpan EventBrewfestdwarf02Time = TimeSpan.FromSeconds(155);
public const uint EventBrewfestdwarf03Time = 23000; public static TimeSpan EventBrewfestdwarf03Time = TimeSpan.FromSeconds(23);
public const uint EventBrewfestgoblin01Time = 68000; public static TimeSpan EventBrewfestgoblin01Time = TimeSpan.FromSeconds(68);
public const uint EventBrewfestgoblin02Time = 93000; public static TimeSpan EventBrewfestgoblin02Time = TimeSpan.FromSeconds(93);
public const uint EventBrewfestgoblin03Time = 28000; public static TimeSpan EventBrewfestgoblin03Time = TimeSpan.FromSeconds(28);
//Bellhourlymisc //Bellhourlymisc
public const uint GameEventHourlyBells = 73; public const uint GameEventHourlyBells = 73;
@@ -816,7 +816,7 @@ namespace Scripts.World.GameObjects
class go_brewfest_music : GameObjectAI class go_brewfest_music : GameObjectAI
{ {
uint rnd = 0; uint rnd = 0;
uint musicTime = 1000; TimeSpan musicTime = TimeSpan.FromSeconds(1);
public go_brewfest_music(GameObject go) : base(go) public go_brewfest_music(GameObject go) : base(go)
{ {
@@ -825,7 +825,7 @@ namespace Scripts.World.GameObjects
if (Global.GameEventMgr.IsHolidayActive(HolidayIds.Brewfest)) // Check if Brewfest is active if (Global.GameEventMgr.IsHolidayActive(HolidayIds.Brewfest)) // Check if Brewfest is active
{ {
rnd = RandomHelper.URand(0, 2); // Select random music sample rnd = RandomHelper.URand(0, 2); // Select random music sample
task.Repeat(TimeSpan.FromMilliseconds(musicTime)); // Select new song music after play time is over task.Repeat(musicTime); // Select new song music after play time is over
} }
}); });
_scheduler.Schedule(TimeSpan.FromSeconds(2), task => _scheduler.Schedule(TimeSpan.FromSeconds(2), task =>