Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match advanced inventory UI and info text #38763

Merged
merged 80 commits into from
Mar 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
c6acd3e
JSONize AEP_EVIL and implement intermittent artifact effects
KorGgenT Feb 21, 2020
c66bbbf
read ids and save ids for enchantments
KorGgenT Feb 23, 2020
cddc8b8
Add utf8_display_split function
jbytheway Feb 1, 2020
8e46186
Switch mapgen keys from ints to strings
jbytheway Feb 2, 2020
24b5616
Test Unicode mapgen with bookcases in house_w
jbytheway Feb 9, 2020
47d20e3
Document the Unicode mapgen support
jbytheway Feb 19, 2020
5311cdc
[Aftershock] Millyficent whately and the migo (#36908)
Maleclypse Mar 6, 2020
315ba2f
DinoModv3: DinoDNA (#26525)
LyleSY Mar 6, 2020
601b8cd
Dark Skies Part 2: Blacklists
ephemeralstoryteller Mar 1, 2020
5f1297e
Dark Skies Part 3: Effects and Items
ephemeralstoryteller Mar 1, 2020
ea99793
Part 3.1
ephemeralstoryteller Mar 1, 2020
cbdabbb
Dark Skies Part 4: Overrides (#38526)
ephemeralstoryteller Mar 6, 2020
3d167ff
Override scraps
ephemeralstoryteller Mar 4, 2020
b2bb766
adds snippets
ephemeralstoryteller Mar 4, 2020
089d6dd
Adds files related to monsters
ephemeralstoryteller Mar 4, 2020
1651aef
Removes door opening from certain soldiers
ephemeralstoryteller Mar 4, 2020
b51216f
Slows down consecrators
ephemeralstoryteller Mar 4, 2020
16099cc
Slows down emissaries
ephemeralstoryteller Mar 4, 2020
5b6f4e4
Lints neworder_loworder
ephemeralstoryteller Mar 4, 2020
a28ba4b
[Aftershock] Mutant npcs to aftershock (#37530)
Maleclypse Mar 6, 2020
c049ae0
Aftershock Crafting System (#37707)
John-Candlebury Mar 6, 2020
91efe2f
Adds new starting scenario - Crazy party and new starting profession …
CountAlex Mar 6, 2020
a93f169
Add subway maps (#37540)
wapcaplet Mar 6, 2020
18a9771
Add The Satanic Bible (#37806)
karthas077 Mar 6, 2020
f69b8f5
add shot counter to mods and gun
Feb 4, 2020
efadd5a
Refluff power armour and adjust stats slightly (#37578)
I-am-Erk Mar 6, 2020
8d154aa
Fix line endings
ZhilkinSerg Mar 6, 2020
ab5e207
Allow professions to start with a nearby vehicle - trucker profession…
Mar 6, 2020
6f1f4ab
Dark Skies 8: Adds strays, lurker, enemies; updates modinfo (#38596)
ephemeralstoryteller Mar 6, 2020
78b8043
updates for spell fixes (#38643)
ephemeralstoryteller Mar 8, 2020
7cb83af
[Magiclysm] Add Magiclysm academy (#38511)
curstwist Mar 8, 2020
96de5a0
Magiclysm: Forest Tomb (#37699)
arijust Mar 8, 2020
274a29c
Remove manual JSON object member check:
BevapDin Jan 26, 2020
64cc92f
Move some repeated code into a function get_mapgen_function.
BevapDin Jan 26, 2020
843f1f1
Move some code as function into mapgen.cpp
BevapDin Jan 26, 2020
954935c
Remove redundant declaration.
BevapDin Jan 26, 2020
7b5cbd5
Remove commented out code.
BevapDin Jan 26, 2020
6fc919e
Move access to oter_mapgen into mapgen.cpp
BevapDin Jan 26, 2020
29c506e
Remove exposing variables from mapgen.cpp in the header.
BevapDin Jan 26, 2020
cb3b5fa
Add separate function to register mapgen object: register_mapgen_func…
BevapDin Jan 26, 2020
458a013
Change oter_mapgen to contain ínstances of a dedicated class
BevapDin Jan 26, 2020
bfdbccb
Merge oter_mapgen_weights into oter_mapgen:
BevapDin Jan 26, 2020
e74d702
Store pointers directly in oter_mapgen weights map instead of indices…
BevapDin Jan 26, 2020
4be5b52
Use weighted_int_list for oter_mapgen weights
BevapDin Jan 26, 2020
8821d73
Move code into a member function mapgen_basic_container::pick
BevapDin Jan 26, 2020
fca3a31
Move code into a member function: mapgen_basic_container::setup
BevapDin Jan 26, 2020
78cb68e
Move code into a member function: mapgen_basic_container::check_consi…
BevapDin Jan 26, 2020
050c9a9
Make all data members of mapgen_basic_container private.
BevapDin Jan 26, 2020
f3b532c
Make a separate class for oter_mapgen
BevapDin Jan 26, 2020
0ea1229
Replace `auto` with actual type
BevapDin Jan 26, 2020
4083a15
Consistent naming: "omw" just like in the other function
BevapDin Jan 26, 2020
4bd7d70
Consistent naming: just "iter" as there is no need to hint the data t…
BevapDin Jan 26, 2020
6222fc0
Add usage checks for loaded mapgen instances.
BevapDin Jan 26, 2020
ef0579f
Add some documentation.
BevapDin Jan 26, 2020
3f6e622
Encapsulate the `mapgen_function` function pointers within `mapgen_fa…
BevapDin Feb 1, 2020
ca74007
Remove mapgen entries for overmap terrain "null".
BevapDin Feb 2, 2020
5d4a321
Follow recommendation of clang-tidy
BevapDin Feb 2, 2020
f19c870
Make parameter offset of load_mapgen_function mandatory.
BevapDin Feb 2, 2020
f2056a9
Remove default_idx parameter from load_mapgen_function.
BevapDin Feb 2, 2020
cc3d958
Refactor loading bonuses: (#36562)
BevapDin Mar 10, 2020
041c833
Indian cookbook (#37930)
ashGlaw Mar 10, 2020
637fd21
AR pistols (#37768)
RarkGrames Mar 10, 2020
9761f13
Sus bathroom 3.5 (#37431)
xanderrootslayer Mar 10, 2020
d000196
Add map_bash_info to fields (#37865)
Fris0uman Mar 10, 2020
aa5e87b
Fix style
ZhilkinSerg Mar 10, 2020
d96624c
Fix technique bonus format
ZhilkinSerg Mar 10, 2020
d70a5fb
Fix barrel length
ZhilkinSerg Mar 10, 2020
462379d
Fix barrel length
ZhilkinSerg Mar 10, 2020
3104ea8
Vehicle prototype is a struct
ZhilkinSerg Mar 10, 2020
40fd0f3
Merge pull request #38262 from KorGgenT/artifact-read-ids
ZhilkinSerg Mar 11, 2020
cf78c18
jsonize spell skills (#37368)
KorGgenT Mar 11, 2020
6ed76b6
Merge pull request #38221 from KorGgenT/artifact-intermittent
ZhilkinSerg Mar 11, 2020
cabffee
traps can cast spells (#38122)
KorGgenT Mar 11, 2020
f5f5b4f
Unicode in mapgen (#38149)
ZhilkinSerg Mar 11, 2020
1116a74
JSONize AEP_SMOKE and add emitters to enchantments (#38260)
KorGgenT Mar 12, 2020
4c47204
Match advanced inventory UI
Pupsi-Mupsi Mar 14, 2020
3fe4cf1
Match info text
Pupsi-Mupsi Mar 14, 2020
1bd931d
Add demon chitin armor & repairing dragon armor (#36733)
Mar 15, 2020
2007250
Merge branch 'dev' into PM-AI
ZhilkinSerg Mar 15, 2020
955b99d
Merge branch 'dev' into PM-AI
ZhilkinSerg Mar 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/advanced_inv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1102,10 +1102,9 @@ void advanced_inventory::display()
draw_border( head );
Messages::display_messages( head, 2, 1, w_width - 1, head_height - 2 );
draw_minimap();
const std::string msg = string_format( _( "< [%s] Show help >" ),
ctxt.get_desc( "HELP_KEYBINDINGS" ) );
mvwprintz( head, point( w_width - ( minimap_width + 2 ) - utf8_width( msg ) - 1, 0 ),
c_white, msg );
right_print( head, 0, +3, c_white, string_format(
_( "< [<color_yellow>%s</color>] keybindings >" ),
ctxt.get_desc( "HELP_KEYBINDINGS" ) ) );
if( g->u.has_watch() ) {
const std::string time = to_string_time_of_day( calendar::turn );
mvwprintz( head, point( 2, 0 ), c_white, time );
Expand Down
8 changes: 5 additions & 3 deletions src/output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -745,21 +745,23 @@ void draw_item_filter_rules( const catacurses::window &win, int starty, int heig

starty += fold_and_print( win, point( 1, starty ), len, c_white,
// NOLINTNEXTLINE(cata-text-style): literal comma
_( "Separate multiple items with ," ) );
_( "Separate multiple items with [<color_yellow>,</color>]." ) );
starty += 1 + fold_and_print( win, point( 1, starty ), len, c_white,
//~ An example of how to separate multiple items with a comma when filtering items.
_( "Example: back,flash,aid, ,band" ) ); // NOLINT(cata-text-style): literal comma

if( type == item_filter_type::FILTER ) {
starty += fold_and_print( win, point( 1, starty ), len, c_white,
_( "To exclude items, place - in front." ) );
_( "To exclude items, place [<color_yellow>-</color>] in front." ) );
starty += 1 + fold_and_print( win, point( 1, starty ), len, c_white,
//~ An example of how to exclude items with - when filtering items.
_( "Example: -pipe,-chunk,-steel" ) );
}

starty += fold_and_print( win, point( 1, starty ), len, c_white,
_( "Search [c]ategory, [m]aterial, [q]uality, [n]otes or [d]isassembled components:" ) );
_( "Search [<color_yellow>c</color>]ategory, [<color_yellow>m</color>]aterial, "
"[<color_yellow>q</color>]uality, [<color_yellow>n</color>]otes or "
"[<color_yellow>d</color>]isassembled components." ) );
fold_and_print( win, point( 1, starty ), len, c_white,
//~ An example of how to filter items based on category or material.
_( "Examples: c:food,m:iron,q:hammering,n:toolshelf,d:pipe" ) );
Expand Down