From 48dcbfc014417244ba564264e40a155fcc253e54 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Wed, 23 Jan 2019 08:48:26 -0800 Subject: [PATCH 01/10] Revert "Merge pull request #6 from CleverRaven/master" This reverts commit 753b1ac43005c113a6eb7106cb5f14bb9cfe009f, reversing changes made to 9a32197630613d5ce69b04e66219fe7e584b6017. --- data/json/items/armor.json | 2 +- data/json/items/tools.json | 5 +- data/json/recipes/armor/storage.json | 2 +- src/faction_camp.cpp | 2 +- src/iuse_actor.h | 1 - src/main.cpp | 7 +-- src/sidebar.cpp | 94 ++++++++++++++-------------- 7 files changed, 53 insertions(+), 60 deletions(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index b849420eec76f..febbe328f1045 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -1242,7 +1242,7 @@ "id": "spearsling", "type": "ARMOR", "name": "spear strap", - "description": "A leather strap tied around the torso for toting spears while keeping your hands free. You have to duck to get through doors while one's in it, though. Activate to holster/draw a weapon.", + "description": "A cloth strap tied around the torso for toting spears while keeping your hands free. You have to duck to get through doors while one's in it, though. Activate to holster/draw a weapon.", "weight": 160, "volume": 2, "price": 5200, diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 309048c26535f..58407ee12dbae 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -1509,7 +1509,7 @@ "type": "TOOL", "name": "circular saw (off)", "name_plural": "circular saws (off)", - "description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.", + "description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, metal, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.", "weight": 2940, "volume": 3, "price": 5000, @@ -1531,7 +1531,6 @@ "type": "TOOL", "name": "circular saw (on)", "name_plural": "circular saws (on)", - "//": "Circular saw would be very fast but imprecise butchering tool - alas the qualities are not separate and so speed is sacrificed.", "description": "A lightweight handheld cordless circular saw. It is currently on and the blade is spinning; use this item to turn it off.", "weight": 2940, "volume": 3, @@ -1546,7 +1545,7 @@ "max_charges": 100, "turns_per_charge": 1, "revert_to": "circsaw_off", - "qualities": [ [ "CUT", 1 ], [ "SAW_W", 2 ], [ "BUTCHER", -40 ] ], + "qualities": [ [ "CUT", 1 ], [ "SAW_W", 2 ], [ "SAW_M", 2 ], [ "BUTCHER", 60 ] ], "use_action": "CIRCSAW_ON", "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE" ] }, diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 6e87f48f22fae..c7a6ab371fb18 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -661,7 +661,7 @@ "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ - [ [ "felt_patch", 7 ], [ "leather", 7 ], [ "fur", 7 ] ], + [ [ "rag", 7 ], [ "felt_patch", 7 ], [ "leather", 7 ], [ "fur", 7 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 2, "LIST" ] ] ] }, diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 9d9e0a39425fa..9115acfd4e560 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -1040,7 +1040,7 @@ bool basecamp::handle_mission( npc &p, const std::string &miss_id, const std::st craft_construction( p, miss_id, miss_dir, "COOK", "_faction_exp_kitchen_cooking_" ); if( miss_id == miss_dir + " (Finish) Cooking" ) { const std::string msg = _( "returns from your kitchen with something..." ); - mission_return( p, "_faction_exp_kitchen_cooking_" + miss_dir, 15_minutes, + mission_return( p, "_faction_exp_kitchen_crafting_" + miss_dir, 15_minutes, true, msg, "cooking", 2 ); } diff --git a/src/iuse_actor.h b/src/iuse_actor.h index ecc820ba32f75..9c80d798527ab 100644 --- a/src/iuse_actor.h +++ b/src/iuse_actor.h @@ -448,7 +448,6 @@ class salvage_actor : public iuse_actor material_id( "cotton" ), material_id( "leather" ), material_id( "fur" ), - material_id( "faux_fur" ), material_id( "nomex" ), material_id( "kevlar" ), material_id( "plastic" ), diff --git a/src/main.cpp b/src/main.cpp index 592e08ac6475d..f3c7fcd9b92a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,15 +33,10 @@ #include "translations.h" #ifdef TILES -# if defined(_MSC_VER) && defined(USE_VCPKG) -# include -# else -# include -# endif +#include "sdl_wrappers.h" #endif #ifdef __ANDROID__ -#include #include #include #include diff --git a/src/sidebar.cpp b/src/sidebar.cpp index 5c1dbca70050b..d351263d6a11a 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -467,7 +467,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window veh = veh_pointer_or_null( g->m.veh_at( pos() ) ); } if( veh ) { - veh->print_fuel_indicators( w, sideStyle ? 5 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); + veh->print_fuel_indicators( w, sideStyle ? 4 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); nc_color col_indf1 = c_light_gray; const float strain = veh->strain(); @@ -519,7 +519,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window wprintz( w, c_white, " " ); } - wmove( w, sideStyle ? 4 : 3, getmaxx( w ) - ( sideStyle ? 14 : 12 ) ); + //Vehicle direction indicator in 0-359° where 0 is north (veh->face.dir() 0° is west) wprintz( w, c_white, "%3d°", ( veh->face.dir() + 90 ) % 360 ); @@ -567,57 +567,57 @@ void player::disp_status( const catacurses::window &w, const catacurses::window //~ Movement type: "running". Max string length: one letter. const auto str_run = pgettext( "movement-type", "R" ); wprintz( w, c_white, " %s", move_mode == "walk" ? str_walk : str_run ); - } - // display power level - wmove( sideStyle ? w : g->w_HP, - sideStyle ? 4 : 21, - sideStyle ? 17 : 0 ); - wprintz( sideStyle ? w : g->w_HP, c_white, _( "Pwr " ) ); + // display power level + wmove( sideStyle ? w : g->w_HP, + sideStyle ? spdy - 1 : 21, + sideStyle ? ( wx + dx * 4 - 1 ) : 0 ); - if( this->max_power_level == 0 ) { - wprintz( sideStyle ? w : g->w_HP, c_light_gray, " --" ); - } else { - nc_color color = c_red; - if( this->power_level >= this->max_power_level / 2 ) { - color = c_green; - } else if( this->power_level >= this->max_power_level / 3 ) { - color = c_yellow; - } else if( this->power_level >= this->max_power_level / 4 ) { - color = c_red; - } + wprintz( sideStyle ? w : g->w_HP, c_white, _( "Pwr " ) ); - // calc number of digits in powerlevel int - int offset = get_int_digits( this->power_level ); - - // case power_level > 999 display 1k instead - int display_power = this->power_level; - std::string unit = ""; - if( this->power_level > 999 ) { - switch( offset ) { - case 4: - display_power /= 1000; - unit = "k"; - offset = 2; - break; - case 5: - display_power /= 1000; - unit = "k"; - offset = 0; - break; - } + if( this->max_power_level == 0 ) { + wprintz( sideStyle ? w : g->w_HP, c_light_gray, " --" ); } else { - unit = ""; - } + nc_color color = c_red; + if( this->power_level >= this->max_power_level / 2 ) { + color = c_green; + } else if( this->power_level >= this->max_power_level / 3 ) { + color = c_yellow; + } else if( this->power_level >= this->max_power_level / 4 ) { + color = c_red; + } - wmove( sideStyle ? w : g->w_HP, - sideStyle ? 4 : 21, - sideStyle ? 17 - offset : 7 - offset ); - std::string power_value = std::to_string( display_power ) + unit; - wprintz( sideStyle ? w : g->w_HP, color, power_value ); - } - wrefresh( sideStyle ? w : g->w_HP ); + // calc number of digits in powerlevel int + int offset = get_int_digits( this->power_level ); + + // case power_level > 999 display 1k instead + int display_power = this->power_level; + std::string unit = ""; + if( this->power_level > 999 ) { + switch( offset ) { + case 4: + display_power /= 1000; + unit = "k"; + offset = 2; + break; + case 5: + display_power /= 1000; + unit = "k"; + offset = 0; + break; + } + } else { + unit = ""; + } + wmove( sideStyle ? w : g->w_HP, + sideStyle ? spdy - 1 : 21, + sideStyle ? ( wx + dx * 4 + 6 ) - offset : 7 - offset ); + std::string power_value = std::to_string( display_power ) + unit; + wprintz( sideStyle ? w : g->w_HP, color, power_value ); + } + wrefresh( sideStyle ? w : g->w_HP ); + } } int get_int_digits( const int &digits ) From 17e54d22a72f952899a67e7926414a07e6db6826 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Wed, 23 Jan 2019 18:43:46 -0800 Subject: [PATCH 02/10] Revert "Revert "Merge pull request #6 from CleverRaven/master"" This reverts commit 48dcbfc014417244ba564264e40a155fcc253e54. --- data/json/items/armor.json | 2 +- data/json/items/tools.json | 5 +- data/json/recipes/armor/storage.json | 2 +- src/faction_camp.cpp | 2 +- src/iuse_actor.h | 1 + src/main.cpp | 7 ++- src/sidebar.cpp | 94 ++++++++++++++-------------- 7 files changed, 60 insertions(+), 53 deletions(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index febbe328f1045..b849420eec76f 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -1242,7 +1242,7 @@ "id": "spearsling", "type": "ARMOR", "name": "spear strap", - "description": "A cloth strap tied around the torso for toting spears while keeping your hands free. You have to duck to get through doors while one's in it, though. Activate to holster/draw a weapon.", + "description": "A leather strap tied around the torso for toting spears while keeping your hands free. You have to duck to get through doors while one's in it, though. Activate to holster/draw a weapon.", "weight": 160, "volume": 2, "price": 5200, diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 58407ee12dbae..309048c26535f 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -1509,7 +1509,7 @@ "type": "TOOL", "name": "circular saw (off)", "name_plural": "circular saws (off)", - "description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, metal, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.", + "description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.", "weight": 2940, "volume": 3, "price": 5000, @@ -1531,6 +1531,7 @@ "type": "TOOL", "name": "circular saw (on)", "name_plural": "circular saws (on)", + "//": "Circular saw would be very fast but imprecise butchering tool - alas the qualities are not separate and so speed is sacrificed.", "description": "A lightweight handheld cordless circular saw. It is currently on and the blade is spinning; use this item to turn it off.", "weight": 2940, "volume": 3, @@ -1545,7 +1546,7 @@ "max_charges": 100, "turns_per_charge": 1, "revert_to": "circsaw_off", - "qualities": [ [ "CUT", 1 ], [ "SAW_W", 2 ], [ "SAW_M", 2 ], [ "BUTCHER", 60 ] ], + "qualities": [ [ "CUT", 1 ], [ "SAW_W", 2 ], [ "BUTCHER", -40 ] ], "use_action": "CIRCSAW_ON", "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE" ] }, diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c7a6ab371fb18..6e87f48f22fae 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -661,7 +661,7 @@ "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ - [ [ "rag", 7 ], [ "felt_patch", 7 ], [ "leather", 7 ], [ "fur", 7 ] ], + [ [ "felt_patch", 7 ], [ "leather", 7 ], [ "fur", 7 ] ], [ [ "filament", 20, "LIST" ], [ "cordage", 2, "LIST" ] ] ] }, diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 9115acfd4e560..9d9e0a39425fa 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -1040,7 +1040,7 @@ bool basecamp::handle_mission( npc &p, const std::string &miss_id, const std::st craft_construction( p, miss_id, miss_dir, "COOK", "_faction_exp_kitchen_cooking_" ); if( miss_id == miss_dir + " (Finish) Cooking" ) { const std::string msg = _( "returns from your kitchen with something..." ); - mission_return( p, "_faction_exp_kitchen_crafting_" + miss_dir, 15_minutes, + mission_return( p, "_faction_exp_kitchen_cooking_" + miss_dir, 15_minutes, true, msg, "cooking", 2 ); } diff --git a/src/iuse_actor.h b/src/iuse_actor.h index 9c80d798527ab..ecc820ba32f75 100644 --- a/src/iuse_actor.h +++ b/src/iuse_actor.h @@ -448,6 +448,7 @@ class salvage_actor : public iuse_actor material_id( "cotton" ), material_id( "leather" ), material_id( "fur" ), + material_id( "faux_fur" ), material_id( "nomex" ), material_id( "kevlar" ), material_id( "plastic" ), diff --git a/src/main.cpp b/src/main.cpp index f3c7fcd9b92a1..592e08ac6475d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,10 +33,15 @@ #include "translations.h" #ifdef TILES -#include "sdl_wrappers.h" +# if defined(_MSC_VER) && defined(USE_VCPKG) +# include +# else +# include +# endif #endif #ifdef __ANDROID__ +#include #include #include #include diff --git a/src/sidebar.cpp b/src/sidebar.cpp index d351263d6a11a..5c1dbca70050b 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -467,7 +467,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window veh = veh_pointer_or_null( g->m.veh_at( pos() ) ); } if( veh ) { - veh->print_fuel_indicators( w, sideStyle ? 4 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); + veh->print_fuel_indicators( w, sideStyle ? 5 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); nc_color col_indf1 = c_light_gray; const float strain = veh->strain(); @@ -519,7 +519,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window wprintz( w, c_white, " " ); } - + wmove( w, sideStyle ? 4 : 3, getmaxx( w ) - ( sideStyle ? 14 : 12 ) ); //Vehicle direction indicator in 0-359° where 0 is north (veh->face.dir() 0° is west) wprintz( w, c_white, "%3d°", ( veh->face.dir() + 90 ) % 360 ); @@ -567,57 +567,57 @@ void player::disp_status( const catacurses::window &w, const catacurses::window //~ Movement type: "running". Max string length: one letter. const auto str_run = pgettext( "movement-type", "R" ); wprintz( w, c_white, " %s", move_mode == "walk" ? str_walk : str_run ); + } + // display power level + wmove( sideStyle ? w : g->w_HP, + sideStyle ? 4 : 21, + sideStyle ? 17 : 0 ); - // display power level - wmove( sideStyle ? w : g->w_HP, - sideStyle ? spdy - 1 : 21, - sideStyle ? ( wx + dx * 4 - 1 ) : 0 ); + wprintz( sideStyle ? w : g->w_HP, c_white, _( "Pwr " ) ); - wprintz( sideStyle ? w : g->w_HP, c_white, _( "Pwr " ) ); + if( this->max_power_level == 0 ) { + wprintz( sideStyle ? w : g->w_HP, c_light_gray, " --" ); + } else { + nc_color color = c_red; + if( this->power_level >= this->max_power_level / 2 ) { + color = c_green; + } else if( this->power_level >= this->max_power_level / 3 ) { + color = c_yellow; + } else if( this->power_level >= this->max_power_level / 4 ) { + color = c_red; + } - if( this->max_power_level == 0 ) { - wprintz( sideStyle ? w : g->w_HP, c_light_gray, " --" ); - } else { - nc_color color = c_red; - if( this->power_level >= this->max_power_level / 2 ) { - color = c_green; - } else if( this->power_level >= this->max_power_level / 3 ) { - color = c_yellow; - } else if( this->power_level >= this->max_power_level / 4 ) { - color = c_red; + // calc number of digits in powerlevel int + int offset = get_int_digits( this->power_level ); + + // case power_level > 999 display 1k instead + int display_power = this->power_level; + std::string unit = ""; + if( this->power_level > 999 ) { + switch( offset ) { + case 4: + display_power /= 1000; + unit = "k"; + offset = 2; + break; + case 5: + display_power /= 1000; + unit = "k"; + offset = 0; + break; } - - // calc number of digits in powerlevel int - int offset = get_int_digits( this->power_level ); - - // case power_level > 999 display 1k instead - int display_power = this->power_level; - std::string unit = ""; - if( this->power_level > 999 ) { - switch( offset ) { - case 4: - display_power /= 1000; - unit = "k"; - offset = 2; - break; - case 5: - display_power /= 1000; - unit = "k"; - offset = 0; - break; - } - } else { - unit = ""; - } - - wmove( sideStyle ? w : g->w_HP, - sideStyle ? spdy - 1 : 21, - sideStyle ? ( wx + dx * 4 + 6 ) - offset : 7 - offset ); - std::string power_value = std::to_string( display_power ) + unit; - wprintz( sideStyle ? w : g->w_HP, color, power_value ); + } else { + unit = ""; } - wrefresh( sideStyle ? w : g->w_HP ); + + wmove( sideStyle ? w : g->w_HP, + sideStyle ? 4 : 21, + sideStyle ? 17 - offset : 7 - offset ); + std::string power_value = std::to_string( display_power ) + unit; + wprintz( sideStyle ? w : g->w_HP, color, power_value ); } + wrefresh( sideStyle ? w : g->w_HP ); + } int get_int_digits( const int &digits ) From 25734fddd831668a84856a8a466863dfc46f24ce Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 13:10:46 -0800 Subject: [PATCH 03/10] Create currency.json Adds two new currencies, for the free merchants and the as-yet nonexistent campus faction. --- data/json/items/generic/currency.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 data/json/items/generic/currency.json diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json new file mode 100644 index 0000000000000..70e03d2a735a8 --- /dev/null +++ b/data/json/items/generic/currency.json @@ -0,0 +1,26 @@ +[ + { + "type": "GENERIC", + "id": "FMCNote", + "name": "FMCN", + "description": "The Free Merchant Certified Note, also known by names such as a 'c-note' or 'merch', is a currency based on old American bills. Fifty dollar bills and larger are printed with a promissory note signed by the treasurer of the Free Merchants, along with a complex design. The note explains that this can be exchanged for food, water, and other services through the Free Merchants in the Refugee Center.", + "weight": 1, + "to_hit": -3, + "color": "white", + "symbol": "$", + "material": [ "paper" ], + "volume": "2 mL" + }, + { + "type": "GENERIC", + "id": "FlatCoin", + "name": "FlatCoin", + "description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlayed with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.", + "weight": 2, + "to_hit": -3, + "color": "orange", + "symbol": "$", + "material": [ "copper" ], + "volume": "2 mL" + } +] From 10959f67c2dff901ace0ec2259a9baf1cf18067f Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 13:16:13 -0800 Subject: [PATCH 04/10] Add a number of FM Certified Notes to shopkeeper This makes sure the shopkeeper will have some, but the amount will vary randomly --- data/json/npcs/NC_EVAC_SHOPKEEP.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/json/npcs/NC_EVAC_SHOPKEEP.json b/data/json/npcs/NC_EVAC_SHOPKEEP.json index 07780f2d6d1ac..569d677fc751f 100644 --- a/data/json/npcs/NC_EVAC_SHOPKEEP.json +++ b/data/json/npcs/NC_EVAC_SHOPKEEP.json @@ -16,6 +16,17 @@ "type" : "item_group", "id" : "NC_EVAC_SHOPKEEP_misc", "items":[ + [ "FMCNote", "charges": 100, 90 ], + [ "FMCNote", "charges": 200, 80 ], + [ "FMCNote", "charges": 300, 70 ], + [ "FMCNote", "charges": 10, 90 ], + [ "FMCNote", "charges": 50, 90 ], + [ "FMCNote", "charges": 20, 90 ], + [ "FMCNote", "charges": 1, 90 ], + [ "FMCNote", "charges": 2, 90 ], + [ "FMCNote", "charges": 3, 90 ], + [ "FMCNote", "charges": 5, 90 ], + [ "FMCNote", "charges": 7, 90 ], ["vest", 40], ["kevlar", 15], ["jacket_army", 30], From 4dbdc55ce3e47091005e4e512f9178e60ad141a6 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 13:17:27 -0800 Subject: [PATCH 05/10] Update currency.json Adds a price value, pretty much randomly set for now. --- data/json/items/generic/currency.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json index 70e03d2a735a8..54286e188fb77 100644 --- a/data/json/items/generic/currency.json +++ b/data/json/items/generic/currency.json @@ -4,6 +4,7 @@ "id": "FMCNote", "name": "FMCN", "description": "The Free Merchant Certified Note, also known by names such as a 'c-note' or 'merch', is a currency based on old American bills. Fifty dollar bills and larger are printed with a promissory note signed by the treasurer of the Free Merchants, along with a complex design. The note explains that this can be exchanged for food, water, and other services through the Free Merchants in the Refugee Center.", + "price" : 10, "weight": 1, "to_hit": -3, "color": "white", @@ -16,6 +17,7 @@ "id": "FlatCoin", "name": "FlatCoin", "description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlayed with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.", + "price" : 5, "weight": 2, "to_hit": -3, "color": "orange", From 04818f945ab302da974a596e86eb31d6379fa339 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Tue, 29 Jan 2019 14:47:18 -0800 Subject: [PATCH 06/10] Correct erroneous merge --- src/sidebar.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sidebar.cpp b/src/sidebar.cpp index 44bf9735c963a..7d0dfd1f55a12 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -467,7 +467,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window veh = veh_pointer_or_null( g->m.veh_at( pos() ) ); } if( veh ) { - veh->print_fuel_indicators( w, sideStyle ? 4 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); + veh->print_fuel_indicators( w, sideStyle ? 5 : 3, sideStyle ? getmaxx( w ) - 5 : 49 ); nc_color col_indf1 = c_light_gray; const float strain = veh->strain(); @@ -519,7 +519,7 @@ void player::disp_status( const catacurses::window &w, const catacurses::window wprintz( w, c_white, " " ); } - + wmove( w, sideStyle ? 4 : 3, getmaxx( w ) - ( sideStyle ? 14 : 12 ) ); //Vehicle direction indicator in 0-359° where 0 is north (veh->face.dir() 0° is west) wprintz( w, c_white, "%3d°", ( veh->face.dir() + 90 ) % 360 ); @@ -618,7 +618,6 @@ void player::disp_status( const catacurses::window &w, const catacurses::window } wrefresh( sideStyle ? w : g->w_HP ); - } int get_int_digits( const int &digits ) From 7261b6a79ba708eb446f77b8c98d16c1c82f7fc3 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 20:52:52 -0800 Subject: [PATCH 07/10] Update NC_EVAC_SHOPKEEP.json --- data/json/npcs/NC_EVAC_SHOPKEEP.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/data/json/npcs/NC_EVAC_SHOPKEEP.json b/data/json/npcs/NC_EVAC_SHOPKEEP.json index 569d677fc751f..0495668e337e9 100644 --- a/data/json/npcs/NC_EVAC_SHOPKEEP.json +++ b/data/json/npcs/NC_EVAC_SHOPKEEP.json @@ -16,17 +16,7 @@ "type" : "item_group", "id" : "NC_EVAC_SHOPKEEP_misc", "items":[ - [ "FMCNote", "charges": 100, 90 ], - [ "FMCNote", "charges": 200, 80 ], - [ "FMCNote", "charges": 300, 70 ], - [ "FMCNote", "charges": 10, 90 ], - [ "FMCNote", "charges": 50, 90 ], - [ "FMCNote", "charges": 20, 90 ], - [ "FMCNote", "charges": 1, 90 ], - [ "FMCNote", "charges": 2, 90 ], - [ "FMCNote", "charges": 3, 90 ], - [ "FMCNote", "charges": 5, 90 ], - [ "FMCNote", "charges": 7, 90 ], + { "item": "FMCNote", "count-min": 50, "count-max": 300, "prob": 100 }, ["vest", 40], ["kevlar", 15], ["jacket_army", 30], From f95170d5eef937e867275ce24376fea4a32ecab5 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 20:56:40 -0800 Subject: [PATCH 08/10] Update currency.json --- data/json/items/generic/currency.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json index 54286e188fb77..adfa488aa3e19 100644 --- a/data/json/items/generic/currency.json +++ b/data/json/items/generic/currency.json @@ -4,7 +4,7 @@ "id": "FMCNote", "name": "FMCN", "description": "The Free Merchant Certified Note, also known by names such as a 'c-note' or 'merch', is a currency based on old American bills. Fifty dollar bills and larger are printed with a promissory note signed by the treasurer of the Free Merchants, along with a complex design. The note explains that this can be exchanged for food, water, and other services through the Free Merchants in the Refugee Center.", - "price" : 10, + "price": 10, "weight": 1, "to_hit": -3, "color": "white", @@ -17,7 +17,7 @@ "id": "FlatCoin", "name": "FlatCoin", "description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlayed with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.", - "price" : 5, + "price": 5, "weight": 2, "to_hit": -3, "color": "orange", From 329eaa1521d0ef7acc00ddd291a6ed0cfba320b3 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 29 Jan 2019 21:33:47 -0800 Subject: [PATCH 09/10] Update currency.json --- data/json/items/generic/currency.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json index adfa488aa3e19..82fc7946beb26 100644 --- a/data/json/items/generic/currency.json +++ b/data/json/items/generic/currency.json @@ -2,7 +2,7 @@ { "type": "GENERIC", "id": "FMCNote", - "name": "FMCN", + "name": "Merch", "description": "The Free Merchant Certified Note, also known by names such as a 'c-note' or 'merch', is a currency based on old American bills. Fifty dollar bills and larger are printed with a promissory note signed by the treasurer of the Free Merchants, along with a complex design. The note explains that this can be exchanged for food, water, and other services through the Free Merchants in the Refugee Center.", "price": 10, "weight": 1, From 05709e78104acc4a3f53751310a7fa666591b16b Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Mon, 4 Feb 2019 03:09:27 +0000 Subject: [PATCH 10/10] Substitute volume and color to silence load errors --- data/json/items/generic/currency.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json index 82fc7946beb26..b12e237a7f31f 100644 --- a/data/json/items/generic/currency.json +++ b/data/json/items/generic/currency.json @@ -10,7 +10,7 @@ "color": "white", "symbol": "$", "material": [ "paper" ], - "volume": "2 mL" + "volume": "2ml" }, { "type": "GENERIC", @@ -20,9 +20,9 @@ "price": 5, "weight": 2, "to_hit": -3, - "color": "orange", + "color": "brown", "symbol": "$", "material": [ "copper" ], - "volume": "2 mL" + "volume": "2ml" } ]