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.

Sign up for GitHub

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

Jump to bottom

Start industry and research growth only if happiness is at least five #2745

Merged
merged 2 commits into from
Apr 14, 2020
Merged

Start industry and research growth only if happiness is at least five #2745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bdcb99
Start industry and research growth only if happiness is at least five
Sep 20, 2019
ff99143
Planet bad happiness status indicator, sitrep and force energy struct…
Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions default/scripting/species/common/general.macros
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ STANDARD_METER_GROWTH
]
priority = [[AFTER_ALL_TARGET_MAX_METERS_PRIORITY]]
effects = [
SetResearch value = Value + min(max(Value(Target.TargetResearch) - Value, -1), 1)
SetIndustry value = Value + min(max(Value(Target.TargetIndustry) - Value, -1), 1)
SetResearch value = Value + min(max(Value(Target.TargetResearch) - Value, -1), min(1, Value(Target.Happiness) - 4))
SetIndustry value = Value + min(max(Value(Target.TargetIndustry) - Value, -1), min(1, Value(Target.Happiness) - 4))
]

// removes residual production from a dead planet
Expand Down
4 changes: 2 additions & 2 deletions default/scripting/techs/construction/FORCE_ENERGY_STRC.focs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Tech
priority = [[AFTER_ALL_TARGET_MAX_METERS_PRIORITY]]
effects = If
condition = (Value(LocalCandidate.Industry) <= Value(LocalCandidate.TargetIndustry))
effects = SetIndustry value = min(Value + 2, Value(Target.TargetIndustry))
effects = SetIndustry value = min(Value + (2 * ( Statistic If condition = (Target.Happiness > 4) ) ), Value(Target.TargetIndustry))
else = SetIndustry value = max(Value - 4, Value(Target.TargetIndustry))

EffectsGroup
Expand All @@ -30,7 +30,7 @@ Tech
priority = [[AFTER_ALL_TARGET_MAX_METERS_PRIORITY]]
effects = If
condition = (Value(LocalCandidate.Research) <= Value(LocalCandidate.TargetResearch))
effects = SetResearch value = min(Value + 2, Value(Target.TargetResearch))
effects = SetResearch value = min(Value + (2 * ( Statistic If condition = (Target.Happiness > 4) ) ), Value(Target.TargetResearch))
else = SetResearch value = max(Value - 4, Value(Target.TargetResearch))

EffectsGroup
Expand Down
8 changes: 4 additions & 4 deletions default/stringtables/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ OPTIONS_DB_UI_PLANET_STATUS_CONQUERED
%1% has just been conquered. Happiness will probably be reduced.

OPTIONS_DB_UI_PLANET_STATUS_UNHAPPY
The population on %1% is very unhappy. It can not be used as a source for settlers.
The population on %1% is very unhappy. Neither [[metertype METER_INDUSTRY]] nor [[metertype METER_RESEARCH]] will increase. It can not be used as a source for settlers.

OPTIONS_DB_UI_PLANET_STATUS_NO_SUPPLY
%1% has been cut off from supply. Industry generated on this planet can only be used here.
Expand Down Expand Up @@ -5597,7 +5597,7 @@ METER_HAPPINESS_VALUE_LABEL
Happiness

METER_HAPPINESS_VALUE_DESC
'''The Happiness of a colony's population starts out low after initial colonization or after invasion, and may also be affected by other factors. A minimum Happiness of 5 is necessary for a colony to act as a source of settlers for colonizing other planets.
'''The Happiness of a colony's population starts out low after initial colonization or after invasion, and may also be affected by other factors. A minimum Happiness of 5 is necessary for a colony to act as a source of settlers for colonizing other planets. Also [[metertype METER_INDUSTRY]] and [[metertype METER_RESEARCH]] only start growing if Happiness is at least 5.

The Target Happiness is the stable Happiness level a planet's population will approach, given the current factors influencing the planetary Happiness. Its value is connected to [[encyclopedia ENC_BUILDING_TYPE]]s built on the planet, [[encyclopedia ENC_TECH]] researched by the empire, [[encyclopedia ENC_SPECIAL]]s linked to the planet, and various other game effects. If these factors change, then the Target Happiness value is likely to shift.'''

Expand Down Expand Up @@ -6783,7 +6783,7 @@ SITREP_FOREIGN_FLEET_ARRIVED_AT_DESTINATION_LABEL
Foreign Fleet Arrived

SITREP_POP_THRESHOLD
On %planet%: The colony has reached sufficient size and [[metertype METER_HAPPINESS]] to be a settler source for colonizing other planets.
On %planet%: The colony has reached sufficient size and [[metertype METER_HAPPINESS]] to be a settler source for colonizing other planets. Also [[metertype METER_INDUSTRY]] and [[metertype METER_RESEARCH]] may start growing.

SITREP_POP_THRESHOLD_LABEL
Colonizing Threshold
Expand Down Expand Up @@ -11117,7 +11117,7 @@ CON_FRC_ENRG_STRC
Force-Energy Structures

CON_FRC_ENRG_STRC_DESC
'''Increases the growth of resource and infrastructure meters below target value to 3 per turn, and the decay of resource meters above target value to 5 per turn.
'''Increases the growth of resource and infrastructure meters below target value to 3 per turn, and the decay of resource meters above target value to 5 per turn. [[metertype METER_INDUSTRY]] and [[metertype METER_RESEARCG]]l grow only if [[metertype METER_HAPPINESS]] is at least 5.

The flexibility and versatility of force-energy structures permits a colonies buildings to be more easily re-tooled to suit new purposes, increasing the rate at which focus changes can take effect.

Expand Down