Skip to content

Commit

Permalink
Merge branch 'Hearth-Edition-Dev' into Hearth-Edition-Main
Browse files Browse the repository at this point in the history
  • Loading branch information
SirMotte committed Jul 30, 2022
2 parents 12a5df3 + f622c17 commit 9457e74
Show file tree
Hide file tree
Showing 47 changed files with 77 additions and 36 deletions.
54 changes: 26 additions & 28 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[SIZE=4][COLOR="#FF0000"][B]Update to Version 2.9.3 - Sneaking Giraffe[/B][/COLOR][/SIZE]
[SIZE=4][COLOR="#FF0000"][B]Update to Version 2.9.4 - Breezy Kilt[/B][/COLOR][/SIZE]

[B]Anouncement:[/B]

Extension Update with the sole purpose to get the theme up to date to possible changes over the past year that need addressing.
Small cosmetic update and support for more extensions and some fixes. I won't have time to work more on the theme during the weekend, so I wanted to put this one in the wild now.

Enjoy!
Sir Motte
Expand All @@ -14,29 +14,27 @@ Sir Motte

[B]Changelog - Theme Elements:[/B]
[LIST]
[*]Changed sidebar button size to show 1px of the background and muted border color a little, as it's not necessary to have them this bright in this area.
[*]Minor "Roll initiative all" button adjustement in the CT menu.
[*]Changed Dual Wield Icon Color in Actions Tab from Orange to Red, as Orange is supposed to be the "UI element active" color.
[*]Changed "on hover" button state for eg. help or close window to yellow, instead of orange, as orange is supposed to be the "UI element active" color.
[*]Changed "on press" button sown state for eg. close window to a bright red, instead of dark red, so when pressed they don't appear to vanish.
[*]Fixed color inconsistencies for bright red ui elements.
[*]Fixed record sheet graphic, that was off 1px, casuing cutoff frames in eg. items, encounters and other ui elements.
[*]Fixed new Radial Menu colors from last update - forgot to include the altered pngs.
[*]Changed die calculated result color to saturated yellow, to better "pop" at a glance.
[*]First batch of sidebar icons.
[*]Changed Module loaded/unloaded icon size
[*]Changed settings menu link icon to be a hybrid of link and setting.
[*]
[*]
[*]
[*]Changed Font Graphic for Chat, Emote, Story aso. when typing in the chat.
[*]Fixed Default Sidebar Icon (D20) xml definition.
[*]Fixed CT sidebar icon xml definition.
[*]Fixed Party Sheet sidebar xml defintition.
[*]Adjusted "icon_window_close" + "icon_window_close_remote" (radial menu) colors to fit recent changes
[*]Changed "emotefont" chat color to lavender.
[*]Changed "chatgmfont" to bright orange.
[*]
[/LIST]

[B]Changelog - Theme Elements - Extension Icons:[/B]

Explanation: Depending on the number of extensions you use, things get pretty wild in the Chat on launch. I try to remedy this a little by adjusting extension icons to use the same width, height and frame.
This calms down the chaos and gives me the opportunity to better embed other authors extension icons, without changing them altogether. Purely Cosmetic Madness.

[LIST]
[*]A whole lot...like all of them - when possible...why do I do this to me?!
[*]Arcane Ward by Ryan Hagelstrom
[*]Trigger Me Timbers by MeAndUnique
[*]Better Combat Effects
[*]Kent Height (hidden in vault) by Ryan Hagelstrom
[*]Player Agency by Damned
[/LIST]

[B]Changelog - DnD 5E Ruleset:[/B]
Expand All @@ -46,20 +44,20 @@ This calms down the chaos and gives me the opportunity to better embed other aut

[B]Added Extension Support:[/B]
[LIST]
[*]
[/LIST]

[B]Removed Extension Support:[/B]
[LIST]
[*]None
[*]Arcane Ward by Ryan Hagelstrom
[*]Trigger Me Timbers by MeAndUnique
[/LIST]

[B]Supported Extension changes:[/B]
[LIST]
[*]Fixed some missing Button Colors for Requested Rolls by McCartysr (Thanks to McCartysr and special thanks to Saagael)
[*]Changed Chest Icon from Map Parcel by Silent Ruin.
[*]Changed all custom frames of extensions to use the new frame outline color.
[*]Updated Legendary Assistant by Stv to work with the recent sidebar changes.
[*]Updated support for Agency by Damned
[*]
[*]
[*]
[*]
[*]
[*]
[*]
[/LIST]

