Skip to content

Commit

Permalink
Merge pull request #336 from Cold-War-Project/error-cleanup
Browse files Browse the repository at this point in the history
Error cleanup
  • Loading branch information
Arcadyi authored Jun 20, 2023
2 parents e39bcff + cad67c2 commit b790ad2
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 116 deletions.
3 changes: 0 additions & 3 deletions common/history/countries/arg - argentina.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
activate_law = law_type:law_welfare_state
activate_law = law_type:law_wrongful_dismissal_protections
activate_law = law_type:law_protected_speech
ig:ig_moralists = {
set_interest_group_name = ig_catholic_church
}
set_institution_investment_level = {
institution = institution_schools
level = 2
Expand Down
3 changes: 0 additions & 3 deletions common/history/countries/brz - brazil.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
ig:ig_securocrats = {
add_ruling_interest_group = yes
}
ig:ig_moralists = {
set_interest_group_name = ig_catholic_church
}
# laws
effect_create_law_package = {
headOfGovernment = executive
Expand Down
3 changes: 0 additions & 3 deletions common/history/countries/chl - chile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,5 @@
ig:ig_securocrats = {
add_ruling_interest_group = yes
}
ig:ig_moralists = {
set_interest_group_name = ig_catholic_church
}
}
}
3 changes: 0 additions & 3 deletions common/history/countries/egy - egypt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
# activate_law = law_type:law_segregationist
# activate_law = law_type:law_anti_industrialization
# activate_law = law_type:law_professional_military
ig:ig_moralists = {
set_interest_group_name = ig_sunni_madrasahs
}
ig:ig_securocrats = {
add_ruling_interest_group = yes
}
Expand Down
6 changes: 0 additions & 6 deletions common/history/countries/gbr - great britain.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
effect_corruption_low = yes
# Politics
set_next_election_date = 1946.2.1
ig:ig_elites = {
set_interest_group_name = ig_landed_gentry
}
ig:ig_moralists = {
set_interest_group_name = ig_anglican_church
}
# Tech and Tax
effect_starting_technology_tier_1_tech = yes
effect_starting_technology_wartime_major_participant_tech = yes
Expand Down
7 changes: 0 additions & 7 deletions common/history/countries/jap - japan.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,7 @@
ig:ig_elites = {
add_ruling_interest_group = yes
}
ig:ig_entrepreneurs = {
set_interest_group_name = ig_professional_middle_class
}
ig:ig_securocrats = {
set_interest_group_name = ig_national_police_reserve
}
ig:ig_capitalists = {
set_interest_group_name = ig_keiretsu
set_ig_suppression = yes
}
}
Expand Down
1 change: 0 additions & 1 deletion common/history/countries/mgl - mongolia.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
}
ig:ig_securocrats = {
add_ruling_interest_group = yes
set_interest_group_name = ig_red_army
}
ig:ig_intelligentsia = {
add_ruling_interest_group = yes
Expand Down
1 change: 0 additions & 1 deletion common/history/countries/prc - communist china.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
}
ig:ig_securocrats = {
add_ruling_interest_group = yes
set_interest_group_name = ig_red_army
}
ig:ig_ruralists = {
add_ruling_interest_group = yes
Expand Down
4 changes: 0 additions & 4 deletions common/history/countries/roc - nationalist china.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@
set_tax_level = low
# Interest Groups
ig:ig_securocrats = {
set_interest_group_name = ig_national_revolutionary_army
add_ruling_interest_group = yes
}
ig:ig_elites = {
set_interest_group_name = ig_political_families
add_ruling_interest_group = yes
}
ig:ig_entrepreneurs = {
set_interest_group_name = ig_urban_workers
add_ruling_interest_group = yes
}
ig:ig_capitalists = {
set_interest_group_name = ig_capitalist_families
add_ruling_interest_group = yes
}
effect_create_law_package = {
Expand Down
1 change: 0 additions & 1 deletion common/history/countries/rus - russia.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
}
ig:ig_securocrats = {
add_ruling_interest_group = yes
set_interest_group_name = ig_red_army
}
set_institution_investment_level = {
institution = institution_schools
Expand Down
5 changes: 0 additions & 5 deletions common/history/countries/usa - usa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,16 @@
}
# Politics
#todo IGs and Ideologies
ig:ig_moralists = {
set_interest_group_name = ig_evangelicals
}
ig:ig_entrepreneurs = {
add_ruling_interest_group = yes
}
ig:ig_urbanists = {
add_ruling_interest_group = yes
}
ig:ig_capitalists = {
set_interest_group_name = ig_us_corporations
add_ruling_interest_group = yes
}
ig:ig_laborists = {
set_interest_group_name = ig_us_democratic_socialists
add_ruling_interest_group = yes
}
# Tech and Tax
Expand Down
4 changes: 2 additions & 2 deletions gui/international_panel.gui
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ types international_panel
}
# Info
flowcontainer = {
parentanchor = center|top
parentanchor = hcenter
direction = vertical
position = { 50 50 }
spacing = 10
Expand Down Expand Up @@ -387,7 +387,7 @@ types international_panel
}
# Info
flowcontainer = {
parentanchor = center|top
parentanchor = hcenter
direction = vertical
position = { 50 50 }
spacing = 10
Expand Down
3 changes: 1 addition & 2 deletions gui/nato_panel.gui
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ types nato_panel
direction = vertical
textbox = {
margin_top = 30
parentanchor = center|top
parentanchor = hcenter
align = center|nobaseline
raw_text = "[concept_nato] Applications"
using = fontsize_mega
Expand All @@ -609,7 +609,6 @@ types nato_panel
vbox = {
datamodel_wrap = 1
spacing = 20
flipdirection = yes
datamodel = "[GetGlobalList('nato_application_list')]"
item = {
flowcontainer = {
Expand Down
3 changes: 1 addition & 2 deletions gui/warsaw_pact_panel.gui
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ types warsaw_pact_panel
direction = vertical
textbox = {
margin_top = 30
parentanchor = center|top
parentanchor = hcenter
align = center|nobaseline
raw_text = "[concept_warsaw_pact] Applications"
using = fontsize_mega
Expand All @@ -609,7 +609,6 @@ types warsaw_pact_panel
vbox = {
datamodel_wrap = 1
spacing = 20
flipdirection = yes
datamodel = "[GetGlobalList('warsaw_pact_application_list')]"
item = {
flowcontainer = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,76 +45,4 @@

# Flavor Ideologies
ig_red_army: "Red Army"
ig_red_army_desc: "TODO"

ig_private_military_companies: "Private Military Companies"
ig_private_military_companies_desc: "Private military companies are private companies that provide armed security services, risk management, and military services to governments and private individuals."

ideology_profit_driven: "Profit Driven"
ideology_profit_driven_desc: "The ideology of profit driven companies is to make as much money as possible for their shareholders and owners."

ig_catholic_church: "Catholic Church"
ig_catholic_church_desc: "Catholicism is the largest sect of Christianity. Believers hold that the Archbishop of Rome, the Pope, is the uninterrupted successor to the authority of Jesus Christ via Saint Peter. Other important beliefs include veneration of the saints and of the Virgin Mary."
ig_orthodox_church: "Orthodox Church"
ig_orthodox_church_desc: "The Orthodox churches tend to be Eastern churches not in communion with the Pope."
ig_oriental_orthodox_church: "Oriental Orthodox Church"
ig_oriental_orthodox_church_desc: "The Oriental Orthodox churches tend to be Middle Eastern churches not in communion with the Pope."
ig_anglican_church: "Anglican Church"
ig_anglican_church_desc: "The Anglican Church was created by King Henry VIII during the Protestant Reformation. Anglicans believe that the Bible is the main authority on Christian dogma, rejecting the Pope while being less radical than other Evangelical churches."
ig_evangelical_church: "Evangelical Church"
ig_evangelical_church_desc: "The Evangelical churches were created mostly in Northern Europe during the Protestant Reformation. Evangelicals believe that the Bible is the sole authority on Christian dogma, rejecting the Pope and seeing the Catholic veneration of the saints as bordering on idolatry."
ig_rabbinical_council: "Rabbinical Council"
ig_rabbinical_council_desc: "The leadership of a country's Jewish populace tend to be well-educated Rabbis with strong traditions of debate and scholarship."
ig_sunni_madrasahs: "Sunni Ulema"
ig_sunni_madrasahs_desc: "Sunni is the largest sect of Islam. Believers hold that Muhammad was succeeded as Caliph of Islam by his uncle, Abu Bakr, as opposed to the Shia view that his son-in-law Ali was the legitimate successor."
ig_shia_madrasahs: "Shia Ulema"
ig_shia_madrasahs_desc: "Shiism is the second largest sect of Islam. Believers hold that Muhammad was succeeded as Caliph of Islam by his son-in-law, Ali, as opposed to the Sunni view that his uncle Abu Bakr was the legitimate successor."
ig_hindu_priesthood: "Hindu Priesthood"
ig_hindu_priesthood_desc: "Probably the oldest organized religion still in existence, Hinduism holds that breaking the cycle of reincarnation and achieving Nirvana requires adherence to a caste system whereby individuals serve a role to improve their karma, just as the many gods worshiped by Hindus serve different roles."
ig_sikh_priesthood: "Sikh Priesthood"
ig_sikh_priesthood_desc: "A relatively young religion, founded in the 16th century in Punjab, Sikhism is a monotheistic faith holding that worldly pursuits are distractions from the oneness of God."
ig_vajrayana_monks: "Vajrayana Monks"
ig_vajrayana_monks_desc: "Vajrayana Buddhism is strongest in Tibet and Mongolia. It emphasizes the use of meditation and self-discipline."
ig_mahayana_monks: "Mahayana Monks"
ig_mahayana_monks_desc: "Mahayana Buddhism is strongest in China, Vietnam and Korea. It emphasizes that everyone in society should be encouraged to seek enlightenment through perfection. Mahayana sees Buddha as a God-like figure."
ig_theravada_monks: "Theravada Monks"
ig_theravada_monks_desc: "Theravada Buddhism is strongest in Burma, Siam, Cambodia and Ceylon. It places great emphasis on individuals seeking Nirvana to break the cycle of reincarnation. Theravada sees Buddha not as a God, but as an enlightened man who showed the rest of mankind the path to perfection."
ig_shinto_monks: "Shinto Monks"
ig_shinto_monks_desc: "Shintoism is a syncretic faith, combining Buddhist concepts of karma and reincarnation with worship and placation of kami, the spirits of nature and dead ancestors."
ig_pagan_shamans: "Pagan Shamans"
ig_pagan_shamans_desc: "Animism is the worship and placation of natural spirits. Rituals undertaken by animists include sacrifices of food and livestock, and consumption of hallucinogenic drugs for spiritual journeys of introspection."

# British IGs
ig_landed_gentry: "Landed Gentry"
ig_landed_gentry_desc: "The owners of great estates and vast properties, the landed gentry are custodians of tradition and old money."

# USA IGs
ig_evangelicals: "Evangelicals"
ig_evangelicals_desc: "These are the fervent disciples of faith, the Evangelicals. Hailing from an unexpected spectrum of Protestant denominations, they are bound by a shared belief that the nation stands at the brink of a spiritual renaissance. They echo with a unified voice, a clarion call that the nation's salvation lies within its own spiritual awakening, a divine resurrection from its worldly afflictions."

ig_us_military: "Military"
ig_us_military_desc: "This is the US military, a formidable colossus perched on the precipice of global power and influence. Birthed from the crucible of World War II, their influence reverberates through the corridors of the US government, casting long shadows on the world stage. They are an omnipresent force, their footprint etched into the soil of continents far and wide, a testament to their enduring power."

ig_us_democratic_socialists: "Democratic Socialists"
ig_us_democratic_socialists_desc: "Democratic socialism in the US is a pulsating vein running deep since the 1930s, a potent fusion of capitalism's vibrant dynamism and socialism's empathetic solidarity. This is a movement that seeks to bridge divides, interweaving the state's nurturing hand in providing social services with its discerning eye in regulating the economy. They stand as the architects of a more equitable future, balancing the scales of prosperity and social justice."

ig_us_corporations: "Corporations"
ig_us_corporations_desc: "The US is the nesting ground of towering corporate leviathans, some of the largest entities that dot the global economic skyline. They command significant political sway, fueled by their substantial capital, and their influence ebbs and flows through the veins of American society. Often serving as the country's largest employers, they shape not only the economy but the very lives of millions, their reach extending far beyond their boardrooms and into the heart of the nation."

# China IGs
ig_national_revolutionary_army: "National Revolutionary Army"
ig_national_revolutionary_army_desc: "The NRA are armed forces of the Republic of China founded in 1925, despite being a part of the ROC it effectively is the military wing of the KMT and suffers from much factional divisions with individual generals acting more like warlords than a part of a unified army structure."
ig_political_families: "Political Families"
ig_political_families_desc: "Powerful and influential families with a great deal of influence within KMT politics usually taking a traditional and patriarchal view of chinese society wishing to preserve their power."
ig_urban_workers: "Urban Workers"
ig_urban_workers_desc: "The urban lower and middle class of china's cities often small business holders and factory workers with a vested interest in economic development and stability. "
ig_capitalist_families: "Capitalist Families"
ig_capitalist_families_desc: "The elite chinese families with great economic influence usually owners of urban industries and financial institutions, They support industrialization and a move away from an agrarian economy."

#Japanese IGs
ig_keiretsu: "Keiretsu"
ig_keiretsu_desc: "The Keiretsu are the vast economic capitalists made up of interlocking companies who own shares in each other and held together by central corporate banks. Unlike the Zaibatsu that precedes them the Keiretsu are run by landlords and managers rather than economic families."
ig_national_police_reserve: "National Police Reserve"
ig_national_police_reserve_desc: "The National Police Reserve are the national police force of japan, despite being a police force they sport military equipment and training serving as the closest thing Japan has to a standing army."
ig_professional_middle_class: "Professional Middle Class"
ig_professional_middle_class_desc: "The Professional middle class are the urban professional workers and salaryman that work at the middle and lower levels of japans vast companies."
ig_red_army_desc: "TODO"

0 comments on commit b790ad2

Please sign in to comment.