ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #713 from TechHypno/master

Browse source
This commit is contained in:
goaaats 2021-12-09 18:42:22 +01:00 • committed by GitHub
commit a110cfc59b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Dalamud/Game/Gui/FlyText/FlyTextKind.cs
View file

@ -116,168 +116,178 @@ namespace Dalamud.Game.Gui.FlyText
/// </summary> /// </summary>
NamedEp = 20, NamedEp = 20,
/// <summary>
/// Sans-serif Text1 next to serif Val1 with all caps condensed font CP with Text2 in sans-serif as subtitle.
/// </summary>
NamedCp = 21,
/// <summary>
/// Sans-serif Text1 next to serif Val1 with all caps condensed font GP with Text2 in sans-serif as subtitle.
/// </summary>
NamedGp = 22,
/// <summary> /// <summary>
/// Displays nothing. /// Displays nothing.
/// </summary> /// </summary>
None = 21, None = 23,
/// <summary> /// <summary>
/// All caps serif INVULNERABLE. /// All caps serif INVULNERABLE.
/// </summary> /// </summary>
Invulnerable = 22, Invulnerable = 24,
/// <summary> /// <summary>
/// All caps sans-serif condensed font INTERRUPTED! /// All caps sans-serif condensed font INTERRUPTED!
/// Does a large bounce effect on appearance. /// Does a large bounce effect on appearance.
/// Does not scroll up or down the screen. /// Does not scroll up or down the screen.
/// </summary> /// </summary>
Interrupted = 23, Interrupted = 25,
/// <summary> /// <summary>
/// AutoAttack with no Text2. /// AutoAttack with no Text2.
/// </summary> /// </summary>
AutoAttackNoText = 24, AutoAttackNoText = 26,
/// <summary> /// <summary>
/// AutoAttack with no Text2 (2). /// AutoAttack with no Text2 (2).
/// </summary> /// </summary>
AutoAttackNoText2 = 25, AutoAttackNoText2 = 27,
/// <summary> /// <summary>
/// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle. Does a bigger bounce effect on appearance (2). /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle. Does a bigger bounce effect on appearance (2).
/// </summary> /// </summary>
CriticalHit2 = 26, CriticalHit2 = 28,
/// <summary> /// <summary>
/// AutoAttack with no Text2 (3). /// AutoAttack with no Text2 (3).
/// </summary> /// </summary>
AutoAttackNoText3 = 27, AutoAttackNoText3 = 29,
/// <summary> /// <summary>
/// CriticalHit with sans-serif Text1 to the left of the Val1 (2). /// CriticalHit with sans-serif Text1 to the left of the Val1 (2).
/// </summary> /// </summary>
NamedCriticalHit2 = 28, NamedCriticalHit2 = 30,
/// <summary> /// <summary>
/// Same as NamedCriticalHit with a green (cannot change) MP in condensed font to the right of Val1. /// Same as NamedCriticalHit with a green (cannot change) MP in condensed font to the right of Val1.
/// Does a jiggle effect to the right on appearance. /// Does a jiggle effect to the right on appearance.
/// </summary> /// </summary>
NamedCriticalHitWithMp = 29, NamedCriticalHitWithMp = 31,
/// <summary> /// <summary>
/// Same as NamedCriticalHit with a yellow (cannot change) TP in condensed font to the right of Val1. /// Same as NamedCriticalHit with a yellow (cannot change) TP in condensed font to the right of Val1.
/// Does a jiggle effect to the right on appearance. /// Does a jiggle effect to the right on appearance.
/// </summary> /// </summary>
NamedCriticalHitWithTp = 30, NamedCriticalHitWithTp = 32,
/// <summary> /// <summary>
/// Same as NamedIcon with sans-serif "has no effect!" to the right. /// Same as NamedIcon with sans-serif "has no effect!" to the right.
/// </summary> /// </summary>
NamedIconHasNoEffect = 31, NamedIconHasNoEffect = 33,
/// <summary> /// <summary>
/// Same as NamedIcon but Text1 is slightly faded. Used for buff expiration. /// Same as NamedIcon but Text1 is slightly faded. Used for buff expiration.
/// </summary> /// </summary>
NamedIconFaded = 32, NamedIconFaded = 34,
/// <summary> /// <summary>
/// Same as NamedIcon but Text1 is slightly faded (2). /// Same as NamedIcon but Text1 is slightly faded (2).
/// Used for buff expiration. /// Used for buff expiration.
/// </summary> /// </summary>
NamedIconFaded2 = 33, NamedIconFaded2 = 35,
/// <summary> /// <summary>
/// Text1 in sans-serif font. /// Text1 in sans-serif font.
/// </summary> /// </summary>
Named = 34, Named = 36,
/// <summary> /// <summary>
/// Same as NamedIcon with sans-serif "(fully resisted)" to the right. /// Same as NamedIcon with sans-serif "(fully resisted)" to the right.
/// </summary> /// </summary>
NamedIconFullyResisted = 35, NamedIconFullyResisted = 37,
/// <summary> /// <summary>
/// All caps serif 'INCAPACITATED!'. /// All caps serif 'INCAPACITATED!'.
/// </summary> /// </summary>
Incapacitated = 36, Incapacitated = 38,
/// <summary> /// <summary>
/// Text1 with sans-serif "(fully resisted)" to the right. /// Text1 with sans-serif "(fully resisted)" to the right.
/// </summary> /// </summary>
NamedFullyResisted = 37, NamedFullyResisted = 39,
/// <summary> /// <summary>
/// Text1 with sans-serif "has no effect!" to the right. /// Text1 with sans-serif "has no effect!" to the right.
/// </summary> /// </summary>
NamedHasNoEffect = 38, NamedHasNoEffect = 40,
/// <summary> /// <summary>
/// AutoAttack with sans-serif Text1 to the left of the Val1 (3). /// AutoAttack with sans-serif Text1 to the left of the Val1 (3).
/// </summary> /// </summary>
NamedAttack3 = 39, NamedAttack3 = 41,
/// <summary> /// <summary>
/// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (3). /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (3).
/// </summary> /// </summary>
NamedMp3 = 40, NamedMp3 = 42,
/// <summary> /// <summary>
/// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (3). /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (3).
/// </summary> /// </summary>
NamedTp3 = 41, NamedTp3 = 43,
/// <summary> /// <summary>
/// Same as NamedIcon with serif "INVULNERABLE!" beneath the Text1. /// Same as NamedIcon with serif "INVULNERABLE!" beneath the Text1.
/// </summary> /// </summary>
NamedIconInvulnerable = 42, NamedIconInvulnerable = 44,
/// <summary> /// <summary>
/// All caps serif RESIST. /// All caps serif RESIST.
/// </summary> /// </summary>
Resist = 43, Resist = 45,
/// <summary> /// <summary>
/// Same as NamedIcon but places the given icon in the item icon outline. /// Same as NamedIcon but places the given icon in the item icon outline.
/// </summary> /// </summary>
NamedIconWithItemOutline = 44, NamedIconWithItemOutline = 46,
/// <summary> /// <summary>
/// AutoAttack with no Text2 (4). /// AutoAttack with no Text2 (4).
/// </summary> /// </summary>
AutoAttackNoText4 = 45, AutoAttackNoText4 = 47,
/// <summary> /// <summary>
/// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (3). /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (3).
/// Does a bigger bounce effect on appearance. /// Does a bigger bounce effect on appearance.
/// </summary> /// </summary>
CriticalHit3 = 46, CriticalHit3 = 48,
/// <summary> /// <summary>
/// All caps serif REFLECT. /// All caps serif REFLECT.
/// </summary> /// </summary>
Reflect = 47, Reflect = 49,
/// <summary> /// <summary>
/// All caps serif REFLECTED. /// All caps serif REFLECTED.
/// </summary> /// </summary>
Reflected = 48, Reflected = 50,
/// <summary> /// <summary>
/// Val1 in serif font, Text2 in sans-serif as subtitle (2). /// Val1 in serif font, Text2 in sans-serif as subtitle (2).
/// Does a bounce effect on appearance. /// Does a bounce effect on appearance.
/// </summary> /// </summary>
DirectHit2 = 49, DirectHit2 = 51,
/// <summary> /// <summary>
/// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (4). /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (4).
/// Does a bigger bounce effect on appearance. /// Does a bigger bounce effect on appearance.
/// </summary> /// </summary>
CriticalHit4 = 50, CriticalHit4 = 52,
/// <summary> /// <summary>
/// Val1 in even larger serif font with 2 exclamations, Text2 in sans-serif as subtitle (2). /// Val1 in even larger serif font with 2 exclamations, Text2 in sans-serif as subtitle (2).
/// Does a large bounce effect on appearance. Does not scroll up or down the screen. /// Does a large bounce effect on appearance. Does not scroll up or down the screen.
/// </summary> /// </summary>
CriticalDirectHit2 = 51, CriticalDirectHit2 = 53,
} }
} }