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

Core/Battlegrounds: Move to scripts And a lot of misc commits i couldn't recover.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d0d5d309bb5877dc2fcb27f6cb123707a31ec1e8)
This commit is contained in:
Hondacrx
2024-08-04 15:18:22 -04:00
parent bca02a24b0
commit e9b21a91be
139 changed files with 8322 additions and 8700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/AchievementManager.cs
+17 -5
View File
@@ -506,14 +506,26 @@ namespace Game.Achievements
//! Since no common attributes were found, (not even in titleRewardFlags field)
//! we explicitly check by ID. Maybe in the future we could move the achievement_reward
//! condition fields to the condition system.
uint titleId = reward.TitleId[achievement.Id == 1793 ? (int)_owner.GetNativeGender() : (_owner.GetTeam() == Team.Alliance ? 0 : 1)];
if (titleId != 0)
uint titleId = 0;
if (achievement.Id == 1793)
titleId = reward.TitleId[(int)_owner.GetNativeGender()];
else
{
CharTitlesRecord titleEntry = CliDB.CharTitlesStorage.LookupByKey(titleId);
if (titleEntry != null)
_owner.SetTitle(titleEntry);
switch (_owner.GetTeam())
{
case Team.Alliance:
titleId = reward.TitleId[0];
break;
case Team.Horde:
titleId = reward.TitleId[1];
break;
}
}
var titleEntry = CliDB.CharTitlesStorage.LookupByKey(titleId);
if (titleEntry != null)
_owner.SetTitle(titleEntry);
// mail
if (reward.SenderCreatureId != 0)
{
Source/Game/Achievements/CriteriaHandler.cs
+2 -4
View File
@@ -1254,8 +1254,7 @@ namespace Game.Achievements
}
case ModifierTreeType.PlayerMeetsCondition: // 2
{
PlayerConditionRecord playerCondition = CliDB.PlayerConditionStorage.LookupByKey(reqValue);
if (playerCondition == null || !ConditionManager.IsPlayerMeetingCondition(referencePlayer, playerCondition))
if (!ConditionManager.IsPlayerMeetingCondition(referencePlayer, reqValue))
return false;
break;
}
@@ -1520,8 +1519,7 @@ namespace Game.Achievements
if (refe == null || !refe.IsPlayer())
return false;
PlayerConditionRecord playerCondition = CliDB.PlayerConditionStorage.LookupByKey(reqValue);
if (playerCondition == null || !ConditionManager.IsPlayerMeetingCondition(refe.ToPlayer(), playerCondition))
if (!ConditionManager.IsPlayerMeetingCondition(refe.ToPlayer(), reqValue))
return false;
break;
}