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

Fixed appearance validation

Browse Source 
Implemented proper facial hair validation
Implemented transmog Set
fix interaction of spells like Shadowmeld with Threat reducing effects
This commit is contained in:
hondacrx
2017-08-24 18:01:44 -04:00
parent 7934d51702
commit 0707f9b377
71 changed files with 2968 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/Northrend/DraktharonKeep/BossTrollgore.cs
+1 -1
View File
@@ -269,7 +269,7 @@ namespace Scripts.Northrend.DraktharonKeep.Trollgore
{
}
public override bool OnCheck(Player player, Unit target)
public override bool OnCheck(Player source, Unit target)
{
if (!target)
return false;
Scripts/World/Achievements.cs
+4 -1
View File
@@ -37,6 +37,9 @@ namespace Scripts.World
public const uint AuraPerfumeForever = 70235;
public const uint AuraPerfumeEnchantress = 70234;
public const uint AuraPerfumeVictory = 70233;
//BgSA Artillery
public const uint AntiPersonnalCannon = 27894;
}
[Script]
@@ -144,7 +147,7 @@ namespace Scripts.World
Creature vehicle = source.GetVehicleCreatureBase();
if (vehicle)
{
if (vehicle.GetEntry() == SACreatureIds.AntiPersonnalCannon)
if (vehicle.GetEntry() == AchievementConst.AntiPersonnalCannon)
return true;
}
Scripts/World/GameObjects.cs
+119
View File
@@ -189,6 +189,40 @@ namespace Scripts.World
//Toy Train Set
public const uint SpellToyTrainPulse = 61551;
//BrewfestMusic
public const uint EventBrewfestdwarf01 = 11810; // 1.35 Min
public const uint EventBrewfestdwarf02 = 11812; // 1.55 Min
public const uint EventBrewfestdwarf03 = 11813; // 0.23 Min
public const uint EventBrewfestgoblin01 = 11811; // 1.08 Min
public const uint EventBrewfestgoblin02 = 11814; // 1.33 Min
public const uint EventBrewfestgoblin03 = 11815; // 0.28 Min
// These Are In Seconds
//Brewfestmusictime
public const uint EventBrewfestdwarf01Time = 95000;
public const uint EventBrewfestdwarf02Time = 155000;
public const uint EventBrewfestdwarf03Time = 23000;
public const uint EventBrewfestgoblin01Time = 68000;
public const uint EventBrewfestgoblin02Time = 93000;
public const uint EventBrewfestgoblin03Time = 28000;
//Brewfestmusicareas
public const uint Silvermoon = 3430; // Horde
public const uint Undercity = 1497;
public const uint Orgrimmar1 = 1296;
public const uint Orgrimmar2 = 14;
public const uint Thunderbluff = 1638;
public const uint Ironforge1 = 809; // Alliance
public const uint Ironforge2 = 1;
public const uint Stormwind = 12;
public const uint Exodar = 3557;
public const uint Darnassus = 1657;
public const uint Shattrath = 3703; // General
//Brewfestmusicevents
public const uint EventBmSelectMusic = 1;
public const uint EventBmStartMusic = 2;
}
[Script]
@@ -971,4 +1005,89 @@ namespace Scripts.World
return new go_toy_train_setAI(go);
}
}
[Script]
class go_brewfest_music : GameObjectScript
{
public go_brewfest_music() : base("go_brewfest_music") { }
class go_brewfest_musicAI : GameObjectAI
{
public go_brewfest_musicAI(GameObject go) : base(go)
{
_events.ScheduleEvent(GameobjectConst.EventBmSelectMusic, 1000);
_events.ScheduleEvent(GameobjectConst.EventBmStartMusic, 2000);
}
public override void UpdateAI(uint diff)
{
_events.Update(diff);
_events.ExecuteEvents(eventId =>
{
switch (eventId)
{
case GameobjectConst.EventBmSelectMusic:
if (!Global.GameEventMgr.IsHolidayActive(HolidayIds.Brewfest)) // Check if Brewfest is active
break;
rnd = RandomHelper.URand(0, 2); // Select random music sample
_events.ScheduleEvent(GameobjectConst.EventBmSelectMusic, musicTime); // Select new song music after play time is over
break;
case GameobjectConst.EventBmStartMusic:
if (!Global.GameEventMgr.IsHolidayActive(HolidayIds.Brewfest)) // Check if Brewfest is active
break;
// Check if gob is correct area, play music, set time of music
if (go.GetAreaId() == GameobjectConst.Silvermoon || go.GetAreaId() == GameobjectConst.Undercity || go.GetAreaId() == GameobjectConst.Orgrimmar1 || go.GetAreaId() == GameobjectConst.Orgrimmar2 || go.GetAreaId() == GameobjectConst.Thunderbluff || go.GetAreaId() == GameobjectConst.Shattrath)
{
if (rnd == 0)
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestgoblin01);
musicTime = GameobjectConst.EventBrewfestgoblin01Time;
}
else if (rnd == 1)
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestgoblin02);
musicTime = GameobjectConst.EventBrewfestgoblin02Time;
}
else
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestgoblin03);
musicTime = GameobjectConst.EventBrewfestgoblin03Time;
}
}
if (go.GetAreaId() == GameobjectConst.Ironforge1 || go.GetAreaId() == GameobjectConst.Ironforge2 || go.GetAreaId() == GameobjectConst.Stormwind || go.GetAreaId() == GameobjectConst.Exodar || go.GetAreaId() == GameobjectConst.Darnassus || go.GetAreaId() == GameobjectConst.Shattrath)
{
if (rnd == 0)
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestdwarf01);
musicTime = GameobjectConst.EventBrewfestdwarf01Time;
}
else if (rnd == 1)
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestdwarf02);
musicTime = GameobjectConst.EventBrewfestdwarf02Time;
}
else
{
go.PlayDirectMusic(GameobjectConst.EventBrewfestdwarf03);
musicTime = GameobjectConst.EventBrewfestdwarf03Time;
}
}
_events.ScheduleEvent(GameobjectConst.EventBmStartMusic, 5000); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client
break;
default:
break;
}
});
}
uint rnd = 0;
uint musicTime = 1000;
}
public override GameObjectAI GetAI(GameObject go)
{
return new go_brewfest_musicAI(go);
}
}
}
Scripts/World/NpcProfessions.cs
-104
View File
@@ -21,109 +21,5 @@ using Game.Scripting;
namespace Scripts.World
{
enum GossipOptionIds
{
Alchemy = 0,
Blacksmithing = 1,
Enchanting = 2,
Engineering = 3,
Herbalism = 4,
Inscription = 5,
Jewelcrafting = 6,
Leatherworking = 7,
Mining = 8,
Skinning = 9,
Tailoring = 10,
Multi = 11,
}
enum GossipMenuIds
{
Herbalism = 12188,
Mining = 12189,
Skinning = 12190,
Alchemy = 12191,
Blacksmithing = 12192,
Enchanting = 12193,
Engineering = 12195,
Inscription = 12196,
Jewelcrafting = 12197,
Leatherworking = 12198,
Tailoring = 12199,
}
[Script] //start menu multi profession trainer
class npc_multi_profession_trainer : ScriptedAI
{
public npc_multi_profession_trainer(Creature creature) : base(creature) { }
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
{
switch ((GossipOptionIds)gossipListId)
{
case GossipOptionIds.Alchemy:
case GossipOptionIds.Blacksmithing:
case GossipOptionIds.Enchanting:
case GossipOptionIds.Engineering:
case GossipOptionIds.Herbalism:
case GossipOptionIds.Inscription:
case GossipOptionIds.Jewelcrafting:
case GossipOptionIds.Leatherworking:
case GossipOptionIds.Mining:
case GossipOptionIds.Skinning:
case GossipOptionIds.Tailoring:
SendTrainerList(player, (GossipOptionIds)gossipListId);
break;
case GossipOptionIds.Multi:
{
switch ((GossipMenuIds)menuId)
{
case GossipMenuIds.Herbalism:
SendTrainerList(player, GossipOptionIds.Herbalism);
break;
case GossipMenuIds.Mining:
SendTrainerList(player, GossipOptionIds.Mining);
break;
case GossipMenuIds.Skinning:
SendTrainerList(player, GossipOptionIds.Skinning);
break;
case GossipMenuIds.Alchemy:
SendTrainerList(player, GossipOptionIds.Alchemy);
break;
case GossipMenuIds.Blacksmithing:
SendTrainerList(player, GossipOptionIds.Blacksmithing);
break;
case GossipMenuIds.Enchanting:
SendTrainerList(player, GossipOptionIds.Enchanting);
break;
case GossipMenuIds.Engineering:
SendTrainerList(player, GossipOptionIds.Engineering);
break;
case GossipMenuIds.Inscription:
SendTrainerList(player, GossipOptionIds.Inscription);
break;
case GossipMenuIds.Jewelcrafting:
SendTrainerList(player, GossipOptionIds.Jewelcrafting);
break;
case GossipMenuIds.Leatherworking:
SendTrainerList(player, GossipOptionIds.Leatherworking);
break;
case GossipMenuIds.Tailoring:
SendTrainerList(player, GossipOptionIds.Tailoring);
break;
default:
break;
}
}
break;
default:
break;
}
}
void SendTrainerList(Player player, GossipOptionIds Index)
{
player.GetSession().SendTrainerList(me.GetGUID(), (uint)Index + 1);
}
}
}