[B]Changelog D&D 4E Ruleset[/B]
Expand Down
Binary file modified Theme_SirMotte_Hearth.ext
Binary file not shown.
4 changes: 2 additions & 2 deletions extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!--Special Thanks to MeAndUnique and Saagael for the enormous amount of help with xml and lua stuff <3!-->

<root version="3.2">
<announcement text="Theme Loaded: \rSir Motte's Magnificent Darkness\rVersion: 2.9.3 - Sneaking Giraffe\rHearth Edition" font="oocfont" icon="footface"/>
<announcement text="Theme Loaded: \rSir Motte's Magnificent Darkness\rVersion: 2.9.4 - Breezy Kilt\rHearth Edition" font="oocfont" icon="footface"/>

<properties>
<name>Theme: Hearth</name>
<author>Sir Motte - Co. Authors: MeAndUnique and Saagael</author>
<version>2.9.3</version>
<version>2.9.4</version>
<description>Dark, warm and reduced user interface for FGU</description>
<loadorder>1500</loadorder>
<!--While many rulesets should work for the most part, only 5E is currently supported-->
Expand Down
48 changes: 45 additions & 3 deletions graphics/extension_graphics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,22 @@
<icon name="chat_place" file="graphics/extensions/damned/player_agency/chat_place.png" />
<icon name="chat_religion" file="graphics/extensions/damned/player_agency/chat_religion.png" />
<icon name="chat_group" file="graphics/extensions/damned/player_agency/chat_group.png" />
<!--Sidebar-->
<icon name="button_world" file="graphics/extensions/damned/player_agency/button_world.png" />
<icon name="button_investigator" file="graphics/extensions/damned/player_agency/button_investigator.png" />
<!--Icon-->
<icon name="playeragency" file="graphics/extensions/damned/player_agency/imlogo.png" />
<!--Ext: Sharing is Caring-->
<!--Frame-->
<framedef name="chatframe_spell">
<bitmap file="graphics/extensions/damned/sharing_is_caring/chatframe_spell.png" />
<offset>40,40,40,40</offset>
</framedef>
<!--Chat-->
<icon name="button_chat" file="graphics/extensions/damned/sharing_is_caring/chat.png" />
<!--Chat-->
<icon name="button_chat" file="graphics/extensions/damned/sharing_is_caring/chat.png" />
<!--Icon-->
<icon name="sharingiscaring" file="graphics/extensions/damned/player_agency/imlogo.png" />

<!--Ext: Halt!-->
<!--Icons-->
<icon name="button_stop" file="graphics/extensions/damned/halt/stop.png" />
Expand Down Expand Up @@ -169,6 +177,34 @@
<!--Icons-->
<icon name="BetterCombatEffectsGold" file="graphics/extensions/ryan_hagelstrom/BCEG/bceg.png"></icon>
<icon name="bce_save" file="graphics/extensions/ryan_hagelstrom/BCEG/bce_save.png"></icon>
<!--Better Combat Effects-->
<!--Icons-->
<icon name="BetterCombatEffects" file="graphics/extensions/ryan_hagelstrom/BCEG/bceg.png"></icon>
<!--Arkane Ward-->
<!--Icons-->
<icon name="button_arcaneward" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_aw_small.png" />
<icon name="button_arcaneward_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_aw_small_down.png" />
<icon name="button_arcaneward_no_slots" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_aw_small_no_slots.png" />
<icon name="button_arcaneward_no_slots_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_aw_small_down_no_slots.png" />
<icon name="button_arcaneward_off" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_aw_small_off.png" />

<icon name="button_cast_spell" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_cast_small.png" />
<icon name="button_cast_spell_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_cast_small_down.png" />
<icon name="button_cast_spell_no_slots" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_cast_small_no_slots.png" />
<icon name="button_cast_spell_no_slots_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_cast_small_down_no_slots.png" />
<icon name="button_cast_spell_off" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_cast_small_off.png" />

<icon name="button_pactmagic" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_pm_small.png" />
<icon name="button_pactmagic_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_pm_small_down.png" />
<icon name="button_pactmagic_no_slots" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_pm_small_no_slots.png" />
<icon name="button_pactmagic_no_slots_pressed" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_pm_small_down_no_slots.png" />
<icon name="button_pactmagic_off" file="graphics/extensions/ryan_hagelstrom/arcane_ward/button_pm_small_off.png" />

<icon name="ArcaneWard" file="graphics/extensions/ryan_hagelstrom/arcane_ward/ArcaneWard.png"></icon>
<!--Kent Height-->
<!--Icons-->
<icon name="KentHeight" file="graphics/extensions/ryan_hagelstrom/kent_height/kheight.png"></icon>


