Skip to content

Commit

Permalink
enhancement: description windows and slot textures (#51)
Browse files Browse the repository at this point in the history
- Revamps description styling and slots textures.
- Also fixes a formatting issue at resources\gui\layouts\game\EquipmentItem.json
  • Loading branch information
Arufonsu authored Jul 16, 2024
1 parent 771123b commit 7a8801c
Show file tree
Hide file tree
Showing 29 changed files with 27 additions and 28 deletions.
Binary file modified resources/gui/bankitem.png
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 resources/gui/craftitem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gui/description.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gui/description_divider.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gui/description_header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gui/description_headericon.png
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 resources/gui/equipmentitem.png
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 resources/gui/hotbaritem.png
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 resources/gui/inventoryitem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/gui/itemdesc.png
Binary file not shown.
Binary file removed resources/gui/itemdescexpanded.png
Binary file not shown.
Binary file removed resources/gui/itemdescription.png
Binary file not shown.
Binary file removed resources/gui/itemdescriptiondivider.png
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/gui/layouts/game/CraftingIngredient.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions resources/gui/layouts/game/DescriptionWindowDescription.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion resources/gui/layouts/game/DescriptionWindowDivider.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ToolTipBackground": null,
"ToolTipFont": null,
"ToolTipTextColor": "",
"Texture": "itemdescriptiondivider.png",
"Texture": "description_divider.png",
"HoverSound": null,
"LeftMouseClickSound": null,
"RightMouseClickSound": null
Expand Down
12 changes: 6 additions & 6 deletions resources/gui/layouts/game/DescriptionWindowHeader.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -41,7 +41,7 @@
"ToolTipBackground": null,
"ToolTipFont": null,
"ToolTipTextColor": "",
"Texture": "itemdescriptionheadericon.png",
"Texture": "description_headericon.png",
"HoverSound": null,
"LeftMouseClickSound": null,
"RightMouseClickSound": null,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions resources/gui/layouts/game/DescriptionWindowRowContainer.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -17,7 +17,7 @@
"ToolTipBackground": null,
"ToolTipFont": null,
"ToolTipTextColor": "",
"Texture": "itemdescription.png",
"Texture": "description.png",
"HoverSound": null,
"LeftMouseClickSound": null,
"RightMouseClickSound": null,
Expand Down
7 changes: 3 additions & 4 deletions resources/gui/layouts/game/EquipmentItem.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}
}
}
6 changes: 3 additions & 3 deletions resources/gui/layouts/game/PlayerStatusIcon.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions resources/gui/layouts/game/SpellStatusIcon.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions resources/gui/layouts/game/TargetStatusIcon.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Binary file modified resources/gui/menuitem.png
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 resources/gui/shopitem.png
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 resources/gui/spellitem.png
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 resources/gui/status.png
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 resources/gui/texturepanel.png
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 resources/gui/tooltip.png
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 resources/gui/tradeitem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a8801c

Please sign in to comment.