Skip to content

fix: duplicate rows in deserialized aggregate collections #834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eduardosmaniotto wants to merge 3 commits into
base: master
Choose a base branch
from
+56 −43
Open

fix: duplicate rows in deserialized aggregate collections #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba6507
fix: duplicate rows in deserialized aggregate collections
eduardosmaniotto Jul 17, 2026
691374b
code review: apply gemini suggestions
eduardosmaniotto Jul 17, 2026
23dbb5e
revert to previouly hardcoded buff values
eduardosmaniotto Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 40 additions & 35 deletions src/Persistence/Initialization/Updates/AddElfSoldierBuffPlugIn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,41 +62,46 @@ protected override async ValueTask ApplyAsync(IContext context, GameConfiguratio
return;
}

var buffEffect = context.CreateNew<MagicEffectDefinition>();
gameConfiguration.MagicEffects.Add(buffEffect);
buffEffect.Number = (short)MagicEffectNumber.ElfSoldierBuff;
buffEffect.Name = "Elf Soldier Buff";
buffEffect.InformObservers = true;
buffEffect.StopByDeath = true;

// Duration: 60 minutes
buffEffect.Duration = context.CreateNew<PowerUpDefinitionValue>();
buffEffect.Duration.ConstantValue.Value = 3600;

// Defense boost: 50 + (Level / 5)
var defensePowerUp = context.CreateNew<PowerUpDefinition>();
defensePowerUp.TargetAttribute = Stats.DefenseFinal.GetPersistent(gameConfiguration);
defensePowerUp.Boost = context.CreateNew<PowerUpDefinitionValue>();
defensePowerUp.Boost.ConstantValue.Value = 50;
defensePowerUp.Boost.ConstantValue.AggregateType = AggregateType.AddFinal;
var defensePerLevel = context.CreateNew<AttributeRelationship>();
defensePerLevel.InputAttribute = Stats.Level.GetPersistent(gameConfiguration);
defensePerLevel.InputOperand = 1f / 5;
defensePerLevel.InputOperator = InputOperator.Multiply;
defensePowerUp.Boost.RelatedValues.Add(defensePerLevel);
buffEffect.PowerUpDefinitions.Add(defensePowerUp);

// Damage boost: 45 + (Level / 3)
var damagePowerUp = context.CreateNew<PowerUpDefinition>();
damagePowerUp.TargetAttribute = Stats.GreaterDamageBonus.GetPersistent(gameConfiguration);
damagePowerUp.Boost = context.CreateNew<PowerUpDefinitionValue>();
damagePowerUp.Boost.ConstantValue.Value = 45;
var damagePerLevel = context.CreateNew<AttributeRelationship>();
damagePerLevel.InputAttribute = Stats.Level.GetPersistent(gameConfiguration);
damagePerLevel.InputOperand = 1f / 3;
damagePerLevel.InputOperator = InputOperator.Multiply;
damagePowerUp.Boost.RelatedValues.Add(damagePerLevel);
buffEffect.PowerUpDefinitions.Add(damagePowerUp);
var buffEffect = gameConfiguration.MagicEffects.FirstOrDefault(e => e.Number == (short)MagicEffectNumber.ElfSoldierBuff);
if (buffEffect is null)
{
buffEffect = context.CreateNew<MagicEffectDefinition>();
gameConfiguration.MagicEffects.Add(buffEffect);
buffEffect.Number = (short)MagicEffectNumber.ElfSoldierBuff;
buffEffect.Name = "Elf Soldier Buff";
buffEffect.InformObservers = true;
buffEffect.StopByDeath = true;

// Duration: 60 minutes
buffEffect.Duration = context.CreateNew<PowerUpDefinitionValue>();
buffEffect.Duration.ConstantValue.Value = 3600;

// Defense boost: 50 + (Level / 5)
var defensePowerUp = context.CreateNew<PowerUpDefinition>();
defensePowerUp.TargetAttribute = Stats.DefenseFinal.GetPersistent(gameConfiguration);
defensePowerUp.Boost = context.CreateNew<PowerUpDefinitionValue>();
defensePowerUp.Boost.ConstantValue.Value = 50;
defensePowerUp.Boost.ConstantValue.AggregateType = AggregateType.AddFinal;
var defensePerLevel = context.CreateNew<AttributeRelationship>();
defensePerLevel.InputAttribute = Stats.Level.GetPersistent(gameConfiguration);
defensePerLevel.InputOperand = 1f / 5;
defensePerLevel.InputOperator = InputOperator.Multiply;
defensePowerUp.Boost.RelatedValues.Add(defensePerLevel);
buffEffect.PowerUpDefinitions.Add(defensePowerUp);

// Damage boost: 45 + (Level / 3)
var damagePowerUp = context.CreateNew<PowerUpDefinition>();
damagePowerUp.TargetAttribute = Stats.GreaterDamageBonus.GetPersistent(gameConfiguration);
damagePowerUp.Boost = context.CreateNew<PowerUpDefinitionValue>();
damagePowerUp.Boost.ConstantValue.Value = 45;
damagePowerUp.Boost.ConstantValue.AggregateType = AggregateType.AddRaw;
var damagePerLevel = context.CreateNew<AttributeRelationship>();
damagePerLevel.InputAttribute = Stats.Level.GetPersistent(gameConfiguration);
damagePerLevel.InputOperand = 1f / 3;
damagePerLevel.InputOperator = InputOperator.Multiply;
damagePowerUp.Boost.RelatedValues.Add(damagePerLevel);
buffEffect.PowerUpDefinitions.Add(damagePowerUp);
}
Comment thread
eduardosmaniotto marked this conversation as resolved.

