diff --git a/resources/gui/bankitem.png b/resources/gui/bankitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/bankitem.png and b/resources/gui/bankitem.png differ diff --git a/resources/gui/craftitem.png b/resources/gui/craftitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/craftitem.png and b/resources/gui/craftitem.png differ diff --git a/resources/gui/description.png b/resources/gui/description.png new file mode 100644 index 0000000..d01bdb2 Binary files /dev/null and b/resources/gui/description.png differ diff --git a/resources/gui/description_divider.png b/resources/gui/description_divider.png new file mode 100644 index 0000000..eafc606 Binary files /dev/null and b/resources/gui/description_divider.png differ diff --git a/resources/gui/description_header.png b/resources/gui/description_header.png new file mode 100644 index 0000000..8dda71e Binary files /dev/null and b/resources/gui/description_header.png differ diff --git a/resources/gui/description_headericon.png b/resources/gui/description_headericon.png new file mode 100644 index 0000000..42fc80a Binary files /dev/null and b/resources/gui/description_headericon.png differ diff --git a/resources/gui/equipmentitem.png b/resources/gui/equipmentitem.png index 461820a..7ad939f 100644 Binary files a/resources/gui/equipmentitem.png and b/resources/gui/equipmentitem.png differ diff --git a/resources/gui/hotbaritem.png b/resources/gui/hotbaritem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/hotbaritem.png and b/resources/gui/hotbaritem.png differ diff --git a/resources/gui/inventoryitem.png b/resources/gui/inventoryitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/inventoryitem.png and b/resources/gui/inventoryitem.png differ diff --git a/resources/gui/itemdesc.png b/resources/gui/itemdesc.png deleted file mode 100644 index d062973..0000000 Binary files a/resources/gui/itemdesc.png and /dev/null differ diff --git a/resources/gui/itemdescexpanded.png b/resources/gui/itemdescexpanded.png deleted file mode 100644 index f2cd656..0000000 Binary files a/resources/gui/itemdescexpanded.png and /dev/null differ diff --git a/resources/gui/itemdescription.png b/resources/gui/itemdescription.png deleted file mode 100644 index 53c306b..0000000 Binary files a/resources/gui/itemdescription.png and /dev/null differ diff --git a/resources/gui/itemdescriptiondivider.png b/resources/gui/itemdescriptiondivider.png deleted file mode 100644 index 8ad4a21..0000000 Binary files a/resources/gui/itemdescriptiondivider.png and /dev/null differ diff --git a/resources/gui/layouts/game/CraftingIngredient.json b/resources/gui/layouts/game/CraftingIngredient.json index 8665250..b4c5c50 100644 --- a/resources/gui/layouts/game/CraftingIngredient.json +++ b/resources/gui/layouts/game/CraftingIngredient.json @@ -1,5 +1,5 @@ { - "Bounds": "0,0,34,34", + "Bounds": "0,0,34,35", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", diff --git a/resources/gui/layouts/game/DescriptionWindowDescription.json b/resources/gui/layouts/game/DescriptionWindowDescription.json index 056010b..a40f66e 100644 --- a/resources/gui/layouts/game/DescriptionWindowDescription.json +++ b/resources/gui/layouts/game/DescriptionWindowDescription.json @@ -1,5 +1,5 @@ { - "Bounds": "0,0,210,120", + "Bounds": "0,0,210,46", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", @@ -17,17 +17,17 @@ "ToolTipBackground": null, "ToolTipFont": null, "ToolTipTextColor": "", - "Texture": "itemdescription.png", + "Texture": "description.png", "HoverSound": null, "LeftMouseClickSound": null, "RightMouseClickSound": null, "Children": { "Description": { - "Bounds": "3,0,204,16", + "Bounds": "0,0,210,46", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", - "Margin": "0,0,5,2", + "Margin": "0,0,0,0", "RenderColor": "255,255,255,255", "Alignments": "", "DrawBackground": true, diff --git a/resources/gui/layouts/game/DescriptionWindowDivider.json b/resources/gui/layouts/game/DescriptionWindowDivider.json index e2fe88e..77d394e 100644 --- a/resources/gui/layouts/game/DescriptionWindowDivider.json +++ b/resources/gui/layouts/game/DescriptionWindowDivider.json @@ -17,7 +17,7 @@ "ToolTipBackground": null, "ToolTipFont": null, "ToolTipTextColor": "", - "Texture": "itemdescriptiondivider.png", + "Texture": "description_divider.png", "HoverSound": null, "LeftMouseClickSound": null, "RightMouseClickSound": null diff --git a/resources/gui/layouts/game/DescriptionWindowHeader.json b/resources/gui/layouts/game/DescriptionWindowHeader.json index e1990d7..afa39d6 100644 --- a/resources/gui/layouts/game/DescriptionWindowHeader.json +++ b/resources/gui/layouts/game/DescriptionWindowHeader.json @@ -17,13 +17,13 @@ "ToolTipBackground": null, "ToolTipFont": null, "ToolTipTextColor": "", - "Texture": "itemdescription.png", + "Texture": "description_header.png", "HoverSound": null, "LeftMouseClickSound": null, "RightMouseClickSound": null, "Children": { "IconContainer": { - "Bounds": "3,3,34,34", + "Bounds": "6,6,36,36", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", @@ -41,7 +41,7 @@ "ToolTipBackground": null, "ToolTipFont": null, "ToolTipTextColor": "", - "Texture": "itemdescriptionheadericon.png", + "Texture": "description_headericon.png", "HoverSound": null, "LeftMouseClickSound": null, "RightMouseClickSound": null, @@ -73,7 +73,7 @@ } }, "Title": { - "Bounds": "40,0,1,20", + "Bounds": "46,0,1,20", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", @@ -103,7 +103,7 @@ "TextScale": 1.0 }, "Subtitle": { - "Bounds": "40,16,1,16", + "Bounds": "46,16,1,16", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", @@ -133,7 +133,7 @@ "TextScale": 1.0 }, "Description": { - "Bounds": "40,29,1,16", + "Bounds": "46,29,1,16", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", diff --git a/resources/gui/layouts/game/DescriptionWindowRowContainer.json b/resources/gui/layouts/game/DescriptionWindowRowContainer.json index 232b8b9..4d466d0 100644 --- a/resources/gui/layouts/game/DescriptionWindowRowContainer.json +++ b/resources/gui/layouts/game/DescriptionWindowRowContainer.json @@ -1,9 +1,9 @@ { - "Bounds": "0,0,210,40", + "Bounds": "0,0,210,46", "Padding": "0,0,0,0", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", - "Margin": "0,0,0,5", + "Margin": "0,0,0,0", "RenderColor": "255,255,255,255", "Alignments": "", "DrawBackground": true, @@ -17,7 +17,7 @@ "ToolTipBackground": null, "ToolTipFont": null, "ToolTipTextColor": "", - "Texture": "itemdescription.png", + "Texture": "description.png", "HoverSound": null, "LeftMouseClickSound": null, "RightMouseClickSound": null, diff --git a/resources/gui/layouts/game/EquipmentItem.json b/resources/gui/layouts/game/EquipmentItem.json index 7184b67..d29d7d8 100644 --- a/resources/gui/layouts/game/EquipmentItem.json +++ b/resources/gui/layouts/game/EquipmentItem.json @@ -1,5 +1,5 @@ { - "Bounds": "0,0,34,34", + "Bounds": "0,0,36,36", "Padding": "2,2,2,2", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", @@ -33,9 +33,8 @@ "MouseInputEnabled": false, "HideToolTip": false, "Texture": "", - "HoverSound": "octave-tap-resonant.wav", - "RightMouseClickSound": "octave-beep-tapped.wav", - + "HoverSound": "octave-tap-resonant.wav", + "RightMouseClickSound": "octave-beep-tapped.wav" } } } \ No newline at end of file diff --git a/resources/gui/layouts/game/PlayerStatusIcon.json b/resources/gui/layouts/game/PlayerStatusIcon.json index e7ebe5c..34e84d3 100644 --- a/resources/gui/layouts/game/PlayerStatusIcon.json +++ b/resources/gui/layouts/game/PlayerStatusIcon.json @@ -1,9 +1,9 @@ { - "Bounds": "0,0,34,35", - "Padding": "0,0,0,0", + "Bounds": "0,0,36,36", + "Padding": "2,2,2,2", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", - "Margin": "0,0,4,4", + "Margin": "4,1,4,1", "RenderColor": "255,255,255,255", "Alignments": "", "DrawBackground": true, diff --git a/resources/gui/layouts/game/SpellStatusIcon.json b/resources/gui/layouts/game/SpellStatusIcon.json index 7fd938a..34e84d3 100644 --- a/resources/gui/layouts/game/SpellStatusIcon.json +++ b/resources/gui/layouts/game/SpellStatusIcon.json @@ -1,9 +1,9 @@ { - "Bounds": "0,0,34,35", - "Padding": "0,0,0,0", + "Bounds": "0,0,36,36", + "Padding": "2,2,2,2", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", - "Margin": "5,1,5,3", + "Margin": "4,1,4,1", "RenderColor": "255,255,255,255", "Alignments": "", "DrawBackground": true, diff --git a/resources/gui/layouts/game/TargetStatusIcon.json b/resources/gui/layouts/game/TargetStatusIcon.json index 49b3c56..490dd4f 100644 --- a/resources/gui/layouts/game/TargetStatusIcon.json +++ b/resources/gui/layouts/game/TargetStatusIcon.json @@ -1,9 +1,9 @@ { - "Bounds": "0,0,34,35", - "Padding": "0,0,0,0", + "Bounds": "0,0,36,36", + "Padding": "2,2,2,2", "AlignmentEdgeDistances": "0,0,0,0", "AlignmentTransform": "0,0", - "Margin": "0,0,4,4", + "Margin": "4,1,4,1", "RenderColor": "255,255,255,255", "Alignments": "", "DrawBackground": true, diff --git a/resources/gui/menuitem.png b/resources/gui/menuitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/menuitem.png and b/resources/gui/menuitem.png differ diff --git a/resources/gui/shopitem.png b/resources/gui/shopitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/shopitem.png and b/resources/gui/shopitem.png differ diff --git a/resources/gui/spellitem.png b/resources/gui/spellitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/spellitem.png and b/resources/gui/spellitem.png differ diff --git a/resources/gui/status.png b/resources/gui/status.png index b40c7c1..7ad939f 100644 Binary files a/resources/gui/status.png and b/resources/gui/status.png differ diff --git a/resources/gui/texturepanel.png b/resources/gui/texturepanel.png index 84f08c7..bc64cc9 100644 Binary files a/resources/gui/texturepanel.png and b/resources/gui/texturepanel.png differ diff --git a/resources/gui/tooltip.png b/resources/gui/tooltip.png index 06dc170..9522f5b 100644 Binary files a/resources/gui/tooltip.png and b/resources/gui/tooltip.png differ diff --git a/resources/gui/tradeitem.png b/resources/gui/tradeitem.png index b40c7c1..b178398 100644 Binary files a/resources/gui/tradeitem.png and b/resources/gui/tradeitem.png differ