<!--Author: Silent Ruin-->
<!--Ext: Polymorphism-->
Expand Down Expand Up @@ -453,6 +489,11 @@
<!-- Ext: Temporal Fixation -->
<!-- Icons -->
<icon name="TemporalFixation" file="graphics/extensions/meandunique/temporal_fixation/TemporalFixation.png" />
<!--Ext: Trigger me Timbers-->
<icon name="TriggerMeTimbers" file="graphics/extensions/meandunique/trigger_me_timbers/TriggerMeTimbers.png" />
<icon name="sidebar_icon_recordtype_trigger" file="graphics/extensions/meandunique/trigger_me_timbers/trigger.png" />
<icon name="active_trigger" file="graphics/extensions/meandunique/trigger_me_timbers/lightning.png" />

<!--Author: pr6i6est (Troy Monteith)-->
<!--Ext: NPC Random Treasure Drops-->
<icon name="conditions_tab" file="graphics/extensions/troy_monteith/npc_random_treasure_drops/conditions_tab.png" />
Expand All @@ -462,7 +503,8 @@
<icon name="pr6i6e6st_logo_miniARL" file="graphics/extensions/troy_monteith/automatic_record_links/pr6i6e6st_logo_miniARL.png" />
<!--Ext: Random Spellbook Generator-->
<icon name="pr6i6e6st_logo_miniRSG" file="graphics/extensions/troy_monteith/random_spellbook_generator/pr6i6e6st_logo_miniRSG.png" />

<!--Ext: Random Encounter Generator-->
<icon name="pr6i6e6st_logo_miniREG" file="graphics/extensions/troy_monteith/random_encounter_generator/pr6i6e6st_logo_miniREG.png" />

<!--Author: pr6i6est (Troy Monteith) and bmos-->
<!--Ext: Clock Adjuster-->
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/extensions/ryan_hagelstrom/BCEG/bceg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions graphics/graphics_fonts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<font name="emotefont">
<fgffile name="graphics/fonts/regular-10.fgf" />
<ttf file="graphics/fonts/Roboto-Regular.ttf" name="Roboto" size="16" />
<color value="#FF8C8C" /> <!-- Replaceable Color: Chat Font 1 -->
<color value="#C292FF" /> <!-- Replaceable Color: Chat Font 1 -->
</font>
<font name="narratorfont">
<fgffile name="graphics/fonts/bold-10.fgf" />
Expand Down Expand Up @@ -103,12 +103,12 @@
<font name="chatgmfont">
<fgffile name="graphics/fonts/bolditalic-10.fgf" />
<ttf file="graphics/fonts/Roboto-Italic.ttf" name="Roboto Italic" size="16" />
<color value="#B4B4F0" /> <!-- Replaceable Color: Chat Font 6 -->
<color value="#FFD3AA" /> <!-- Replaceable Color: Chat Font 6 -->
</font>
<font name="whisperfont">
<fgffile name="graphics/fonts/bold-10.fgf" />
<ttf file="graphics/fonts/Roboto-Regular.ttf" name="Roboto" size="16" />
<color value="#44CDC5" /> <!-- Replaceable Color: Chat Font 7 -->
<color value="#56E5DD" /> <!-- Replaceable Color: Chat Font 7 -->
</font>

<!-- Radial menus and character list -->
Expand Down
1 change: 1 addition & 0 deletions graphics/graphics_icons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<root>
<!-- sidebar -->
<!-- CoreRPG -->
<icon name="sidebar_icon_default" file="graphics/pngs/sidebar_icon_default.png" />
<icon name="sidebar_icon_link_ct" file="graphics/pngs/sidebar_icon_link_ct.png" />
<icon name="sidebar_icon_link_ps" file="graphics/pngs/sidebar_icon_link_ps.png" />
<icon name="sidebar_icon_link_calendar" file="graphics/pngs/sidebar_icon_link_calendar.png" />
Expand Down
Binary file modified graphics/pngs/chat_action.png
Binary file modified graphics/pngs/chat_emote.png
Binary file modified graphics/pngs/chat_ooc.png
Binary file modified graphics/pngs/chat_speak.png
Binary file modified graphics/pngs/chat_story.png
Binary file modified graphics/pngs/icon_window_close.png
Binary file modified graphics/pngs/icon_window_close_remote.png
Binary file modified graphics/pngs/menuback.png
Binary file modified graphics/pngs/menubackground.png
Binary file modified graphics/pngs/menuhub.png
Binary file modified graphics/pngs/sidebar_icon_link_ct.png
Binary file modified graphics/pngs/sidebar_icon_link_ps.png

0 comments on commit 9457e74

Please sign in to comment.