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

Tech cleanup #339

Merged
merged 7 commits into from
Jun 25, 2023
Merged

Tech cleanup #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9057247
Update 30_society.txt
Mercur-3 Jun 21, 2023
0ac143d
Update 30_society.txt
Mercur-3 Jun 21, 2023
fa8523d
Update 30_society.txt
Mercur-3 Jun 21, 2023
f7faccb
Update 20_military.txt
Mercur-3 Jun 21, 2023
bf171fe
Merge branch 'dev' into Tech-cleanup
JackEPepper Jun 22, 2023
ea174f1
Merge branch 'dev' into Tech-cleanup
JackEPepper Jun 23, 2023
4799d00
Merge branch 'dev' into Tech-cleanup
Arcadyi Jun 25, 2023
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
27 changes: 1 addition & 26 deletions common/technology/technologies/20_military.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,19 +1214,6 @@ counter_insurgency = {
}
}

police_action = {
era = era_3
texture = "gfx/interface/icons/invention_icons/invention_placeholder.dds"
category = military
unlocking_technologies = {
total_warfare
counter_insurgency
}
ai_weight = {
value = 1
}
}

civil_defense = {
era = era_3
texture = "gfx/interface/icons/invention_icons/invention_placeholder.dds"
Expand All @@ -1240,18 +1227,6 @@ civil_defense = {
}
}

international_taskforces = {
era = era_3
texture = "gfx/interface/icons/invention_icons/invention_placeholder.dds"
category = military
unlocking_technologies = {
police_action
}
ai_weight = {
value = 1
}
}

mutually_assured_destruction = {
era = era_3
texture = "gfx/interface/icons/invention_icons/military/mutually_assured_destruction.dds"
Expand Down Expand Up @@ -3856,4 +3831,4 @@ total_network_warfare = {
}

# Era 11
# Era 12
# Era 12
79 changes: 3 additions & 76 deletions common/technology/technologies/30_society.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,6 @@ prefabrication = {
value = 1
}
}

pre_war_policing = {
era = era_1
texture = "gfx/interface/icons/invention_icons/society/pre_war_policing.dds"
category = society
unlocking_technologies = {
modernism
informal_bureaucracy
}
ai_weight = {
value = 1
}
}

public_transportation = {
era = era_1
texture = "gfx/interface/icons/invention_icons/society/public_transportation.dds"
Expand Down Expand Up @@ -495,19 +481,8 @@ united_nations = {
}
}

international_whaling_commission = {
era = era_2
texture = "gfx/interface/icons/invention_icons/society/international_whaling_commission.dds"
category = society
unlocking_technologies = {
international_relations
}
ai_weight = {
value = 1
}
}

nature_conservation = {
#make sure this unlocks any future whaling un resolutions
era = era_2
texture = "gfx/interface/icons/invention_icons/society/nature_conservation.dds"
category = society
Expand Down Expand Up @@ -1739,18 +1714,6 @@ compstat = {
}
}

military_equipment_repurposing = {
era = era_7
texture = "gfx/interface/icons/invention_icons/society/urbanization.dds"
category = society
unlocking_technologies = {
compstat
}
ai_weight = {
value = 1
}
}

paperless_offices = {
era = era_7
texture = "gfx/interface/icons/invention_icons/society/paperless_offices.dds"
Expand Down Expand Up @@ -2329,18 +2292,6 @@ gender_studies = {
}
}

targeted_ads = {
era = era_9
texture = "gfx/interface/icons/invention_icons/society/targeted_ads.dds"
category = society
unlocking_technologies = {
sensationalism
}
ai_weight = {
value = 1
}
}

social_surveillance = {
era = era_9
texture = "gfx/interface/icons/invention_icons/society/social_surveillance.dds"
Expand Down Expand Up @@ -2371,18 +2322,6 @@ streaming_services = {
}
}

meme_culture = {
era = era_9
texture = "gfx/interface/icons/invention_icons/society/meme_culture.dds"
category = society
unlocking_technologies = {
anti_terrorism
}
ai_weight = {
value = 1
}
}

#########################################################################
################################# ERA 10 #################################
#########################################################################
Expand Down Expand Up @@ -2415,19 +2354,6 @@ ai_art_generation = {
value = 1
}
}

anti_authoritarian_rhetoric = {
era = era_10
texture = "gfx/interface/icons/invention_icons/society/anti_authoritarian_rhetoric.dds"
category = society
unlocking_technologies = {
meme_culture
}
ai_weight = {
value = 1
}
}

sustainable_building_materials = {
era = era_10
texture = "gfx/interface/icons/invention_icons/society/sustainable_building_materials.dds"
Expand Down Expand Up @@ -2597,7 +2523,8 @@ complete_biological_customization = {
category = society
#todo make this a real modifier
modifier = {
state_mortality_mult = -1
state_mortality_wealth_mult = -0.03

}
unlocking_technologies = {
cellular_reconstruction
Expand Down