Skip to content

Commit

Permalink
Update src/faction.h
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
GalacticApple and github-actions[bot] authored May 31, 2024
1 parent ce16a2a commit 4ab7263
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions src/faction.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,37 +117,37 @@ struct faction_epilogue_data {

class faction_template
{
protected:
faction_template();
void load_relations(const JsonObject& jsobj);

private:
explicit faction_template(const JsonObject& jsobj);


public:
static void load(const JsonObject& jsobj);
static void check_consistency();
static void reset();

std::string name;
int likes_u;
int respects_u;
int trusts_u; // Determines which item groups are available for trading
bool known_by_u;
faction_id id;
translation desc;
int size; // How big is our sphere of influence?
int power; // General measure of our power
nutrients food_supply; //Total nutritional value held
bool consumes_food; //Whether this faction actually draws down the food_supply when eating from it
int wealth; //Total trade currency
bool lone_wolf_faction; // is this a faction for just one person?
itype_id currency; // id of the faction currency
std::vector<faction_price_rule> price_rules; // additional pricing rules
std::map<std::string, std::bitset<npc_factions::rel_types>> relations;
mfaction_str_id mon_faction; // mon_faction_id of the monster faction; defaults to human
std::vector<faction_epilogue_data> epilogue_data;
protected:
faction_template();
void load_relations( const JsonObject &jsobj );

private:
explicit faction_template( const JsonObject &jsobj );


public:
static void load( const JsonObject &jsobj );
static void check_consistency();
static void reset();

std::string name;
int likes_u;
int respects_u;
int trusts_u; // Determines which item groups are available for trading
bool known_by_u;
faction_id id;
translation desc;
int size; // How big is our sphere of influence?
int power; // General measure of our power
nutrients food_supply; //Total nutritional value held
bool consumes_food; //Whether this faction actually draws down the food_supply when eating from it
int wealth; //Total trade currency
bool lone_wolf_faction; // is this a faction for just one person?
itype_id currency; // id of the faction currency
std::vector<faction_price_rule> price_rules; // additional pricing rules
std::map<std::string, std::bitset<npc_factions::rel_types>> relations;
mfaction_str_id mon_faction; // mon_faction_id of the monster faction; defaults to human
std::vector<faction_epilogue_data> epilogue_data;
};

class faction : public faction_template
Expand Down

0 comments on commit 4ab7263

Please sign in to comment.