var buff = context.CreateNew<Buff>();
buff.MagicEffectDefinition = buffEffect;
Expand Down
1 change: 1 addition & 0 deletions src/Persistence/Initialization/VersionSeasonSix/NpcInitialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public override void Initialize()
damagePowerUp.TargetAttribute = Stats.GreaterDamageBonus.GetPersistent(this.GameConfiguration);
damagePowerUp.Boost = this.Context.CreateNew<PowerUpDefinitionValue>();
damagePowerUp.Boost.ConstantValue.Value = 45;
damagePowerUp.Boost.ConstantValue.AggregateType = AggregateType.AddRaw;
var damagePerLevel = this.Context.CreateNew<AttributeRelationship>();
damagePerLevel.InputAttribute = Stats.Level.GetPersistent(this.GameConfiguration);
damagePerLevel.InputOperand = 1f / 3;
Expand Down
23 changes: 15 additions & 8 deletions src/Persistence/Json/ReferenceResolvingConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ static ReferenceResolvingConverter()
else if (x.CollectionInterface != null && x.Property.Name.StartsWith("Raw"))
{
propertyType = x.CollectionInterface.GetGenericArguments()[0];

var collectionExpr = Expression.Convert(Expression.Property(tParam, x.Property), x.CollectionInterface);
var itemExpr = Expression.Convert(objParam, propertyType);
var containsCall = Expression.Call(collectionExpr, x.CollectionInterface.GetMethod("Contains")!, itemExpr);
var addCall = Expression.Call(collectionExpr, x.CollectionInterface.GetMethod("Add")!, itemExpr);

adder = Expression.Lambda<Action<T, object>>(
Expression.Call(
Expression.Property(tParam, x.Property),
x.CollectionInterface.GetMethod("Add")!,
Expression.Convert(objParam, propertyType)),
Expression.IfThen(Expression.Not(containsCall), addCall),
tParam,
objParam)
.Compile();
Expand All @@ -66,11 +69,15 @@ static ReferenceResolvingConverter()

propertyType = propertyType.GetProperties().First(p => p.PropertyType.BaseType == baseType).PropertyType;
jsonPropertyName = basePropertyName;

var baseCollectionInterface = DetermineCollectionInterface(baseCollectionProperty)!;
var collectionExpr = Expression.Convert(Expression.Property(tParam, baseCollectionProperty), baseCollectionInterface);
var itemExpr = Expression.Convert(objParam, propertyType);
var containsCall = Expression.Call(collectionExpr, baseCollectionInterface.GetMethod("Contains")!, itemExpr);
var addCall = Expression.Call(collectionExpr, baseCollectionInterface.GetMethod("Add")!, itemExpr);

adder = Expression.Lambda<Action<T, object>>(
Expression.Call(
Expression.Property(tParam, baseCollectionProperty),
baseCollectionProperty.PropertyType.GetMethod("Add")!,
Expression.Convert(objParam, propertyType)),
Expression.IfThen(Expression.Not(containsCall), addCall),
tParam,
objParam)
.Compile();
Expand Down