diff --git a/rsrc/dialogs/get-items.xml b/rsrc/dialogs/get-items.xml
index 4fdeacbc..9f22be91 100644
--- a/rsrc/dialogs/get-items.xml
+++ b/rsrc/dialogs/get-items.xml
@@ -54,10 +54,13 @@
-
+
=Keyboard: To get item, hit 'a' - 'h'.
To scroll, hit up and down arrows.
+
+ To select the junk bag, hit '7'.
+
diff --git a/rsrc/dialogs/help-inventory.xml b/rsrc/dialogs/help-inventory.xml
index 893dbc56..2a185b55 100644
--- a/rsrc/dialogs/help-inventory.xml
+++ b/rsrc/dialogs/help-inventory.xml
@@ -17,7 +17,7 @@
Once there, to equip (i.e. use) or unequip (take off) an item, click on its name.
Other buttons will appear enabling you do to other things:
-
+
Items from slain monsters normally appear unidentified.
To identify them, take them to a sage (such as Habecker in Fort Emergence).
Also, buying Item Lore skill sometimes makes monster's treasure appear already identified.
@@ -34,9 +34,11 @@
The Sell, ID, and Enchant buttons only appear when talking to a person who can do these things.
Many shopkeepers will buy your items, and certain sages can identify and even enchant them.
-
+
Finally, hitting the Jobs button (or typing '8') takes you to the jobs page,
where you can see what jobs you currently have.
Hitting the 'Spec' button (or typing '9') brings up whatever special items you have.
+ If "Show the junk bag" is enabled in the preferences, the 'Recycle Bin' button (or by typing '7')
+ shows you its items.
diff --git a/rsrc/graphics/CREDITS.md b/rsrc/graphics/CREDITS.md
index 38110992..b9eafbe5 100644
--- a/rsrc/graphics/CREDITS.md
+++ b/rsrc/graphics/CREDITS.md
@@ -23,7 +23,7 @@ though in some cases rearranged a little:
- errors.png ( "Under Construction Grunge Sign" by Free Grunge Textures - www.freestock.ca is licensed under CC BY 2.0 )
- edsplash.png (by James Ernest)
- fighthelp.png
-- invenbtns.png (the coin was cropped from an item graphic)
+- invenbtns.png (the coin was cropped from an item graphic, the "trash" icon is licensed under CC BY-SA 2.5)
- invenhelp.png
- inventory.png
- missiles.png
@@ -91,6 +91,8 @@ For item graphics, most are original BoE graphics, except for the following:
- The last two rows of objects.png are by ADoS, as is graphic 17.
- On tinyobj.png, graphics 17, 45-54, 69, and 134-138 are by ADoS.
+- On invenbtns.png, the "trash" picture is from the Tango! Desktop Project CC BY-SA 2.5.
+ https://commons.wikimedia.org/wiki/File:User-trash-full-4.svg
startanim.png has been heavily modified by ADoS with new text, but the actual pictures
in it are still all original BoE graphics.
diff --git a/rsrc/graphics/invenbtns.png b/rsrc/graphics/invenbtns.png
index 7ab2812a..b539cae4 100644
Binary files a/rsrc/graphics/invenbtns.png and b/rsrc/graphics/invenbtns.png differ
diff --git a/rsrc/graphicsUndithered/CREDITS.md b/rsrc/graphicsUndithered/CREDITS.md
new file mode 100644
index 00000000..288c379a
--- /dev/null
+++ b/rsrc/graphicsUndithered/CREDITS.md
@@ -0,0 +1,107 @@
+Graphics Credits
+================
+
+This is just a list of where all the graphics in this folder came from. In many cases,
+graphics will be referenced by their index as understood by the game; usually this is
+counted across first and then down, but in a few cases (like animated terrain or monsters)
+you count down and then across.
+
+The following files consist solely of original BoE graphics primarily by Andrew Hunter,
+though in some cases rearranged a little:
+
+- actionhelp.png
+- bigscenpics.png (except the fourth which is by The Almighty Doer of Stuff)
+- buttons.png
+- dlgbtnred.pm
+- dlogbtnhelp.png
+- dlogbtnled.png
+- dlogbtnlg.png
+- dlogbtnmed.ong
+- dlogbtnsm.png
+- dlogbtntall.png
+- dlogpics.png
+- errors.png ( "Under Construction Grunge Sign" by Free Grunge Textures - www.freestock.ca is licensed under CC BY 2.0 )
+- edsplash.png (by James Ernest)
+- fighthelp.png
+- invenbtns.png (the coin was cropped from an item graphic, the "trash" icon is licensed under CC BY-SA 2.5)
+- invenhelp.png
+- inventory.png
+- missiles.png
+- outhelp.png
+- pcedbuttons.png
+- pcedtitle.png
+- pcs.png (except the Vahnatai which is by Kelyar-Ihrno)
+- pixpats.png
+- scenpics.png
+- spidlogo.png
+- startbut.png
+- startsplash.png (by James Ernest)
+- startup.png
+- statarea.png
+- stathelp.png
+- talkportraits.png
+- terscreen.png
+- textbar.png
+- townhelp.png
+- transcript.png
+- trim.png
+- vehicle.png (except the last row which is by ADoS and is currently unused)
+they have been undithered with ImageMagick.
+
+In booms.png, the last two rows and the right-most graphic on the first row are by ADoS.
+The yellow explosion is a simple invert of the blue one. The rest are original BoE.
+
+In fields.png, the first four graphics were created by ADoS.
+The rest are original BoE graphics.
+
+Some sheets are entirely original:
+
+- dlogscroll.png created by Jewels (pressed versions made by Celtic Minstrel)
+
+For terrain graphics, most are original BoE graphics, except for the following (some of
+which are based on original BoE graphics):
+
+- On ter4.png, the grass hut is basically original BoE but had a shadow added by
+Celtic Minstrel.
+- On ter5.png, graphics 20-23 and 33 are by Mistb0rn. Graphics 2, 3, 18, 19, 25 are by ADoS.
+Graphics 24 and 46-49 were monster graphics in original BoE. Graphic 4 is by Celtic Minstrel
+based on original BoE graphics.
+- ter6.png is entirely by Mistb0rn.
+- ter7.png is by Mistb0rn, except the small trees (54 and 46) which are by Celtic
+Minstrel.
+- On ter8.png, graphics 0, 1, 5, 6, 10, 11, 15, 16 are by Celtic Minstrel; 18, 19, 44-49
+are by ADoS, and the rest are by Mistb0rn.
+- ter9.png is entirely by ADoS (some based on original BoE graphics).
+- On ter10.png, the base ice tiles (graphics 1 and 2) are by Mistb0rn and the rest is by
+ADoS (based on those tiles and original BoE graphics) with some tweaks by Celtic Minstrel.
+- ter11.png, ter12.png, ter13.png, and ter14.png are entirely by ADoS, except for the
+desert crater (graphic 7 on ter12.png) which is by Celtic Minstrel.
+- On teranim.png, graphic 15 is by Mistb0rn and graphic 16 is by ADoS.
+- termap.png currently just contains directly shrunken versions of the other sheets.
+
+For monster graphics, most are original BoE graphics, except for the following (some of
+which are based on original BoE graphics):
+
+- The last graphic in monst5.png (the statue) is adapted from Exile III (though BoE had a
+nearly-identical one).
+- The last graphic in monst7.png (the red slime) is by ADoS.
+- The crystal souls in monst8.png have been modified from the original to remove the
+background flooring.
+
+For item graphics, most are original BoE graphics, except for the following:
+
+- The last two rows of objects.png are by ADoS, as is graphic 17.
+- On tinyobj.png, graphics 17, 45-54, 69, and 134-138 are by ADoS.
+- On invenbtns.png, the "trash" picture is from the Tango! Desktop Project CC BY-SA 2.5.
+ https://commons.wikimedia.org/wiki/File:User-trash-full-4.svg
+
+startanim.png has been heavily modified by ADoS with new text, but the actual pictures
+in it are still all original BoE graphics.
+
+In staticons.png, the last four rows are by ADoS, some with tweaks by Celtic Minstrel.
+The rest are original BoE graphics.
+
+Most of edbuttons.png is by ADoS. A few of the tiny icons are by Celtic Minstrel or
+unchanged from original BoE. Most of the palette buttons are based on original BoE or on
+buttons by Celtic Minstrel (some of which were themselves based on original BoE). The
+blue button is unchanged from original BoE; the + button is by Celtic Minstrel.
diff --git a/rsrc/graphicsUndithered/invenbtns.png b/rsrc/graphicsUndithered/invenbtns.png
index b8e0b319..c839e4af 100644
Binary files a/rsrc/graphicsUndithered/invenbtns.png and b/rsrc/graphicsUndithered/invenbtns.png differ
diff --git a/rsrc/graphicsUnditheredByHand/invenbtns.png b/rsrc/graphicsUnditheredByHand/invenbtns.png
new file mode 100644
index 00000000..64eac027
Binary files /dev/null and b/rsrc/graphicsUnditheredByHand/invenbtns.png differ
diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index 329164df..ebfc4191 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -39,11 +39,12 @@
#include "render_shapes.hpp"
#include "enum_map.hpp"
-rectangle item_screen_button_rects[9] = {
- {125,10,141,28},{125,40,141,58},{125,68,141,86},{125,98,141,116},{125,126,141,144},{125,156,141,174},
- {126,176,141,211},
- {126,213,141,248},
- {127,251,140,267}
+rectangle item_screen_button_rects[10] = {
+ {125,9,141,27},{125,37,141,55},{125,64,141,82},{125,92,141,110},{125,119,141,137},{125,147,141,165}, // pc
+ {126,190,141,222}, // special
+ {126,221,141,254}, // quest
+ {127,254,140,270}, // help
+ {125,174,141,189} // junk bag
};
rectangle medium_buttons[4] = {
{383,190,401,225}, {402, 190, 420, 225},
@@ -61,7 +62,7 @@ rectangle startup_top;
enum_map(eItemButton, bool) item_area_button_active[8];
enum_map(ePlayerButton, bool) pc_area_button_active[6];
-short item_bottom_button_active[9] = {0,0,0,0,0, 0,1,1,1};
+bool item_bottom_button_active[10] = {false,false,false,false,false, false,true,true,true,false};
rectangle pc_help_button;
@@ -190,19 +191,6 @@ void init_screen_locs() {
item_buttons[i][j].offset(0,13 * i);
}
-/* for(short i = 0; i < 8; i++) {
- item_screen_button_rects[i] = bottom_base;
- OffsetRect(&item_screen_button_rects[i],10 + i * 29,126);
- }
- item_screen_button_rects[6].left = 176;
- item_screen_button_rects[6].right = 211;
- item_screen_button_rects[7].left = 213;
- item_screen_button_rects[7].right = 248;
- item_screen_button_rects[8].top = 127;
- item_screen_button_rects[8].bottom = 140;
- item_screen_button_rects[8].left = 251;
- item_screen_button_rects[8].right = 267; */
-
// name, hp, sp, info, trade
pc_buttons[0][PCBTN_NAME].top = 18;
pc_buttons[0][PCBTN_NAME].bottom = pc_buttons[0][PCBTN_NAME].top + 12;
@@ -1354,7 +1342,7 @@ bool handle_action(const sf::Event& event) {
point_in_area.x -= item_win_ul.x;
point_in_area.y -= item_win_ul.y;
- for(int i = 0; i < 9; i++)
+ for(int i = 0; i < 10; i++)
if(item_bottom_button_active[i] > 0 && point_in_area.in(item_screen_button_rects[i])) {
rectangle button_rect = item_screen_button_rects[i];
button_rect.offset(item_win_ul);
@@ -1369,6 +1357,9 @@ bool handle_action(const sf::Event& event) {
case 8: // help
cChoiceDlog("help-inventory").show();
break;
+ case 9:
+ set_stat_window(ITEM_WIN_JUNK);
+ break;
default:
handle_switch_pc_items(i, need_redraw);
break;
diff --git a/src/game/boe.items.cpp b/src/game/boe.items.cpp
index ca66cde9..702e7c22 100644
--- a/src/game/boe.items.cpp
+++ b/src/game/boe.items.cpp
@@ -629,10 +629,14 @@ bool show_get_items(std::string titleText, std::vector& itemRefs, short
sout << "item" << i << "-info";
itemDialog[sout.str()].attachClickHandler(handler);
}
- if (univ.party.show_junk_bag)
+ if (univ.party.show_junk_bag) {
itemDialog["junk"].show();
- else
+ itemDialog["help-junk"].show();
+ }
+ else {
itemDialog["junk"].hide();
+ itemDialog["help-junk"].hide();
+ }
put_item_graphics(itemDialog, first_item, pc_getting, itemRefs);
void (*give_help)(short,short,cDialog&) = ::give_help;
diff --git a/src/game/boe.text.cpp b/src/game/boe.text.cpp
index cb87c24d..a723a9ce 100644
--- a/src/game/boe.text.cpp
+++ b/src/game/boe.text.cpp
@@ -74,10 +74,10 @@ extern enum_map(eItemButton, rectangle) item_buttons[8];
extern enum_map(ePlayerButton, rectangle) pc_buttons[6];
extern enum_map(eItemButton, bool) item_area_button_active[8];
extern enum_map(ePlayerButton, bool) pc_area_button_active[6];
-extern rectangle item_screen_button_rects[9];
+extern rectangle item_screen_button_rects[10];
extern std::vector spec_item_array;
// combat globals
-extern short item_bottom_button_active[9];
+extern bool item_bottom_button_active[10];
extern cUniverse univ;
extern short shop_identify_cost;
extern short store_selling_values[8];
@@ -543,7 +543,7 @@ void place_item_button(short button_position,short which_slot,eItemButton button
void place_item_bottom_buttons() {
rectangle pc_from_rect = {0,0,36,28},but_from_rect = {30,60,46,78},to_rect;
- rectangle spec_from_rect = {0,60,15,95}, job_from_rect = {15,60,30,95}, help_from_rect = {46,60,59,76};
+ rectangle spec_from_rect = {0,60,15,95}, job_from_rect = {15,60,30,95}, help_from_rect = {46,60,59,76}, bag_from_rect = {60,60,78,78};
// TODO: What about when the buttons are pressed?
TextStyle style;
style.lineHeight = 10;
@@ -576,6 +576,18 @@ void place_item_bottom_buttons() {
rect_draw_some_item(invenbtn_gworld, job_from_rect, item_stats_gworld, to_rect, sf::BlendAlpha);
to_rect = item_screen_button_rects[8];
rect_draw_some_item(invenbtn_gworld, help_from_rect, item_stats_gworld, to_rect, sf::BlendAlpha);
+ if (univ.party.show_junk_bag) {
+ to_rect = item_screen_button_rects[9];
+ item_bottom_button_active[9] = true;
+ rect_draw_some_item(invenbtn_gworld, bag_from_rect, item_stats_gworld, to_rect, sf::BlendAlpha);
+ to_rect.inset(2,2);
+ std::string numeral = "7";
+ short width = string_length(numeral, style);
+ to_rect.offset(-width - 5, 0);
+ win_draw_string(item_stats_gworld, to_rect, numeral, eTextMode::LEFT_TOP, style);
+ }
+ else
+ item_bottom_button_active[9] = false;
}
void set_stat_window_for_pc(int pc) {