mmo-ref/stendhal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename client slot emblems so are grouped together

Browse source
This commit is contained in:
Jordan Irwin 2020-01-01 21:01:51 -08:00
parent 9b5de6d2bf
commit 60c78f211e
22 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
data/gui/armor-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 280 B

BIN
data/gui/boots-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 289 B

BIN
data/gui/helmet-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 309 B

BIN
data/gui/key-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 245 B

BIN
data/gui/legs-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 270 B

BIN
data/gui/portfolio-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 223 B

BIN
data/gui/ring-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 304 B

BIN
data/gui/shield-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 261 B

BIN
data/gui/slot-armor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 235 B

0
data/gui/bag-slot.png → data/gui/slot-bag.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 229 B

Before After
Before After

BIN
data/gui/slot-boots.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 237 B

0
data/gui/cloak-slot.png → data/gui/slot-cloak.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

Before After
Before After

BIN
data/gui/slot-helmet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 242 B

BIN
data/gui/slot-key.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 218 B

BIN
data/gui/slot-legs.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 227 B

BIN
data/gui/slot-portfolio.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 B

BIN
data/gui/slot-ring.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 249 B

BIN
data/gui/slot-shield.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 221 B

BIN
data/gui/slot-weapon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 263 B

BIN
data/gui/weapon-slot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 302 B

20
doc/sources/graphics-misc.txt
View file

@ -2,24 +2,17 @@
data/gui/
accountcontrol.png ???; ???; ???
armor-slot.png ???; ???; ???
bag.png rg1024, Jordan Irwin (AntumDeluge); CC0; https://openclipart.org/detail/31207
bag-slot.png CC0; Stendhal (based on cloak from Dungeon Crawl Stone Soup)
banner_background.* ???; ???; ???
boots-slot.png ???; ???; ???
buddy.png Svetlana Kushnariova (Cabbit), Jordan Irwin (AntumDeluge); OGA BY 3.0; https://opengameart.org/node/72969
buddy_offline.png ???; ???; ???
buddy_online.png ???; ???; ???
chat.png ???; ???; ???
cloak-slot.png CC0; Stendhal
danger.* ???; ???; ???
forbidden.* ???; ???; ???
helmet-slot.png ???; ???; ???
help.png ???; ???; ???
karma_scale.png ???; ???; ???
keyring.png ???; ???; ???
key-slot.png ???; ???; ???
legs-slot.png ???; ???; ???
mana_scale.png ???; ???; ???
offline.png ???; ???; ???
panel_aubergine_001.png ???; ???; ???
@ -28,16 +21,23 @@ panel_honeycomb_001.png ???; ???; ???
panel_leather_black_001.png Duion; CC0; http://opengameart.org/node/15132
panel_parquet_brown_001.png ???; ???; ???
panel_tile_aqua_001.png Jordan Irwin (AntumDeluge); CC BY 3.0; Stendhal
ring-slot.png ???; ???; ???
rp.png ???; ???; ???
scroll_background.* ???; ???; ???
settings.png ???; ???; ???
shield-slot.png ???; ???; ???
slot.png ???; ???; ???
slot-armor.png ???; ???; ???
slot-bag.png CC0; Stendhal (based on cloak from Dungeon Crawl Stone Soup)
slot-boots.png ???; ???; ???
slot-cloak.png CC0; Stendhal
slot-helmet.png ???; ???; ???
slot-key.png ???; ???; ???
slot-legs.png ???; ???; ???
slot-ring.png ???; ???; ???
slot-shield.png ???; ???; ???
slot-weapon.png ???; ???; ???
StendhalIcon.png ???; ???; ???
trash.* ???; ???; ???
tutorial_background.* Svetlana Kushnariova (Cabbit), Nila122, Kimmo Rundelin (kiheru), Jordan Irwin (AntumDeluge); CC BY-SA 3.0; Stendhal, https://opengameart.org/node/83626, https://opengameart.org/node/29293
weapon-slot.png ???; ???; ???
data/sprites/

20
src/games/stendhal/client/gui/Character.java
View file

@ -118,19 +118,19 @@ Inspectable {
*/
left.add(Box.createVerticalStrut(HAND_YSHIFT * 2));
ItemPanel panel = createItemPanel(itemClass, store, "rhand", "data/gui/weapon-slot.png");
ItemPanel panel = createItemPanel(itemClass, store, "rhand", "data/gui/slot-weapon.png");
left.add(panel);
panel = createItemPanel(itemClass, store, "finger", "data/gui/ring-slot.png");
panel = createItemPanel(itemClass, store, "finger", "data/gui/slot-ring.png");
left.add(panel);
// Fill the middle column
panel = createItemPanel(itemClass, store, "head", "data/gui/helmet-slot.png");
panel = createItemPanel(itemClass, store, "head", "data/gui/slot-helmet.png");
middle.add(panel);
panel = createItemPanel(itemClass, store, "armor", "data/gui/armor-slot.png");
panel = createItemPanel(itemClass, store, "armor", "data/gui/slot-armor.png");
middle.add(panel);
panel = createItemPanel(itemClass, store, "legs", "data/gui/legs-slot.png");
panel = createItemPanel(itemClass, store, "legs", "data/gui/slot-legs.png");
middle.add(panel);
panel = createItemPanel(itemClass, store, "feet", "data/gui/boots-slot.png");
panel = createItemPanel(itemClass, store, "feet", "data/gui/slot-boots.png");
middle.add(panel);
/*
@ -140,9 +140,9 @@ Inspectable {
* the column uses the other half at the bottom.
*/
right.add(Box.createVerticalStrut(HAND_YSHIFT * 2));
panel = createItemPanel(itemClass, store, "lhand", "data/gui/shield-slot.png");
panel = createItemPanel(itemClass, store, "lhand", "data/gui/slot-shield.png");
right.add(panel);
panel = createItemPanel(itemClass, store, "cloak", "data/gui/cloak-slot.png");
panel = createItemPanel(itemClass, store, "cloak", "data/gui/slot-cloak.png");
right.add(panel);
@ -153,9 +153,9 @@ Inspectable {
specialSlots.setVisible(false);
content.add(specialSlots);
panel = createItemPanel(itemClass, store, "back", "data/gui/bag-slot.png");
panel = createItemPanel(itemClass, store, "back", "data/gui/slot-bag.png");
specialSlots.add(panel);
panel = createItemPanel(itemClass, store, "belt", "data/gui/key-slot.png");
panel = createItemPanel(itemClass, store, "belt", "data/gui/slot-key.png");
specialSlots.add(panel);
setContent(content);