Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lys3rg1k
Lys3rg1k committed Dec 11, 2019
2 parents ef0d3a0 + 278da94 commit 96bd867
Show file tree
Hide file tree
Showing 77 changed files with 1,088 additions and 1,222 deletions.
31 changes: 14 additions & 17 deletions src/activity_handlers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,20 @@

#define dbg(x) DebugLog((x),D_GAME) << __FILE__ << ":" << __LINE__ << ": "

const skill_id skill_survival( "survival" );
const skill_id skill_firstaid( "firstaid" );
const skill_id skill_electronics( "electronics" );
const skill_id skill_computer( "computer" );

const species_id HUMAN( "HUMAN" );
const species_id ZOMBIE( "ZOMBIE" );

const efftype_id effect_bleed( "bleed" );
const efftype_id effect_blind( "blind" );
const efftype_id effect_narcosis( "narcosis" );
const efftype_id effect_milked( "milked" );
const efftype_id effect_sleep( "sleep" );
const efftype_id effect_under_op( "under_operation" );
const efftype_id effect_pet( "pet" );
const efftype_id effect_controlled( "controlled" );
const efftype_id effect_saddled( "saddled" );
static const skill_id skill_survival( "survival" );
static const skill_id skill_firstaid( "firstaid" );
static const skill_id skill_electronics( "electronics" );
static const skill_id skill_computer( "computer" );

static const species_id HUMAN( "HUMAN" );
static const species_id ZOMBIE( "ZOMBIE" );

static const efftype_id effect_blind( "blind" );
static const efftype_id effect_narcosis( "narcosis" );
static const efftype_id effect_sleep( "sleep" );
static const efftype_id effect_under_op( "under_operation" );
static const efftype_id effect_pet( "pet" );
static const efftype_id effect_controlled( "controlled" );

static const trait_id trait_ILLITERATE( "ILLITERATE" );

Expand Down
15 changes: 7 additions & 8 deletions src/activity_item_handling.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,16 @@ struct construction_category;

void cancel_aim_processing();

const efftype_id effect_controlled( "controlled" );
const efftype_id effect_pet( "pet" );
static const efftype_id effect_controlled( "controlled" );
static const efftype_id effect_pet( "pet" );

const zone_type_id zone_source_firewood( "SOURCE_FIREWOOD" );
const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" );
static const zone_type_id zone_source_firewood( "SOURCE_FIREWOOD" );
static const zone_type_id z_loot_unsorted( "LOOT_UNSORTED" );

const quality_id LIFT( "LIFT" );
const quality_id WELD( "WELD" );
static const quality_id WELD( "WELD" );

const trap_str_id tr_firewood_source( "tr_firewood_source" );
const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
static const trap_str_id tr_firewood_source( "tr_firewood_source" );
static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );

//Generic activity: maximum search distance for zones, constructions, etc.
const int ACTIVITY_SEARCH_DISTANCE = 60;
Expand Down
4 changes: 2 additions & 2 deletions src/addiction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "calendar.h"
#include "enums.h"

const efftype_id effect_hallu( "hallu" );
const efftype_id effect_shakes( "shakes" );
static const efftype_id effect_hallu( "hallu" );
static const efftype_id effect_shakes( "shakes" );

