Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 38 additions & 5 deletions src/NosCore.Data/Enumerations/Buff/AdditionalTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,13 @@ public enum Block : byte
ChanceRangedIncreased = 31,
ChanceRangedDecreased = 32,
ChanceMagicalIncreased = 41,
ChanceMagicalDecreased = 42
ChanceMagicalDecreased = 42,

/// <summary>
/// Per-critical reduction over a run of hits, not a chance like 11-42.
/// </summary>
CriticalDamageReducedPerHit = 51,
CriticalDamageReducedPerHitNegated = 52
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

public enum BossMonstersSkill : byte
Expand Down Expand Up @@ -631,16 +637,36 @@ public enum Morale : byte
IgnoreEnemyMoraleNegated = 52
}

/// <summary>
/// 21-22 are a percentage and 41-42 are flat, which the names do not say. 11-12 and 51-52
/// carry the same text as each other in the files, so the X2 slot has no meaning of its own.
/// </summary>
public enum Move : byte
{
MovementImpossible = 11,
MovementImpossibleNegated = 12,

/// <summary>Movement speed is increased by %s%%.</summary>
MoveSpeedIncreased = 21,

/// <summary>Movement speed is decreased by %s%%.</summary>
MoveSpeedDecreased = 22,
SetMovement = 31,
SetMovementNegated = 32,

/// <summary>
/// Your movement speed is increased by %s <b>while you are hidden</b>. Not a "set
/// movement" of any kind: it is a flat bonus that only applies while invisible.
/// </summary>
SpeedWhileHiddenIncreased = 31,

/// <summary>Your movement speed is decreased by %s while you are hidden.</summary>
SpeedWhileHiddenDecreased = 32,

/// <summary>Movement speed is increased by %s. This is the unconditional flat one.</summary>
MovementSpeedIncreased = 41,

/// <summary>Movement speed is decreased by %s.</summary>
MovementSpeedDecreased = 42,

TempMaximized = 51,
TempMaximizedNegated = 52
}
Expand Down Expand Up @@ -1292,14 +1318,21 @@ public enum Type103 : byte
DecreaseConcentration = 52
}

/// <summary>
/// 52 targets allies, not enemies - it is not the negation of 51.
/// </summary>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
public enum Type104 : byte
{
ReflectOnDeff = 11,
ReflectOnDeffNegated = 12,
AreaDamageEachSecond = 21,
AreaDamageEachSecondNegated = 22,
SummonMonsterOnDef = 31,
//SubType 4 didn't exist.
AreaBuffEachSecond = 51
SummonTwoMonstersOnDef = 32,
MateAttackIncreased = 41,
MateAttackIncreasedNegated = 42,
AreaBuffEachSecond = 51,
AreaBuffOnAlliesEachSecond = 52
}

public enum Type107 : byte
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ private byte CalculateSpeed(IAliveEntity aliveEntity, byte defaultSpeed)
// return 0;
// }

var bonusSpeed = 0; /*(byte)GetBuff(CardType.Move, (byte)AdditionalTypes.Move.SetMovementNegated)[0];*/
// The movement BCards are still not read. The placeholder that used to sit
// here reached for subtype 32, which the files say is "movement speed is
// DECREASED by %s while you are hidden": wrong slot and wrong condition for a
// general speed bonus. The unconditional flat pair is 41-42, and 21-22 is the
// percentage.
var bonusSpeed = 0;
if (defaultSpeed + bonusSpeed > 59)
{
return 59;
Expand Down
Loading