diff --git a/Content/Sprites/Breakables_Filled.PNG b/Content/Sprites/Breakables_Filled.PNG new file mode 100644 index 00000000..5a36b2c8 Binary files /dev/null and b/Content/Sprites/Breakables_Filled.PNG differ diff --git a/Content/Sprites/Breakables_Grey.PNG b/Content/Sprites/Breakables_Grey.PNG new file mode 100644 index 00000000..6043abd3 Binary files /dev/null and b/Content/Sprites/Breakables_Grey.PNG differ diff --git a/Content/Sprites/Cassettes_Filled.PNG b/Content/Sprites/Cassettes_Filled.PNG new file mode 100644 index 00000000..a9c6c639 Binary files /dev/null and b/Content/Sprites/Cassettes_Filled.PNG differ diff --git a/Content/Sprites/Cassettes_Grey.PNG b/Content/Sprites/Cassettes_Grey.PNG new file mode 100644 index 00000000..909e5b70 Binary files /dev/null and b/Content/Sprites/Cassettes_Grey.PNG differ diff --git a/Content/Sprites/Coins_Filled.PNG b/Content/Sprites/Coins_Filled.PNG new file mode 100644 index 00000000..b6bf7874 Binary files /dev/null and b/Content/Sprites/Coins_Filled.PNG differ diff --git a/Content/Sprites/Coins_Grey.png b/Content/Sprites/Coins_Grey.png new file mode 100644 index 00000000..29439db9 Binary files /dev/null and b/Content/Sprites/Coins_Grey.png differ diff --git a/Content/Sprites/Dash_Filled.png b/Content/Sprites/Dash_Filled.png new file mode 100644 index 00000000..61a2f1c3 Binary files /dev/null and b/Content/Sprites/Dash_Filled.png differ diff --git a/Content/Sprites/Dash_Grey.png b/Content/Sprites/Dash_Grey.png new file mode 100644 index 00000000..cdc87a9a Binary files /dev/null and b/Content/Sprites/Dash_Grey.png differ diff --git a/Content/Sprites/DoubleDash_Filled.png b/Content/Sprites/DoubleDash_Filled.png new file mode 100644 index 00000000..3726440e Binary files /dev/null and b/Content/Sprites/DoubleDash_Filled.png differ diff --git a/Content/Sprites/DoubleDash_Grey.png b/Content/Sprites/DoubleDash_Grey.png new file mode 100644 index 00000000..465b74c5 Binary files /dev/null and b/Content/Sprites/DoubleDash_Grey.png differ diff --git a/Content/Sprites/Feather_Filled.png b/Content/Sprites/Feather_Filled.png new file mode 100644 index 00000000..13c52076 Binary files /dev/null and b/Content/Sprites/Feather_Filled.png differ diff --git a/Content/Sprites/Feather_Grey.png b/Content/Sprites/Feather_Grey.png new file mode 100644 index 00000000..571c2186 Binary files /dev/null and b/Content/Sprites/Feather_Grey.png differ diff --git a/Content/Sprites/Springs_Filled.png b/Content/Sprites/Springs_Filled.png new file mode 100644 index 00000000..2f694545 Binary files /dev/null and b/Content/Sprites/Springs_Filled.png differ diff --git a/Content/Sprites/Springs_Grey.png b/Content/Sprites/Springs_Grey.png new file mode 100644 index 00000000..9351c0b7 Binary files /dev/null and b/Content/Sprites/Springs_Grey.png differ diff --git a/Content/Sprites/Traffic_Filled.png b/Content/Sprites/Traffic_Filled.png new file mode 100644 index 00000000..c40c8aa4 Binary files /dev/null and b/Content/Sprites/Traffic_Filled.png differ diff --git a/Content/Sprites/Traffic_Grey.png b/Content/Sprites/Traffic_Grey.png new file mode 100644 index 00000000..ddd3624b Binary files /dev/null and b/Content/Sprites/Traffic_Grey.png differ diff --git a/Source/Helpers/UI.cs b/Source/Helpers/UI.cs index 0415fbb2..46a68262 100644 --- a/Source/Helpers/UI.cs +++ b/Source/Helpers/UI.cs @@ -66,6 +66,85 @@ public static void DeathLinks(Batcher batch, int count, int req, in Vec2 at, flo Icon(batch, "icon_skull", $"x{count:00}/{req:00}", at, align); } + public static void Items(Batcher batch, in Vec2 at, float align = 0) + { + Vec2 pos = at; + if (Save.CurrentRecord.GetFlag("Breakables") == 0) + { + Icon(batch, "Breakables_Grey", "", pos, align); + } + else + { + Icon(batch, "Breakables_Filled", "", pos, align); + } + pos.X += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("Cassette") == 0) + { + Icon(batch, "Cassettes_Grey", "", pos, align); + } + else + { + Icon(batch, "Cassettes_Filled", "", pos, align); + } + pos.X -= (UI.IconSize + 8); + pos.Y += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("Coin") == 0) + { + Icon(batch, "Coins_Grey", "", pos, align); + } + else + { + Icon(batch, "Coins_Filled", "", pos, align); + } + pos.X += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("DashRefill") == 0) + { + Icon(batch, "Dash_Grey", "", pos, align); + } + else + { + Icon(batch, "Dash_Filled", "", pos, align); + } + pos.X -= (UI.IconSize + 8); + pos.Y += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("DoubleDashRefill") == 0) + { + Icon(batch, "DoubleDash_Grey", "", pos, align); + } + else + { + Icon(batch, "DoubleDash_Filled", "", pos, align); + } + pos.X += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("Feather") == 0) + { + Icon(batch, "Feather_Grey", "", pos, align); + } + else + { + Icon(batch, "Feather_Filled", "", pos, align); + } + pos.X -= (UI.IconSize + 8); + pos.Y += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("Spring") == 0) + { + Icon(batch, "Springs_Grey", "", pos, align); + } + else + { + Icon(batch, "Springs_Filled", "", pos, align); + } + pos.X += (UI.IconSize + 8); + if (Save.CurrentRecord.GetFlag("TrafficBlock") == 0) + { + Icon(batch, "Traffic_Grey", "", pos, align); + } + else + { + Icon(batch, "Traffic_Filled", "", pos, align); + } + } + public static void Prompt(Batcher batch, VirtualButton button, string label, in Vec2 at, out float width, float align = 0) { var pos = at; diff --git a/Source/Scenes/World.cs b/Source/Scenes/World.cs index 7a070d58..806df18f 100644 --- a/Source/Scenes/World.cs +++ b/Source/Scenes/World.cs @@ -823,7 +823,10 @@ public override void Render(Target target) if (Game.Instance.ArchipelagoManager.DeathLink) { UI.DeathLinks(batch, Game.Instance.ArchipelagoManager.DeathsCounted, Game.Instance.ArchipelagoManager.DeathLinkAmnesty, pos); + pos.Y += (UI.IconSize + 8); } + + UI.Items(batch, pos, 0); } // show version number when paused / in ending area