namespace io
{
Expand Down
24 changes: 11 additions & 13 deletions src/avatar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,17 @@
class JsonIn;
class JsonOut;

const efftype_id effect_contacts( "contacts" );
const efftype_id effect_depressants( "depressants" );
const efftype_id effect_happy( "happy" );
const efftype_id effect_irradiated( "irradiated" );
const efftype_id effect_pkill( "pkill" );
const efftype_id effect_riding( "riding" );
const efftype_id effect_sad( "sad" );
const efftype_id effect_sleep( "sleep" );
const efftype_id effect_sleep_deprived( "sleep_deprived" );
const efftype_id effect_slept_through_alarm( "slept_through_alarm" );
const efftype_id effect_stim( "stim" );
const efftype_id effect_stim_overdose( "stim_overdose" );
const efftype_id effect_winded( "winded" );
static const efftype_id effect_contacts( "contacts" );
static const efftype_id effect_depressants( "depressants" );
static const efftype_id effect_happy( "happy" );
static const efftype_id effect_irradiated( "irradiated" );
static const efftype_id effect_pkill( "pkill" );
static const efftype_id effect_sad( "sad" );
static const efftype_id effect_sleep( "sleep" );
static const efftype_id effect_sleep_deprived( "sleep_deprived" );
static const efftype_id effect_slept_through_alarm( "slept_through_alarm" );
static const efftype_id effect_stim( "stim" );
static const efftype_id effect_stim_overdose( "stim_overdose" );

static const bionic_id bio_eye_optic( "bio_eye_optic" );
static const bionic_id bio_memory( "bio_memory" );
Expand Down
2 changes: 1 addition & 1 deletion src/ballistics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "type_id.h"
#include "point.h"

const efftype_id effect_bounced( "bounced" );
static const efftype_id effect_bounced( "bounced" );

static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
{
Expand Down
3 changes: 1 addition & 2 deletions src/basecamp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
#include "flat_set.h"
#include "line.h"

const zone_type_id z_camp_storage( "CAMP_STORAGE" );
const zone_type_id z_loot_ignore( "LOOT_IGNORE" );
static const zone_type_id z_camp_storage( "CAMP_STORAGE" );

const std::map<point, base_camps::direction_data> base_camps::all_directions = {
// direction, direction id, tab order, direction abbreviation with bracket, direction tab title
Expand Down
162 changes: 81 additions & 81 deletions src/bionics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,48 +66,48 @@
#include "point.h"
#include "teleport.h"

const skill_id skilll_electronics( "electronics" );
const skill_id skilll_firstaid( "firstaid" );
const skill_id skilll_mechanics( "mechanics" );
const skill_id skilll_computer( "computer" );

const efftype_id effect_adrenaline( "adrenaline" );
const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
const efftype_id effect_asthma( "asthma" );
const efftype_id effect_assisted( "assisted" );
const efftype_id effect_bleed( "bleed" );
const efftype_id effect_bloodworms( "bloodworms" );
const efftype_id effect_brainworms( "brainworms" );
const efftype_id effect_cig( "cig" );
const efftype_id effect_datura( "datura" );
const efftype_id effect_dermatik( "dermatik" );
const efftype_id effect_drunk( "drunk" );
const efftype_id effect_fungus( "fungus" );
const efftype_id effect_hallu( "hallu" );
const efftype_id effect_high( "high" );
const efftype_id effect_iodine( "iodine" );
const efftype_id effect_narcosis( "narcosis" );
const efftype_id effect_meth( "meth" );
const efftype_id effect_operating( "operating" );
const efftype_id effect_paincysts( "paincysts" );
const efftype_id effect_pblue( "pblue" );
const efftype_id effect_pkill1( "pkill1" );
const efftype_id effect_pkill2( "pkill2" );
const efftype_id effect_pkill3( "pkill3" );
const efftype_id effect_pkill_l( "pkill_l" );
const efftype_id effect_poison( "poison" );
const efftype_id effect_sleep( "sleep" );
const efftype_id effect_stung( "stung" );
const efftype_id effect_tapeworm( "tapeworm" );
const efftype_id effect_teleglow( "teleglow" );
const efftype_id effect_tetanus( "tetanus" );
const efftype_id effect_took_flumed( "took_flumed" );
const efftype_id effect_took_prozac( "took_prozac" );
const efftype_id effect_took_prozac_bad( "took_prozac_bad" );
const efftype_id effect_took_xanax( "took_xanax" );
const efftype_id effect_under_op( "under_operation" );
const efftype_id effect_visuals( "visuals" );
const efftype_id effect_weed_high( "weed_high" );
static const skill_id skill_electronics( "electronics" );
static const skill_id skill_firstaid( "firstaid" );
static const skill_id skill_mechanics( "mechanics" );
static const skill_id skill_computer( "computer" );

static const efftype_id effect_adrenaline( "adrenaline" );
static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
static const efftype_id effect_asthma( "asthma" );
static const efftype_id effect_assisted( "assisted" );
static const efftype_id effect_bleed( "bleed" );
static const efftype_id effect_bloodworms( "bloodworms" );
static const efftype_id effect_brainworms( "brainworms" );
static const efftype_id effect_cig( "cig" );
static const efftype_id effect_datura( "datura" );
static const efftype_id effect_dermatik( "dermatik" );
static const efftype_id effect_drunk( "drunk" );
static const efftype_id effect_fungus( "fungus" );
static const efftype_id effect_hallu( "hallu" );
static const efftype_id effect_high( "high" );
static const efftype_id effect_iodine( "iodine" );
static const efftype_id effect_narcosis( "narcosis" );
static const efftype_id effect_meth( "meth" );
static const efftype_id effect_operating( "operating" );
static const efftype_id effect_paincysts( "paincysts" );
static const efftype_id effect_pblue( "pblue" );
static const efftype_id effect_pkill1( "pkill1" );
static const efftype_id effect_pkill2( "pkill2" );
static const efftype_id effect_pkill3( "pkill3" );
static const efftype_id effect_pkill_l( "pkill_l" );
static const efftype_id effect_poison( "poison" );
static const efftype_id effect_sleep( "sleep" );
static const efftype_id effect_stung( "stung" );
static const efftype_id effect_tapeworm( "tapeworm" );
static const efftype_id effect_teleglow( "teleglow" );
static const efftype_id effect_tetanus( "tetanus" );
static const efftype_id effect_took_flumed( "took_flumed" );
static const efftype_id effect_took_prozac( "took_prozac" );
static const efftype_id effect_took_prozac_bad( "took_prozac_bad" );
static const efftype_id effect_took_xanax( "took_xanax" );
static const efftype_id effect_under_op( "under_operation" );
static const efftype_id effect_visuals( "visuals" );
static const efftype_id effect_weed_high( "weed_high" );

static const trait_id trait_PROF_MED( "PROF_MED" );
static const trait_id trait_PROF_AUTODOC( "PROF_AUTODOC" );
Expand Down Expand Up @@ -1580,14 +1580,14 @@ bool player::can_uninstall_bionic( const bionic_id &b_id, player &installer, boo
// removal of bionics adds +2 difficulty over installation
float adjusted_skill;
if( autodoc ) {
adjusted_skill = installer.bionics_adjusted_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
adjusted_skill = installer.bionics_adjusted_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
} else {
adjusted_skill = installer.bionics_adjusted_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
adjusted_skill = installer.bionics_adjusted_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
}
int chance_of_success = bionic_manip_cos( adjusted_skill + assist_bonus, autodoc, difficulty + 2 );
Expand Down Expand Up @@ -1627,22 +1627,22 @@ bool player::uninstall_bionic( const bionic_id &b_id, player &installer, bool au
float adjusted_skill;
int pl_skill;
if( autodoc ) {
adjusted_skill = installer.bionics_adjusted_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
adjusted_skill = installer.bionics_adjusted_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
pl_skill = installer.bionics_pl_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
pl_skill = installer.bionics_pl_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
} else {
adjusted_skill = installer.bionics_adjusted_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
adjusted_skill = installer.bionics_adjusted_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
pl_skill = installer.bionics_pl_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
pl_skill = installer.bionics_pl_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
}

Expand Down Expand Up @@ -1818,14 +1818,14 @@ bool player::can_install_bionics( const itype &type, player &installer, bool aut
float adjusted_skill;

if( autodoc ) {
adjusted_skill = installer.bionics_adjusted_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
adjusted_skill = installer.bionics_adjusted_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
} else {
adjusted_skill = installer.bionics_adjusted_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
adjusted_skill = installer.bionics_adjusted_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
}
int chance_of_success = bionic_manip_cos( adjusted_skill + assist_bonus, autodoc, difficult );
Expand Down Expand Up @@ -1877,31 +1877,31 @@ bool player::install_bionics( const itype &type, player &installer, bool autodoc
float adjusted_skill;
int pl_skill;
if( autodoc ) {
adjusted_skill = installer.bionics_adjusted_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
adjusted_skill = installer.bionics_adjusted_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
pl_skill = installer.bionics_pl_skill( skilll_firstaid,
skilll_computer,
skilll_electronics,
pl_skill = installer.bionics_pl_skill( skill_firstaid,
skill_computer,
skill_electronics,
skill_level );
} else {
adjusted_skill = installer.bionics_adjusted_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
adjusted_skill = installer.bionics_adjusted_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
pl_skill = installer.bionics_pl_skill( skilll_electronics,
skilll_firstaid,
skilll_mechanics,
pl_skill = installer.bionics_pl_skill( skill_electronics,
skill_firstaid,
skill_mechanics,
skill_level );
}
int chance_of_success = bionic_manip_cos( adjusted_skill + assist_bonus, autodoc, difficulty );

// Practice skills only if conducting manual installation
if( !autodoc ) {
installer.practice( skilll_electronics, static_cast<int>( ( 100 - chance_of_success ) * 1.5 ) );
installer.practice( skilll_firstaid, static_cast<int>( ( 100 - chance_of_success ) * 1.0 ) );
installer.practice( skilll_mechanics, static_cast<int>( ( 100 - chance_of_success ) * 0.5 ) );
installer.practice( skill_electronics, static_cast<int>( ( 100 - chance_of_success ) * 1.5 ) );
installer.practice( skill_firstaid, static_cast<int>( ( 100 - chance_of_success ) * 1.0 ) );
installer.practice( skill_mechanics, static_cast<int>( ( 100 - chance_of_success ) * 0.5 ) );
}

int success = chance_of_success - rng( 0, 99 );
Expand Down
3 changes: 1 addition & 2 deletions src/cata_tiles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ static const std::array<std::string, 8> multitile_keys = {{

extern int fontwidth;
extern int fontheight;
const efftype_id effect_ridden( "ridden" );
const efftype_id effect_riding( "riding" );
static const efftype_id effect_ridden( "ridden" );
static const std::string empty_string;
static const std::array<std::string, 12> TILE_CATEGORY_IDS = {{
"", // C_NONE,
Expand Down
Loading

0 comments on commit 96bd867

Please sign in to comment.