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/Conditions/ConditionManager.cs
+57 -5
View File
@@ -505,6 +505,41 @@ namespace Game
foreach (var (id, conditions) in ConditionStorage[ConditionSourceType.Graveyard])
AddToGraveyardData(id, conditions);
bool isPlayerConditionIdUsedByCondition(int playerConditionId, List<Condition> conditions, Dictionary<ConditionSourceType, Dictionary<ConditionId, List<Condition>>> store)
{
return conditions.Any(condition =>
{
if (condition.ConditionType == ConditionTypes.PlayerCondition)
{
if (condition.ConditionValue1 == playerConditionId)
return true;
var playerCondList = store[ConditionSourceType.PlayerCondition].LookupByKey(new ConditionId(0, (int)condition.ConditionValue1, 0));
if (playerCondList != null)
if (isPlayerConditionIdUsedByCondition(playerConditionId, playerCondList, store))
return true;
}
else if (condition.ReferenceId != 0)
{
var refList = store[ConditionSourceType.ReferenceCondition].LookupByKey(new ConditionId(condition.ReferenceId, 0, 0));
if (refList != null)
if (isPlayerConditionIdUsedByCondition(playerConditionId, refList, store))
return true;
}
return false;
});
}
foreach (var (id, conditions) in ConditionStorage[ConditionSourceType.PlayerCondition])
{
if (isPlayerConditionIdUsedByCondition(id.SourceEntry, conditions, ConditionStorage))
{
Log.outError(LogFilter.Sql, $"[Condition SourceType: CONDITION_SOURCE_TYPE_PLAYER_CONDITION, SourceGroup: {id.SourceGroup}, SourceEntry: {id.SourceEntry}, SourceId: {id.SourceId}] " +
$"has a circular reference to player condition id {id.SourceEntry}, removed all conditions for this SourceEntry!");
conditions.Clear();
}
}
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} conditions in {1} ms", count, Time.GetMSTimeDiffToNow(oldMSTime));
}
@@ -1086,10 +1121,6 @@ namespace Game
return false;
}
break;
case ConditionSourceType.GossipMenu:
case ConditionSourceType.GossipMenuOption:
case ConditionSourceType.SmartEvent:
break;
case ConditionSourceType.Graveyard:
if (Global.ObjectMgr.FindGraveyardData((uint)cond.SourceEntry, cond.SourceGroup) == null)
{
@@ -1183,6 +1214,11 @@ namespace Game
}
break;
}
case ConditionSourceType.GossipMenu:
case ConditionSourceType.GossipMenuOption:
case ConditionSourceType.SmartEvent:
case ConditionSourceType.PlayerCondition:
break;
default:
Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionSourceType in `condition` table, ignoring.");
return false;
@@ -1892,6 +1928,21 @@ namespace Game
return 0;
}
public static bool IsPlayerMeetingCondition(Player player, uint conditionId)
{
if (conditionId == 0)
return true;
if (!Global.ConditionMgr.IsObjectMeetingNotGroupedConditions(ConditionSourceType.PlayerCondition, conditionId, player))
return false;
var playerCondition = CliDB.PlayerConditionStorage.LookupByKey(conditionId);
if (playerCondition != null)
return IsPlayerMeetingCondition(player, playerCondition);
return true;
}
public static bool IsPlayerMeetingCondition(Player player, PlayerConditionRecord condition)
{
ContentTuningLevels? levels = Global.DB2Mgr.GetContentTuningData(condition.ContentTuningID, player.m_playerData.CtrOptions.GetValue().ContentTuningConditionMask);
@@ -2957,7 +3008,8 @@ namespace Game
"AreaTrigger Client Triggered",
"Trainer Spell",
"Object Visibility (by ID)",
"Spawn Group"
"Spawn Group",
"Player Condition"
};
public ConditionTypeInfo[] StaticConditionTypeData =