fix: fixed layout.

ArchiDog1998 · Aug 16, 2023 · 8d007d1 · 8d007d1
1 parent 78b6641
commit 8d007d1
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 268 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>3.2.3.1</Version>
+		<Version>3.2.3.2</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/Resources/InputConfig.json b/Resources/InputConfig.json
diff --git a/Resources/RotationSolverIconDiscord_512.png b/Resources/RotationSolverIconDiscord_512.png
diff --git a/Resources/discord.md b/Resources/discord.md
diff --git a/RotationSolver.Basic/Data/IconSet.cs b/RotationSolver.Basic/Data/IconSet.cs
@@ -139,7 +139,7 @@ public static bool GetTexture(uint id, out TextureWrap texture, uint @default =
     public static bool GetTexture(string path, out TextureWrap texture)
         => ThreadLoadImageHandler.TryGetTextureWrap(path, out texture)
         || (path.StartsWith("http:", StringComparison.OrdinalIgnoreCase) || path.StartsWith("https:", StringComparison.OrdinalIgnoreCase))
-        && GetTexture((uint)(62571 + Environment.TickCount / 300 % 3), out texture); // loading pics.
+        && GetTexture("ui/uld/image2.tex", out texture); // loading pics.
 
     private static readonly Dictionary<uint, uint> _actionIcons = new();
 

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -223,8 +223,7 @@
   "Action_Attack": "Attack",
   "ComboConditionType_Bool": "Boolean",
   "ComboConditionType_Byte": "Byte",
-  "ComboConditionType_Time": "Time",
-  "ComboConditionType_GCD": "GCD",
+  "ComboConditionType_Float": "Float",
   "ComboConditionType_Last": "Last",
   "TargetingType_Big": "Big",
   "TargetingType_Small": "Small",
@@ -288,110 +287,129 @@
   "JobRole_DiscipleOfTheLand": "Disciple of the Land",
   "JobRole_DiscipleOfTheHand": "Disciple of the Hand",
   "MemberInfoName": {
-    "IsMoving": "IsMoving",
-    "HaveHostilesInRange": "Have Hostiles InRange",
-    "IsFullParty": "Is Full Party",
-    "SettingBreak": "Breaking",
-    "Level": "Level",
+    "IsMoving": "Is Moving",
+    "HasSwift": "Has Swift",
+    "HasTankStance": "Has tank stance",
     "InCombat": "In Combat",
+    "NotInCombatDelay": "Not In Combat Delay",
+    "CurrentMp": "Player's MP",
+    "HasCompanion": "Has companion",
+    "RatioOfMembersIn2minsBurst": "Raito of members that in 2 mins burst.",
+    "IsFullParty": "Is Full Party",
+    "PartyMembersMinHP": "Min HP in party members.",
+    "PartyMembersAverHP": "Average HP in party members.",
+    "IsTargetDying": "Is target going to die",
+    "IsTargetBoss": "Is target a boss",
+    "HasHostilesInRange": "Has hostiles in Range",
+    "NumberOfHostilesInRange": "The number of hostiles in Range",
+    "NumberOfHostilesInMaxRange": "The number of hostiles in max Range",
+    "InBurst": "In burst.",
+    "CanHealAreaAbility": "Can heal area ability",
+    "CanHealAreaSpell": "Can heal area spell",
+    "CanHealSingleAbility": "Can heal single ability",
+    "CanHealSingleSpell": "Can heal single area",
+    "AutoState": "The state of auto. True for on.",
+    "IsManual": "The state of manual. True for manual.",
+    "IsInHighEndDuty": "Is in the high-end duty",
+    "Ping": "Your ping",
+    "NextAbilityToNextGCD": "Time from next ability to next GCD",
     "IsLastGCD": "Just used GCD",
     "IsLastAbility": "Just used Ability",
     "IsLastAction": "Just used Action",
-    "IsTargetDying": "Target is dying",
-    "IsTargetBoss": "Target is Boss",
-    "HaveSwift": "Have Swift",
-    "HaveShield": "Have defensive stance",
-    "PlayCard": "Play",
+    "CombatTime": "Combat time",
+    "StopMovingTime": "Stop moving time",
+    "CountDownAhead": "Count Down ahead",
+    "HealthAreaAbility": "Health of Area Ability",
+    "HealthAreaSpell": "Health of Area spell",
+    "HealthAreaAbilityHot": "Health of Area Ability Hot",
+    "HealthAreaSpellHot": "Health of Area spell Hot",
+    "HealthSingleAbility": "Health of single ability",
+    "HealthSingleSpell": "Health of single spell",
+    "HealthSingleAbilityHot": "Health of single ability Hot",
+    "HealthSingleSpellHot": "Health of single spell Hot",
+    "HealthForDyingTanksDefault": "Health of dying tank",
+    "IsValid": "Is this rotation valid",
+    "ShowStatus": "Show the status",
     "UmbralIceStacks": "Umbral Ice Stacks",
     "AstralFireStacks": "Astral Fire Stacks",
     "PolyglotStacks": "Polyglot Stacks",
-    "UmbralHearts": "Umbral Heart Stacks",
-    "IsParadoxActive": "Is Paradox Active ?",
+    "UmbralHearts": "Umbral Hearts",
+    "IsParadoxActive": "Is Paradox Active",
     "InUmbralIce": "In Umbral Ice",
     "InAstralFire": "In Astral Fire",
-    "IsEnochianActive": "Is Enochian Active?",
-    "EnchinaEndAfter": "Enchina End After (s)",
-    "EnchinaEndAfterGCD": "Enchina End After (GCDs)",
-    "ElementTimeEndAfter": "Element Time End After (s)",
-    "ElementTimeEndAfterGCD": "Element Time End After (GCDs)",
-    "HasFire": "Has Firestarter",
-    "HasThunder": "Has Thunder",
-    "IsPolyglotStacksMaxed": "Whether Polyglot already has the maximum number of charge stacks at the current level",
+    "IsEnochianActive": "Is Enochian Active",
+    "IsPolyglotStacksMaxed": "IsPolyglot Stacks Maxed",
+    "EnochianTime": "Enochian Time",
+    "Repertoire": "Repertoire",
     "SoulVoice": "Soul Voice",
-    "SongEndAfter": "Song End After (s)",
-    "SongEndAfterGCD": "Song End After (GCDs)",
-    "Repertoire": "Song Gauge Stacks",
-    "IsDancing": "Is Dancing",
-    "Esprit": "Esprit",
-    "Feathers": "Feathers",
-    "CompletedSteps": "CompletedSteps",
-    "FinishStepGCD": "FinishStepGCD",
-    "ExcutionStepGCD": "Excution Step GCD",
-    "Blood": "Blood",
-    "HasDarkArts": "Has Dark Arts",
-    "DarkSideEndAfter": "DarkSideEndAfter",
-    "DarkSideEndAfterGCD": "DarkSideEndAfterGCD",
-    "Ammo": "Ammo",
-    "AmmoComboStep": "Ammo Combo Step",
-    "IsOverheated": "Is Over heated",
-    "Heat": "Heat",
-    "Battery": "Battery",
-    "OverheatedEndAfter": "Over heated End After (s)",
-    "OverheatedEndAfterGCD": "Over heated End After(GCDs)",
-    "Chakra": "Chakra"
-  },
-  "MemberInfoDesc": {
-    "IsMoving": "Player Is Moving",
-    "HaveHostilesInRange": "Have Hostiles In Range(Melee <3m,Ranged<25m)",
-    "IsFullParty": "Is Full Party",
-    "SettingBreak": "In break",
-    "Level": "Player level",
-    "InCombat": "In Combat",
-    "IsLastGCD": "Just used GCD",
-    "IsLastAbility": "Just used ability",
-    "IsLastAction": "Just used Action",
-    "IsTargetDying": "Target is Dying",
-    "IsTargetBoss": "Target is Boss",
-    "HaveSwift": "Have Swift",
-    "HaveShield": "Have defensive stance",
-    "PlayCard": "Play",
-    "UmbralIceStacks": "Umbral Ice Stacks",
-    "AstralFireStacks": "Astral Fire Stacks",
-    "PolyglotStacks": "Polyglot Stacks",
-    "UmbralHearts": "Umbral Heart Stacks",
-    "IsParadoxActive": "Is Paradox Active?",
-    "InUmbralIce": "In Umbral Ice",
-    "InAstralFire": "In Astral Fire",
-    "IsEnochianActive": "Is Enochian Active?",
-    "EnchinaEndAfter": "Enchina End After (s)",
-    "EnchinaEndAfterGCD": "Enchina End After (GCDs)",
-    "ElementTimeEndAfter": "Element remaining time",
-    "ElementTimeEndAfterGCD": "Element remaining time",
-    "HasFire": "Has Firestarter",
-    "HasThunder": "Has Thunder",
-    "IsPolyglotStacksMaxed": "Whether Polyglot already has the maximum number of charge stacks at the current level",
-    "SoulVoice": "SoulVoice",
-    "SongEndAfter": "Song End After (s)",
-    "SongEndAfterGCD": "Song End After (GCDs)",
-    "Repertoire": "Song Gauge Stacks",
+    "SongTime": "Soul Time",
     "IsDancing": "Is Dancing",
     "Esprit": "Esprit",
     "Feathers": "Feathers",
     "CompletedSteps": "Completed Steps",
-    "FinishStepGCD": "Finish Step GCD",
-    "ExcutionStepGCD": "Excution Step GCD",
+    "EyeCount": "Eye Count",
+    "FocusCount": "Focus Count",
+    "LOTDTime": "LOTD Time",
     "Blood": "Blood",
     "HasDarkArts": "Has Dark Arts",
-    "DarkSideEndAfter": "DarkSide End After (s)",
-    "DarkSideEndAfterGCD": "DarkSide End After (GCDs)",
+    "DarkSideTime": "Dark Side Time",
+    "ShadowTime": "Shadow Side Time",
     "Ammo": "Ammo",
     "AmmoComboStep": "Ammo Combo Step",
-    "IsOverheated": "Is Over heated",
+    "MaxAmmo": "Max Ammo",
+    "IsOverheated": "Is Overheated",
     "Heat": "Heat",
     "Battery": "Battery",
-    "OverheatedEndAfter": "OverheatedEndAfter",
-    "OverheatedEndAfterGCD": "OverheatedEndAfterGCD",
-    "Chakra": "Chakra"
+    "OverheatTime": "Overheat Time Remaining",
+    "Chakra": "Chakra",
+    "HasSolar": "Has Solar",
+    "HasLunar": "Has Lunar",
+    "Ninki": "Ninki",
+    "HutonTime": "Huton Time",
+    "HasDivineMight": "Has Divine Might",
+    "HasFightOrFlight": "Has Fight Or Flight",
+    "OathGauge": "OathGauge",
+    "WhiteMana": "White Mana",
+    "BlackMana": "Black Mana",
+    "ManaStacks": "Mana Stacks",
+    "HasEnshrouded": "Has Enshrouded",
+    "HasSoulReaver": "Has Soul Reaver",
+    "Soul": "Soul",
+    "Shroud": "Shroud",
+    "LemureShroud": "Lemure Shroud",
+    "VoidShroud": "Void Shroud",
+    "HasMoon": "Has Moon",
+    "HasFlower": "Has Flower",
+    "IsMoonTimeLessThanFlower": "Is MoonTime Less Than Flower",
+    "HasSetsu": "Has Setsu",
+    "HasGetsu": "Has Getsu",
+    "HasKa": "Has Ka",
+    "Kenki": "Kenki",
+    "MeditationStacks": "Meditation Stacks",
+    "SenCount": "Sen Count",
+    "FairyGauge": "Fairy Gauge",
+    "HasAetherflow": "Has Aetherflow",
+    "SeraphTime": "Seraph Time",
+    "HasEukrasia": "Has Eukrasia",
+    "Addersgall": "Addersgall",
+    "Addersting": "Addersting",
+    "AddersgallTime": "Addersgall Time",
+    "InBahamut": "In Bahamut",
+    "InPhoenix": "In Phoenix",
+    "HasAetherflowStacks": "Has Aetherflow Stacks",
+    "Attunement": "Attunement",
+    "IsIfritReady": "Is Ifrit Ready",
+    "IsTitanReady": "Is Titan Ready",
+    "IsGarudaReady": "Is Garuda Ready",
+    "InIfrit": "In Ifrit",
+    "InTitan": "In Titan",
+    "InGaruda": "In Garuda",
+    "SummonTime": "Summon Time",
+    "AttunmentTime": "Attunment Time",
+    "BeastGauge": "Beast Gauge",
+    "Lily": "Lily",
+    "BloodLily": "Blood Lily",
+    "LilyTime": "Lily Time"
   },
   "HighEndWarning": "Please separately keybind damage reduction / shield cooldowns in case RS fails at a crucial moment in {0}!",
   "TextToTalkWarning": "You didn't install TextToTalk, please install it to make Rotation Solver say something for you!",