API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 17th, 2018
980
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 599.02 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/2.0.0/common/alerts.txt b/2.0.2/common/alerts.txt
  2. index c2bf6a6..e9b3c6c 100755
  3. --- a/2.0.0/common/alerts.txt
  4. +++ b/2.0.2/common/alerts.txt
  5. @@ -135,5 +135,9 @@ alerts = {
  6. category = HIGH
  7. sound = "high_war_exhaustion"
  8. }
  9. + alert_high_piracy_risk = {
  10. + category = MEDIUM
  11. + sound = "alert_negative"
  12. + }
  13. alert_deprecated = { category = disabled }
  14. }
  15. \ No newline at end of file
  16. diff --git a/2.0.0/common/armies/01_assault_armies.txt b/2.0.2/common/armies/01_assault_armies.txt
  17. index c104aaa..8d49055 100755
  18. --- a/2.0.0/common/armies/01_assault_armies.txt
  19. +++ b/2.0.2/common/armies/01_assault_armies.txt
  20. @@ -51,11 +51,11 @@ slave_army = {
  21. collateral_damage = 1.50
  22. war_exhaustion = 0.50
  23. time = 60
  24. - maintenance = 0.75
  25. + maintenance = 0.50
  26. icon_frame = 10
  27.  
  28. cost = {
  29. - minerals = 75
  30. + minerals = 50
  31. }
  32.  
  33. prerequisites = { "tech_neural_implants" }
  34. @@ -87,12 +87,12 @@ clone_army = {
  35. collateral_damage = 1.25
  36. war_exhaustion = 0.50
  37. time = 30
  38. - maintenance = 0.50
  39. + maintenance = 0.75
  40. icon_frame = 7
  41. pop_limited = no
  42.  
  43. cost = {
  44. - minerals = 50
  45. + minerals = 75
  46. }
  47.  
  48. prerequisites = { "tech_gene_banks" }
  49. diff --git a/2.0.0/common/armies/02_event_armies.txt b/2.0.2/common/armies/02_event_armies.txt
  50. index 391b0e5..eeebbd1 100755
  51. --- a/2.0.0/common/armies/02_event_armies.txt
  52. +++ b/2.0.2/common/armies/02_event_armies.txt
  53. @@ -102,6 +102,22 @@ swarm_army = {
  54. }
  55. }
  56.  
  57. +# Rampaging Tree Armies
  58. +tree_army = {
  59. + defensive = yes
  60. + damage = 1.0
  61. + morale_damage = 1.0
  62. + health = 1.0
  63. + has_morale = no
  64. + icon_frame = 8
  65. + has_species = no
  66. +
  67. + potential = {
  68. + always = no
  69. + }
  70. +}
  71. +
  72. +
  73. # Titanic life troops
  74. # Can build on planets with titanic life if you get event + special project there
  75. # Should be very strong and quite expensive, but cannot get attachments and can be built only in limited numbers
  76. diff --git a/2.0.2/common/armies/03_occupation_armies.txt b/2.0.2/common/armies/03_occupation_armies.txt
  77. new file mode 100755
  78. index 0000000..cdec839
  79. --- /dev/null
  80. +++ b/2.0.2/common/armies/03_occupation_armies.txt
  81. @@ -0,0 +1,110 @@
  82. +#Defensive armies can't transport of the planet
  83. +#maintenance is directly scripted here. 0.25 translates to 0.25 monthly cost (excluding other upkeep modifiers)
  84. +#morale_damage = 1 # average morale damage of the army, default: auto (calculated from morale * MORALE_DAMAGE_MULT)
  85. +#building spawned armies can't be built normally, but only created from pops working buildings
  86. +
  87. +# Occupation Armies
  88. +occupation_army = {
  89. + defensive = yes
  90. + occupation = yes
  91. + health = 1.25
  92. + damage = 1.50
  93. + morale = 1.25
  94. + collateral_damage = 0.0
  95. + war_exhaustion = 0.0 # No WE from occupation armies
  96. + icon_frame = 1
  97. +
  98. + potential = {
  99. + from = {
  100. + NOR = {
  101. + has_trait = "trait_robotic_1"
  102. + has_trait = "trait_robotic_2"
  103. + has_trait = "trait_robotic_3"
  104. + has_trait = "trait_machine_unit"
  105. + is_sapient = no
  106. + }
  107. + }
  108. + owner = {
  109. + OR = {
  110. + NOT = { has_authority = auth_machine_intelligence }
  111. + has_valid_civic = civic_machine_assimilator
  112. + }
  113. + }
  114. + }
  115. +}
  116. +
  117. +# Robotic Armies
  118. +robotic_occupation_army = {
  119. + defensive = yes
  120. + occupation = yes
  121. + damage = 1.00
  122. + health = 1.25
  123. + morale_damage = 1.00
  124. + collateral_damage = 0.0
  125. + war_exhaustion = 0.0 # No WE from occupation armies
  126. + has_morale = no
  127. + icon_frame = 4
  128. + has_species = yes
  129. +
  130. + potential = {
  131. + from = {
  132. + OR = {
  133. + has_trait = "trait_robotic_1"
  134. + has_trait = "trait_robotic_2"
  135. + }
  136. + }
  137. + owner = {
  138. + NOT = { has_authority = auth_machine_intelligence }
  139. + }
  140. + }
  141. +
  142. + allow = {
  143. + owner = { NOT = { has_policy_flag = robots_outlawed } }
  144. + }
  145. +}
  146. +
  147. +# Synthetic Armies
  148. +android_occupation_army = {
  149. + defensive = yes
  150. + occupation = yes
  151. + damage = 1.25
  152. + health = 1.25
  153. + has_morale = no
  154. + morale_damage = 1.00
  155. + collateral_damage = 0.0
  156. + war_exhaustion = 0.0 # No WE from occupation armies
  157. + icon_frame = 4
  158. + has_species = yes
  159. +
  160. + potential = {
  161. + from = { has_trait = "trait_robotic_3" }
  162. + owner = {
  163. + NOT = { has_authority = auth_machine_intelligence }
  164. + }
  165. + }
  166. +
  167. + allow = {
  168. + owner = { NOT = { has_policy_flag = ai_outlawed } }
  169. + }
  170. +}
  171. +
  172. +### Machine Empire Armies
  173. +machine_occupation_army = {
  174. + defensive = yes
  175. + occupation = yes
  176. + health = 1.10
  177. + damage = 1.10
  178. + has_morale = no
  179. + morale_damage = 1.00
  180. + collateral_damage = 0.0
  181. + war_exhaustion = 0.0 # No WE from occupation armies
  182. + icon_frame = 12
  183. + has_species = yes
  184. +
  185. + potential = {
  186. + owner = { has_authority = auth_machine_intelligence }
  187. + from = {
  188. + has_trait = "trait_machine_unit"
  189. + }
  190. + }
  191. +}
  192. \ No newline at end of file
  193. diff --git a/2.0.0/common/ascension_perks/00_ascension_perks.txt b/2.0.2/common/ascension_perks/00_ascension_perks.txt
  194. index b65ef22..5b2604b 100755
  195. --- a/2.0.0/common/ascension_perks/00_ascension_perks.txt
  196. +++ b/2.0.2/common/ascension_perks/00_ascension_perks.txt
  197. @@ -46,13 +46,7 @@ ap_nihilistic_acquisition = {
  198. NOT = {
  199. has_ascension_perk = ap_nihilistic_acquisition
  200. }
  201. - NOR = {
  202. - has_valid_civic = civic_fanatic_purifiers
  203. - has_valid_civic = civic_hive_devouring_swarm
  204. - has_valid_civic = civic_inwards_perfection
  205. - has_valid_civic = civic_machine_terminator
  206. - has_valid_civic = civic_barbaric_despoilers
  207. - }
  208. + NOT = { has_valid_civic = civic_barbaric_despoilers }
  209. }
  210.  
  211. on_enabled = {
  212. @@ -73,6 +67,15 @@ ap_nihilistic_acquisition = {
  213. factor = 0
  214. NOT = { has_ai_personality_behaviour = slaver }
  215. }
  216. + modifier = {
  217. + factor = 0
  218. + OR = {
  219. + has_valid_civic = civic_fanatic_purifiers
  220. + has_valid_civic = civic_hive_devouring_swarm
  221. + has_valid_civic = civic_inwards_perfection
  222. + has_valid_civic = civic_machine_terminator
  223. + }
  224. + }
  225. }
  226. }
  227.  
  228. @@ -213,8 +216,8 @@ ap_evolutionary_mastery = {
  229. num_ascension_perks > 2
  230. }
  231. custom_tooltip = {
  232. - fail_text = "requires_technology_gene_expressions"
  233. - has_technology = tech_gene_expressions
  234. + fail_text = "requires_technology_glandular_acclimation"
  235. + has_technology = tech_glandular_acclimation
  236. }
  237. custom_tooltip = {
  238. fail_text = "requires_ap_engineered_evolution"
  239. @@ -610,6 +613,37 @@ ap_interstellar_dominion = {
  240. }
  241. }
  242.  
  243. +ap_grasp_the_void = {
  244. + possible = {
  245. + custom_tooltip = {
  246. + fail_text = "requires_ascension_perks_1"
  247. + num_ascension_perks > 0
  248. + }
  249. + }
  250. +
  251. + modifier = {
  252. + country_starbase_capacity_add = 5
  253. + }
  254. +
  255. + potential = {
  256. + NOT = {
  257. + has_ascension_perk = ap_grasp_the_void
  258. + }
  259. + }
  260. +
  261. + ai_weight = {
  262. + factor = 10
  263. + modifier = {
  264. + factor = 2
  265. + has_civic = civic_inwards_perfection
  266. + }
  267. + modifier = {
  268. + factor = 1.5
  269. + is_xenophobe = yes
  270. + }
  271. + }
  272. +}
  273. +
  274. ap_eternal_vigilance = {
  275. possible = {
  276. custom_tooltip = {
  277. @@ -819,7 +853,7 @@ ap_imperial_prerogative = {
  278.  
  279. ap_executive_vigor = {
  280. modifier = {
  281. - edict_length_mult = 1.00
  282. + edict_length_mult = 0.50
  283. }
  284.  
  285. potential = {
  286. @@ -833,9 +867,26 @@ ap_executive_vigor = {
  287. }
  288. }
  289.  
  290. +ap_transcendent_learning = {
  291. + modifier = {
  292. + leader_skill_levels = 2
  293. + country_leader_cap = 2
  294. + }
  295. +
  296. + potential = {
  297. + NOT = {
  298. + has_ascension_perk = ap_transcendent_learning
  299. + }
  300. + }
  301. +
  302. + ai_weight = {
  303. + factor = 10
  304. + }
  305. +}
  306. +
  307. ap_shared_destiny = {
  308. modifier = {
  309. - subject_integration_influence_cost_mult = -0.5
  310. + subject_integration_influence_cost_mult = -0.75
  311. }
  312.  
  313. potential = {
  314. @@ -852,6 +903,14 @@ ap_shared_destiny = {
  315.  
  316. ai_weight = {
  317. factor = 5
  318. + modifier = {
  319. + factor = 0
  320. + NOT = {
  321. + any_subject = {
  322. + is_subject_type = vassal
  323. + }
  324. + }
  325. + }
  326. }
  327. }
  328.  
  329. @@ -891,46 +950,6 @@ ap_voidborn = {
  330. }
  331. }
  332.  
  333. -ap_the_circle_of_life = {
  334. - on_enabled = {
  335. - custom_tooltip = "allow_ring_world"
  336. - }
  337. -
  338. - possible = {
  339. - custom_tooltip = {
  340. - fail_text = "requires_ascension_perks_3"
  341. - num_ascension_perks > 2
  342. - }
  343. - custom_tooltip = {
  344. - fail_text = "requires_ap_voidborn"
  345. - has_ascension_perk = ap_voidborn
  346. - }
  347. - custom_tooltip = {
  348. - fail_text = "requires_mega_engineering"
  349. - has_technology = tech_mega_engineering
  350. - }
  351. - }
  352. -
  353. - potential = {
  354. - host_has_dlc = "Utopia"
  355. - NOT = {
  356. - has_ascension_perk = ap_the_circle_of_life
  357. - }
  358. - }
  359. -
  360. - ai_weight = {
  361. - factor = 10
  362. - modifier = {
  363. - factor = 2
  364. - has_ethic = ethic_pacifist
  365. - }
  366. - modifier = {
  367. - factor = 3
  368. - has_ethic = ethic_fanatic_pacifist
  369. - }
  370. - }
  371. -}
  372. -
  373. ap_master_builders = {
  374. on_enabled = {
  375. if = {
  376. @@ -986,6 +1005,7 @@ ap_galactic_wonders = {
  377. custom_tooltip = "allow_spy_orb"
  378. custom_tooltip = "allow_think_tank"
  379. custom_tooltip = "allow_dysons_sphere"
  380. + custom_tooltip = "allow_ring_world"
  381. }
  382.  
  383. possible = {
  384. @@ -1065,6 +1085,7 @@ ap_machine_worlds = {
  385. potential = {
  386. host_has_dlc = "Synthetic Dawn Story Pack"
  387. has_authority = auth_machine_intelligence
  388. + NOT = { has_civic = civic_machine_assimilator }
  389. NOT = {
  390. has_ascension_perk = ap_machine_worlds
  391. }
  392. diff --git a/2.0.0/common/bombardment_stances/00_bombardment_stances.txt b/2.0.2/common/bombardment_stances/00_bombardment_stances.txt
  393. index 1927ac9..9166ca4 100755
  394. --- a/2.0.0/common/bombardment_stances/00_bombardment_stances.txt
  395. +++ b/2.0.2/common/bombardment_stances/00_bombardment_stances.txt
  396. @@ -150,7 +150,7 @@ raiding = {
  397. army_damage = 0.5
  398.  
  399. kill_pop_chance = 1.0
  400. - min_pops_to_kill_pop = 6
  401. + min_pops_to_kill_pop = 4
  402. add_blocker_chance = 0.0
  403. max_blockers = 0
  404.  
  405. diff --git a/2.0.0/common/buildings/00_buildings.txt b/2.0.2/common/buildings/00_buildings.txt
  406. index 7c3f0f9..4ba7a47 100755
  407. --- a/2.0.0/common/buildings/00_buildings.txt
  408. +++ b/2.0.2/common/buildings/00_buildings.txt
  409. @@ -2015,6 +2015,27 @@ building_replicator = {
  410. minerals = 500
  411. }
  412.  
  413. + planet_modifier_with_pop_trigger = {
  414. + key = building_replicator
  415. + potential = {
  416. + NAND = {
  417. + has_citizenship_type = { type = citizenship_purge }
  418. + OR = {
  419. + has_purge_type = { type = purge_normal }
  420. + has_purge_type = { type = purge_processing }
  421. + has_purge_type = { type = purge_matrix }
  422. + }
  423. + }
  424. + NAND = {
  425. + has_citizenship_type = { type = citizenship_slavery }
  426. + OR = {
  427. + has_slavery_type = { type = slavery_livestock }
  428. + has_slavery_type = { type = slavery_matrix }
  429. + }
  430. + }
  431. + }
  432. + }
  433. +
  434. allow = {
  435. if = {
  436. limit = {
  437. @@ -2051,7 +2072,7 @@ building_replicator = {
  438. }
  439.  
  440. planet_modifier = {
  441. - static_planet_resource_minerals_add = 30
  442. + static_planet_resource_minerals_add = 40
  443. }
  444.  
  445. required_resources = {
  446. @@ -4498,6 +4519,12 @@ building_stronghold = {
  447.  
  448. planetary_ftl_inhibitor = yes
  449.  
  450. + potential = {
  451. + planet = {
  452. + NOT = { is_planet_class = pc_habitat }
  453. + }
  454. + }
  455. +
  456. prerequisites = {
  457. "tech_planetary_defenses"
  458. }
  459. @@ -4506,6 +4533,15 @@ building_stronghold = {
  460. minerals = 300
  461. }
  462.  
  463. + produced_resource_trigger = {
  464. + modifier = {
  465. + has_valid_civic = civic_citizen_service
  466. + resources = {
  467. + unity = 1
  468. + }
  469. + }
  470. + }
  471. +
  472. produced_resources = {
  473. unity = 1
  474. }
  475. @@ -4528,6 +4564,18 @@ building_stronghold = {
  476. factor = 0
  477. years_passed < 25
  478. }
  479. + modifier = {
  480. + factor = 0
  481. + planet = {
  482. + unrest < 50
  483. + sector_controlled = yes
  484. + owner = { is_ai = no }
  485. + }
  486. + NOR = {
  487. + has_building = "building_stronghold"
  488. + has_building = "building_fortress"
  489. + }
  490. + }
  491. modifier = {
  492. factor = 0
  493. planet = {
  494. @@ -4624,6 +4672,13 @@ building_fortress = {
  495.  
  496. planetary_ftl_inhibitor = yes
  497.  
  498. +
  499. + potential = {
  500. + planet = {
  501. + NOT = { is_planet_class = pc_habitat }
  502. + }
  503. + }
  504. +
  505. prerequisites = {
  506. "tech_global_defense_grid"
  507. }
  508. @@ -4632,6 +4687,15 @@ building_fortress = {
  509. minerals = 500
  510. }
  511.  
  512. + produced_resource_trigger = {
  513. + modifier = {
  514. + has_valid_civic = civic_citizen_service
  515. + resources = {
  516. + unity = 1
  517. + }
  518. + }
  519. + }
  520. +
  521. produced_resources = {
  522. unity = 2
  523. }
  524. @@ -4683,6 +4747,18 @@ building_fortress = {
  525. factor = 0
  526. years_passed < 25
  527. }
  528. + modifier = {
  529. + factor = 0
  530. + planet = {
  531. + unrest < 50
  532. + sector_controlled = yes
  533. + owner = { is_ai = no }
  534. + }
  535. + NOR = {
  536. + has_building = "building_stronghold"
  537. + has_building = "building_fortress"
  538. + }
  539. + }
  540. modifier = {
  541. factor = 0
  542. planet = {
  543. diff --git a/2.0.0/common/buildings/00_guardian_buildings.txt b/2.0.2/common/buildings/00_guardian_buildings.txt
  544. index 0c4767f..14816d0 100755
  545. --- a/2.0.0/common/buildings/00_guardian_buildings.txt
  546. +++ b/2.0.2/common/buildings/00_guardian_buildings.txt
  547. @@ -63,14 +63,14 @@
  548. ###
  549.  
  550. building_guardian_dragon_shrine = {
  551. - base_buildtime = @b0time
  552. + base_buildtime = 360
  553.  
  554. empire_unique = yes
  555.  
  556. requires_pop = yes
  557.  
  558. cost = {
  559. - minerals = @b0cost
  560. + minerals = 800
  561. }
  562.  
  563. produced_resources = {
  564. @@ -103,14 +103,14 @@ building_guardian_dragon_shrine = {
  565. }
  566.  
  567. building_guardian_dragon_monument = {
  568. - base_buildtime = @b0time
  569. + base_buildtime = 360
  570.  
  571. empire_unique = yes
  572.  
  573. requires_pop = yes
  574.  
  575. cost = {
  576. - minerals = @b0cost
  577. + minerals = 800
  578. }
  579.  
  580. produced_resources = {
  581. @@ -145,11 +145,11 @@ building_guardian_dragon_monument = {
  582. # Stellarite Trophy
  583. building_stellarite_trophy = {
  584. icon = "building_zanaam_obelisk"
  585. - base_buildtime = 1000
  586. + base_buildtime = 360
  587. empire_unique = yes
  588.  
  589. cost = {
  590. - minerals = 2500
  591. + minerals = 800
  592. }
  593.  
  594. produced_resources = {
  595. diff --git a/2.0.0/common/buildings/00_habitat_buildings.txt b/2.0.2/common/buildings/00_habitat_buildings.txt
  596. index 82ab17f..3e67a8d 100755
  597. --- a/2.0.0/common/buildings/00_habitat_buildings.txt
  598. +++ b/2.0.2/common/buildings/00_habitat_buildings.txt
  599. @@ -49,6 +49,11 @@ building_hab_astro_mining_facility = {
  600. potential = {
  601. planet = {
  602. is_planet_class = pc_habitat
  603. + }
  604. + }
  605. +
  606. + allow = {
  607. + planet = {
  608. has_building = "building_hab_capital"
  609. }
  610. }
  611. @@ -116,6 +121,11 @@ building_hab_agri_bay = {
  612. NOT = { owner = { has_authority = auth_machine_intelligence } }
  613. planet = {
  614. is_planet_class = pc_habitat
  615. + }
  616. + }
  617. +
  618. + allow = {
  619. + planet = {
  620. has_building = "building_hab_capital"
  621. }
  622. }
  623. @@ -139,6 +149,11 @@ building_hab_laboratory_module = {
  624. potential = {
  625. planet = {
  626. is_planet_class = pc_habitat
  627. + }
  628. + }
  629. +
  630. + allow = {
  631. + planet = {
  632. has_building = "building_hab_capital"
  633. }
  634. }
  635. @@ -168,6 +183,11 @@ building_hab_cultural_center = {
  636. }
  637. planet = {
  638. is_planet_class = pc_habitat
  639. + }
  640. + }
  641. +
  642. + allow = {
  643. + planet = {
  644. has_building = "building_hab_capital"
  645. }
  646. }
  647. @@ -193,3 +213,65 @@ building_hab_cultural_center = {
  648. weight = 300
  649. }
  650. }
  651. +
  652. +building_hab_stronghold = {
  653. + icon = "building_stronghold"
  654. + base_buildtime = 180
  655. + is_listed = yes
  656. + defense_armies = 2
  657. +
  658. + potential = {
  659. + planet = {
  660. + is_planet_class = pc_habitat
  661. + }
  662. + }
  663. +
  664. + allow = {
  665. + planet = {
  666. + has_building = "building_hab_capital"
  667. + }
  668. + }
  669. +
  670. + cost = {
  671. + minerals = 250
  672. + }
  673. +
  674. + produced_resources = {
  675. + unity = 1
  676. + }
  677. +
  678. + required_resources = {
  679. + energy = 2
  680. + }
  681. +
  682. + planet_modifier = {
  683. + planet_unrest_add = -40
  684. + }
  685. +
  686. + ai_weight = {
  687. + weight = 1000
  688. + modifier = {
  689. + factor = 0
  690. + years_passed < 25
  691. + }
  692. + modifier = {
  693. + factor = 0
  694. + planet = {
  695. + NOT = { unrest > 50 }
  696. + }
  697. + }
  698. + modifier = {
  699. + factor = 0
  700. + planet = {
  701. + count_tile = {
  702. + limit = {
  703. + OR = {
  704. + has_building = building_hab_stronghold
  705. + }
  706. + }
  707. + count > 0
  708. + }
  709. + }
  710. + }
  711. + }
  712. +}
  713. diff --git a/2.0.0/common/bypass/00_bypasses.txt b/2.0.2/common/bypass/00_bypasses.txt
  714. index 19a8add..bf64e12 100755
  715. --- a/2.0.0/common/bypass/00_bypasses.txt
  716. +++ b/2.0.2/common/bypass/00_bypasses.txt
  717. @@ -104,12 +104,22 @@ wormhole = {
  718. country_can_use = {
  719. custom_tooltip = {
  720. fail_text = NATURAL_WORMHOLE_COUNTRY_CANNOT_USE
  721. + # Wormhole can be used if...
  722. OR = {
  723. + # System has no owner
  724. NOT = { exists = from }
  725. + # System's owner has not closed borders to you
  726. from = {
  727. - OR = {
  728. NOT = { has_closed_borders = root }
  729. - is_at_war_with = root
  730. + }
  731. + # System's owner is at war with you
  732. + from = { is_at_war_with = root }
  733. + # System's owner is not a proper empire
  734. + from = {
  735. + NOR = {
  736. + is_country_type = default
  737. + is_country_type = awakened_fallen_empire
  738. + is_country_type = fallen_empire
  739. }
  740. }
  741. }
  742. diff --git a/2.0.0/common/casus_belli/00_casus_belli.txt b/2.0.2/common/casus_belli/00_casus_belli.txt
  743. index 09fbf96..8477a7a 100755
  744. --- a/2.0.0/common/casus_belli/00_casus_belli.txt
  745. +++ b/2.0.2/common/casus_belli/00_casus_belli.txt
  746. @@ -38,11 +38,6 @@ cb_subjugation = {
  747. is_valid = {
  748. is_country_type = awakened_fallen_empire
  749. NOT = { has_authority = auth_machine_intelligence }
  750. - has_total_war_cb = no
  751. - OR = {
  752. - is_subject = no
  753. - overlord = { NOT = { is_same_value = from } }
  754. - }
  755. }
  756. }
  757.  
  758. @@ -70,17 +65,67 @@ cb_humiliation = {
  759. }
  760.  
  761. cb_ideology = {
  762. - show_in_diplomacy = no
  763. - show_notification = no
  764. + show_in_diplomacy = yes
  765. + show_notification = yes
  766. potential = {
  767. is_country_type = default
  768. NOT = { has_ethic = ethic_gestalt_consciousness }
  769. }
  770. is_valid = {
  771. has_policy_flag = liberation_wars
  772. - is_rival = FROM
  773. + is_neighbor_of = FROM
  774. + from = { is_country_type = default }
  775. from = { NOT = { has_ethic = ethic_gestalt_consciousness } }
  776. has_total_war_cb = no
  777. + OR = {
  778. + AND = {
  779. + is_xenophile = yes
  780. + from = { is_xenophile = no }
  781. + }
  782. + AND = {
  783. + is_xenophobe = yes
  784. + from = { is_xenophobe = no }
  785. + }
  786. + AND = {
  787. + is_authoritarian = yes
  788. + from = { is_authoritarian = no }
  789. + }
  790. + AND = {
  791. + is_egalitarian = yes
  792. + from = { is_egalitarian = no }
  793. + }
  794. + AND = {
  795. + is_spiritualist = yes
  796. + from = { is_spiritualist = no }
  797. + }
  798. + AND = {
  799. + is_materialist = yes
  800. + from = { is_materialist = no }
  801. + }
  802. + AND = {
  803. + is_militarist = yes
  804. + from = { is_militarist = no }
  805. + }
  806. + AND = {
  807. + is_pacifist = yes
  808. + from = { is_pacifist = no }
  809. + }
  810. + }
  811. + OR = {
  812. + is_subject = no
  813. + overlord = { NOT = { is_same_value = from } }
  814. + }
  815. + }
  816. +}
  817. +
  818. +cb_sublimation = {
  819. + show_in_diplomacy = no
  820. + show_notification = no
  821. + potential = {
  822. + has_valid_civic = civic_machine_assimilator
  823. + }
  824. + is_valid = {
  825. + has_total_war_cb = yes
  826. OR = {
  827. is_subject = no
  828. overlord = { NOT = { is_same_value = from } }
  829. @@ -89,8 +134,8 @@ cb_ideology = {
  830. }
  831.  
  832. cb_purification = {
  833. - show_in_diplomacy = yes
  834. - show_notification = yes
  835. + show_in_diplomacy = no
  836. + show_notification = no
  837. potential = {
  838. OR = {
  839. is_berserk_fallen_machine_empire = yes
  840. @@ -100,10 +145,6 @@ cb_purification = {
  841. }
  842. is_valid = {
  843. has_total_war_cb = yes
  844. - OR = {
  845. - is_berserk_fallen_machine_empire = yes
  846. - is_neighbor_of = from
  847. - }
  848. OR = {
  849. is_subject = no
  850. overlord = { NOT = { is_same_value = from } }
  851. @@ -112,15 +153,14 @@ cb_purification = {
  852. }
  853.  
  854. cb_hunger = {
  855. - show_in_diplomacy = yes
  856. - show_notification = yes
  857. + show_in_diplomacy = no
  858. + show_notification = no
  859. potential = {
  860. is_country_type = default
  861. has_valid_civic = civic_hive_devouring_swarm
  862. }
  863. is_valid = {
  864. has_total_war_cb = yes
  865. - is_neighbor_of = from
  866. OR = {
  867. is_subject = no
  868. overlord = { NOT = { is_same_value = from } }
  869. @@ -137,6 +177,7 @@ cb_despoliation = {
  870. }
  871. is_valid = {
  872. is_neighbor_of = from
  873. + has_total_war_cb = no
  874. OR = {
  875. is_subject = no
  876. overlord = { NOT = { is_same_value = from } }
  877. @@ -150,10 +191,12 @@ cb_colossus = {
  878. potential = {
  879. is_country_type = default
  880. has_technology = "tech_colossus"
  881. + has_policy_flag = unrestricted_wars
  882. }
  883. is_valid = {
  884. - has_total_war_cb = yes
  885. - is_rival = from
  886. + is_neighbor_of = from
  887. + has_total_war_cb = no
  888. + any_owned_ship = { is_ship_size = colossus }
  889. OR = {
  890. is_subject = no
  891. overlord = { NOT = { is_same_value = from } }
  892. @@ -166,13 +209,13 @@ cb_stop_colossus = {
  893. show_notification = yes
  894. potential = {
  895. is_country_type = default
  896. - NOT = { has_technology = "tech_colossus" }
  897. - exists = from
  898. - from = { has_technology = "tech_colossus" }
  899. }
  900. is_valid = {
  901. - has_total_war_cb = yes
  902. - is_rival = from
  903. + is_neighbor_of = from
  904. + has_total_war_cb = no
  905. + from = { is_country_type = default }
  906. + from = { any_owned_ship = { is_ship_size = colossus } }
  907. + NOT = { any_owned_ship = { is_ship_size = colossus } }
  908. OR = {
  909. is_subject = no
  910. overlord = { NOT = { is_same_value = from } }
  911. @@ -188,16 +231,25 @@ cb_containment = {
  912. NOR = {
  913. has_valid_civic = civic_fanatic_purifiers
  914. has_valid_civic = civic_machine_terminator
  915. + has_valid_civic = civic_machine_assimilator
  916. has_valid_civic = civic_hive_devouring_swarm
  917. }
  918. }
  919. is_valid = {
  920. has_total_war_cb = yes
  921. - is_neighbor_of = from
  922. OR = {
  923. is_subject = no
  924. overlord = { NOT = { is_same_value = from } }
  925. }
  926. + from = {
  927. + OR = {
  928. + is_country_type = awakened_fallen_empire
  929. + has_valid_civic = civic_fanatic_purifiers
  930. + has_valid_civic = civic_hive_devouring_swarm
  931. + has_valid_civic = civic_machine_assimilator
  932. + has_valid_civic = civic_machine_terminator
  933. + }
  934. + }
  935. }
  936. }
  937.  
  938. diff --git a/2.0.0/common/component_templates/00_guardian_weapons.txt b/2.0.2/common/component_templates/00_guardian_weapons.txt
  939. index 68e539c..be0b718 100755
  940. --- a/2.0.0/common/component_templates/00_guardian_weapons.txt
  941. +++ b/2.0.2/common/component_templates/00_guardian_weapons.txt
  942. @@ -259,7 +259,7 @@ strike_craft_component_template = {
  943. shield = 0
  944. evasion = 0.40
  945.  
  946. - speed = 200
  947. + speed = 300
  948. rotation_speed = 0.3
  949. acceleration = 2.5
  950.  
  951. diff --git a/2.0.0/common/component_templates/00_strike_craft.txt b/2.0.2/common/component_templates/00_strike_craft.txt
  952. index 09ac207..f900d00 100755
  953. --- a/2.0.0/common/component_templates/00_strike_craft.txt
  954. +++ b/2.0.2/common/component_templates/00_strike_craft.txt
  955. @@ -1,7 +1,8 @@
  956. @attack_range = 8
  957. @launch_time = 1.5
  958. -@fighter_speed = 250
  959. -@bomber_speed = 250
  960. +@speed1 = 300
  961. +@speed2 = 350
  962. +@speed3 = 400
  963. @count = 8
  964. @regen = 0.13
  965.  
  966. @@ -40,7 +41,7 @@ strike_craft_component_template = {
  967. shield = 0
  968. evasion = 0.50
  969.  
  970. - speed = @fighter_speed
  971. + speed = @speed1
  972. rotation_speed = 0.1
  973. acceleration = 0.5
  974.  
  975. @@ -77,7 +78,7 @@ strike_craft_component_template = {
  976. shield = 10
  977. evasion = 0.55
  978.  
  979. - speed = @bomber_speed
  980. + speed = @speed1
  981. rotation_speed = 0.1
  982. acceleration = 0.5
  983.  
  984. @@ -119,7 +120,7 @@ strike_craft_component_template = {
  985. shield = 20
  986. evasion = 0.80
  987.  
  988. - speed = @bomber_speed
  989. + speed = @speed2
  990. rotation_speed = 0.1
  991. acceleration = 0.5
  992.  
  993. @@ -161,7 +162,7 @@ strike_craft_component_template = {
  994. shield = 30
  995. evasion = 0.80
  996.  
  997. - speed = @bomber_speed
  998. + speed = @speed3
  999. rotation_speed = 0.1
  1000. acceleration = 0.5
  1001.  
  1002. diff --git a/2.0.0/common/component_templates/00_utilities_afterburners.txt b/2.0.2/common/component_templates/00_utilities_afterburners.txt
  1003. index 8058a52..22c1090 100755
  1004. --- a/2.0.0/common/component_templates/00_utilities_afterburners.txt
  1005. +++ b/2.0.2/common/component_templates/00_utilities_afterburners.txt
  1006. @@ -32,6 +32,7 @@ utility_component_template = {
  1007. ship_speed_mult = 0.10
  1008. ship_evasion_mult = 0.05
  1009. }
  1010. + class_restriction = { shipclass_military }
  1011. prerequisites = { "tech_afterburners_1" }
  1012. component_set = "AFTERBURNER_1"
  1013. upgrades_to = "AFTERBURNER_2"
  1014. @@ -60,6 +61,7 @@ utility_component_template = {
  1015. ship_speed_mult = 0.20
  1016. ship_evasion_mult = 0.10
  1017. }
  1018. + class_restriction = { shipclass_military }
  1019. prerequisites = { "tech_afterburners_2" }
  1020. component_set = "AFTERBURNER_2"
  1021.  
  1022. diff --git a/2.0.0/common/component_templates/00_utilities_roles.txt b/2.0.2/common/component_templates/00_utilities_roles.txt
  1023. index 193ae29..5ba4a01 100755
  1024. --- a/2.0.0/common/component_templates/00_utilities_roles.txt
  1025. +++ b/2.0.2/common/component_templates/00_utilities_roles.txt
  1026. @@ -148,7 +148,7 @@ utility_component_template = {
  1027. upgrades_to = "COMBAT_COMPUTER_SWARM_ADVANCED"
  1028.  
  1029. modifier = {
  1030. - ship_evasion_add = 5
  1031. + ship_evasion_mult = 0.05
  1032. }
  1033. ship_modifier = {
  1034. ship_fire_rate_mult = 0.05
  1035. @@ -174,7 +174,7 @@ utility_component_template = {
  1036. upgrades_to = "COMBAT_COMPUTER_SWARM_SAPIENT"
  1037.  
  1038. modifier = {
  1039. - ship_evasion_add = 10
  1040. + ship_evasion_mult = 0.10
  1041. }
  1042. ship_modifier = {
  1043. ship_fire_rate_mult = 0.10
  1044. @@ -199,7 +199,7 @@ utility_component_template = {
  1045. prerequisites = { "tech_combat_computers_3" }
  1046.  
  1047. modifier = {
  1048. - ship_evasion_add = 25
  1049. + ship_evasion_mult = 0.25
  1050. }
  1051. ship_modifier = {
  1052. ship_fire_rate_mult = 0.15
  1053. @@ -234,7 +234,7 @@ utility_component_template = {
  1054. prerequisites = { "tech_combat_computers_autonomous" }
  1055.  
  1056. modifier = {
  1057. - ship_evasion_add = 25
  1058. + ship_evasion_mult = 0.25
  1059. }
  1060. ship_modifier = {
  1061. ship_fire_rate_mult = 0.15
  1062. @@ -259,7 +259,7 @@ utility_component_template = {
  1063. prerequisites = { "tech_precognition_interface" }
  1064.  
  1065. modifier = {
  1066. - ship_evasion_add = 15
  1067. + ship_evasion_mult = 0.15
  1068. ship_speed_mult = 0.20
  1069. }
  1070. ship_modifier = {
  1071. @@ -336,7 +336,7 @@ utility_component_template = {
  1072. prerequisites = { "tech_combat_computers_3" }
  1073.  
  1074. modifier = {
  1075. - ship_evasion_add = 10
  1076. + ship_evasion_mult = 0.10
  1077. }
  1078. ship_modifier = {
  1079. ship_fire_rate_mult = 0.15
  1080. @@ -372,7 +372,7 @@ utility_component_template = {
  1081. prerequisites = { "tech_combat_computers_autonomous" }
  1082.  
  1083. modifier = {
  1084. - ship_evasion_add = 10
  1085. + ship_evasion_mult = 0.10
  1086. }
  1087. ship_modifier = {
  1088. ship_fire_rate_mult = 0.15
  1089. diff --git a/2.0.0/common/component_templates/00_utilities_thrusters.txt b/2.0.2/common/component_templates/00_utilities_thrusters.txt
  1090. index edbffd4..5cf0bb0 100755
  1091. --- a/2.0.0/common/component_templates/00_utilities_thrusters.txt
  1092. +++ b/2.0.2/common/component_templates/00_utilities_thrusters.txt
  1093. @@ -4,36 +4,74 @@
  1094. @cost2 = 6
  1095. @cost3 = 9
  1096. @cost4 = 12
  1097. +@cost5 = 15
  1098.  
  1099. @power_1 = -10
  1100. @power_2 = -15
  1101. @power_3 = -20
  1102. @power_4 = -25
  1103. +@power_5 = -30
  1104.  
  1105. @destroyer_power_1 = -20
  1106. @destroyer_power_2 = -30
  1107. @destroyer_power_3 = -40
  1108. @destroyer_power_4 = -50
  1109. +@destroyer_power_5 = -60
  1110.  
  1111. @cruiser_power_1 = -40
  1112. @cruiser_power_2 = -60
  1113. @cruiser_power_3 = -80
  1114. @cruiser_power_4 = -100
  1115. +@cruiser_power_5 = -120
  1116.  
  1117. @battleship_power_1 = -80
  1118. @battleship_power_2 = -120
  1119. @battleship_power_3 = -160
  1120. @battleship_power_4 = -200
  1121. +@battleship_power_5 = -240
  1122.  
  1123. @titan_power_1 = -160
  1124. @titan_power_2 = -240
  1125. @titan_power_3 = -320
  1126. @titan_power_4 = -400
  1127. +@titan_power_5 = -480
  1128.  
  1129. @colossus_power_1 = -200
  1130. @colossus_power_2 = -300
  1131. @colossus_power_3 = -400
  1132. @colossus_power_4 = -500
  1133. +@colossus_power_5 = -600
  1134. +
  1135. +@destroyer_cost1 = 6
  1136. +@destroyer_cost2 = 12
  1137. +@destroyer_cost3 = 18
  1138. +@destroyer_cost4 = 24
  1139. +@destroyer_cost5 = 30
  1140. +
  1141. +@cruiser_cost1 = 12
  1142. +@cruiser_cost2 = 24
  1143. +@cruiser_cost3 = 36
  1144. +@cruiser_cost4 = 48
  1145. +@cruiser_cost5 = 60
  1146. +
  1147. +@battleship_cost1 = 24
  1148. +@battleship_cost2 = 48
  1149. +@battleship_cost3 = 72
  1150. +@battleship_cost4 = 96
  1151. +@battleship_cost5 = 120
  1152. +
  1153. +@titan_cost1 = 48
  1154. +@titan_cost2 = 96
  1155. +@titan_cost3 = 144
  1156. +@titan_cost4 = 192
  1157. +@titan_cost5 = 240
  1158. +
  1159. +@colossus_cost1 = 60
  1160. +@colossus_cost2 = 120
  1161. +@colossus_cost3 = 180
  1162. +@colossus_cost4 = 240
  1163. +@colossus_cost5 = 300
  1164. +
  1165.  
  1166. #############
  1167. # THRUSTERS #
  1168. @@ -68,7 +106,7 @@ utility_component_template = {
  1169. icon = "GFX_ship_part_thruster_1"
  1170. icon_frame = 1
  1171. power = @destroyer_power_1
  1172. - cost = @cost1
  1173. + cost = @destroyer_cost1
  1174.  
  1175. modifier = {
  1176. }
  1177. @@ -89,7 +127,7 @@ utility_component_template = {
  1178. icon = "GFX_ship_part_thruster_1"
  1179. icon_frame = 1
  1180. power = @cruiser_power_1
  1181. - cost = @cost1
  1182. + cost = @cruiser_cost1
  1183.  
  1184. modifier = {
  1185. }
  1186. @@ -110,7 +148,7 @@ utility_component_template = {
  1187. icon = "GFX_ship_part_thruster_1"
  1188. icon_frame = 1
  1189. power = @battleship_power_1
  1190. - cost = @cost1
  1191. + cost = @battleship_cost1
  1192.  
  1193. modifier = {
  1194. }
  1195. @@ -131,7 +169,7 @@ utility_component_template = {
  1196. icon = "GFX_ship_part_thruster_1"
  1197. icon_frame = 1
  1198. power = @titan_power_1
  1199. - cost = @cost1
  1200. + cost = @titan_cost1
  1201.  
  1202. modifier = {
  1203. }
  1204. @@ -152,7 +190,7 @@ utility_component_template = {
  1205. icon = "GFX_ship_part_thruster_1"
  1206. icon_frame = 1
  1207. power = @colossus_power_1
  1208. - cost = @cost1
  1209. + cost = @colossus_cost1
  1210.  
  1211. modifier = {
  1212. }
  1213. @@ -160,7 +198,7 @@ utility_component_template = {
  1214. prerequisites = { "tech_thrusters_1" }
  1215. component_set = "thruster_components"
  1216. size_restriction = { colossus }
  1217. - #upgrades_to = "COLOSSUS_SHIP_THRUSTER_2"
  1218. + upgrades_to = "COLOSSUS_SHIP_THRUSTER_2"
  1219.  
  1220. ai_weight = {
  1221. weight = 1
  1222. @@ -177,7 +215,7 @@ utility_component_template = {
  1223. power = @power_2
  1224. cost = @cost2
  1225. modifier = {
  1226. - ship_speed_mult = 0.20
  1227. + ship_base_speed_mult = 0.25
  1228. ship_evasion_add = 5
  1229. }
  1230.  
  1231. @@ -197,11 +235,11 @@ utility_component_template = {
  1232. icon = "GFX_ship_part_thruster_2"
  1233. icon_frame = 1
  1234. power = @destroyer_power_2
  1235. - cost = @cost1
  1236. + cost = @destroyer_cost2
  1237.  
  1238. modifier = {
  1239. - ship_speed_mult = 0.20
  1240. - ship_evasion_add = 5
  1241. + ship_base_speed_mult = 0.25
  1242. + ship_evasion_add = 4
  1243. }
  1244.  
  1245. prerequisites = { "tech_thrusters_2" }
  1246. @@ -220,11 +258,11 @@ utility_component_template = {
  1247. icon = "GFX_ship_part_thruster_2"
  1248. icon_frame = 1
  1249. power = @cruiser_power_2
  1250. - cost = @cost1
  1251. + cost = @cruiser_cost2
  1252.  
  1253. modifier = {
  1254. - ship_speed_mult = 0.20
  1255. - ship_evasion_add = 5
  1256. + ship_base_speed_mult = 0.25
  1257. + ship_evasion_add = 3
  1258. }
  1259.  
  1260. prerequisites = { "tech_thrusters_2" }
  1261. @@ -243,11 +281,11 @@ utility_component_template = {
  1262. icon = "GFX_ship_part_thruster_2"
  1263. icon_frame = 1
  1264. power = @battleship_power_2
  1265. - cost = @cost1
  1266. + cost = @battleship_cost2
  1267.  
  1268. modifier = {
  1269. - ship_speed_mult = 0.20
  1270. - ship_evasion_add = 5
  1271. + ship_base_speed_mult = 0.25
  1272. + ship_evasion_add = 2
  1273. }
  1274.  
  1275. prerequisites = { "tech_thrusters_2" }
  1276. @@ -266,11 +304,11 @@ utility_component_template = {
  1277. icon = "GFX_ship_part_thruster_2"
  1278. icon_frame = 1
  1279. power = @titan_power_2
  1280. - cost = @cost1
  1281. + cost = @titan_cost2
  1282.  
  1283. modifier = {
  1284. - ship_speed_mult = 0.20
  1285. - ship_evasion_add = 5
  1286. + ship_base_speed_mult = 0.25
  1287. + ship_evasion_add = 1
  1288. }
  1289.  
  1290. prerequisites = { "tech_thrusters_2" }
  1291. @@ -289,11 +327,10 @@ utility_component_template = {
  1292. icon = "GFX_ship_part_thruster_2"
  1293. icon_frame = 1
  1294. power = @colossus_power_2
  1295. - cost = @cost1
  1296. + cost = @colossus_cost2
  1297.  
  1298. modifier = {
  1299. - ship_speed_mult = 0.20
  1300. - ship_evasion_add = 5
  1301. + ship_base_speed_mult = 0.25
  1302. }
  1303.  
  1304. prerequisites = { "tech_thrusters_2" }
  1305. @@ -317,7 +354,7 @@ utility_component_template = {
  1306. power = @power_3
  1307. cost = @cost3
  1308. modifier = {
  1309. - ship_speed_mult = 0.40
  1310. + ship_base_speed_mult = 0.50
  1311. ship_evasion_add = 10
  1312. }
  1313.  
  1314. @@ -337,10 +374,10 @@ utility_component_template = {
  1315. icon = "GFX_ship_part_thruster_3"
  1316. icon_frame = 1
  1317. power = @destroyer_power_3
  1318. - cost = @cost3
  1319. + cost = @destroyer_cost3
  1320. modifier = {
  1321. - ship_speed_mult = 0.40
  1322. - ship_evasion_add = 10
  1323. + ship_base_speed_mult = 0.50
  1324. + ship_evasion_add = 8
  1325. }
  1326.  
  1327. prerequisites = { "tech_thrusters_3" }
  1328. @@ -359,10 +396,10 @@ utility_component_template = {
  1329. icon = "GFX_ship_part_thruster_3"
  1330. icon_frame = 1
  1331. power = @cruiser_power_3
  1332. - cost = @cost3
  1333. + cost = @cruiser_cost3
  1334. modifier = {
  1335. - ship_speed_mult = 0.40
  1336. - ship_evasion_add = 10
  1337. + ship_base_speed_mult = 0.50
  1338. + ship_evasion_add = 6
  1339. }
  1340.  
  1341. prerequisites = { "tech_thrusters_3" }
  1342. @@ -381,10 +418,10 @@ utility_component_template = {
  1343. icon = "GFX_ship_part_thruster_3"
  1344. icon_frame = 1
  1345. power = @battleship_power_3
  1346. - cost = @cost3
  1347. + cost = @battleship_cost3
  1348. modifier = {
  1349. - ship_speed_mult = 0.40
  1350. - ship_evasion_add = 10
  1351. + ship_base_speed_mult = 0.50
  1352. + ship_evasion_add = 4
  1353. }
  1354.  
  1355. prerequisites = { "tech_thrusters_3" }
  1356. @@ -403,10 +440,10 @@ utility_component_template = {
  1357. icon = "GFX_ship_part_thruster_3"
  1358. icon_frame = 1
  1359. power = @titan_power_3
  1360. - cost = @cost3
  1361. + cost = @titan_cost3
  1362. modifier = {
  1363. - ship_speed_mult = 0.40
  1364. - ship_evasion_add = 10
  1365. + ship_base_speed_mult = 0.50
  1366. + ship_evasion_add = 2
  1367. }
  1368.  
  1369. prerequisites = { "tech_thrusters_3" }
  1370. @@ -425,10 +462,9 @@ utility_component_template = {
  1371. icon = "GFX_ship_part_thruster_3"
  1372. icon_frame = 1
  1373. power = @colossus_power_3
  1374. - cost = @cost3
  1375. + cost = @colossus_cost3
  1376. modifier = {
  1377. - ship_speed_mult = 0.40
  1378. - ship_evasion_add = 10
  1379. + ship_base_speed_mult = 0.50
  1380. }
  1381.  
  1382. prerequisites = { "tech_thrusters_3" }
  1383. @@ -451,13 +487,14 @@ utility_component_template = {
  1384. power = @power_4
  1385. cost = @cost4
  1386. modifier = {
  1387. - ship_speed_mult = 0.60
  1388. + ship_base_speed_mult = 0.75
  1389. ship_evasion_add = 15
  1390. }
  1391.  
  1392. prerequisites = { "tech_thrusters_4" }
  1393. component_set = "thruster_components"
  1394. size_restriction = { corvette colonizer constructor science transport }
  1395. + upgrades_to = "SHIP_THRUSTER_5"
  1396.  
  1397. ai_weight = {
  1398. weight = 4
  1399. @@ -470,15 +507,16 @@ utility_component_template = {
  1400. icon = "GFX_ship_part_thruster_4"
  1401. icon_frame = 1
  1402. power = @destroyer_power_4
  1403. - cost = @cost4
  1404. + cost = @destroyer_cost4
  1405. modifier = {
  1406. - ship_speed_mult = 0.60
  1407. - ship_evasion_add = 15
  1408. + ship_base_speed_mult = 0.75
  1409. + ship_evasion_add = 12
  1410. }
  1411.  
  1412. prerequisites = { "tech_thrusters_4" }
  1413. component_set = "thruster_components"
  1414. size_restriction = { destroyer }
  1415. + upgrades_to = "DESTROYER_SHIP_THRUSTER_5"
  1416.  
  1417. ai_weight = {
  1418. weight = 4
  1419. @@ -491,15 +529,16 @@ utility_component_template = {
  1420. icon = "GFX_ship_part_thruster_4"
  1421. icon_frame = 1
  1422. power = @cruiser_power_4
  1423. - cost = @cost4
  1424. + cost = @cruiser_cost4
  1425. modifier = {
  1426. - ship_speed_mult = 0.60
  1427. - ship_evasion_add = 15
  1428. + ship_base_speed_mult = 0.75
  1429. + ship_evasion_add = 9
  1430. }
  1431.  
  1432. prerequisites = { "tech_thrusters_4" }
  1433. component_set = "thruster_components"
  1434. size_restriction = { cruiser }
  1435. + upgrades_to = "CRUISER_SHIP_THRUSTER_5"
  1436.  
  1437. ai_weight = {
  1438. weight = 4
  1439. @@ -512,15 +551,16 @@ utility_component_template = {
  1440. icon = "GFX_ship_part_thruster_4"
  1441. icon_frame = 1
  1442. power = @battleship_power_4
  1443. - cost = @cost4
  1444. + cost = @battleship_cost4
  1445. modifier = {
  1446. - ship_speed_mult = 0.60
  1447. - ship_evasion_add = 15
  1448. + ship_base_speed_mult = 0.75
  1449. + ship_evasion_add = 6
  1450. }
  1451.  
  1452. prerequisites = { "tech_thrusters_4" }
  1453. component_set = "thruster_components"
  1454. size_restriction = { battleship }
  1455. + upgrades_to = "BATTLESHIP_SHIP_THRUSTER_5"
  1456.  
  1457. ai_weight = {
  1458. weight = 4
  1459. @@ -533,15 +573,16 @@ utility_component_template = {
  1460. icon = "GFX_ship_part_thruster_4"
  1461. icon_frame = 1
  1462. power = @titan_power_4
  1463. - cost = @cost4
  1464. + cost = @titan_cost4
  1465. modifier = {
  1466. - ship_speed_mult = 0.60
  1467. - ship_evasion_add = 15
  1468. + ship_base_speed_mult = 0.75
  1469. + ship_evasion_add = 3
  1470. }
  1471.  
  1472. prerequisites = { "tech_thrusters_4" }
  1473. component_set = "thruster_components"
  1474. size_restriction = { titan }
  1475. + upgrades_to = "TITAN_SHIP_THRUSTER_5"
  1476.  
  1477. ai_weight = {
  1478. weight = 4
  1479. @@ -555,17 +596,145 @@ utility_component_template = {
  1480. icon = "GFX_ship_part_thruster_4"
  1481. icon_frame = 1
  1482. power = @colossus_power_4
  1483. - cost = @cost4
  1484. + cost = @colossus_cost4
  1485. modifier = {
  1486. - ship_speed_mult = 0.60
  1487. - ship_evasion_add = 15
  1488. + ship_base_speed_mult = 0.75
  1489. }
  1490.  
  1491. prerequisites = { "tech_thrusters_4" }
  1492. component_set = "thruster_components"
  1493. size_restriction = { colossus }
  1494. + upgrades_to = "COLOSSUS_SHIP_THRUSTER_5"
  1495.  
  1496. ai_weight = {
  1497. weight = 4
  1498. }
  1499. }
  1500. +
  1501. +### 5
  1502. +
  1503. +utility_component_template = {
  1504. + key = "SHIP_THRUSTER_5"
  1505. + size = small
  1506. + icon = "GFX_ship_part_thruster_5"
  1507. + icon_frame = 1
  1508. + power = @power_5
  1509. + cost = @cost5
  1510. + modifier = {
  1511. + ship_base_speed_mult = 1.00
  1512. + ship_evasion_add = 20
  1513. + }
  1514. +
  1515. + prerequisites = { "tech_dark_matter_propulsion" }
  1516. + component_set = "thruster_components"
  1517. + size_restriction = { corvette colonizer constructor science transport }
  1518. +
  1519. + ai_weight = {
  1520. + weight = 5
  1521. + }
  1522. +}
  1523. +
  1524. +utility_component_template = {
  1525. + key = "DESTROYER_SHIP_THRUSTER_5"
  1526. + size = small
  1527. + icon = "GFX_ship_part_thruster_5"
  1528. + icon_frame = 1
  1529. + power = @destroyer_power_5
  1530. + cost = @destroyer_cost5
  1531. + modifier = {
  1532. + ship_base_speed_mult = 1.00
  1533. + ship_evasion_add = 16
  1534. + }
  1535. +
  1536. + prerequisites = { "tech_dark_matter_propulsion" }
  1537. + component_set = "thruster_components"
  1538. + size_restriction = { destroyer }
  1539. +
  1540. + ai_weight = {
  1541. + weight = 5
  1542. + }
  1543. +}
  1544. +
  1545. +utility_component_template = {
  1546. + key = "CRUISER_SHIP_THRUSTER_5"
  1547. + size = small
  1548. + icon = "GFX_ship_part_thruster_5"
  1549. + icon_frame = 1
  1550. + power = @cruiser_power_5
  1551. + cost = @cruiser_cost5
  1552. + modifier = {
  1553. + ship_base_speed_mult = 1.00
  1554. + ship_evasion_add = 12
  1555. + }
  1556. +
  1557. + prerequisites = { "tech_dark_matter_propulsion" }
  1558. + component_set = "thruster_components"
  1559. + size_restriction = { cruiser }
  1560. +
  1561. + ai_weight = {
  1562. + weight = 5
  1563. + }
  1564. +}
  1565. +
  1566. +utility_component_template = {
  1567. + key = "BATTLESHIP_SHIP_THRUSTER_5"
  1568. + size = small
  1569. + icon = "GFX_ship_part_thruster_5"
  1570. + icon_frame = 1
  1571. + power = @battleship_power_5
  1572. + cost = @battleship_cost5
  1573. + modifier = {
  1574. + ship_base_speed_mult = 1.00
  1575. + ship_evasion_add = 8
  1576. + }
  1577. +
  1578. + prerequisites = { "tech_dark_matter_propulsion" }
  1579. + component_set = "thruster_components"
  1580. + size_restriction = { battleship }
  1581. +
  1582. + ai_weight = {
  1583. + weight = 5
  1584. + }
  1585. +}
  1586. +
  1587. +utility_component_template = {
  1588. + key = "TITAN_SHIP_THRUSTER_5"
  1589. + size = small
  1590. + icon = "GFX_ship_part_thruster_5"
  1591. + icon_frame = 1
  1592. + power = @titan_power_5
  1593. + cost = @titan_cost5
  1594. + modifier = {
  1595. + ship_base_speed_mult = 1.00
  1596. + ship_evasion_add = 4
  1597. + }
  1598. +
  1599. + prerequisites = { "tech_dark_matter_propulsion" }
  1600. + component_set = "thruster_components"
  1601. + size_restriction = { titan }
  1602. +
  1603. + ai_weight = {
  1604. + weight = 5
  1605. + }
  1606. +}
  1607. +
  1608. +
  1609. +utility_component_template = {
  1610. + key = "COLOSSUS_SHIP_THRUSTER_5"
  1611. + size = small
  1612. + icon = "GFX_ship_part_thruster_5"
  1613. + icon_frame = 1
  1614. + power = @colossus_power_5
  1615. + cost = @colossus_cost5
  1616. + modifier = {
  1617. + ship_base_speed_mult = 1.00
  1618. + }
  1619. +
  1620. + prerequisites = { "tech_dark_matter_propulsion" }
  1621. + component_set = "thruster_components"
  1622. + size_restriction = { colossus }
  1623. +
  1624. + ai_weight = {
  1625. + weight = 5
  1626. + }
  1627. +}
  1628. \ No newline at end of file
  1629. diff --git a/2.0.0/common/component_templates/00_weapons_critters_ai.txt b/2.0.2/common/component_templates/00_weapons_critters_ai.txt
  1630. index 75cf36e..1782d76 100755
  1631. --- a/2.0.0/common/component_templates/00_weapons_critters_ai.txt
  1632. +++ b/2.0.2/common/component_templates/00_weapons_critters_ai.txt
  1633. @@ -32,7 +32,7 @@ strike_craft_component_template = {
  1634. shield = 50
  1635. evasion = 0.80
  1636.  
  1637. - speed = 200
  1638. + speed = 400
  1639. rotation_speed = 0.2
  1640. acceleration = 0.5
  1641.  
  1642. diff --git a/2.0.0/common/component_templates/00_weapons_critters_amoeba.txt b/2.0.2/common/component_templates/00_weapons_critters_amoeba.txt
  1643. index e2c5c95..ec8799f 100755
  1644. --- a/2.0.0/common/component_templates/00_weapons_critters_amoeba.txt
  1645. +++ b/2.0.2/common/component_templates/00_weapons_critters_amoeba.txt
  1646. @@ -65,7 +65,7 @@ strike_craft_component_template = {
  1647. shield = 0
  1648. evasion = 0.50
  1649.  
  1650. - speed = 200
  1651. + speed = 300
  1652. rotation_speed = 0.1
  1653. acceleration = 0.5
  1654.  
  1655. diff --git a/2.0.0/common/component_templates/00_weapons_critters_mining_drones.txt b/2.0.2/common/component_templates/00_weapons_critters_mining_drones.txt
  1656. index f400b61..60f2dbb 100755
  1657. --- a/2.0.0/common/component_templates/00_weapons_critters_mining_drones.txt
  1658. +++ b/2.0.2/common/component_templates/00_weapons_critters_mining_drones.txt
  1659. @@ -66,7 +66,7 @@ strike_craft_component_template = {
  1660. shield = 0
  1661. evasion = 0.30
  1662.  
  1663. - speed = 200
  1664. + speed = 300
  1665. rotation_speed = 0.1
  1666. acceleration = 2.5
  1667.  
  1668. diff --git a/2.0.0/common/component_templates/00_weapons_critters_swarm.txt b/2.0.2/common/component_templates/00_weapons_critters_swarm.txt
  1669. index e001584..68e7beb 100755
  1670. --- a/2.0.0/common/component_templates/00_weapons_critters_swarm.txt
  1671. +++ b/2.0.2/common/component_templates/00_weapons_critters_swarm.txt
  1672. @@ -88,7 +88,7 @@ strike_craft_component_template = {
  1673. shield = 0
  1674. evasion = 0.80
  1675.  
  1676. - speed = 180
  1677. + speed = 400
  1678. rotation_speed = 0.2
  1679. acceleration = 0.5
  1680.  
  1681. diff --git a/2.0.0/common/component_templates/weapon_components.csv b/2.0.2/common/component_templates/weapon_components.csv
  1682. index 4b1d0a4..6950abe 100755
  1683. --- a/2.0.0/common/component_templates/weapon_components.csv
  1684. +++ b/2.0.2/common/component_templates/weapon_components.csv
  1685. @@ -37,32 +37,32 @@ SMALL_MASS_DRIVER_5;28.00;-17.00;14.00;46.00;1.00;1.50;0.00;0.50;0.00;1.00;18.00
  1686. MEDIUM_MASS_DRIVER_5;56.00;-30.00;35.00;115.00;1.00;1.50;0.00;0.50;0.00;1.00;18.00;25.00;75.00;0.75;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1687. LARGE_MASS_DRIVER_5;112.00;-59.00;84.00;276.00;1.00;1.50;0.00;0.50;0.00;1.00;18.00;25.00;100.00;0.75;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1688. # Plasma;;;;;;;;;;;;;;;;;;;;;;
  1689. -SMALL_PLASMA_1;15.00;-10.00;12.00;25.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;30.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1690. -MEDIUM_PLASMA_1;30.00;-17.00;30.00;63.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;50.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1691. -LARGE_PLASMA_1;60.00;-34.00;72.00;150.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;70.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1692. -SMALL_PLASMA_2;20.00;-13.00;16.00;33.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;30.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1693. -MEDIUM_PLASMA_2;40.00;-23.00;40.00;83.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;50.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1694. -LARGE_PLASMA_2;80.00;-45.00;96.00;198.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;70.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1695. -SMALL_PLASMA_3;25.00;-17.00;20.00;42.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;30.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1696. -MEDIUM_PLASMA_3;50.00;-30.00;50.00;105.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;50.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1697. -LARGE_PLASMA_3;100.00;-59.00;120.00;252.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;70.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1698. +SMALL_PLASMA_1;15.00;-10.00;12.00;25.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;40.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1699. +MEDIUM_PLASMA_1;30.00;-17.00;30.00;63.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;60.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1700. +LARGE_PLASMA_1;60.00;-34.00;72.00;150.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;80.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1701. +SMALL_PLASMA_2;20.00;-13.00;16.00;33.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;40.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1702. +MEDIUM_PLASMA_2;40.00;-23.00;40.00;83.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;60.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1703. +LARGE_PLASMA_2;80.00;-45.00;96.00;198.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;80.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1704. +SMALL_PLASMA_3;25.00;-17.00;20.00;42.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;40.00;0.80;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1705. +MEDIUM_PLASMA_3;50.00;-30.00;50.00;105.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;60.00;0.80;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1706. +LARGE_PLASMA_3;100.00;-59.00;120.00;252.00;1.50;0.25;0.00;2.00;0.00;2.00;20.00;40.00;80.00;0.80;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1707. # Disruptors;;;;;;;;;;;;;;;;;;;;;;
  1708. -SMALL_DISRUPTOR_1;15.00;-10.00;1.00;18.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;20.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1709. -MEDIUM_DISRUPTOR_1;30.00;-17.00;1.00;45.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;40.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1710. -SMALL_DISRUPTOR_2;20.00;-13.00;1.00;23.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;20.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1711. -MEDIUM_DISRUPTOR_2;40.00;-23.00;1.00;58.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;40.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1712. -SMALL_DISRUPTOR_3;25.00;-17.00;1.00;30.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;20.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1713. -MEDIUM_DISRUPTOR_3;35.00;-30.00;1.00;75.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;40.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1714. +SMALL_DISRUPTOR_1;15.00;-10.00;1.00;18.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;30.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1715. +MEDIUM_DISRUPTOR_1;30.00;-17.00;1.00;45.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;50.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1716. +SMALL_DISRUPTOR_2;20.00;-13.00;1.00;23.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;30.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1717. +MEDIUM_DISRUPTOR_2;40.00;-23.00;1.00;58.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;50.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1718. +SMALL_DISRUPTOR_3;25.00;-17.00;1.00;30.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;30.00;1.00;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1719. +MEDIUM_DISRUPTOR_3;35.00;-30.00;1.00;75.00;1.00;1.00;1.00;1.00;1.00;2.00;20.00;50.00;50.00;1.00;0.35;0.00;0.00;0.00;0.00;0.00;0.00;
  1720. # Autocannons;;;;;;;;;;;;;;;;;;;;;;
  1721. -AUTOCANNON_1;15.00;-10.00;8.00;16.00;1.25;2.00;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1722. -AUTOCANNON_2;20.00;-13.00;10.00;21.00;1.25;2.00;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1723. -AUTOCANNON_3;25.00;-17.00;14.00;27.00;1.25;2.00;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1724. +AUTOCANNON_1;15.00;-10.00;8.00;16.00;1.25;1.50;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1725. +AUTOCANNON_2;20.00;-13.00;10.00;21.00;1.25;1.50;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1726. +AUTOCANNON_3;25.00;-17.00;14.00;27.00;1.25;1.50;0.00;0.25;0.00;2.00;14.00;15.00;30.00;0.85;0.75;0.00;0.00;0.00;0.00;0.00;0.00;
  1727. # Kinetic Artillery;;;;;;;;;;;;;;;;;;;;;;
  1728. KINETIC_ARTILLERY_1;120.00;-70.00;150.00;450.00;1.25;2.00;0.00;0.50;0.00;3.00;25.00;50.00;120.00;0.75;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1729. KINETIC_ARTILLERY_2;155.00;-90.00;195.00;585.00;1.25;2.00;0.00;0.50;0.00;3.00;25.00;50.00;120.00;0.75;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1730. # Energy Launcher;;;;;;;;;;;;;;;;;;;;;;
  1731. -ENERGY_TORPEDO_1;120.00;-70.00;360.00;800.00;1.75;0.50;0.00;1.50;0.00;1.00;19.00;150.00;130.00;0.90;0.05;270.00;0.00;0.00;0.00;0.00;0.00;
  1732. -ENERGY_TORPEDO_2;155.00;-90.00;468.00;1040.00;1.75;0.50;0.00;1.50;0.00;1.00;19.00;150.00;130.00;0.90;0.05;270.00;0.00;0.00;0.00;0.00;0.00;
  1733. +ENERGY_TORPEDO_1;120.00;-70.00;360.00;800.00;1.75;0.50;0.00;1.50;0.00;1.00;19.00;150.00;130.00;0.90;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1734. +ENERGY_TORPEDO_2;155.00;-90.00;468.00;1040.00;1.75;0.50;0.00;1.50;0.00;1.00;19.00;150.00;130.00;0.90;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1735. # Mega Cannon;;;;;;;;;;;;;;;;;;;;;;
  1736. MASS_ACCELERATOR_1;250.00;-200.00;700.00;2000.00;1.25;1.50;0.00;0.75;0.00;1.00;19.00;80.00;150.00;0.75;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1737. MASS_ACCELERATOR_2;325.00;-250.00;900.00;2600.00;1.25;1.50;0.00;0.75;0.00;1.00;19.00;80.00;150.00;0.75;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1738. @@ -77,30 +77,30 @@ TITAN_LASER;500.00;-500.00;5000.00;10000.00;1.25;0.75;0.00;1.50;0.00;30.00;45.00
  1739. PERDITION_BEAM_TITAN;500.00;-500.00;5000.00;10000.00;1.25;0.75;0.00;1.50;0.00;30.00;45.00;180.00;250.00;0.85;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1740. PERDITION_BEAM_ION;500.00;-500.00;5000.00;10000.00;1.25;0.75;0.00;1.50;0.00;30.00;45.00;180.00;250.00;0.85;0.00;0.00;0.00;0.00;0.00;0.00;0.00;
  1741. # Flak Battery;;;;;;;;;;;;;;;;;;;;;;
  1742. -FLAK_BATTERY_1;8.00;-5.00;1.00;3.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.50;0.00;0.00;0.00;0.00;0.00;0.00;
  1743. -FLAK_BATTERY_2;10.00;-7.00;1.50;4.50;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1744. -FLAK_BATTERY_3;13.00;-10.00;2.00;6.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.70;0.00;0.00;0.00;0.00;0.00;0.00;
  1745. +FLAK_BATTERY_1;8.00;-5.00;1.00;3.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.50;0.00;0.00;0.00;0.00;0.00;0.00;
  1746. +FLAK_BATTERY_2;10.00;-7.00;1.50;4.50;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.60;0.00;0.00;0.00;0.00;0.00;0.00;
  1747. +FLAK_BATTERY_3;13.00;-10.00;2.00;6.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.70;0.00;0.00;0.00;0.00;0.00;0.00;
  1748. # Point-Defense;;;;;;;;;;;;;;;;;;;;;;
  1749. -POINT_DEFENCE_1;8.00;-5.00;1.00;4.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.10;0.00;0.00;0.00;0.00;0.00;0.00;
  1750. -POINT_DEFENCE_2;10.00;-7.00;1.50;6.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1751. -POINT_DEFENCE_3;13.00;-10.00;2.00;8.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;8.00;20.00;0.75;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1752. +POINT_DEFENCE_1;8.00;-5.00;1.00;4.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.10;0.00;0.00;0.00;0.00;0.00;0.00;
  1753. +POINT_DEFENCE_2;10.00;-7.00;1.50;6.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1754. +POINT_DEFENCE_3;13.00;-10.00;2.00;8.00;1.00;1.00;0.00;1.00;0.00;0.00;0.00;5.00;30.00;0.75;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1755. # Missiles;;;;;;;;;;;;;;;;;;;;;;
  1756. -MISSILE_1;20.00;-10.00;30.00;40.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;350.00;0.00;0.00;0.00;10.00;100.00;
  1757. -MISSILE_2;26.00;-13.00;39.00;52.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;350.00;0.10;0.00;0.00;12.00;100.00;
  1758. -MISSILE_3;34.00;-17.00;51.00;68.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;350.00;0.20;0.00;0.00;14.00;100.00;
  1759. -MISSILE_4;44.00;-22.00;66.00;88.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;350.00;0.30;0.00;0.00;16.00;100.00;
  1760. -MISSILE_5;58.00;-26.00;86.00;114.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;350.00;0.40;0.00;0.00;18.00;100.00;
  1761. +MISSILE_1;20.00;-10.00;30.00;40.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;400.00;0.00;0.00;0.00;10.00;100.00;
  1762. +MISSILE_2;26.00;-13.00;39.00;52.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;400.00;0.10;0.00;0.00;12.00;100.00;
  1763. +MISSILE_3;34.00;-17.00;51.00;68.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;400.00;0.20;0.00;0.00;14.00;100.00;
  1764. +MISSILE_4;44.00;-22.00;66.00;88.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;400.00;0.30;0.00;0.00;16.00;100.00;
  1765. +MISSILE_5;58.00;-26.00;86.00;114.00;1.25;1.00;1.00;1.00;0.00;1.00;15.00;42.00;100.00;1.00;0.25;400.00;0.40;0.00;0.00;18.00;100.00;
  1766. # Torpedoes;;;;;;;;;;;;;;;;;;;;;;
  1767. -TORPEDO_1;40.00;-10.00;165.00;265.00;1.00;1.00;1.00;2.00;0.00;2.00;20.00;160.00;80.00;1.00;0.10;270.00;0.00;0.00;0.00;20.00;100.00;
  1768. -TORPEDO_2;52.00;-17.00;215.00;345.00;1.00;1.00;1.00;2.00;0.00;2.00;20.00;160.00;80.00;1.00;0.10;270.00;0.00;0.00;0.00;25.00;100.00;
  1769. -TORPEDO_3;68.00;-26.00;275.00;445.00;1.00;1.00;1.00;2.00;0.00;2.00;20.00;160.00;80.00;1.00;0.10;270.00;0.00;0.00;0.00;30.00;100.00;
  1770. +TORPEDO_1;40.00;-10.00;165.00;265.00;1.00;1.00;1.00;1.50;0.00;2.00;20.00;160.00;80.00;1.00;0.10;350.00;0.00;0.00;0.00;20.00;100.00;
  1771. +TORPEDO_2;52.00;-17.00;215.00;345.00;1.00;1.00;1.00;1.50;0.00;2.00;20.00;160.00;80.00;1.00;0.10;350.00;0.00;0.00;0.00;25.00;100.00;
  1772. +TORPEDO_3;68.00;-26.00;275.00;445.00;1.00;1.00;1.00;1.50;0.00;2.00;20.00;160.00;80.00;1.00;0.10;350.00;0.00;0.00;0.00;30.00;100.00;
  1773. # Swarmer Missiles;;;;;;;;;;;;;;;;;;;;;;
  1774. -SWARMER_MISSILE_1;50.00;-17.00;20.00;27.00;1.00;1.00;1.00;1.00;0.00;1.00;15.00;25.00;100.00;1.00;0.30;400.00;0.00;0.00;0.00;50.00;100.00;
  1775. -SWARMER_MISSILE_2;65.00;-26.00;33.00;48.00;1.00;1.00;1.00;1.00;0.00;1.00;15.00;25.00;100.00;1.00;0.30;400.00;0.00;0.00;0.00;60.00;100.00;
  1776. +SWARMER_MISSILE_1;50.00;-17.00;20.00;27.00;1.00;1.00;1.00;1.00;0.00;1.00;15.00;25.00;100.00;1.00;0.30;420.00;0.00;0.00;0.00;50.00;100.00;
  1777. +SWARMER_MISSILE_2;65.00;-26.00;33.00;48.00;1.00;1.00;1.00;1.00;0.00;1.00;15.00;25.00;100.00;1.00;0.30;420.00;0.00;0.00;0.00;60.00;100.00;
  1778. # Researchable Space Critters;;;;;;;;;;;;;;;;;;;;;;
  1779. -SPACE_CLOUD_LIGHTNING;50.00;-40.00;1.00;136.00;1.00;1.00;1.00;1.00;1.00;1.00;19.00;50.00;60.00;1.00;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1780. -SMALL_MINING_LASER;15.00;-7.00;9.00;22.00;2.00;0.25;0.00;1.25;0.00;1.00;19.00;30.00;30.00;0.75;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1781. -MEDIUM_MINING_LASER;30.00;-13.00;23.00;55.00;2.00;0.25;0.00;1.25;0.00;1.00;19.00;30.00;60.00;0.70;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1782. +SPACE_CLOUD_LIGHTNING;50.00;-40.00;1.00;136.00;1.00;1.00;1.00;1.00;1.00;1.00;19.00;50.00;80.00;1.00;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1783. +SMALL_MINING_LASER;15.00;-7.00;9.00;22.00;1.75;0.5;0.00;1.25;0.00;1.00;19.00;30.00;30.00;0.75;0.40;0.00;0.00;0.00;0.00;0.00;0.00;
  1784. +MEDIUM_MINING_LASER;30.00;-13.00;23.00;55.00;1.75;0.5;0.00;1.25;0.00;1.00;19.00;30.00;60.00;0.70;0.20;0.00;0.00;0.00;0.00;0.00;0.00;
  1785. SPACE_WHALE_WEAPON;15.00;-10.00;10.00;27.00;1.00;2.00;0.00;0.25;0.00;1.00;19.00;30.00;50.00;0.75;0.50;0.00;0.00;0.00;0.00;0.00;0.00;
  1786. # Misc Space Critters;;;;;;;;;;;;;;;;;;;;;;
  1787. MEDIUM_PROBE_LIGHTNING;0.00;0.00;12.00;29.00;1.00;1.00;0.00;1.00;0.00;1.00;19.00;35.00;60.00;0.85;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1788. @@ -156,7 +156,7 @@ SMALL_ED_WEAPON;40.00;-25.00;20.00;49.00;2.00;0.50;0.00;1.50;0.00;2.00;18.00;35.
  1789. MEDIUM_ED_WEAPON;80.00;-50.00;50.00;123.00;2.00;0.50;0.00;1.50;0.00;2.00;18.00;35.00;50.00;0.90;0.30;0.00;0.00;0.00;0.00;0.00;0.00;
  1790. LARGE_ED_WEAPON;160.00;-100.00;120.00;294.00;2.00;0.50;0.00;1.50;0.00;2.00;18.00;35.00;70.00;0.90;0.05;0.00;0.00;0.00;0.00;0.00;0.00;
  1791. # Swarm;;;;;;;;;;;;;;;;;;;;;;
  1792. -LARGE_SCOURGE_MISSILE_1;65.00;-35.00;135.00;175.00;1.50;1.00;1.00;1.50;0.00;1.00;19.00;40.00;120.00;1.00;0.05;350.00;0.40;0.00;0.00;20.00;120.00;
  1793. +LARGE_SCOURGE_MISSILE_1;65.00;-35.00;135.00;175.00;1.50;1.00;1.00;1.50;0.00;1.00;19.00;40.00;120.00;1.00;0.05;400.00;0.40;0.00;0.00;20.00;120.00;
  1794. SMALL_SCOURGE_PROJECTILE_WEAPON;0.00;0.00;20.00;46.00;1.00;1.50;0.00;1.00;0.00;1.00;19.00;30.00;60.00;0.75;0.70;0.00;0.00;0.00;0.00;0.00;0.00;
  1795. MEDIUM_SCOURGE_PROJECTILE_WEAPON;0.00;0.00;50.00;115.00;1.00;1.50;0.00;1.00;0.00;1.00;19.00;30.00;60.00;0.75;0.25;0.00;0.00;0.00;0.00;0.00;0.00;
  1796. # Planet Killer Weapons;;;;;;;;;;;;;;;;;;;;;;
  1797. diff --git a/2.0.0/common/component_templates/weapon_components.ods b/2.0.2/common/component_templates/weapon_components.ods
  1798. index 1427a72..760dffe 100755
  1799. Binary files a/2.0.0/common/component_templates/weapon_components.ods and b/2.0.2/common/component_templates/weapon_components.ods differ
  1800. diff --git a/2.0.0/common/country_types/00_country_types.txt b/2.0.2/common/country_types/00_country_types.txt
  1801. index 9b005e7..2ac66b0 100755
  1802. --- a/2.0.0/common/country_types/00_country_types.txt
  1803. +++ b/2.0.2/common/country_types/00_country_types.txt
  1804. @@ -26,6 +26,7 @@
  1805. # relations = no #default no, this controls whether the country makes us of opinion
  1806. # fallen_empire = no #default no, this controls whether the empire uses the special Fallen Empire AI
  1807. # awakened_fallen_empire = no #default no, this controls whether the empire uses the special Awakened Fallen Empire AI
  1808. +# piracy_risk = no #default no, this controls whether the empire has piracy risk
  1809. # uses_special_buildables = no #default no, this controls whether this empire builds global ship designs that are defined as special buildables instead of normal designable ships
  1810. # show_in_contacts_list = yes #default yes, whether to show an entry in the contacts list
  1811. # minimalist_contacts_list_profile = no #default no, whether to show only empire name and flag in diplomacy panel in the contacts list
  1812. @@ -83,6 +84,7 @@ default = {
  1813. counts_for_victory = yes
  1814. pop_growth = yes
  1815. playable = yes
  1816. + piracy_risk = yes
  1817. randomize_ethos = yes
  1818. shuffle_pop_ethos = yes
  1819. needs_survey = yes
  1820. @@ -584,6 +586,7 @@ awakened_marauders = {
  1821. show_in_contacts_list = yes
  1822. share_survey_data = no
  1823. custom_diplomacy = yes
  1824. + mid_game_crisis = yes
  1825. enforces_borders = no
  1826. needs_survey = no
  1827. has_complete_sensor = yes
  1828. @@ -1004,6 +1007,7 @@ ambient = {
  1829. }
  1830.  
  1831. enclave = {
  1832. + blocks_piracy = yes
  1833. show_in_contacts_list = yes
  1834. can_have_their_comms_shared = yes
  1835. is_enclave = yes
  1836. @@ -1056,6 +1060,7 @@ shroud = {
  1837.  
  1838. shroud_spirits = {
  1839. is_space_critter = yes
  1840. + blocks_piracy = yes
  1841. government = no
  1842. ai = {
  1843. enabled = no
  1844. @@ -1082,7 +1087,7 @@ shroud_spirits = {
  1845. swarm = {
  1846. attack_unarmed_orbital_stations = yes
  1847. scaled_difficulty_bonuses = 3.0 # scales to setting
  1848. - crisis_faction = yes
  1849. + end_game_crisis = yes
  1850. destroys_starbases = yes
  1851. can_own_empty_planets = yes
  1852. needs_survey = no
  1853. @@ -1126,7 +1131,7 @@ swarm = {
  1854. extradimensional = {
  1855. attack_unarmed_orbital_stations = yes
  1856. scaled_difficulty_bonuses = 3.0 # scales to setting
  1857. - crisis_faction = yes
  1858. + end_game_crisis = yes
  1859. destroys_starbases = yes
  1860. needs_survey = no
  1861. has_complete_sensor = yes
  1862. @@ -1170,7 +1175,7 @@ extradimensional = {
  1863. extradimensional_2 = {
  1864. attack_unarmed_orbital_stations = yes
  1865. scaled_difficulty_bonuses = 3.0 # scales to setting
  1866. - crisis_faction = yes
  1867. + end_game_crisis = yes
  1868. destroys_starbases = yes
  1869. needs_survey = no
  1870. has_complete_sensor = yes
  1871. @@ -1213,7 +1218,7 @@ extradimensional_2 = {
  1872. extradimensional_3 = {
  1873. attack_unarmed_orbital_stations = yes
  1874. scaled_difficulty_bonuses = 3.0 # scales to setting
  1875. - crisis_faction = yes
  1876. + end_game_crisis = yes
  1877. destroys_starbases = yes
  1878. needs_survey = no
  1879. has_complete_sensor = yes
  1880. @@ -1256,7 +1261,7 @@ extradimensional_3 = {
  1881. ai_empire = {
  1882. attack_unarmed_orbital_stations = yes
  1883. scaled_difficulty_bonuses = 3.0 # scales to setting
  1884. - crisis_faction = yes
  1885. + end_game_crisis = yes
  1886. destroys_starbases = yes
  1887. can_own_empty_planets = yes
  1888. needs_survey = no
  1889. @@ -1395,6 +1400,7 @@ tiyanki = {
  1890.  
  1891. amoeba = {
  1892. is_space_critter = yes
  1893. + blocks_piracy = yes
  1894. government = no
  1895. ai = {
  1896. enabled = yes
  1897. @@ -1419,6 +1425,7 @@ amoeba = {
  1898.  
  1899. crystal = {
  1900. is_space_critter = yes
  1901. + blocks_piracy = yes
  1902. government = no
  1903. ai = {
  1904. enabled = no
  1905. @@ -1438,6 +1445,7 @@ crystal = {
  1906.  
  1907. drone = {
  1908. is_space_critter = yes
  1909. + blocks_piracy = yes
  1910. government = no
  1911. ai = {
  1912. enabled = no
  1913. @@ -1457,6 +1465,7 @@ drone = {
  1914.  
  1915. cloud = {
  1916. is_space_critter = yes
  1917. + blocks_piracy = yes
  1918. government = no
  1919. ai = {
  1920. enabled = no
  1921. @@ -1496,7 +1505,9 @@ portal_holder = {
  1922.  
  1923. feral_prethoryn = {
  1924. is_space_critter = yes
  1925. + blocks_piracy = yes
  1926. government = no
  1927. + enforces_borders = no
  1928. ai = {
  1929. enabled = yes
  1930. modules = {
  1931. @@ -1520,6 +1531,7 @@ feral_prethoryn = {
  1932.  
  1933. feral_prethoryn_infighting = {
  1934. is_space_critter = yes
  1935. + blocks_piracy = yes
  1936. government = no
  1937. ai = {
  1938. enabled = no
  1939. @@ -1537,3 +1549,24 @@ feral_prethoryn_infighting = {
  1940. basic_technology_module = {}
  1941. }
  1942. }
  1943. +
  1944. +marauder_raiders = {
  1945. + attack_unarmed_orbital_stations = yes
  1946. + scaled_difficulty_bonuses = 0.5 # scales to setting
  1947. + government = no
  1948. + ai = {
  1949. + enabled = no
  1950. + }
  1951. + faction = {
  1952. + hostile = no
  1953. + needs_border_access = no
  1954. + generate_borders = no
  1955. + needs_colony = no
  1956. + }
  1957. + #custom_diplomacy = yes
  1958. + modules = {
  1959. + standard_event_module = {}
  1960. + exclusive_diplomacy_module = {}
  1961. + basic_technology_module = {}
  1962. + }
  1963. +}
  1964. \ No newline at end of file
  1965. diff --git a/2.0.0/common/country_types/01_leviathans_country_types.txt b/2.0.2/common/country_types/01_leviathans_country_types.txt
  1966. index f39b652..bff48fb 100755
  1967. --- a/2.0.0/common/country_types/01_leviathans_country_types.txt
  1968. +++ b/2.0.2/common/country_types/01_leviathans_country_types.txt
  1969. @@ -4,6 +4,7 @@
  1970.  
  1971. guardian = {
  1972. is_space_critter = yes
  1973. + blocks_piracy = yes
  1974. destroys_starbases = yes
  1975. ai = {
  1976. enabled = no
  1977. @@ -23,6 +24,7 @@ guardian = {
  1978.  
  1979. guardian_dragon = {
  1980. is_space_critter = yes
  1981. + blocks_piracy = yes
  1982. destroys_starbases = yes
  1983. ai = {
  1984. enabled = no
  1985. @@ -42,6 +44,7 @@ guardian_dragon = {
  1986.  
  1987. guardian_stellarite = {
  1988. is_space_critter = yes
  1989. + blocks_piracy = yes
  1990. destroys_starbases = yes
  1991. ai = {
  1992. enabled = no
  1993. @@ -61,6 +64,7 @@ guardian_stellarite = {
  1994.  
  1995. guardian_wraith = {
  1996. is_space_critter = yes
  1997. + blocks_piracy = yes
  1998. destroys_starbases = yes
  1999. ai = {
  2000. enabled = no
  2001. @@ -81,6 +85,7 @@ guardian_wraith = {
  2002. guardian_hiver = {
  2003. attack_unarmed_orbital_stations = yes
  2004. is_space_critter = yes
  2005. + blocks_piracy = yes
  2006. destroys_starbases = yes
  2007. ai = {
  2008. enabled = no
  2009. @@ -100,6 +105,7 @@ guardian_hiver = {
  2010.  
  2011. guardian_horror = {
  2012. is_space_critter = yes
  2013. + blocks_piracy = yes
  2014. destroys_starbases = yes
  2015. ai = {
  2016. enabled = no
  2017. @@ -119,6 +125,7 @@ guardian_horror = {
  2018.  
  2019. guardian_fortress = {
  2020. is_space_critter = yes
  2021. + blocks_piracy = yes
  2022. destroys_starbases = yes
  2023. ai = {
  2024. enabled = no
  2025. @@ -138,6 +145,7 @@ guardian_fortress = {
  2026.  
  2027. guardian_dreadnought = {
  2028. is_space_critter = yes
  2029. + blocks_piracy = yes
  2030. destroys_starbases = yes
  2031. ai = {
  2032. enabled = no
  2033. @@ -157,6 +165,8 @@ guardian_dreadnought = {
  2034.  
  2035. guardian_sphere = {
  2036. is_space_critter = yes
  2037. + blocks_piracy = yes
  2038. + blocks_piracy = yes
  2039. destroys_starbases = yes
  2040. ai = {
  2041. enabled = no
  2042. diff --git a/2.0.0/common/defines/00_defines.txt b/2.0.2/common/defines/00_defines.txt
  2043. index 94e2a12..99f7c83 100755
  2044. --- a/2.0.0/common/defines/00_defines.txt
  2045. +++ b/2.0.2/common/defines/00_defines.txt
  2046. @@ -141,7 +141,7 @@
  2047. PLANET_TILT_FROM_SUN = 0.52 # Tilt away from sun
  2048. PLANET_RING_TILT_FROM_SUN = -0.16
  2049. PLANET_MAP_ICON_OFFSET = 0.6 # based on planet size
  2050. - PLANET_DISSOLVE_ANIMATION_TIME_SCALE = 10.0 # Larger value => planet dissolve animation lasts longer
  2051. + PLANET_DISSOLVE_ANIMATION_TIME_SCALE = 7.4 # Larger value => planet dissolve animation lasts longer
  2052.  
  2053. MEGASTRUCTURE_MAP_ICON_OFFSET = 0.06 # based on mega structure size
  2054.  
  2055. @@ -349,6 +349,8 @@
  2056. QUEUED_BUILDING_ALPHA = 0.60 # Used in planet view surface tab
  2057. POTENTIAL_ARMY_ALPHA = 0.45 # Used in planet view army tab
  2058.  
  2059. + HIGH_PIRACY_RISK = 0.5 # used in alerts
  2060. +
  2061. ANOMALY_VIEW_RISK_LOW = 0.1 # Color green if < 11%
  2062. ANOMALY_VIEW_RISK_MEDIUM = 0.49 # Color yellow if < 50% else red
  2063.  
  2064. @@ -423,6 +425,15 @@
  2065. END_GAME_START_MIN = 50
  2066. START_YEAR_SLIDER_INTERVAL = 25
  2067.  
  2068. + PIRACY_BASE_DEFENSE = 10 # Base anti-piracy score
  2069. + PIRACY_OWNED_SYSTEM_SCORE = 1.5 # Per owned system (anti-piracy)
  2070. + PIRACY_STARBASE_SCORE = 2 # Per upgraded starbase (anti-piracy)
  2071. + PIRACY_STARBASE_LEVEL_SCORE = 1 # Per upgraded starbase level score (anti-piracy)
  2072. + PIRACY_BASE_SCORE = 0 # Base piracy score
  2073. + PIRACY_LAWLESS_SYSTEM_SCORE = 1 # Per lawless system connected to territory (increases piracy)
  2074. + PIRACY_CUT_OFF_SYSTEM_SCORE = 2 # Per cut-off system inside territory (increases piracy)
  2075. + PIRATE_SPAWN_INTERVAL = 1800 # In days
  2076. +
  2077. TECH_COST_DEFAULT = 1.0
  2078. TECH_COST_MIN = 0.25
  2079. TECH_COST_MAX = 5.00
  2080. @@ -512,8 +523,6 @@
  2081.  
  2082. BASE_SURVEY_TIME = 20.0 # Base Time In Days for surveying a planet
  2083.  
  2084. - PIRATE_TARGET_DIST = 80.0 # Target system can't be further away from home system
  2085. -
  2086. LEADER_POOL_SIZE = 3 # Each leader pool will consist of this many leaders
  2087. LEADER_POOL_LEAD_TIME = 10 # Years leaders will remain in the leader pool until replaced
  2088. LEADER_HIRING_COST = 200
  2089. @@ -540,8 +549,8 @@
  2090. LEADER_ADMIRAL_FLEET_COMBAT_EXPERIENCE_SCALE = 0.5 # Scale factor used when calculating experience gain for Admiral
  2091. LEADER_ADMIRAL_FLEET_COMBAT_SHIPS_KILLED_CONVERSION = 0.25 # Scale factor for total number of ships killed after combat when calculating experience gain for Admiral
  2092.  
  2093. - LEADER_GENERAL_GROUND_COMBAT_BASE_EXPERIENCE = 10 # Leader General base experience from ground combat
  2094. - LEADER_GENERAL_GROUND_COMBAT_EXPERIENCE_SCALE = 0.5 # Scale factor used when calculating experience gain for General
  2095. + LEADER_GENERAL_GROUND_COMBAT_BASE_EXPERIENCE = 100 # Leader General base experience from ground combat
  2096. + LEADER_GENERAL_GROUND_COMBAT_EXPERIENCE_SCALE = 2.5 # Scale factor used when calculating experience gain for General
  2097. LEADER_GENERAL_GROUND_COMBAT_ARMIES_KILLED_CONVERSION = 0.25 # Scale factor for total number of armies killed after combat when calculating experience gain for General
  2098.  
  2099. LEADER_SCIENTIST_LEADING_RESEARCH_FIELD_EXPERIENCE = 3.5
  2100. @@ -550,7 +559,7 @@
  2101. LEADER_SCIENTIST_COMPLETED_SPECIAL_PROJECT_EXPERIENCE = 100 # Experience gained from completing a special project
  2102. LEADER_SCIENTIST_DEEP_SCAN_EXPERIENCE = 200 # Experience gained from a deep scan
  2103. LEADER_SCIENTIST_ASSIST_RESEARCH = 0.10 # Experience gained from assisting research per day
  2104. - LEADER_SCIENTIST_ASSIST_RESEARCH_MULT = 0.125 # Assist Research modifier-mult per skill level (this value times skill level equals modifier)
  2105. + LEADER_SCIENTIST_ASSIST_RESEARCH_MULT = 0.20 # Assist Research modifier-mult per skill level (this value times skill level equals modifier)
  2106.  
  2107. LEADER_GOVERNOR_BUILDING_OR_TILE_CLEAR_EXPERIENCE = 0.5 # Scale-value for each completed building-construction or tile-clear multiplied with the resources spent
  2108. LEADER_GOVERNOR_EDICT_GAIN_EXPERIENCE = 0.05 # Scale-value for the exp-gain given each month an Edict is active on the planet multiplied with the resources spent
  2109. @@ -572,15 +581,18 @@
  2110. PLANETARY_BUILDING_ADD_FACTOR = 20 # Used in the calculation of the planetary building progress
  2111. ORBITAL_BUILDING_DIV_FACTOR = 6 # Used in the calculation of the orbital building progress
  2112.  
  2113. - WAR_EXHAUSTION_SHIP_KILLED_MULT = 2.0 # Multiplier of war exhaustion gained from ships
  2114. + WAR_EXHAUSTION_NAVAL_CAP_ADD = 100
  2115. + WAR_EXHAUSTION_SHIP_KILLED_MULT = 2.00 # Multiplier of war exhaustion gained from ships
  2116. WAR_EXHAUSTION_ARMY_KILLED_MULT = 0.25 # Multiplier of war exhaustion gained from land battles (armies)
  2117. - WAR_EXHAUSTION_PLANET_DESTRUCTION_DIV = 2.0 # War exhaustion from planets destroyed
  2118. - WAR_EXHAUSTION_SYSTEM_OCCUPATION_MULT = 1.0 # War exhaustion from occupied systems
  2119. - WAR_EXHAUSTION_PASSIVE_GAIN_YEARLY = 0.083 # The amount of yearly war exhaustion gained during war while under WAR_EXHAUSTION_PASSIVE_GAIN_CUTOFF
  2120. + WAR_EXHAUSTION_PLANET_DESTRUCTION_MULT = 5.0 # War exhaustion from planets destroyed
  2121. + WAR_EXHAUSTION_PASSIVE_GAIN_YEARLY = 0.1 # The amount of yearly war exhaustion gained during war while under WAR_EXHAUSTION_PASSIVE_GAIN_CUTOFF
  2122. + WAR_EXHAUSTION_PASSIVE_WAR_SIZE_DIV = 0.1
  2123. WAR_EXHAUSTION_PASSIVE_GAIN_CUTOFF = 1.0 # At this amount of war exhaustion (excluding occupation) you stop getting war exhaustion passively over time
  2124. WAR_EXHAUSTION_FROM_UNITS_CUTOFF = 1.0 # At this amount of war exhaustion (excluding occupation) you stop gaining war exhaustion from lost units
  2125. - WAR_EXHAUSTION_ENFORCE_STATUS_QUO = 1.0 # One side can enforce status quo when the other side is at this level of war exhaustion
  2126. - WAR_EXHAUSTION_HIGH_ALERT = 0.75 # Show alert if war exhaustion >= this
  2127. + WAR_EXHAUSTION_HIGH_THRESHOLD = 1.0 # Apply negative modifier and show alert if war exhaustion >= this
  2128. +
  2129. + ENFORCE_STATUS_QUO_ENABLED = yes # Can status quo be enforced at high WE?
  2130. + ENFORCE_STATUS_QUO_MONTHS = 24
  2131.  
  2132. REBELS_JOIN_DISTANCE_SQRT = 100.0 # Distance threshold if rebels are to join an already existing rebel.
  2133. REBELS_POWER_THRESHOLD = 0.5 # A Threshold that controls when rebels think they have a chance Higher = more unwilling
  2134. @@ -651,6 +663,7 @@
  2135. AUTO_DECLINE_DIPLOMACY_DAYS = 180 # Number of days after which diplomatic action will automatically be declined
  2136.  
  2137. FEDERATION_FLEET_SIZE = 0.2 # Federation fleet capacity is this % of all members' fleets
  2138. + FEDERATION_MAX_FLEET_SIZE = 500
  2139.  
  2140. MIN_RIVAL_YEARS = 10 # Years before you can remove an empire as a rival
  2141. DEFENSIVE_PACT_INFLUENCE_COST = 1 # Per defensive pact
  2142. @@ -769,7 +782,7 @@
  2143. PLANET_COMBAT_WIDTH_BASE = 5 # Maximum number of troops that can fight at the same time
  2144. PLANET_COMBAT_WIDTH_FROM_SIZE = 0.2 # Extra combat width per tile
  2145.  
  2146. - GENERAL_DEATH_CHANCE = 0.1 # Chance that general dies when an army under command is destroyed (scaled to number of armies)
  2147. + GENERAL_DEATH_CHANCE = 0.05 # Chance that general dies when an army under command is destroyed (scaled to number of armies)
  2148.  
  2149. MAX_OBSERVATION_STATIONS = 8 #Maximum observation stations per planet
  2150.  
  2151. @@ -795,18 +808,18 @@
  2152. TECH_WEIGHT_POTENTIAL_ADD = 0
  2153. TECH_RESEARCH_NO_LEADER_PENALTY = -0.25
  2154. TECH_COST_MULT_FALLEN_EMPIRE = 2 # Awakened Empires pay this much more to research techs
  2155. - TECH_COST_MULT_NUM_SYSTEMS = 0.02 # Each System adds +X% tech cost
  2156. + TECH_COST_MULT_NUM_SYSTEMS = 0.01 # Each System adds +X% tech cost
  2157. TECH_COST_MULT_NUM_COLONIES = 0.05 # Each Planet adds +X% tech cost
  2158. TECH_COST_FREE_POPS = 10 # First X pops do not add any tech cost
  2159. TECH_COST_MULT_NUM_POPS = 0.0 # Each non-free Pop adds +X% tech cost
  2160. TECH_WEIGHT_PREVIOUS_OPTION = 0.5 # If a tech was one of the alternatives last time its weight will be multiplied with TECH_WEIGHT_PREVIOUS_OPTION
  2161.  
  2162. - ## tradition cost = ( base_cost + ( ( cost_tradition * num_traditions )^traditions_exponential ) + cost_pop*num_pops ) * ( 1 + cost_planet*num_planets )
  2163. - TRADITION_COST_TRADITION = 6
  2164. - TRADITION_COST_TRADITION_EXP = 1.639 # numbers like 1.656 or 1.639
  2165. + ## tradition cost = ( base_cost + ( cost_tradition * num_traditions )^traditions_exponential ) * ( 1 + cost_planet*num_planets + cost_system*num_systems )
  2166. + TRADITION_COST_TRADITION = 7 # change this value if you want to increase all costs
  2167. + TRADITION_COST_TRADITION_EXP = 1.639 # change this value if you want to increase costs at the end
  2168. TRADITION_COST_MULT_TRADITION_GROUP = 0.05 # each adopted group adds +X% to total cost
  2169. TRADITION_COST_MULT_NUM_COLONIES = 0.20 # Each Planet adds +X% Tradition cost
  2170. - TRADITION_COST_MULT_NUM_SYSTEMS = 0.02 # Each System adds +X% Tradition cost
  2171. + TRADITION_COST_MULT_NUM_SYSTEMS = 0.01 # Each System adds +X% Tradition cost
  2172.  
  2173. KEYBOARD_DOUBLE_CLICK_TIME = 0.5 # Seconds listening to control group double clicks.
  2174.  
  2175. @@ -870,11 +883,11 @@
  2176. COMMAND_LIMIT_MAX = 200 # Max value of Command Limit
  2177. COMMAND_LIMIT_BASE = 20 # Base value of Command Limit
  2178.  
  2179. - NAVAL_CAPACITY_MAX = 1000 # Max value of Naval Capacity
  2180. + NAVAL_CAPACITY_MAX = 9999 # Max value of Naval Capacity
  2181. NAVAL_CAPACITY_BASE = 20 # Base value of Naval Capacity
  2182. NAVAL_CAPACITY_POP_MULT = 0.10 # Mult value of Naval Capacity for each Pop
  2183.  
  2184. - STARBASE_CAPACITY_MAX = 50 # Max value of Starbase Capacity
  2185. + STARBASE_CAPACITY_MAX = 999 # Max value of Starbase Capacity
  2186. STARBASE_CAPACITY_BASE = 3 # Base value of Starbase Capacity
  2187. STARBASE_CAPACITY_SYSTEM_MULT = 0.05 # Mult value of Starbase Capacity for each owned system
  2188. STARBASE_CAPACITY_POP_MULT = 0.025 # Mult value of Starbase Capacity for each Pop
  2189. @@ -897,6 +910,8 @@
  2190. GATEWAYS_MIN_DISTANCE = 200 # Min distance between generated shortcuts and their endpoint
  2191. GALAXY_GENERATION_GATEWAYS_PERCENTAGE = 0.05 # percentage of systems that will have a shortcut at game start
  2192. SCIENCE_SHIP_BASIC_SURVEY_SPEED = 1
  2193. +
  2194. + EDICT_MAX_RESOURCE_COST = 1000000
  2195. }
  2196.  
  2197. NSpecies = {
  2198. @@ -962,6 +977,8 @@
  2199.  
  2200. SHIP_SPEED_SCALE = 0.045 # Setting this to 1 makes the scripted speed value correspond to units/day
  2201.  
  2202. + SHIP_MAX_EVASION = 0.9 # The maximum evasion value a ship is allowed to have (percent)
  2203. +
  2204. FLEET_MOVE_MAX_DIST_SHIPS = 10.0 # Max distance that ships are allowed to travel before last ship
  2205.  
  2206. FLEET_BASE_FORMATION_SCALE = 2.0
  2207. @@ -1068,7 +1085,7 @@
  2208. NPop = {
  2209. MAX_POPS_BASE = 10 # Max pops is base multiplied by planet size
  2210. MIN_CROWDING_TO_MIGRATE = 1 # Unless planet is this % full, pops won't migrate
  2211. - FORCE_MIGRATION_SPEED_MULT = 2
  2212. + FORCE_MIGRATION_SPEED_MULT = 1
  2213. MIGRATION_CROWDING_EFFECT = 0.25 # How much does crowding affect where pops want to migrate
  2214. MIGRATE_CROWDING_FORCE_MOVE_EFFECT = 0.5 # How large is the crowding effect for pops that being force-moved (multiplier on above value)
  2215. MIGRATION_SAME_SPECIES_EFFECT = 1.25 # How much does the species being present on a planet affect chance of migrating there
  2216. @@ -1213,7 +1230,7 @@
  2217. CLAIM_COST_RIVAL_DISCOUNT = -0.20 # Claims are ( 1 + this ) much less expensive against rivals
  2218.  
  2219. TRADITION_COST_RESOURCES = { "unity" } # Resource for tradition cost
  2220. - TRADITION_COST_AMOUNTS = { 56 } # Tradition base cost
  2221. + TRADITION_COST_AMOUNTS = { 100 } # Tradition base cost
  2222. }
  2223.  
  2224. NEngine = {
  2225. @@ -1223,6 +1240,8 @@
  2226. NAI = {
  2227. AI_MAX_DISTANCE = 1000 # AI considers all systems more distant than this to be equally uninteresting
  2228.  
  2229. + AI_POP_MODIFICATION_DISCOUNT = 0.25 # AI pays this much (of base) for gene/robomodding projects
  2230. +
  2231. MIN_DISTANCE_TO_JUMP = 3 # Target must be at least this many systems away for AI to want to use jump drive
  2232. AI_JUMP_DRIVE_BRAVERY = 0.33 # AI will not want to jump into systems unless enemy is this much weaker than them, relatively
  2233.  
  2234. @@ -1274,7 +1293,7 @@
  2235. CRISIS_MILITARY_POWER_MULT_DESPERATION = 0.10 # AI willing to engage crisis factions at these odds when down to their last few worlds
  2236.  
  2237. BOSS_MILITARY_POWER = 40000 # The military power at which AI feels safe to engage a 'boss' creature
  2238. - FALLEN_EMPIRE_AVOID_DISTANCE = 100
  2239. + FALLEN_EMPIRE_FLEET_SIZE = 100 # Fallen empires will have fleets of max this size
  2240.  
  2241. WAS_HUMAN_MONTHS = 60 # Amount of months that the AI will refrain from making large changes to the empire if it's taking over from a player
  2242.  
  2243. @@ -1412,12 +1431,12 @@
  2244. VASSALIZATION_ACCEPTANCE_PROTECTORATE_MAX = 20
  2245. VASSALIZATION_ACCEPTANCE_NUM_POPS = -0.25 # per pop
  2246. VASSALIZATION_ACCEPTANCE_POWER_DIFFERENCE_MIN = 1.5
  2247. - VASSALIZATION_ACCEPTANCE_POWER_DIFFERENCE_MULT = 10 # for each 1x over min
  2248. + VASSALIZATION_ACCEPTANCE_POWER_DIFFERENCE_MULT = 15 # for each 1x over min
  2249. VASSALIZATION_ACCEPTANCE_POWER_DIFFERENCE_MAX = 100
  2250. VASSALIZATION_ACCEPTANCE_ATTITUDE_ALLIANCE = 20
  2251. - VASSALIZATION_ACCEPTANCE_ATTITUDE_COEXIST = 10
  2252. + VASSALIZATION_ACCEPTANCE_ATTITUDE_COEXIST = 0
  2253. VASSALIZATION_ACCEPTANCE_ATTITUDE_ATTACK = -1000
  2254. - VASSALIZATION_ACCEPTANCE_OTHER_ATTITUDE = -100
  2255. + VASSALIZATION_ACCEPTANCE_OTHER_ATTITUDE = -20
  2256. VASSALIZATION_ACCEPTANCE_OTHER_THREAT_MULT = 0.2
  2257. VASSALIZATION_ACCEPTANCE_OTHER_THREAT_MAX = 20
  2258. VASSALIZATION_ACCEPTANCE_DISTANCE_MULT = -0.5 # per 1 border distance
  2259. @@ -1450,8 +1469,8 @@
  2260. TRADE_VALUE_RESOURCE = 2 # for minerals and energy (scaled by income & need)
  2261. TRADE_VALUE_RESOURCE_MONTHLY_MULT = 0.5 # value of monthly resources is multiplied by this compared to lump-sum
  2262. TRADE_VALUE_STRATEGIC_RESOURCE = 1 # for 1 strategic resource (per year)
  2263. - TRADE_VALUE_STRATEGIC_RESOURCE_POP = 0.01 # Extra strategic resource value per pop
  2264. - TRADE_VALUE_STRATEGIC_RESOURCE_MAX_POPS = 400 # Over this, additional pops do not count
  2265. + TRADE_VALUE_STRATEGIC_RESOURCE_POP = 0.002 # Extra strategic resource value per pop
  2266. + TRADE_VALUE_STRATEGIC_RESOURCE_MAX_POPS = 500 # Over this, additional pops do not count
  2267. TRADE_VALUE_SYSTEM = 5
  2268. TRADE_VALUE_COLONY = 0.2 # Per pop
  2269. TRADE_VALUE_SENSOR_CHARTS = 2 # Per new comms
  2270. @@ -1605,9 +1624,11 @@
  2271. PEACE_WAR_EXHAUSTION_FACTOR = 100
  2272. PEACE_OCCUPATION_FACTOR = 100
  2273. PEACE_STATUS_QUO_FACTOR = -75
  2274. + PEACE_HIGH_WE_STATUS_QUO_FACTOR = 100
  2275. PEACE_DEMAND_SURRENDER_FACTOR = -100
  2276. - PEACE_DEFENDING_CLAIM_FACTOR = -10
  2277. - PEACE_DEFENDING_IMPORTANT_CLAIM_FACTOR = -100 # For systems with starbases or planets
  2278. + PEACE_DEFENDING_CLAIM_SYSTEM_FACTOR = -10 # For every system
  2279. + PEACE_DEFENDING_CLAIM_STARBASE_FACTOR = -40 # For systems with upgraded starbases
  2280. + PEACE_DEFENDING_CLAIM_PLANET_FACTOR = -100 # For systems with colonies
  2281. PEACE_RELATIVE_NAVY_STRENGTH_FACTOR = 50
  2282.  
  2283. TECH_NEED_MULT_VALUE = 10 # Tech need value will multiplied by this value e.g. when certain diplomacy techs are needed
  2284. @@ -1626,9 +1647,9 @@
  2285. THREAT_TRUCE_MONTHS = 12 # AI will not consider the opponent a threat if this many months are left on a truce
  2286. FLEET_BALANCE_THREAT = 0.5 # If FleetPower of AI / FleetPower of Enemy is lower than this AI will consider the country a threat
  2287. ENERGY_MONTHS_FACTOR_WAR = 12 # Energy are supposed to last this many months when used to buy new ships in war
  2288. - ENEMY_FLEET_POWER_MULT = 1.2 # AI will need the the fleet power of the enemy multiplied by this value to become offensive in an offensive war
  2289. - ENEMY_ARMY_POWER_MULT = 1.0 # AI will need the the military power of the enemy multiplied by this value to land armies on planet
  2290. - ENEMY_NEUTRALS_FLEET_POWER_MULT = 2 # AI will need the the fleet power of the enemy multiplied by this value to attack neutrals and space hostiles
  2291. + ENEMY_FLEET_POWER_MULT = 1.2 # AI will need the fleet power of the enemy multiplied by this value to become offensive in an offensive war
  2292. + ENEMY_ARMY_POWER_MULT = 1.0 # AI will need the military power of the enemy multiplied by this value to land armies on planet
  2293. + ENEMY_NEUTRALS_FLEET_POWER_MULT = 2 # AI will need the fleet power of the enemy multiplied by this value to attack neutrals and space hostiles
  2294. ENEMY_FLEET_POWER_HOME_SYSTEM_MULT = 1.0 # AI will need the fleet power of the enemy multiplied by this value to attack hostiles in own systems
  2295. PRIO_BASE_FRACTION = 0.80 # Prio base fraction for example if prio is assault arsenal fraction will be set to this value
  2296.  
  2297. @@ -1692,6 +1713,7 @@
  2298. MAX_EXPANSION_DISTANCE = 1 # Max number of jumps away AI will build starbases
  2299. MAX_EXPANSION_DISTANCE_SUBJECT = 1 # Max number of jumps away AI subjects will build starbases
  2300. EXPANSION_OWN_PRIORITY = 1000 # Priority on rebuilding destroyed starbases in colonized systems
  2301. + EXPANSION_CUT_OFF_SYSTEM_PRIORITY = 10 # Priority on systems cut-off inside own territory
  2302. EXPANSION_BORDERING_PRIORITY = 100 # How much will AI prioritize bordering systems when building starbases
  2303. EXPANSION_RESOURCE_PRIORITY = 2 # How much will AI prioritize resource-rich systems when building starbases
  2304. EXPANSION_COLONY_PRIORITY = 10 # How much will AI prioritize systems with colonizeable worlds when building starbases
  2305. @@ -1710,4 +1732,15 @@
  2306.  
  2307. NO_WARS_FLAG = "ai_no_wars"
  2308. NO_LEAVE_FED_FLAG = "ai_no_leave_fed"
  2309. +
  2310. + EMPIRE_RICH_FACTOR = 0.75 # Empire will consider draining a rich sector unless it is above this % of max
  2311. + SECTOR_RICH_FACTOR = 0.5 # Empire considers a sector rich if this % of max
  2312. +
  2313. + EMPIRE_POOR_FACTOR = 0.2 # Empire will consider draining any non poor sector if below this
  2314. + SECTOR_POOR_FACTOR = 0.2 # Empire considers sector poor if below this % of max
  2315. +
  2316. + SURRENDER_ACCEPTANCE_HIGHEST = 1 # Display "ready to surrender" in war summary badge
  2317. + SURRENDER_ACCEPTANCE_HIGH = -20 # Display "approaching surrender" in war summary badge
  2318. + SURRENDER_ACCEPTANCE_LOW = -60 # Display "unlikely to surrender" in war summary badge
  2319. + SURRENDER_ACCEPTANCE_LOWEST = -100 # Display "for sure not surrender" in war summary badge
  2320. }
  2321. diff --git a/2.0.0/common/deposits/00_deposits.txt b/2.0.2/common/deposits/00_deposits.txt
  2322. index f928142..866b9e1 100755
  2323. --- a/2.0.0/common/deposits/00_deposits.txt
  2324. +++ b/2.0.2/common/deposits/00_deposits.txt
  2325. @@ -127,6 +127,8 @@ d_rich_mineral_deposit = {
  2326. OR = {
  2327. is_planet_class = pc_barren
  2328. is_planet_class = pc_barren_cold
  2329. + is_planet_class = pc_broken
  2330. + is_planet_class = pc_shattered
  2331. }
  2332. }
  2333. }
  2334. @@ -193,6 +195,15 @@ d_vast_mineral_deposit = {
  2335. is_asteroid = yes
  2336. }
  2337. }
  2338. + modifier = {
  2339. + weight = 2
  2340. + planet = {
  2341. + OR = {
  2342. + is_planet_class = pc_broken
  2343. + is_planet_class = pc_shattered
  2344. + }
  2345. + }
  2346. + }
  2347. modifier = {
  2348. factor = 0.5
  2349. planet = {
  2350. @@ -257,6 +268,15 @@ d_immense_mineral_deposit = {
  2351. is_asteroid = yes
  2352. }
  2353. }
  2354. + modifier = {
  2355. + weight = 1
  2356. + planet = {
  2357. + OR = {
  2358. + is_planet_class = pc_broken
  2359. + is_planet_class = pc_shattered
  2360. + }
  2361. + }
  2362. + }
  2363. modifier = {
  2364. factor = 0.5
  2365. planet = {
  2366. @@ -553,7 +573,7 @@ d_rich_energy_deposit = {
  2367. }
  2368. }
  2369. modifier = {
  2370. - weight = 100
  2371. + weight = 50
  2372. planet = {
  2373. OR = {
  2374. is_planet_class = pc_a_star
  2375. @@ -620,13 +640,7 @@ d_vast_energy_deposit = {
  2376. }
  2377. }
  2378. modifier = {
  2379. - weight = 10
  2380. - planet = {
  2381. - is_planet_class = pc_gas_giant
  2382. - }
  2383. - }
  2384. - modifier = {
  2385. - weight = 30
  2386. + weight = 60
  2387. planet = {
  2388. OR = {
  2389. is_planet_class = pc_a_star
  2390. @@ -635,7 +649,7 @@ d_vast_energy_deposit = {
  2391. }
  2392. }
  2393. modifier = {
  2394. - weight = 20
  2395. + weight = 40
  2396. planet = {
  2397. OR = {
  2398. is_planet_class = pc_f_star
  2399. @@ -644,7 +658,7 @@ d_vast_energy_deposit = {
  2400. }
  2401. }
  2402. modifier = {
  2403. - weight = 10
  2404. + weight = 20
  2405. planet = {
  2406. OR = {
  2407. is_planet_class = pc_k_star
  2408. @@ -720,7 +734,7 @@ d_immense_energy_deposit = {
  2409. }
  2410. }
  2411. modifier = {
  2412. - weight = 12
  2413. + weight = 30
  2414. planet = {
  2415. OR = {
  2416. is_planet_class = pc_a_star
  2417. @@ -729,7 +743,7 @@ d_immense_energy_deposit = {
  2418. }
  2419. }
  2420. modifier = {
  2421. - weight = 6
  2422. + weight = 20
  2423. planet = {
  2424. OR = {
  2425. is_planet_class = pc_f_star
  2426. @@ -738,7 +752,7 @@ d_immense_energy_deposit = {
  2427. }
  2428. }
  2429. modifier = {
  2430. - weight = 3
  2431. + weight = 10
  2432. planet = {
  2433. OR = {
  2434. is_planet_class = pc_k_star
  2435. @@ -1838,6 +1852,27 @@ d_enormous3_mineral_deposit = {
  2436. drop_weight = { weight = 0 }
  2437. }
  2438.  
  2439. +d_enormous1_energy_deposit = {
  2440. + resources = { energy = 6 }
  2441. + station = shipclass_mining_station
  2442. + orbital_weight = { weight = 0 }
  2443. + drop_weight = { weight = 0 }
  2444. +}
  2445. +
  2446. +d_enormous2_energy_deposit = {
  2447. + resources = { energy = 8 }
  2448. + station = shipclass_mining_station
  2449. + orbital_weight = { weight = 0 }
  2450. + drop_weight = { weight = 0 }
  2451. +}
  2452. +
  2453. +d_enormous3_energy_deposit = {
  2454. + resources = { energy = 10 }
  2455. + station = shipclass_mining_station
  2456. + orbital_weight = { weight = 0 }
  2457. + drop_weight = { weight = 0 }
  2458. +}
  2459. +
  2460. d_worm_deposit = {
  2461. resources = { society_research = 20 }
  2462. station = shipclass_research_station
  2463. diff --git a/2.0.0/common/diplo_phrases/00_diplo_phrases.txt b/2.0.2/common/diplo_phrases/00_diplo_phrases.txt
  2464. index 5ceb5da..76c30b3 100755
  2465. --- a/2.0.0/common/diplo_phrases/00_diplo_phrases.txt
  2466. +++ b/2.0.2/common/diplo_phrases/00_diplo_phrases.txt
  2467. @@ -5521,7 +5521,7 @@ greetings = {
  2468. }
  2469. trigger = {
  2470. has_ai_personality = slaving_despots
  2471. - FROM = { allows_slavery = no }
  2472. + FROM = { allows_slavery = yes }
  2473. NOT = { is_at_war_with = FROM }
  2474. is_neutral_to = FROM
  2475. }
  2476. @@ -5532,7 +5532,7 @@ greetings = {
  2477. }
  2478. trigger = {
  2479. has_ai_personality = slaving_despots
  2480. - FROM = { allows_slavery = yes }
  2481. + FROM = { allows_slavery = no }
  2482. NOT = { is_at_war_with = FROM }
  2483. is_neutral_to = FROM
  2484. }
  2485. diff --git a/2.0.0/common/diplomatic_actions/00_actions.txt b/2.0.2/common/diplomatic_actions/00_actions.txt
  2486. index acc8b6a..a1f08c2 100755
  2487. --- a/2.0.0/common/diplomatic_actions/00_actions.txt
  2488. +++ b/2.0.2/common/diplomatic_actions/00_actions.txt
  2489. @@ -8,6 +8,7 @@
  2490. # requires_actor_federation_leader, boolean, false by default, if the actor is in a federation, he has to be the leader of it.
  2491. # requires_recipient_federation_leader, boolean, true by default, if the recipient is in a federation, he has to be the leader of it.
  2492. # show_decline_to_alliance_members, boolean, false by default, will show your alliance members when you decline a proposal of this type.
  2493. +# should_show_accept_message, decides whether actor gets a response on acceptance (otherwise just on decline)
  2494. # should_show_auto_accept_message_recipient, boolean, decides if the recipient gets a message showing the diplomatic action.
  2495. # should_open_auto_accept_message_recipient, boolean, decides if the recipient automatically opens this message.
  2496. # should_show_auto_accept_message_actor, boolean, decides if the actor gets a reply showing the diplomatic action.
  2497. @@ -39,6 +40,7 @@ action_offer_peace = {
  2498. requires_actor_independence = no
  2499. requires_recipient_independence = no
  2500. should_notify_all_communications = yes
  2501. + should_show_accept_message = no
  2502. }
  2503.  
  2504. # Dummy action for opening the war overview from the diplomacy view
  2505. @@ -1133,7 +1135,7 @@ action_demand_vassalization = {
  2506. }
  2507. custom_tooltip = {
  2508. fail_text = requires_domination_adopted
  2509. - has_non_swapped_tradition = tr_domination_adopt
  2510. + has_subjugation_req = yes
  2511. }
  2512. }
  2513.  
  2514. @@ -1301,9 +1303,13 @@ action_demand_tributary = {
  2515. }
  2516. }
  2517. }
  2518. + custom_tooltip = {
  2519. + fail_text = "requires_actor_not_inward_perfection"
  2520. + NOT = { has_valid_civic = civic_inwards_perfection }
  2521. + }
  2522. custom_tooltip = {
  2523. fail_text = requires_domination_adopted
  2524. - has_non_swapped_tradition = tr_domination_adopt
  2525. + has_subjugation_req = yes
  2526. }
  2527. }
  2528.  
  2529. diff --git a/2.0.0/common/edicts/00_campaigns.txt b/2.0.2/common/edicts/00_campaigns.txt
  2530. index b9cb93a..cf649b9 100755
  2531. --- a/2.0.0/common/edicts/00_campaigns.txt
  2532. +++ b/2.0.2/common/edicts/00_campaigns.txt
  2533. @@ -135,10 +135,12 @@ country_edict = {
  2534. # Hive Mind
  2535. #################
  2536.  
  2537. +@hiveFood = 500
  2538. +
  2539. country_edict = {
  2540. name = "drone_campaign"
  2541. length = @campaignDuration
  2542. - cost = { food = 100 }
  2543. + cost = { food = @hiveFood }
  2544.  
  2545. modifier = {
  2546. pop_growth_speed = 0.20
  2547. @@ -157,7 +159,7 @@ country_edict = {
  2548. country_edict = {
  2549. name = "learning_campaign"
  2550. length = @campaignDuration
  2551. - cost = { food = 50 }
  2552. + cost = { food = @hiveFood }
  2553.  
  2554. modifier = {
  2555. species_leader_exp_gain = 0.25
  2556. @@ -176,7 +178,7 @@ country_edict = {
  2557. country_edict = {
  2558. name = "war_drone_campaign"
  2559. length = @campaignDuration
  2560. - cost = { food = 50 }
  2561. + cost = { food = @hiveFood }
  2562.  
  2563. modifier = {
  2564. army_damage_mult = 0.15
  2565. diff --git a/2.0.0/common/edicts/03_planetary_edicts.txt b/2.0.2/common/edicts/03_planetary_edicts.txt
  2566. index 860b8cd..b91a8d7 100755
  2567. --- a/2.0.0/common/edicts/03_planetary_edicts.txt
  2568. +++ b/2.0.2/common/edicts/03_planetary_edicts.txt
  2569. @@ -129,7 +129,7 @@ planet_edict = {
  2570.  
  2571. potential = {
  2572. owner = {
  2573. - has_authority = auth_machine_intelligence
  2574. + has_ethic = ethic_gestalt_consciousness
  2575. }
  2576. has_orbital_bombardment = no
  2577. }
  2578. diff --git a/2.0.0/common/ethics/00_ethics.txt b/2.0.2/common/ethics/00_ethics.txt
  2579. index 839ec1a..9eed488 100755
  2580. --- a/2.0.0/common/ethics/00_ethics.txt
  2581. +++ b/2.0.2/common/ethics/00_ethics.txt
  2582. @@ -97,6 +97,7 @@ ethic_authoritarian = {
  2583. }
  2584. }
  2585. }
  2586. +
  2587. pop_attraction_tag = {
  2588. desc = POP_ATTRACTION_CONSUMER_GOODS_NEG
  2589. trigger = {
  2590. @@ -221,10 +222,6 @@ ethic_authoritarian = {
  2591. factor = 0
  2592. has_trait = trait_hive_mind
  2593. }
  2594. - modifier = {
  2595. - factor = 0.25
  2596. - is_enslaved = yes
  2597. - }
  2598. modifier = {
  2599. factor = 1.25
  2600. has_trait = "trait_decadent"
  2601. @@ -285,7 +282,7 @@ ethic_fanatic_egalitarian = {
  2602. }
  2603.  
  2604. country_modifier = {
  2605. - faction_influence_mult = 0.3
  2606. + faction_influence_mult = 0.5
  2607. pop_consumer_goods_mult = -0.2
  2608. }
  2609.  
  2610. @@ -310,7 +307,7 @@ ethic_egalitarian = {
  2611. }
  2612.  
  2613. country_modifier = {
  2614. - faction_influence_mult = 0.15
  2615. + faction_influence_mult = 0.25
  2616. pop_consumer_goods_mult = -0.1
  2617. }
  2618.  
  2619. @@ -542,10 +539,6 @@ ethic_egalitarian = {
  2620. has_citizenship_type = { type = citizenship_caste_system }
  2621. }
  2622. }
  2623. - modifier = {
  2624. - factor = 4.0
  2625. - is_enslaved = yes
  2626. - }
  2627. modifier = {
  2628. factor = 1.5
  2629. is_enslaved = no
  2630. @@ -1308,7 +1301,7 @@ ethic_fanatic_militarist = {
  2631. }
  2632.  
  2633. country_modifier = {
  2634. - army_damage_mult = 0.20
  2635. + country_war_exhaustion_mult = -0.2
  2636. ship_fire_rate_mult = 0.20
  2637. }
  2638.  
  2639. @@ -1330,7 +1323,7 @@ ethic_militarist = {
  2640. }
  2641.  
  2642. country_modifier = {
  2643. - army_damage_mult = 0.10
  2644. + country_war_exhaustion_mult = -0.1
  2645. ship_fire_rate_mult = 0.10
  2646. }
  2647.  
  2648. @@ -2483,6 +2476,8 @@ ethic_gestalt_consciousness = {
  2649. use_for_pops = no
  2650.  
  2651. country_modifier = {
  2652. + country_war_exhaustion_mult = -0.2
  2653. + country_piracy_risk_mult = -0.33
  2654. country_resource_influence_add = 1
  2655. country_core_sector_system_cap = 2
  2656. }
  2657. diff --git a/2.0.0/common/game_rules/00_rules.txt b/2.0.2/common/game_rules/00_rules.txt
  2658. index 2749192..4a9cf43 100755
  2659. --- a/2.0.0/common/game_rules/00_rules.txt
  2660. +++ b/2.0.2/common/game_rules/00_rules.txt
  2661. @@ -64,6 +64,10 @@ can_add_claim = {
  2662. fail_text = CANNOT_ADD_CLAIM_DEVOURING_SWARM
  2663. NOT = { root = { has_valid_civic = civic_hive_devouring_swarm } }
  2664. }
  2665. + custom_tooltip = {
  2666. + fail_text = CANNOT_ADD_CLAIM_ASSIMILATOR
  2667. + NOT = { root = { has_valid_civic = civic_machine_assimilator } }
  2668. + }
  2669. custom_tooltip = {
  2670. fail_text = CANNOT_ADD_CLAIM_PURIFIERS
  2671. NAND = {
  2672. @@ -86,25 +90,6 @@ can_add_claim = {
  2673. }
  2674. }
  2675. }
  2676. - custom_tooltip = {
  2677. - fail_text = CANNOT_ADD_CLAIM_THEY_COLOSSUS
  2678. - NAND = {
  2679. - exists = owner
  2680. - NOT = { root = { has_ascension_perk = ap_colossus } }
  2681. - owner = { has_ascension_perk = ap_colossus }
  2682. - root = { is_rival = prev.owner }
  2683. - }
  2684. - }
  2685. - custom_tooltip = {
  2686. - fail_text = CANNOT_ADD_CLAIM_COLOSSUS
  2687. - OR = {
  2688. - AND = {
  2689. - exists = owner
  2690. - NOT = { root = { is_rival = prev.owner } }
  2691. - }
  2692. - NOT = { root = { has_ascension_perk = ap_colossus } }
  2693. - }
  2694. - }
  2695. custom_tooltip = {
  2696. fail_text = CANNOT_ADD_CLAIM_THEY_THREAT
  2697. NAND = {
  2698. @@ -114,6 +99,7 @@ can_add_claim = {
  2699. has_valid_civic = civic_hive_devouring_swarm
  2700. has_valid_civic = civic_fanatic_purifiers
  2701. has_valid_civic = civic_machine_terminator
  2702. + has_valid_civic = civic_machine_assimilator
  2703. }
  2704. }
  2705. root = {
  2706. @@ -121,12 +107,59 @@ can_add_claim = {
  2707. has_valid_civic = civic_hive_devouring_swarm
  2708. has_valid_civic = civic_fanatic_purifiers
  2709. has_valid_civic = civic_machine_terminator
  2710. + has_valid_civic = civic_machine_assimilator
  2711. }
  2712. }
  2713. }
  2714. }
  2715. }
  2716.  
  2717. +# Root = taker country
  2718. +# This = giver country
  2719. +can_get_claim_from_lost_system = {
  2720. + custom_tooltip = {
  2721. + fail_text = CANNOT_ADD_CLAIM_NOT_VALID_EMPIRE
  2722. + OR = {
  2723. + is_country_type = default
  2724. + is_country_type = fallen_empire
  2725. + is_country_type = awakened_fallen_empire
  2726. + }
  2727. + root = {
  2728. + OR = {
  2729. + is_country_type = default
  2730. + is_country_type = fallen_empire
  2731. + is_country_type = awakened_fallen_empire
  2732. + }
  2733. + }
  2734. + }
  2735. + custom_tooltip = {
  2736. + fail_text = CANNOT_ADD_CLAIM_DEVOURING_SWARM
  2737. + NOT = { has_valid_civic = civic_hive_devouring_swarm }
  2738. + }
  2739. + custom_tooltip = {
  2740. + fail_text = CANNOT_ADD_CLAIM_ASSIMILATOR
  2741. + NOT = { has_valid_civic = civic_machine_assimilator }
  2742. + }
  2743. + custom_tooltip = {
  2744. + fail_text = CANNOT_ADD_CLAIM_PURIFIERS
  2745. + NAND = {
  2746. + has_valid_civic = civic_fanatic_purifiers
  2747. + NOT = { is_same_species = root }
  2748. + }
  2749. + }
  2750. + custom_tooltip = {
  2751. + fail_text = CANNOT_ADD_CLAIM_EXTERMINATOR
  2752. + NAND = {
  2753. + has_valid_civic = civic_machine_terminator
  2754. + NOR = {
  2755. + is_same_species = root
  2756. + has_country_flag = synthetic_empire
  2757. + has_authority = auth_machine_intelligence
  2758. + }
  2759. + }
  2760. + }
  2761. +}
  2762. +
  2763. #Root = country
  2764. #This = species
  2765. species_has_citizenship = {
  2766. @@ -331,7 +364,7 @@ can_release_vassal = {
  2767. }
  2768. custom_tooltip = {
  2769. fail_text = requires_domination_adopted
  2770. - has_tradition = tr_domination_adopt
  2771. + has_subjugation_req = yes
  2772. }
  2773. custom_tooltip = {
  2774. fail_text = CANNOT_RELEASE_CULTURE_SHOCK
  2775. @@ -766,6 +799,7 @@ can_orbital_bombard = {
  2776. is_country_type = ai_empire
  2777. is_country_type = cybrex_empire
  2778. is_country_type = dormant_marauders
  2779. + is_country_type = marauder_raiders
  2780. is_country_type = ruined_marauders
  2781. is_country_type = awakened_marauders
  2782. }
  2783. @@ -925,6 +959,7 @@ can_purge_pop_manually = {
  2784. }
  2785. custom_tooltip = {
  2786. fail_text = "ACTION_CANNOT_PURGE_CITIZEN"
  2787. + exists = owner
  2788. OR = {
  2789. is_robot_pop = yes
  2790. is_sapient = no
  2791. @@ -935,6 +970,7 @@ can_purge_pop_manually = {
  2792. }
  2793. custom_tooltip = {
  2794. fail_text = "ACTION_CANNOT_PURGE_POLICY"
  2795. + exists = owner
  2796. OR = {
  2797. is_robot_pop = yes
  2798. AND = {
  2799. @@ -947,6 +983,7 @@ can_purge_pop_manually = {
  2800. }
  2801. custom_tooltip = {
  2802. fail_text = "ACTION_DISASSEMBLE_SYNTHETICS"
  2803. + exists = owner
  2804. OR = {
  2805. is_robot_pop = no
  2806. owner = { has_authority = auth_hive_mind }
  2807. @@ -995,6 +1032,7 @@ is_owned_pop = {
  2808. fleet_uses_templates = {
  2809. is_ship_class = shipclass_military
  2810. is_designable = yes
  2811. + is_alliance_fleet = no
  2812. }
  2813.  
  2814. # this = starbase
  2815. @@ -1012,13 +1050,27 @@ can_spawn_debris = {
  2816.  
  2817. # this = system
  2818. # root = country
  2819. -# Determines if Marauder Horde should restrict (and thus avoid) a system
  2820. -horde_should_restrict_system = {
  2821. +# Determines if AI-controlled empires should restrict (and thus avoid) a system
  2822. +# Used by regular empires, fallen empires & crises
  2823. +ai_should_restrict_system = {
  2824. OR = {
  2825. AND = {
  2826. + root = { is_country_type = fallen_empire }
  2827. + exists = owner
  2828. + owner = { is_country_type = awakened_marauders }
  2829. + }
  2830. + AND = {
  2831. + root = { is_country_type = awakened_marauders }
  2832. exists = owner
  2833. owner = { is_country_type = fallen_empire }
  2834. }
  2835. + AND = {
  2836. + root = {
  2837. + OR = {
  2838. + is_country_type = fallen_empire
  2839. + is_country_type = awakened_marauders
  2840. + }
  2841. + }
  2842. any_ship_in_system = {
  2843. exists = owner
  2844. owner = {
  2845. @@ -1034,10 +1086,11 @@ horde_should_restrict_system = {
  2846. }
  2847. }
  2848. }
  2849. +}
  2850.  
  2851. # this = country
  2852. can_subjugate_empires = {
  2853. - has_tradition = tr_domination_adopt
  2854. + has_subjugation_req = yes
  2855. }
  2856.  
  2857. # THIS = Fleet
  2858. @@ -1048,3 +1101,22 @@ can_jump_drive = {
  2859. }
  2860. }
  2861. }
  2862. +
  2863. +# this = country
  2864. +can_have_piracy_risk = {
  2865. + has_country_flag = birth_of_piracy
  2866. + NOT = { has_country_flag = had_pirates_spawn }
  2867. + OR = {
  2868. + has_isolated_system = yes
  2869. + has_bordering_system = yes
  2870. + }
  2871. +}
  2872. +
  2873. +# this = country
  2874. +can_spawn_occupation_armies = {
  2875. + OR = {
  2876. + is_country_type = default
  2877. + is_country_type = fallen_empire
  2878. + is_country_type = awakened_fallen_empirefallen_empire
  2879. + }
  2880. +}
  2881. \ No newline at end of file
  2882. diff --git a/2.0.0/common/global_ship_designs/event_ship_designs_anomalies.txt b/2.0.2/common/global_ship_designs/event_ship_designs_anomalies.txt
  2883. index 4924c15..2c51c9f 100755
  2884. --- a/2.0.0/common/global_ship_designs/event_ship_designs_anomalies.txt
  2885. +++ b/2.0.2/common/global_ship_designs/event_ship_designs_anomalies.txt
  2886. @@ -96,6 +96,7 @@ ship_design = {
  2887. slot = "mid"
  2888. }
  2889.  
  2890. + required_component = "HYPER_DRIVE_3"
  2891. required_component = "SHIP_THRUSTER_3"
  2892. required_component = "SENSOR_3"
  2893. required_component = "CORVETTE_ANTIMATTER_REACTOR"
  2894. @@ -214,9 +215,17 @@ ship_design = {
  2895. slot = "MEDIUM_GUN_02"
  2896. template = "MEDIUM_GAMMA_LASER"
  2897. }
  2898. + component = {
  2899. + slot = "MEDIUM_GUN_03"
  2900. + template = "MEDIUM_GAMMA_LASER"
  2901. + }
  2902. component = {
  2903. slot = "LARGE_GUN_01"
  2904. - template = "LARGE_GAMMA_LASER"
  2905. + template = "ENERGY_TORPEDO_2"
  2906. + }
  2907. + component = {
  2908. + slot = "LARGE_GUN_02"
  2909. + template = "ENERGY_TORPEDO_2"
  2910. }
  2911. component = {
  2912. slot = "MEDIUM_UTILITY_1"
  2913. @@ -236,13 +245,24 @@ ship_design = {
  2914. }
  2915. component = {
  2916. slot = "MEDIUM_UTILITY_5"
  2917. - template = "MEDIUM_ARMOR_4"
  2918. + template = "MEDIUM_SHIELD_4"
  2919. }
  2920. component = {
  2921. slot = "MEDIUM_UTILITY_6"
  2922. + template = "MEDIUM_SHIELD_4"
  2923. + }
  2924. + component = {
  2925. + slot = "MEDIUM_UTILITY_7"
  2926. template = "MEDIUM_ARMOR_4"
  2927. }
  2928. -
  2929. + component = {
  2930. + slot = "MEDIUM_UTILITY_8"
  2931. + template = "MEDIUM_ARMOR_4"
  2932. + }
  2933. + component = {
  2934. + slot = "AUX_UTILITY_1"
  2935. + template = "SHIELD_BOOSTER"
  2936. + }
  2937. }
  2938. required_component = "HYPER_DRIVE_3"
  2939. required_component = "COMBAT_COMPUTER_LINE_ADVANCED"
  2940. diff --git a/2.0.0/common/global_ship_designs/fallen_empire_ship_designs.txt b/2.0.2/common/global_ship_designs/fallen_empire_ship_designs.txt
  2941. index a05acac..3110500 100755
  2942. --- a/2.0.0/common/global_ship_designs/fallen_empire_ship_designs.txt
  2943. +++ b/2.0.2/common/global_ship_designs/fallen_empire_ship_designs.txt
  2944. @@ -42,7 +42,7 @@ ship_design = {
  2945. required_component="SENSOR_4"
  2946. required_component="JUMP_DRIVE_1"
  2947. required_component="COLOSSUS_DARK_MATTER_REACTOR"
  2948. - required_component="SHIP_THRUSTER_4"
  2949. + required_component="COLOSSUS_SHIP_THRUSTER_5"
  2950.  
  2951. # For special buildable
  2952. is_special_buildable = yes
  2953. @@ -222,7 +222,7 @@ ship_design = {
  2954. required_component="JUMP_DRIVE_1"
  2955. required_component="COMBAT_COMPUTER_ARTILLERY_SAPIENT"
  2956. required_component="TITAN_DARK_MATTER_REACTOR"
  2957. - required_component="SHIP_THRUSTER_4"
  2958. + required_component="TITAN_SHIP_THRUSTER_5"
  2959.  
  2960. # For special buildable
  2961. is_special_buildable = yes
  2962. @@ -318,7 +318,7 @@ ship_design = {
  2963. required_component="JUMP_DRIVE_1"
  2964. required_component="COMBAT_COMPUTER_LINE_SAPIENT"
  2965. required_component="BATTLESHIP_DARK_MATTER_REACTOR"
  2966. - required_component="SHIP_THRUSTER_4"
  2967. + required_component="BATTLESHIP_SHIP_THRUSTER_5"
  2968.  
  2969. # For special buildable
  2970. is_special_buildable = yes
  2971. @@ -402,7 +402,7 @@ ship_design = {
  2972. required_component="JUMP_DRIVE_1"
  2973. required_component="COMBAT_COMPUTER_PICKET_SAPIENT"
  2974. required_component="DESTROYER_DARK_MATTER_REACTOR"
  2975. - required_component="SHIP_THRUSTER_4"
  2976. + required_component="DESTROYER_SHIP_THRUSTER_5"
  2977.  
  2978. # For special buildable
  2979. is_special_buildable = yes
  2980. @@ -513,7 +513,7 @@ ship_design = {
  2981. }
  2982. }
  2983. required_component="JUMP_DRIVE_1"
  2984. - required_component="SHIP_THRUSTER_4"
  2985. + required_component="SHIP_THRUSTER_5"
  2986. required_component="SENSOR_4"
  2987. required_component="CORVETTE_DARK_MATTER_REACTOR"
  2988.  
  2989. @@ -545,7 +545,7 @@ ship_design = {
  2990. }
  2991. }
  2992. required_component="JUMP_DRIVE_1"
  2993. - required_component="SHIP_THRUSTER_4"
  2994. + required_component="SHIP_THRUSTER_5"
  2995. required_component="SENSOR_4"
  2996. required_component="CORVETTE_DARK_MATTER_REACTOR"
  2997.  
  2998. @@ -598,7 +598,7 @@ ship_design = {
  2999. required_component="SENSOR_4"
  3000. required_component="JUMP_DRIVE_1"
  3001. required_component="COLOSSUS_DARK_MATTER_REACTOR"
  3002. - required_component="SHIP_THRUSTER_4"
  3003. + required_component="COLOSSUS_SHIP_THRUSTER_5"
  3004.  
  3005. # For special buildable
  3006. is_special_buildable = yes
  3007. @@ -778,7 +778,7 @@ ship_design = {
  3008. required_component="JUMP_DRIVE_1"
  3009. required_component="COMBAT_COMPUTER_ARTILLERY_SAPIENT"
  3010. required_component="TITAN_DARK_MATTER_REACTOR"
  3011. - required_component="SHIP_THRUSTER_4"
  3012. + required_component="TITAN_SHIP_THRUSTER_5"
  3013.  
  3014. # For special buildable
  3015. is_special_buildable = yes
  3016. @@ -874,7 +874,7 @@ ship_design = {
  3017. required_component="JUMP_DRIVE_1"
  3018. required_component="COMBAT_COMPUTER_LINE_SAPIENT"
  3019. required_component="BATTLESHIP_DARK_MATTER_REACTOR"
  3020. - required_component="SHIP_THRUSTER_4"
  3021. + required_component="BATTLESHIP_SHIP_THRUSTER_5"
  3022.  
  3023. # For special buildable
  3024. is_special_buildable = yes
  3025. @@ -958,7 +958,7 @@ ship_design = {
  3026. required_component="JUMP_DRIVE_1"
  3027. required_component="COMBAT_COMPUTER_PICKET_SAPIENT"
  3028. required_component="DESTROYER_DARK_MATTER_REACTOR"
  3029. - required_component="SHIP_THRUSTER_4"
  3030. + required_component="DESTROYER_SHIP_THRUSTER_5"
  3031.  
  3032. # For special buildable
  3033. is_special_buildable = yes
  3034. @@ -1073,7 +1073,7 @@ ship_design = {
  3035. }
  3036. }
  3037. required_component="JUMP_DRIVE_1"
  3038. - required_component="SHIP_THRUSTER_4"
  3039. + required_component="SHIP_THRUSTER_5"
  3040. required_component="SENSOR_4"
  3041. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3042.  
  3043. @@ -1105,7 +1105,7 @@ ship_design = {
  3044. }
  3045. }
  3046. required_component="JUMP_DRIVE_1"
  3047. - required_component="SHIP_THRUSTER_4"
  3048. + required_component="SHIP_THRUSTER_5"
  3049. required_component="SENSOR_4"
  3050. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3051.  
  3052. @@ -1158,7 +1158,7 @@ ship_design = {
  3053. required_component="SENSOR_4"
  3054. required_component="JUMP_DRIVE_1"
  3055. required_component="COLOSSUS_DARK_MATTER_REACTOR"
  3056. - required_component="SHIP_THRUSTER_4"
  3057. + required_component="COLOSSUS_SHIP_THRUSTER_5"
  3058.  
  3059. # For special buildable
  3060. is_special_buildable = yes
  3061. @@ -1339,9 +1339,9 @@ ship_design = {
  3062. required_component="PSI_JUMP_DRIVE_1"
  3063. required_component="COMBAT_COMPUTER_ARTILLERY_PRECOG"
  3064. required_component="TITAN_DARK_MATTER_REACTOR"
  3065. - required_component="SHIP_THRUSTER_4"
  3066. + required_component="TITAN_SHIP_THRUSTER_5"
  3067.  
  3068. - # For special buildable
  3069. + # For special buildable¨
  3070. is_special_buildable = yes
  3071. allow_buildable_trigger = is_fallen_empire_spiritualist
  3072. }
  3073. @@ -1444,7 +1444,7 @@ ship_design = {
  3074. required_component="PSI_JUMP_DRIVE_1"
  3075. required_component="COMBAT_COMPUTER_LINE_PRECOG"
  3076. required_component="BATTLESHIP_DARK_MATTER_REACTOR"
  3077. - required_component="SHIP_THRUSTER_4"
  3078. + required_component="BATTLESHIP_SHIP_THRUSTER_5"
  3079.  
  3080. # For special buildable
  3081. is_special_buildable = yes
  3082. @@ -1528,7 +1528,7 @@ ship_design = {
  3083. required_component="PSI_JUMP_DRIVE_1"
  3084. required_component="COMBAT_COMPUTER_PICKET_PRECOG"
  3085. required_component="DESTROYER_DARK_MATTER_REACTOR"
  3086. - required_component="SHIP_THRUSTER_4"
  3087. + required_component="DESTROYER_SHIP_THRUSTER_5"
  3088.  
  3089. # For special buildable
  3090. is_special_buildable = yes
  3091. @@ -1643,7 +1643,7 @@ ship_design = {
  3092. }
  3093. }
  3094. required_component="PSI_JUMP_DRIVE_1"
  3095. - required_component="SHIP_THRUSTER_4"
  3096. + required_component="SHIP_THRUSTER_5"
  3097. required_component="SENSOR_4"
  3098. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3099.  
  3100. @@ -1675,7 +1675,7 @@ ship_design = {
  3101. }
  3102. }
  3103. required_component="PSI_JUMP_DRIVE_1"
  3104. - required_component="SHIP_THRUSTER_4"
  3105. + required_component="SHIP_THRUSTER_5"
  3106. required_component="SENSOR_4"
  3107. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3108.  
  3109. @@ -1729,7 +1729,7 @@ ship_design = {
  3110. required_component="SENSOR_4"
  3111. required_component="JUMP_DRIVE_1"
  3112. required_component="COLOSSUS_DARK_MATTER_REACTOR"
  3113. - required_component="SHIP_THRUSTER_4"
  3114. + required_component="COLOSSUS_SHIP_THRUSTER_5"
  3115.  
  3116. # For special buildable
  3117. is_special_buildable = yes
  3118. @@ -1909,7 +1909,7 @@ ship_design = {
  3119. required_component="JUMP_DRIVE_1"
  3120. required_component="COMBAT_COMPUTER_ARTILLERY_ADVANCED"
  3121. required_component="TITAN_DARK_MATTER_REACTOR"
  3122. - required_component="SHIP_THRUSTER_4"
  3123. + required_component="TITAN_SHIP_THRUSTER_5"
  3124.  
  3125. # For special buildable
  3126. is_special_buildable = yes
  3127. @@ -2007,7 +2007,7 @@ ship_design = {
  3128. required_component="JUMP_DRIVE_1"
  3129. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3130. required_component="BATTLESHIP_DARK_MATTER_REACTOR"
  3131. - required_component="SHIP_THRUSTER_4"
  3132. + required_component="BATTLESHIP_SHIP_THRUSTER_5"
  3133.  
  3134. # For special buildable
  3135. is_special_buildable = yes
  3136. @@ -2090,7 +2090,7 @@ ship_design = {
  3137. required_component="SENSOR_4"
  3138. required_component="JUMP_DRIVE_1"
  3139. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3140. - required_component="SHIP_THRUSTER_4"
  3141. + required_component="SHIP_THRUSTER_5"
  3142.  
  3143. # For special buildable
  3144. is_special_buildable = yes
  3145. @@ -2205,7 +2205,7 @@ ship_design = {
  3146. }
  3147. }
  3148. required_component="JUMP_DRIVE_1"
  3149. - required_component="SHIP_THRUSTER_4"
  3150. + required_component="SHIP_THRUSTER_5"
  3151. required_component="SENSOR_4"
  3152. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3153.  
  3154. @@ -2237,7 +2237,7 @@ ship_design = {
  3155. }
  3156. }
  3157. required_component="JUMP_DRIVE_1"
  3158. - required_component="SHIP_THRUSTER_4"
  3159. + required_component="SHIP_THRUSTER_5"
  3160. required_component="SENSOR_4"
  3161. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3162.  
  3163. @@ -2290,7 +2290,7 @@ ship_design = {
  3164. required_component="SENSOR_4"
  3165. required_component="JUMP_DRIVE_1"
  3166. required_component="COLOSSUS_DARK_MATTER_REACTOR"
  3167. - required_component="SHIP_THRUSTER_4"
  3168. + required_component="COLOSSUS_SHIP_THRUSTER_5"
  3169.  
  3170. # For special buildable
  3171. is_special_buildable = yes
  3172. @@ -2470,7 +2470,7 @@ ship_design = {
  3173. required_component="JUMP_DRIVE_1"
  3174. required_component="COMBAT_COMPUTER_ARTILLERY_ADVANCED"
  3175. required_component="TITAN_DARK_MATTER_REACTOR"
  3176. - required_component="SHIP_THRUSTER_4"
  3177. + required_component="TITAN_SHIP_THRUSTER_5"
  3178.  
  3179. # For special buildable
  3180. is_special_buildable = yes
  3181. @@ -2567,7 +2567,7 @@ ship_design = {
  3182. required_component="JUMP_DRIVE_1"
  3183. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3184. required_component="BATTLESHIP_DARK_MATTER_REACTOR"
  3185. - required_component="SHIP_THRUSTER_4"
  3186. + required_component="BATTLESHIP_SHIP_THRUSTER_5"
  3187.  
  3188. # For special buildable
  3189. is_special_buildable = yes
  3190. @@ -2651,7 +2651,7 @@ ship_design = {
  3191. required_component="JUMP_DRIVE_1"
  3192. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3193. required_component="DESTROYER_DARK_MATTER_REACTOR"
  3194. - required_component="SHIP_THRUSTER_4"
  3195. + required_component="DESTROYER_SHIP_THRUSTER_5"
  3196.  
  3197. # For special buildable
  3198. is_special_buildable = yes
  3199. @@ -2766,7 +2766,7 @@ ship_design = {
  3200. }
  3201. }
  3202. required_component="JUMP_DRIVE_1"
  3203. - required_component="SHIP_THRUSTER_4"
  3204. + required_component="SHIP_THRUSTER_5"
  3205. required_component="SENSOR_4"
  3206. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3207.  
  3208. @@ -2797,7 +2797,7 @@ ship_design = {
  3209. }
  3210. }
  3211. required_component="JUMP_DRIVE_1"
  3212. - required_component="SHIP_THRUSTER_4"
  3213. + required_component="SHIP_THRUSTER_5"
  3214. required_component="SENSOR_4"
  3215. required_component="CORVETTE_DARK_MATTER_REACTOR"
  3216.  
  3217. @@ -2898,7 +2898,7 @@ ship_design = {
  3218. required_component="SENSOR_4"
  3219. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3220. required_component="BATTLESHIP_ZERO_POINT_REACTOR"
  3221. - required_component="SHIP_THRUSTER_4"
  3222. + required_component="BATTLESHIP_SHIP_THRUSTER_4"
  3223. }
  3224.  
  3225. ship_design = {
  3226. @@ -2989,7 +2989,7 @@ ship_design = {
  3227. required_component="SENSOR_4"
  3228. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3229. required_component="BATTLESHIP_ZERO_POINT_REACTOR"
  3230. - required_component="SHIP_THRUSTER_4"
  3231. + required_component="BATTLESHIP_SHIP_THRUSTER_4"
  3232. }
  3233.  
  3234. ship_design = {
  3235. @@ -3081,7 +3081,7 @@ ship_design = {
  3236. required_component="SENSOR_4"
  3237. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3238. required_component="BATTLESHIP_ZERO_POINT_REACTOR"
  3239. - required_component="SHIP_THRUSTER_4"
  3240. + required_component="BATTLESHIP_SHIP_THRUSTER_4"
  3241. }
  3242.  
  3243. ship_design = {
  3244. @@ -3160,7 +3160,7 @@ ship_design = {
  3245. required_component="SENSOR_4"
  3246. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3247. required_component="DESTROYER_ZERO_POINT_REACTOR"
  3248. - required_component="SHIP_THRUSTER_4"
  3249. + required_component="DESTROYER_SHIP_THRUSTER_4"
  3250. }
  3251.  
  3252. ship_design = {
  3253. @@ -3239,7 +3239,7 @@ ship_design = {
  3254. required_component="SENSOR_4"
  3255. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3256. required_component="DESTROYER_ZERO_POINT_REACTOR"
  3257. - required_component="SHIP_THRUSTER_4"
  3258. + required_component="DESTROYER_SHIP_THRUSTER_4"
  3259. }
  3260.  
  3261. ship_design = {
  3262. @@ -3318,7 +3318,7 @@ ship_design = {
  3263. required_component="SENSOR_4"
  3264. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3265. required_component="DESTROYER_ZERO_POINT_REACTOR"
  3266. - required_component="SHIP_THRUSTER_4"
  3267. + required_component="DESTROYER_SHIP_THRUSTER_4"
  3268. }
  3269.  
  3270. ship_design = {
  3271. @@ -3417,7 +3417,7 @@ ship_design = {
  3272. required_component="SENSOR_4"
  3273. required_component="COMBAT_COMPUTER_LINE_ADVANCED"
  3274. required_component="BATTLESHIP_ZERO_POINT_REACTOR"
  3275. - required_component="SHIP_THRUSTER_4"
  3276. + required_component="BATTLESHIP_SHIP_THRUSTER_4"
  3277. }
  3278.  
  3279. ship_design = {
  3280. @@ -3496,5 +3496,5 @@ ship_design = {
  3281. required_component="SENSOR_4"
  3282. required_component="COMBAT_COMPUTER_PICKET_ADVANCED"
  3283. required_component="DESTROYER_ZERO_POINT_REACTOR"
  3284. - required_component="SHIP_THRUSTER_4"
  3285. + required_component="DESTROYER_SHIP_THRUSTER_4"
  3286. }
  3287. diff --git a/2.0.0/common/governments/00_governments.txt b/2.0.2/common/governments/00_governments.txt
  3288. index 6b0a28f..dc45c7a 100755
  3289. --- a/2.0.0/common/governments/00_governments.txt
  3290. +++ b/2.0.2/common/governments/00_governments.txt
  3291. @@ -464,6 +464,8 @@ gov_martial_dictatorship = {
  3292.  
  3293. should_force_rename = yes
  3294.  
  3295. + leader_class = admiral # Initial ruler will become this if elected out of office
  3296. +
  3297. election_candidates = {
  3298. modifier = {
  3299. add = 100
  3300. @@ -495,6 +497,8 @@ gov_war_council = {
  3301.  
  3302. should_force_rename = yes
  3303.  
  3304. + leader_class = admiral # Initial ruler will become this if elected out of office
  3305. +
  3306. election_candidates = {
  3307. modifier = {
  3308. add = 100
  3309. @@ -526,6 +530,8 @@ gov_assembly_of_clans = {
  3310.  
  3311. should_force_rename = yes
  3312.  
  3313. + leader_class = admiral # Initial ruler will become this if elected out of office
  3314. +
  3315. election_candidates = {
  3316. modifier = {
  3317. add = 100
  3318. @@ -557,6 +563,8 @@ gov_citizen_stratocracy = {
  3319.  
  3320. should_force_rename = yes
  3321.  
  3322. + leader_class = admiral # Initial ruler will become this if elected out of office
  3323. +
  3324. election_candidates = {
  3325. modifier = {
  3326. add = 100
  3327. @@ -948,6 +956,8 @@ gov_technocratic_dictatorship = {
  3328.  
  3329. should_force_rename = yes
  3330.  
  3331. + leader_class = scientist # Initial ruler will become this if elected out of office
  3332. +
  3333. election_candidates = {
  3334. modifier = {
  3335. add = 100
  3336. @@ -976,6 +986,8 @@ gov_science_directorate = {
  3337.  
  3338. should_force_rename = yes
  3339.  
  3340. + leader_class = scientist # Initial ruler will become this if elected out of office
  3341. +
  3342. election_candidates = {
  3343. modifier = {
  3344. add = 100
  3345. @@ -1004,6 +1016,8 @@ gov_rational_consensus = {
  3346.  
  3347. should_force_rename = yes
  3348.  
  3349. + leader_class = scientist # Initial ruler will become this if elected out of office
  3350. +
  3351. election_candidates = {
  3352. modifier = {
  3353. add = 100
  3354. diff --git a/2.0.0/common/governments/civics/00_civics.txt b/2.0.2/common/governments/civics/00_civics.txt
  3355. index 2739a2c..adb0041 100755
  3356. --- a/2.0.0/common/governments/civics/00_civics.txt
  3357. +++ b/2.0.2/common/governments/civics/00_civics.txt
  3358. @@ -138,6 +138,7 @@ civic_meritocracy = {
  3359. }
  3360.  
  3361. civic_citizen_service = {
  3362. + description = "civic_tooltip_citizen_service_effects"
  3363. potential = { ethics = { NOT = { value = ethic_gestalt_consciousness } } }
  3364. possible = {
  3365. ethics = {
  3366. @@ -208,6 +209,7 @@ civic_police_state = {
  3367. random_weight = { base = 5 }
  3368. modifier = {
  3369. planet_unrest_mult = -0.25
  3370. + country_piracy_risk_mult = -0.25
  3371. }
  3372. }
  3373.  
  3374. @@ -312,6 +314,7 @@ civic_distinguished_admiralty = {
  3375. random_weight = { base = 5 }
  3376. modifier = {
  3377. admiral_skill_levels = 2
  3378. + country_leader_cap = 2
  3379. }
  3380. }
  3381.  
  3382. @@ -328,7 +331,7 @@ civic_free_haven = {
  3383. }
  3384. random_weight = { base = 5 }
  3385. modifier = {
  3386. - planet_migration_all_pull = 0.50
  3387. + planet_migration_xeno_pull = 0.50
  3388. }
  3389. }
  3390.  
  3391. @@ -443,8 +446,8 @@ civic_nationalistic_zeal = {
  3392. }
  3393. random_weight = { base = 5 }
  3394. modifier = {
  3395. + country_war_exhaustion_mult = -0.1
  3396. country_claim_influence_cost_mult = -0.1
  3397. - max_rivalries = 1
  3398. }
  3399. }
  3400.  
  3401. @@ -469,8 +472,8 @@ civic_aristocratic_elite = {
  3402. }
  3403. random_weight = { base = 5 }
  3404. modifier = {
  3405. - leader_governor_cost = -0.50
  3406. - country_leader_cap = 4
  3407. + governor_skill_levels = 2
  3408. + country_leader_cap = 2
  3409. }
  3410. }
  3411.  
  3412. @@ -545,7 +548,6 @@ civic_syncretic_evolution = {
  3413. title = civic_syncretic_evolution_secondary_species
  3414. traits = {
  3415. trait = trait_syncretic_proles
  3416. - trait = trait_strong
  3417. }
  3418. }
  3419. }
  3420. @@ -952,12 +954,13 @@ civic_hive_devouring_swarm = {
  3421. random_weight = { base = 5 }
  3422. description = "civic_tooltip_devouring_swarm_effects"
  3423. modifier = {
  3424. + country_starbase_influence_cost_mult = -0.5
  3425. ship_hull_mult = 0.25
  3426. ship_hull_regen_add_perc = 0.5
  3427. ship_armor_regen_add_perc = 0.5
  3428. army_damage_mult = 0.40
  3429. category_biology_research_speed_mult = 0.20
  3430. - starbase_shipyard_build_cost_mult = -0.15
  3431. + starbase_shipyard_build_cost_mult = -0.25
  3432. country_naval_cap_mult = 0.33
  3433. }
  3434. }
  3435. @@ -1013,6 +1016,7 @@ civic_machine_terminator = {
  3436. }
  3437. description = civic_tooltip_machine_terminator_effects
  3438. modifier = {
  3439. + country_starbase_influence_cost_mult = -0.3
  3440. ship_weapon_damage = 0.25
  3441. starbase_shipyard_build_cost_mult = -0.15
  3442. country_naval_cap_mult = 0.33
  3443. diff --git a/2.0.0/common/megastructures/00_ring_world.txt b/2.0.2/common/megastructures/00_ring_world.txt
  3444. index 6904754..b55d10f 100755
  3445. --- a/2.0.0/common/megastructures/00_ring_world.txt
  3446. +++ b/2.0.2/common/megastructures/00_ring_world.txt
  3447. @@ -17,7 +17,7 @@ ring_world_1 = {
  3448. }
  3449.  
  3450. potential = {
  3451. - has_ascension_perk = ap_the_circle_of_life
  3452. + has_ascension_perk = ap_galactic_wonders
  3453. }
  3454.  
  3455. possible = {
  3456. @@ -113,7 +113,7 @@ ring_world_2_intermediate = {
  3457. }
  3458.  
  3459. possible = {
  3460. - from = { has_ascension_perk = ap_the_circle_of_life }
  3461. + from = { has_ascension_perk = ap_galactic_wonders }
  3462. }
  3463.  
  3464. on_build_start = {}
  3465. @@ -190,7 +190,7 @@ ring_world_3_intermediate = {
  3466. }
  3467.  
  3468. possible = {
  3469. - from = { has_ascension_perk = ap_the_circle_of_life }
  3470. + from = { has_ascension_perk = ap_galactic_wonders }
  3471. }
  3472.  
  3473. on_build_complete = {
  3474. diff --git a/2.0.0/common/megastructures/05_gateways.txt b/2.0.2/common/megastructures/05_gateways.txt
  3475. index 944ffd8..0ddf24b 100755
  3476. --- a/2.0.0/common/megastructures/05_gateways.txt
  3477. +++ b/2.0.2/common/megastructures/05_gateways.txt
  3478. @@ -171,6 +171,11 @@ gateway_restored = {
  3479. limit = { num_active_gateways = 1 }
  3480. random_megastructure = {
  3481. limit = { is_megastructure_type = gateway_ruined }
  3482. + solar_system = {
  3483. + starbase = {
  3484. + owner = { set_country_flag = did_not_repair_gateway }
  3485. + }
  3486. + }
  3487. upgrade_megastructure_to = gateway_restored
  3488. finish_upgrade = yes
  3489. }
  3490. diff --git a/2.0.0/common/megastructures/habitats.txt b/2.0.2/common/megastructures/habitats.txt
  3491. index 51ec9b3..70b5d45 100755
  3492. --- a/2.0.0/common/megastructures/habitats.txt
  3493. +++ b/2.0.2/common/megastructures/habitats.txt
  3494. @@ -9,7 +9,7 @@ habitat_0 = {
  3495. build_time = 1800
  3496. build_cost = {
  3497. minerals = 10000
  3498. - influence = 100
  3499. + influence = 200
  3500. }
  3501. construction_blocks_others = no
  3502.  
  3503. diff --git a/2.0.0/common/name_lists/ART1.txt b/2.0.2/common/name_lists/ART1.txt
  3504. index 13f7b06..b797f4c 100755
  3505. --- a/2.0.0/common/name_lists/ART1.txt
  3506. +++ b/2.0.2/common/name_lists/ART1.txt
  3507. @@ -98,6 +98,18 @@ ART1 = {
  3508. gene_warrior_army = {
  3509. sequential_name = "%O% Gene-Commando Pod"
  3510. }
  3511. +
  3512. + occupation_army = {
  3513. + sequential_name = "%O% Garrison Pod"
  3514. + }
  3515. +
  3516. + robotic_occupation_army = {
  3517. + sequential_name = "%O% Droid Garrison Pod"
  3518. + }
  3519. +
  3520. + android_occupation_army = {
  3521. + sequential_name = "%O% Android Garrison Pod"
  3522. + }
  3523. }
  3524.  
  3525. planet_names = {
  3526. diff --git a/2.0.0/common/name_lists/ART2.txt b/2.0.2/common/name_lists/ART2.txt
  3527. index 674b740..42a2f05 100755
  3528. --- a/2.0.0/common/name_lists/ART2.txt
  3529. +++ b/2.0.2/common/name_lists/ART2.txt
  3530. @@ -96,6 +96,18 @@ ART2 = {
  3531. gene_warrior_army = {
  3532. sequential_name = "The Surpassing Ones %R%"
  3533. }
  3534. +
  3535. + occupation_army = {
  3536. + sequential_name = "%O% Endo Garrison Forces"
  3537. + }
  3538. +
  3539. + robotic_occupation_army = {
  3540. + sequential_name = "%O% Mecha Garrison Group"
  3541. + }
  3542. +
  3543. + android_occupation_army = {
  3544. + sequential_name = "%O% Constructor Garrison Group"
  3545. + }
  3546. }
  3547.  
  3548. planet_names = {
  3549. diff --git a/2.0.0/common/name_lists/ART3.txt b/2.0.2/common/name_lists/ART3.txt
  3550. index a93fca7..80f3151 100755
  3551. --- a/2.0.0/common/name_lists/ART3.txt
  3552. +++ b/2.0.2/common/name_lists/ART3.txt
  3553. @@ -96,6 +96,18 @@ ART3 = {
  3554. gene_warrior_army = {
  3555. sequential_name = "%O% Brutes"
  3556. }
  3557. +
  3558. + occupation_army = {
  3559. + sequential_name = "%O% Occupation Cast"
  3560. + }
  3561. +
  3562. + robotic_occupation_army = {
  3563. + sequential_name = "%O% Occupation Robo-Ticks"
  3564. + }
  3565. +
  3566. + android_occupation_army = {
  3567. + sequential_name = "%O% Construct Occupation Cast"
  3568. + }
  3569. }
  3570.  
  3571. planet_names = {
  3572. diff --git a/2.0.0/common/name_lists/ART4.txt b/2.0.2/common/name_lists/ART4.txt
  3573. index c4093f6..9c66c6d 100755
  3574. --- a/2.0.0/common/name_lists/ART4.txt
  3575. +++ b/2.0.2/common/name_lists/ART4.txt
  3576. @@ -98,6 +98,18 @@ ART4 = {
  3577. gene_warrior_army = {
  3578. sequential_name = "%O% Gene-Commando Pod"
  3579. }
  3580. +
  3581. + occupation_army = {
  3582. + sequential_name = "%O% Occupation Pod"
  3583. + }
  3584. +
  3585. + robotic_occupation_army = {
  3586. + sequential_name = "%O% Occupation Droid Pod"
  3587. + }
  3588. +
  3589. + android_occupation_army = {
  3590. + sequential_name = "%O% Occupation Android Pod"
  3591. + }
  3592. }
  3593.  
  3594. planet_names = {
  3595. diff --git a/2.0.0/common/name_lists/AVI1.txt b/2.0.2/common/name_lists/AVI1.txt
  3596. index 67c88c6..bddcc90 100755
  3597. --- a/2.0.0/common/name_lists/AVI1.txt
  3598. +++ b/2.0.2/common/name_lists/AVI1.txt
  3599. @@ -102,6 +102,18 @@ AVI1 = {
  3600. gene_warrior_army = {
  3601. sequential_name = "%O% Death Commando"
  3602. }
  3603. +
  3604. + occupation_army = {
  3605. + sequential_name = "%O% Occupation Wing"
  3606. + }
  3607. +
  3608. + robotic_occupation_army = {
  3609. + sequential_name = "%O% Occupation Machines"
  3610. + }
  3611. +
  3612. + android_occupation_army = {
  3613. + sequential_name = "%O% Occupation Sentinels"
  3614. + }
  3615. }
  3616.  
  3617. planet_names = {
  3618. diff --git a/2.0.0/common/name_lists/AVI2.txt b/2.0.2/common/name_lists/AVI2.txt
  3619. index 326eaa0..f5fe6af 100755
  3620. --- a/2.0.0/common/name_lists/AVI2.txt
  3621. +++ b/2.0.2/common/name_lists/AVI2.txt
  3622. @@ -103,6 +103,18 @@ AVI2 = {
  3623. gene_warrior_army = {
  3624. sequential_name = "%O% Ascension Wing"
  3625. }
  3626. +
  3627. + occupation_army = {
  3628. + sequential_name = "%O% Occupation Wing"
  3629. + }
  3630. +
  3631. + robotic_occupation_army = {
  3632. + sequential_name = "%O% Droid Occupation Force"
  3633. + }
  3634. +
  3635. + android_occupation_army = {
  3636. + sequential_name = "%O% Nano Occupation Force"
  3637. + }
  3638. }
  3639.  
  3640. planet_names = {
  3641. diff --git a/2.0.0/common/name_lists/AVI3.txt b/2.0.2/common/name_lists/AVI3.txt
  3642. index 40be300..2f12764 100755
  3643. --- a/2.0.0/common/name_lists/AVI3.txt
  3644. +++ b/2.0.2/common/name_lists/AVI3.txt
  3645. @@ -115,6 +115,18 @@ AVI3 = {
  3646. gene_warrior_army = {
  3647. sequential_name = "%O% Mutation Flock"
  3648. }
  3649. +
  3650. + occupation_army = {
  3651. + sequential_name = "%O% Occupation Flock"
  3652. + }
  3653. +
  3654. + robotic_occupation_army = {
  3655. + sequential_name = "Droid Occupation Forces %R%"
  3656. + }
  3657. +
  3658. + android_occupation_army = {
  3659. + sequential_name = "Android Occupation Forces %R%"
  3660. + }
  3661. }
  3662.  
  3663. planet_names = {
  3664. diff --git a/2.0.0/common/name_lists/AVI4.txt b/2.0.2/common/name_lists/AVI4.txt
  3665. index 10d6cb5..3d57a94 100755
  3666. --- a/2.0.0/common/name_lists/AVI4.txt
  3667. +++ b/2.0.2/common/name_lists/AVI4.txt
  3668. @@ -104,6 +104,18 @@ AVI4 = {
  3669. gene_warrior_army = {
  3670. sequential_name = "%O% Perfected Infantry"
  3671. }
  3672. +
  3673. + occupation_army = {
  3674. + sequential_name = "%O% Occupation Broodwatchers"
  3675. + }
  3676. +
  3677. + robotic_occupation_army = {
  3678. + sequential_name = "%O% Mechanized Occupiers"
  3679. + }
  3680. +
  3681. + android_occupation_army = {
  3682. + sequential_name = "%O% Android Occupiers"
  3683. + }
  3684. }
  3685.  
  3686. planet_names = {
  3687. diff --git a/2.0.0/common/name_lists/FUN1.txt b/2.0.2/common/name_lists/FUN1.txt
  3688. index 22519d8..868a689 100755
  3689. --- a/2.0.0/common/name_lists/FUN1.txt
  3690. +++ b/2.0.2/common/name_lists/FUN1.txt
  3691. @@ -97,6 +97,18 @@ FUN1 = {
  3692. gene_warrior_army = {
  3693. sequential_name = "%O% Shock Infantry"
  3694. }
  3695. +
  3696. + occupation_army = {
  3697. + sequential_name = "%O% Occupation Contingent"
  3698. + }
  3699. +
  3700. + robotic_occupation_army = {
  3701. + sequential_name = "%O% Mechanized Watchers"
  3702. + }
  3703. +
  3704. + android_occupation_army = {
  3705. + sequential_name = "%O% Centurion Watchers"
  3706. + }
  3707. }
  3708.  
  3709. planet_names = {
  3710. diff --git a/2.0.0/common/name_lists/FUN2.txt b/2.0.2/common/name_lists/FUN2.txt
  3711. index 13316d4..4bf5222 100755
  3712. --- a/2.0.0/common/name_lists/FUN2.txt
  3713. +++ b/2.0.2/common/name_lists/FUN2.txt
  3714. @@ -96,6 +96,18 @@ FUN2 = {
  3715. gene_warrior_army = {
  3716. sequential_name = "%O% Slime Molds"
  3717. }
  3718. +
  3719. + occupation_army = {
  3720. + sequential_name = "%O% Garrison Agarics"
  3721. + }
  3722. +
  3723. + robotic_occupation_army = {
  3724. + sequential_name = "%O% Robotic Garrison"
  3725. + }
  3726. +
  3727. + android_occupation_army = {
  3728. + sequential_name = "%O% Synthetic Garrison"
  3729. + }
  3730. }
  3731.  
  3732. planet_names = {
  3733. diff --git a/2.0.0/common/name_lists/FUN3.txt b/2.0.2/common/name_lists/FUN3.txt
  3734. index eec313b..b19e3eb 100755
  3735. --- a/2.0.0/common/name_lists/FUN3.txt
  3736. +++ b/2.0.2/common/name_lists/FUN3.txt
  3737. @@ -95,6 +95,18 @@ FUN3 = {
  3738. gene_warrior_army = {
  3739. sequential_name = "%O% Death Caps"
  3740. }
  3741. +
  3742. + occupation_army = {
  3743. + sequential_name = "%O% Occupation Patrol"
  3744. + }
  3745. +
  3746. + robotic_occupation_army = {
  3747. + sequential_name = "%O% Robo Patrol"
  3748. + }
  3749. +
  3750. + android_occupation_army = {
  3751. + sequential_name = "%O% Fungitech Patrol"
  3752. + }
  3753. }
  3754.  
  3755. planet_names = {
  3756. diff --git a/2.0.0/common/name_lists/FUN4.txt b/2.0.2/common/name_lists/FUN4.txt
  3757. index 56b8262..1abd0dd 100755
  3758. --- a/2.0.0/common/name_lists/FUN4.txt
  3759. +++ b/2.0.2/common/name_lists/FUN4.txt
  3760. @@ -97,6 +97,18 @@ FUN4 = {
  3761. gene_warrior_army = {
  3762. sequential_name = "%O% Biomorph Force"
  3763. }
  3764. +
  3765. + occupation_army = {
  3766. + sequential_name = "%O% Occupation Force"
  3767. + }
  3768. +
  3769. + robotic_occupation_army = {
  3770. + sequential_name = "%O% Mechanized Occupiers"
  3771. + }
  3772. +
  3773. + android_occupation_army = {
  3774. + sequential_name = "%O% Synthetic Occupiers"
  3775. + }
  3776. }
  3777.  
  3778. planet_names = {
  3779. diff --git a/2.0.0/common/name_lists/HIVE_SC.txt b/2.0.0/common/name_lists/HIVE_SC.txt
  3780. deleted file mode 100755
  3781. index b8f5b5d..0000000
  3782. --- a/2.0.0/common/name_lists/HIVE_SC.txt
  3783. +++ /dev/null
  3784. @@ -1,256 +0,0 @@
  3785. -### Hive Mind
  3786. -### Created by Miranda van den Brink
  3787. -### Based on a template by Henrik Eklund
  3788. -
  3789. -HIVE = {
  3790. -
  3791. - language = "l_simp_chinese"
  3792. -
  3793. - randomized = no
  3794. - should_name_home_system_planets = no
  3795. -
  3796. - ship_names = {
  3797. - generic = {
  3798. - "蜂巢船"
  3799. - }
  3800. -
  3801. - corvette = {
  3802. - "作战船只"
  3803. - }
  3804. -
  3805. - destroyer = {
  3806. - "作战船只"
  3807. - }
  3808. -
  3809. - cruiser = {
  3810. - "作战船只"
  3811. - }
  3812. -
  3813. - battleship = {
  3814. - "作战船只"
  3815. - }
  3816. -
  3817. - titan = {
  3818. - "作战船只"
  3819. - }
  3820. -
  3821. - colossus = {
  3822. - "作战船只"
  3823. - }
  3824. -
  3825. - science = {
  3826. - "寻求船"
  3827. - }
  3828. -
  3829. - colonizer = {
  3830. - "筑巢者"
  3831. - }
  3832. -
  3833. - constructor = {
  3834. - "建造船"
  3835. - }
  3836. -
  3837. - military_station_small = {
  3838. - "阿尔法式" "贝塔式" "伽玛式" "德耳塔式" "艾普西隆式" "泽塔式" "伊塔式" "西塔式" "约塔式" "卡帕式" "拉姆达式" "谬式" "纽式" "克西式" "奥米克戎式" "派式" "柔式" "西格马式" "陶式" "宇普西龙式" "斐式" "希式" "普西式" "奥米伽式"
  3839. - }
  3840. -
  3841. - ion_cannon = {
  3842. - "阿尔法式" "贝塔式" "伽玛式" "德耳塔式" "艾普西隆式" "泽塔式" "伊塔式" "西塔式" "约塔式" "卡帕式" "拉姆达式" "谬式" "纽式" "克西式" "奥米克戎式" "派式" "柔式" "西格马式" "陶式" "宇普西龙式" "斐式" "希式" "普西式" "奥米伽式"
  3843. - }
  3844. -
  3845. - transport = {
  3846. - "航母船"
  3847. - }
  3848. - }
  3849. -
  3850. - ship_class_names = {
  3851. - generic = {
  3852. - "阿尔法式" "贝塔式" "伽玛式" "德耳塔式" "艾普西隆式" "泽塔式" "伊塔式" "西塔式" "约塔式" "卡帕式" "拉姆达式" "谬式" "纽式" "克西式" "奥米克戎式" "派式" "柔式" "西格马式" "陶式" "宇普西龙式" "斐式" "希式" "普西式" "奥米伽式"
  3853. - }
  3854. - }
  3855. -
  3856. - fleet_names = {
  3857. - random_names = {
  3858. - }
  3859. - sequential_name = "%O% 战斗虫群"
  3860. - }
  3861. -
  3862. - ### ARMIES
  3863. - army_names = {
  3864. - defense_army = {
  3865. - sequential_name = "%O% 蜂巢防御者"
  3866. - }
  3867. -
  3868. - assault_army = {
  3869. - sequential_name = "%O% 攻击者"
  3870. - }
  3871. -
  3872. - slave_army = {
  3873. - sequential_name = "%O% 劳力战士无人机"
  3874. - }
  3875. -
  3876. - clone_army = {
  3877. - sequential_name = "%O% 克隆战士无人机"
  3878. - }
  3879. -
  3880. - robotic_army = {
  3881. - sequential_name = "%O% 机器人战士无人机"
  3882. - }
  3883. -
  3884. - robotic_defense_army = {
  3885. - sequential_name = "%O% 机器人防御无人机"
  3886. - }
  3887. -
  3888. - android_army = {
  3889. - sequential_name = "%O% 智能人战士无人机"
  3890. - }
  3891. -
  3892. - android_defense_army = {
  3893. - sequential_name = "%O% 智能人防御无人机"
  3894. - }
  3895. -
  3896. - psionic_army = {
  3897. - sequential_name = "%O% 普西战士无人机"
  3898. - }
  3899. -
  3900. - xenomorph_army = {
  3901. - sequential_name = "%O% 变体战士无人机"
  3902. - }
  3903. -
  3904. - gene_warrior_army = {
  3905. - sequential_name = "%O% 强化战士无人机"
  3906. - }
  3907. - }
  3908. -
  3909. - ### PLANETS
  3910. -
  3911. - planet_names = {
  3912. -
  3913. - generic = {
  3914. - names = {
  3915. - "阿尔法单元" "虫群单元阿尔法" "子成员单元" "筑巢舱" "子成员巢" "外向延伸" "外部子成员舱" "扩展节点" "标准节点" "子成员节点" "扩张单元" "生产舱" "高等天顶" "扩张节点" "发展舱" "进步单元" "生产节点" "组装单元" "守卫接合点" "超前天顶" "前进接合点" "组装节点" "巢穴移民地" "阿尔法移民地" "贝塔移民地" "伽玛移民地" "德耳塔移民地" "艾普西隆移民地" "泽塔移民地" "伊塔移民地" "西塔移民地" "Iota_Colony" "生产单元" "巢穴单元" "子成员群" "虫群移民地" "子成员移民地" "组装移民地"
  3916. - }
  3917. - }
  3918. -
  3919. - pc_desert = {
  3920. - names = {
  3921. - }
  3922. - }
  3923. -
  3924. - pc_tropical = {
  3925. - names = {
  3926. - }
  3927. - }
  3928. -
  3929. - pc_arid = {
  3930. - names = {
  3931. - }
  3932. - }
  3933. -
  3934. - pc_continental = {
  3935. - names = {
  3936. - }
  3937. - }
  3938. -
  3939. - pc_ocean = {
  3940. - names = {
  3941. - }
  3942. - }
  3943. -
  3944. - pc_tundra = {
  3945. - names = {
  3946. - }
  3947. - }
  3948. -
  3949. - pc_arctic = {
  3950. - names = {
  3951. - }
  3952. - }
  3953. -
  3954. - pc_savannah = {
  3955. - names = {
  3956. - }
  3957. - }
  3958. -
  3959. - pc_alpine = {
  3960. - names = {
  3961. - }
  3962. - }
  3963. -
  3964. - ### UNINHABITABLE PLANETS
  3965. -
  3966. - pc_gas_giant = {
  3967. - names = {
  3968. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3969. - }
  3970. - }
  3971. -
  3972. - pc_barren = {
  3973. - names = {
  3974. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3975. - }
  3976. - }
  3977. -
  3978. - pc_molten = {
  3979. - names = {
  3980. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3981. - }
  3982. - }
  3983. -
  3984. - pc_barren_cold = {
  3985. - names = {
  3986. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3987. - }
  3988. - }
  3989. -
  3990. - pc_toxic = {
  3991. - names = {
  3992. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3993. - }
  3994. - }
  3995. -
  3996. - pc_frozen = {
  3997. - names = {
  3998. - "阿尔法" "贝塔" "伽马值" "德耳塔" "艾普西隆" "泽塔" "伊塔" "西塔" "约塔" "卡帕" "拉姆达" "谬" "纽" "克西" "奥米克戎" "派" "柔" "西格马" "陶" "宇普西龙" "斐" "希" "普西" "奥米伽" "球体 I" "球体 II" "球体 III" "球体 IV" "球体 V" "球体 VI" "球体 VII" "球体 VIII" "球体 IX" "球体 X"
  3999. - }
  4000. - }
  4001. - }
  4002. -
  4003. - ### CHARACTERS
  4004. -
  4005. - character_names = {
  4006. - default = {
  4007. - # A complete name
  4008. - full_names = {
  4009. -
  4010. - "自主子成员 1" "自主子成员 2" "自主子成员 3" "自主子成员 4" "自主子成员 5" "自主子成员 6" "自主子成员 7" "自主子成员 8" "自主子成员 9" "自主子成员 10" "自主子成员 11" "自主子成员 12" "自主子成员 13" "自主子成员 14"
  4011. - "自主子成员 15" "自主子成员 16" "自主子成员 17" "自主子成员 18" "自主子成员 19" "自主子成员 20" "自主子成员 21" "自主子成员 22" "自主子成员 23" "自主子成员 24" "自主子成员 25" "自主子成员 26" "自主子成员 27" "自主子成员 28" "自主子成员 29"
  4012. - "自主子成员 30" "自主子成员 31" "自主子成员 32" "自主子成员 33" "自主子成员 34" "自主子成员 35" "自主子成员 36" "自主子成员 37" "自主子成员 38" "自主子成员 39" "自主子成员 40" "自主子成员 41" "自主子成员 42" "自主子成员 43" "自主子成员 44"
  4013. - "自主子成员 45" "自主子成员 46" "自主子成员 47" "自主子成员 48" "自主子成员 49" "自主子成员 50" "自主子成员 51" "自主子成员 52" "自主子成员 53" "自主子成员 54" "自主子成员 55" "自主子成员 56" "自主子成员 57" "自主子成员 58" "自主子成员 59"
  4014. - "自主子成员 60" "自主子成员 61" "自主子成员 62" "自主子成员 63" "自主子成员 64" "自主子成员 65" "自主子成员 66" "自主子成员 67" "自主子成员 68" "自主子成员 69" "自主子成员 70" "自主子成员 71" "自主子成员 72" "自主子成员 73" "自主子成员 74"
  4015. - }
  4016. -
  4017. - # Always combined with a second name
  4018. - first_names = {
  4019. - }
  4020. -
  4021. - # Always combined with a first name
  4022. - second_names = {
  4023. - }
  4024. -
  4025. - regnal_first_names = {
  4026. - }
  4027. -
  4028. - regnal_second_names = {
  4029. - }
  4030. - }
  4031. - }
  4032. -
  4033. - ruler_names = {
  4034. - default = {
  4035. - full_names = {
  4036. - "突触枢纽" 意识
  4037. - }
  4038. - }
  4039. - }
  4040. -}
  4041. \ No newline at end of file
  4042. diff --git a/2.0.0/common/name_lists/HUM1.txt b/2.0.2/common/name_lists/HUM1.txt
  4043. index 4783d7d..270033d 100755
  4044. --- a/2.0.0/common/name_lists/HUM1.txt
  4045. +++ b/2.0.2/common/name_lists/HUM1.txt
  4046. @@ -102,6 +102,18 @@ HUM1 = {
  4047. gene_warrior_army = {
  4048. sequential_name = "%O% Star Knights"
  4049. }
  4050. +
  4051. + occupation_army = {
  4052. + sequential_name = "%O% Occupation Shield"
  4053. + }
  4054. +
  4055. + robotic_occupation_army = {
  4056. + sequential_name = "%O% Robotic Occupiers"
  4057. + }
  4058. +
  4059. + android_occupation_army = {
  4060. + sequential_name = "%O% Autonomous Occupiers"
  4061. + }
  4062. }
  4063.  
  4064. planet_names = {
  4065. diff --git a/2.0.0/common/name_lists/HUM2.txt b/2.0.2/common/name_lists/HUM2.txt
  4066. index f396ed2..212fcc8 100755
  4067. --- a/2.0.0/common/name_lists/HUM2.txt
  4068. +++ b/2.0.2/common/name_lists/HUM2.txt
  4069. @@ -96,6 +96,18 @@ HUM2 = {
  4070. gene_warrior_army = {
  4071. sequential_name = "%O% Purebloods"
  4072. }
  4073. +
  4074. + occupation_army = {
  4075. + sequential_name = "%O% Occupation Watch"
  4076. + }
  4077. +
  4078. + robotic_occupation_army = {
  4079. + sequential_name = "%O% Occupation Drones"
  4080. + }
  4081. +
  4082. + android_occupation_army = {
  4083. + sequential_name = "%O% Occupation Droids"
  4084. + }
  4085. }
  4086.  
  4087. planet_names = {
  4088. diff --git a/2.0.0/common/name_lists/HUM3.txt b/2.0.2/common/name_lists/HUM3.txt
  4089. index ce8d5c8..3e2f0e9 100755
  4090. --- a/2.0.0/common/name_lists/HUM3.txt
  4091. +++ b/2.0.2/common/name_lists/HUM3.txt
  4092. @@ -95,6 +95,18 @@ HUM3 = {
  4093. gene_warrior_army = {
  4094. sequential_name = "%O% Star Knights"
  4095. }
  4096. +
  4097. + occupation_army = {
  4098. + sequential_name = "%O% Occupation Watch"
  4099. + }
  4100. +
  4101. + robotic_occupation_army = {
  4102. + sequential_name = "%O% Occupation Drones"
  4103. + }
  4104. +
  4105. + android_occupation_army = {
  4106. + sequential_name = "%O% Occupation Droids"
  4107. + }
  4108. }
  4109.  
  4110. planet_names = {
  4111. diff --git a/2.0.0/common/name_lists/HUM4.txt b/2.0.2/common/name_lists/HUM4.txt
  4112. index b785c04..6611513 100755
  4113. --- a/2.0.0/common/name_lists/HUM4.txt
  4114. +++ b/2.0.2/common/name_lists/HUM4.txt
  4115. @@ -95,6 +95,18 @@ HUM4 = {
  4116. gene_warrior_army = {
  4117. sequential_name = "%O% Supermen"
  4118. }
  4119. +
  4120. + occupation_army = {
  4121. + sequential_name = "%O% Occupation Sentinels"
  4122. + }
  4123. +
  4124. + robotic_occupation_army = {
  4125. + sequential_name = "%O% Metal Sentinels"
  4126. + }
  4127. +
  4128. + android_occupation_army = {
  4129. + sequential_name = "%O% Replicant Sentinels"
  4130. + }
  4131. }
  4132.  
  4133. planet_names = {
  4134. diff --git a/2.0.0/common/name_lists/HUMAN1.txt b/2.0.2/common/name_lists/HUMAN1.txt
  4135. index 0025023..2c26495 100755
  4136. --- a/2.0.0/common/name_lists/HUMAN1.txt
  4137. +++ b/2.0.2/common/name_lists/HUMAN1.txt
  4138. @@ -112,6 +112,18 @@ HUMAN1 = {
  4139. }
  4140. sequential_name = "%O% Bio-Engineered Squadron"
  4141. }
  4142. +
  4143. + occupation_army = {
  4144. + sequential_name = "%O% Garrison Force"
  4145. + }
  4146. +
  4147. + robotic_occupation_army = {
  4148. + sequential_name = "%O% Mechanized Garrison"
  4149. + }
  4150. +
  4151. + android_occupation_army = {
  4152. + sequential_name = "%O% Synthetic Garrison"
  4153. + }
  4154. }
  4155.  
  4156. planet_names = {
  4157. diff --git a/2.0.0/common/name_lists/HUMAN2.txt b/2.0.2/common/name_lists/HUMAN2.txt
  4158. index 9a68d43..0d5fa3a 100755
  4159. --- a/2.0.0/common/name_lists/HUMAN2.txt
  4160. +++ b/2.0.2/common/name_lists/HUMAN2.txt
  4161. @@ -70,7 +70,7 @@ HUMAN2 = {
  4162.  
  4163. army_names = {
  4164. generic = {
  4165. - sequential_name = "%O% Colonial Garrison"
  4166. + sequential_name = "%O% Colonial Gendarmerie"
  4167. }
  4168.  
  4169. assault_army = {
  4170. @@ -90,7 +90,7 @@ HUMAN2 = {
  4171. }
  4172.  
  4173. robotic_defense_army = {
  4174. - sequential_name = "%O% Unmanned Garrison"
  4175. + sequential_name = "%O% Unmanned Gendarmerie"
  4176. }
  4177.  
  4178. android_army = {
  4179. @@ -98,7 +98,7 @@ HUMAN2 = {
  4180. }
  4181.  
  4182. android_defense_army = {
  4183. - sequential_name = "%O% Android Garrison"
  4184. + sequential_name = "%O% Android Gendarmerie"
  4185. }
  4186.  
  4187. psionic_army = {
  4188. @@ -120,6 +120,18 @@ HUMAN2 = {
  4189. gene_warrior_army = {
  4190. sequential_name = "%O% Eugenic Vanguard"
  4191. }
  4192. +
  4193. + occupation_army = {
  4194. + sequential_name = "%O% Occupation Legion"
  4195. + }
  4196. +
  4197. + robotic_occupation_army = {
  4198. + sequential_name = "%O% Unmanned Garrison"
  4199. + }
  4200. +
  4201. + android_occupation_army = {
  4202. + sequential_name = "%O% Android Garrison"
  4203. + }
  4204. }
  4205.  
  4206. ### PLANETS
  4207. diff --git a/2.0.0/common/name_lists/HUMAN3.txt b/2.0.2/common/name_lists/HUMAN3.txt
  4208. index d947c48..b96669a 100755
  4209. --- a/2.0.0/common/name_lists/HUMAN3.txt
  4210. +++ b/2.0.2/common/name_lists/HUMAN3.txt
  4211. @@ -108,6 +108,18 @@ HUMAN3 = {
  4212. gene_warrior_army = {
  4213. sequential_name = "Legio Praetoriae %R%"
  4214. }
  4215. +
  4216. + occupation_army = {
  4217. + sequential_name = "Cohort Vigilum %R%"
  4218. + }
  4219. +
  4220. + robotic_occupation_army = {
  4221. + sequential_name = "Robotum Vigilum %R%"
  4222. + }
  4223. +
  4224. + android_occupation_army = {
  4225. + sequential_name = "Robotum Superior Vigilum %R%"
  4226. + }
  4227. }
  4228.  
  4229. ### PLANETS
  4230. diff --git a/2.0.0/common/name_lists/MACHINE1.txt b/2.0.2/common/name_lists/MACHINE1.txt
  4231. index b282abe..0d35d04 100755
  4232. --- a/2.0.0/common/name_lists/MACHINE1.txt
  4233. +++ b/2.0.2/common/name_lists/MACHINE1.txt
  4234. @@ -104,6 +104,10 @@ MACHINE1 = {
  4235. clone_army = {
  4236. sequential_name = "%O% Mechanized Clone Force"
  4237. }
  4238. +
  4239. + machine_occupation_army = {
  4240. + sequential_name = "%O% Mechanized Garrison Force"
  4241. + }
  4242. }
  4243.  
  4244.  
  4245. diff --git a/2.0.0/common/name_lists/MACHINE2.txt b/2.0.2/common/name_lists/MACHINE2.txt
  4246. index 7d97661..3495b80 100755
  4247. --- a/2.0.0/common/name_lists/MACHINE2.txt
  4248. +++ b/2.0.2/common/name_lists/MACHINE2.txt
  4249. @@ -105,6 +105,10 @@ MACHINE2 = {
  4250. clone_army = {
  4251. sequential_name = "%O% Cybertron Clones"
  4252. }
  4253. +
  4254. + machine_occupation_army = {
  4255. + sequential_name = "%O% Occubots"
  4256. + }
  4257. }
  4258.  
  4259. planet_names = {
  4260. diff --git a/2.0.0/common/name_lists/MACHINE3.txt b/2.0.2/common/name_lists/MACHINE3.txt
  4261. index c843fa9..de1dfe1 100755
  4262. --- a/2.0.0/common/name_lists/MACHINE3.txt
  4263. +++ b/2.0.2/common/name_lists/MACHINE3.txt
  4264. @@ -111,6 +111,10 @@ MACHINE3 = {
  4265. clone_army = {
  4266. sequential_name = "%O% Bio-Curated Clones"
  4267. }
  4268. +
  4269. + machine_occupation_army = {
  4270. + sequential_name = "%O% Occupation Caretaker Squad"
  4271. + }
  4272. }
  4273.  
  4274.  
  4275. diff --git a/2.0.0/common/name_lists/MACHINE4.txt b/2.0.2/common/name_lists/MACHINE4.txt
  4276. index e12c128..37e5192 100755
  4277. --- a/2.0.0/common/name_lists/MACHINE4.txt
  4278. +++ b/2.0.2/common/name_lists/MACHINE4.txt
  4279. @@ -82,6 +82,10 @@ MACHINE4 = {
  4280. clone_army = {
  4281. sequential_name = "%O% Replica Regiment"
  4282. }
  4283. +
  4284. + machine_occupation_army = {
  4285. + sequential_name = "%O% Occupation Assignment"
  4286. + }
  4287. }
  4288.  
  4289. planet_names = {
  4290. diff --git a/2.0.0/common/name_lists/MAM1.txt b/2.0.2/common/name_lists/MAM1.txt
  4291. index 6e91ed8..fd46ae1 100755
  4292. --- a/2.0.0/common/name_lists/MAM1.txt
  4293. +++ b/2.0.2/common/name_lists/MAM1.txt
  4294. @@ -96,6 +96,18 @@ MAM1 = {
  4295. gene_warrior_army = {
  4296. sequential_name = "%O% Modified Troopers"
  4297. }
  4298. +
  4299. + occupation_army = {
  4300. + sequential_name = "%O% Occupation Column"
  4301. + }
  4302. +
  4303. + robotic_occupation_army = {
  4304. + sequential_name = "%O% Robotic Garrison"
  4305. + }
  4306. +
  4307. + android_occupation_army = {
  4308. + sequential_name = "%O% Android Garrison"
  4309. + }
  4310. }
  4311.  
  4312. planet_names = {
  4313. diff --git a/2.0.0/common/name_lists/MAM2.txt b/2.0.2/common/name_lists/MAM2.txt
  4314. index 8cb9b79..3e09d3f 100755
  4315. --- a/2.0.0/common/name_lists/MAM2.txt
  4316. +++ b/2.0.2/common/name_lists/MAM2.txt
  4317. @@ -97,6 +97,18 @@ MAM2 = {
  4318. gene_warrior_army = {
  4319. sequential_name = "%O% Augmented Vanguard"
  4320. }
  4321. +
  4322. + occupation_army = {
  4323. + sequential_name = "%O% Occupation Regulars"
  4324. + }
  4325. +
  4326. + robotic_occupation_army = {
  4327. + sequential_name = "%O% Occupation Droids"
  4328. + }
  4329. +
  4330. + android_occupation_army = {
  4331. + sequential_name = "%O% Occupation Legionnaires"
  4332. + }
  4333. }
  4334.  
  4335. planet_names = {
  4336. diff --git a/2.0.0/common/name_lists/MAM3.txt b/2.0.2/common/name_lists/MAM3.txt
  4337. index 320f9f0..aa2d29b 100755
  4338. --- a/2.0.0/common/name_lists/MAM3.txt
  4339. +++ b/2.0.2/common/name_lists/MAM3.txt
  4340. @@ -96,6 +96,18 @@ MAM3 = {
  4341. gene_warrior_army = {
  4342. sequential_name = "%O% Gene-Warrior Division"
  4343. }
  4344. +
  4345. + occupation_army = {
  4346. + sequential_name = "%O% Occupation Army"
  4347. + }
  4348. +
  4349. + robotic_occupation_army = {
  4350. + sequential_name = "%O% Occupation Robot Army"
  4351. + }
  4352. +
  4353. + android_occupation_army = {
  4354. + sequential_name = "%O% Occupation Android Army"
  4355. + }
  4356. }
  4357.  
  4358. planet_names = {
  4359. diff --git a/2.0.0/common/name_lists/MAM4.txt b/2.0.2/common/name_lists/MAM4.txt
  4360. index dd76541..995bf0a 100755
  4361. --- a/2.0.0/common/name_lists/MAM4.txt
  4362. +++ b/2.0.2/common/name_lists/MAM4.txt
  4363. @@ -95,6 +95,18 @@ MAM4 = {
  4364. gene_warrior_army = {
  4365. sequential_name = "%O% Modified Troopers"
  4366. }
  4367. +
  4368. + occupation_army = {
  4369. + sequential_name = "%O% Occupation Column"
  4370. + }
  4371. +
  4372. + robotic_occupation_army = {
  4373. + sequential_name = "%O% Robotic Occupiers"
  4374. + }
  4375. +
  4376. + android_occupation_army = {
  4377. + sequential_name = "%O% Android Occupiers"
  4378. + }
  4379. }
  4380.  
  4381. planet_names = {
  4382. diff --git a/2.0.0/common/name_lists/MOL1.txt b/2.0.2/common/name_lists/MOL1.txt
  4383. index ad8fe50..510665b 100755
  4384. --- a/2.0.0/common/name_lists/MOL1.txt
  4385. +++ b/2.0.2/common/name_lists/MOL1.txt
  4386. @@ -96,6 +96,18 @@ MOL1 = {
  4387. gene_warrior_army = {
  4388. sequential_name = "%O% Ascenders"
  4389. }
  4390. +
  4391. + occupation_army = {
  4392. + sequential_name = "%O% Occupation Shell"
  4393. + }
  4394. +
  4395. + robotic_occupation_army = {
  4396. + sequential_name = "%O% Occupation Oephalodroids"
  4397. + }
  4398. +
  4399. + android_occupation_army = {
  4400. + sequential_name = "%O% Occupation Spirit Guard"
  4401. + }
  4402. }
  4403.  
  4404. planet_names = {
  4405. diff --git a/2.0.0/common/name_lists/MOL2.txt b/2.0.2/common/name_lists/MOL2.txt
  4406. index 610e8b5..b644f3c 100755
  4407. --- a/2.0.0/common/name_lists/MOL2.txt
  4408. +++ b/2.0.2/common/name_lists/MOL2.txt
  4409. @@ -97,6 +97,18 @@ MOL2 = {
  4410. gene_warrior_army = {
  4411. sequential_name = "%O% Manipulated Troops"
  4412. }
  4413. +
  4414. + occupation_army = {
  4415. + sequential_name = "%O% Shore Occupiers"
  4416. + }
  4417. +
  4418. + robotic_occupation_army = {
  4419. + sequential_name = "%O% Mechanica Occupiers"
  4420. + }
  4421. +
  4422. + android_occupation_army = {
  4423. + sequential_name = "%O% Replicata Occupiers"
  4424. + }
  4425. }
  4426.  
  4427. planet_names = {
  4428. diff --git a/2.0.0/common/name_lists/MOL3.txt b/2.0.2/common/name_lists/MOL3.txt
  4429. index 808270a..b717c36 100755
  4430. --- a/2.0.0/common/name_lists/MOL3.txt
  4431. +++ b/2.0.2/common/name_lists/MOL3.txt
  4432. @@ -97,6 +97,18 @@ MOL3 = {
  4433. gene_warrior_army = {
  4434. sequential_name = "%O% Bio-Enhanced Brigade"
  4435. }
  4436. +
  4437. + occupation_army = {
  4438. + sequential_name = "%O% Occupation Bastion"
  4439. + }
  4440. +
  4441. + robotic_occupation_army = {
  4442. + sequential_name = "%O% Steel Occupiers"
  4443. + }
  4444. +
  4445. + android_occupation_army = {
  4446. + sequential_name = "%O% Thought Circuit Occupiers"
  4447. + }
  4448. }
  4449.  
  4450. planet_names = {
  4451. diff --git a/2.0.0/common/name_lists/MOL4.txt b/2.0.2/common/name_lists/MOL4.txt
  4452. index 7770fd4..ec14471 100755
  4453. --- a/2.0.0/common/name_lists/MOL4.txt
  4454. +++ b/2.0.2/common/name_lists/MOL4.txt
  4455. @@ -108,6 +108,18 @@ MOL4 = {
  4456. gene_warrior_army = {
  4457. sequential_name = "%O% Deathbound Germinants"
  4458. }
  4459. +
  4460. + occupation_army = {
  4461. + sequential_name = "%O% Hardshell Occupiers"
  4462. + }
  4463. +
  4464. + robotic_occupation_army = {
  4465. + sequential_name = "%O% Defensebot Occupiers"
  4466. + }
  4467. +
  4468. + android_occupation_army = {
  4469. + sequential_name = "%O% Defensedroid Occupiers"
  4470. + }
  4471. }
  4472.  
  4473. planet_names = {
  4474. diff --git a/2.0.0/common/name_lists/PLANT.txt b/2.0.2/common/name_lists/PLANT.txt
  4475. index f89e665..860e1a8 100755
  4476. --- a/2.0.0/common/name_lists/PLANT.txt
  4477. +++ b/2.0.2/common/name_lists/PLANT.txt
  4478. @@ -118,6 +118,18 @@ PLANT = {
  4479. gene_warrior_army = {
  4480. sequential_name = "%O% Transgenic Wreath"
  4481. }
  4482. +
  4483. + occupation_army = {
  4484. + sequential_name = "%O% Occupation Wreath"
  4485. + }
  4486. +
  4487. + robotic_occupation_army = {
  4488. + sequential_name = "%O% Brass Occupation Wreath"
  4489. + }
  4490. +
  4491. + android_occupation_army = {
  4492. + sequential_name = "%O% Golden Occupation Wreath"
  4493. + }
  4494. }
  4495.  
  4496. planet_names = {
  4497. diff --git a/2.0.0/common/name_lists/PLANT2.txt b/2.0.2/common/name_lists/PLANT2.txt
  4498. index 69a15a0..c12bd0a 100755
  4499. --- a/2.0.0/common/name_lists/PLANT2.txt
  4500. +++ b/2.0.2/common/name_lists/PLANT2.txt
  4501. @@ -118,6 +118,18 @@ PLANT2 = {
  4502. gene_warrior_army = {
  4503. sequential_name = "%O% Hybrid Stalk"
  4504. }
  4505. +
  4506. + occupation_army = {
  4507. + sequential_name = "%O% Occupation Stalk"
  4508. + }
  4509. +
  4510. + robotic_occupation_army = {
  4511. + sequential_name = "%O% Iron Occupation Branch"
  4512. + }
  4513. +
  4514. + android_occupation_army = {
  4515. + sequential_name = "%O% Steel Occupation Branch"
  4516. + }
  4517. }
  4518.  
  4519. planet_names = {
  4520. diff --git a/2.0.0/common/name_lists/PLANT3.txt b/2.0.2/common/name_lists/PLANT3.txt
  4521. index d4b91ec..5576cc4 100755
  4522. --- a/2.0.0/common/name_lists/PLANT3.txt
  4523. +++ b/2.0.2/common/name_lists/PLANT3.txt
  4524. @@ -96,6 +96,18 @@ PLANT3 = {
  4525. gene_warrior_army = {
  4526. sequential_name = "%O% Extremophile Force"
  4527. }
  4528. +
  4529. + occupation_army = {
  4530. + sequential_name = "%O% Bark Garrison"
  4531. + }
  4532. +
  4533. + robotic_occupation_army = {
  4534. + sequential_name = "%O% Daffodil Garrison"
  4535. + }
  4536. +
  4537. + android_occupation_army = {
  4538. + sequential_name = "%O% Mayflower Garrison"
  4539. + }
  4540. }
  4541.  
  4542. planet_names = {
  4543. diff --git a/2.0.0/common/name_lists/PLANT4.txt b/2.0.2/common/name_lists/PLANT4.txt
  4544. index 1461524..8c7ee23 100755
  4545. --- a/2.0.0/common/name_lists/PLANT4.txt
  4546. +++ b/2.0.2/common/name_lists/PLANT4.txt
  4547. @@ -119,6 +119,18 @@ PLANT4 = {
  4548. gene_warrior_army = {
  4549. sequential_name = "%O% Stirpes ka Genea"
  4550. }
  4551. +
  4552. + occupation_army = {
  4553. + sequential_name = "%O% Stirpes ka Matea"
  4554. + }
  4555. +
  4556. + robotic_occupation_army = {
  4557. + sequential_name = "%R% Matea Sentis"
  4558. + }
  4559. +
  4560. + android_occupation_army = {
  4561. + sequential_name = "%R% Stirpes ka Dendro"
  4562. + }
  4563. }
  4564.  
  4565. planet_names = {
  4566. diff --git a/2.0.0/common/name_lists/PRT1.txt b/2.0.2/common/name_lists/PRT1.txt
  4567. index 2918fea..61c8821 100755
  4568. --- a/2.0.0/common/name_lists/PRT1.txt
  4569. +++ b/2.0.2/common/name_lists/PRT1.txt
  4570. @@ -13,7 +13,7 @@ PRT1 = {
  4571.  
  4572. ship_names = {
  4573. generic = {
  4574. - Eyesore Tinderbox Pipedream Deathtrap Jawbreaker Crybaby Spoilsport Pottymouth Whippersnapper Stepchild Homewrecker Roadkill Malcontent "Loose Cannon" Butterfingers Snapperhead "Hissy Fit" Sourpuss "Sucker Punch" Gutbuster "I Hate Everything" Highwayman Outlaw "Turbulent Priest" "Sea Monkey" "Dairy Farmer" "Morally Bankrupt" "Mental Midget" "Bucket of Bolts" "Free Lunch" "Wallet Inspector" "Laughing Stock" Gunslinger Sellsword Rapscallion "Wayward Son" Braindrain "Inconspicuous Asteroid" "One Trick Pony" "Wide Load" "No Refunds" Fencesitter Blindspot "Ugly Stick" "Show's Over" "Four Lights" "Poetic Justice" "Foreign Object" "Why Me" "Last Straw" "Designated Driver" "Comet Sighted!" "Slapped Together" "Lowest Bidder" "Wet Blanket" "Sordid Methods" "Broken Record" "Gender Bender" Ne'er-do-well Grotesque "Impudent Whelp" "Harsh Language" "Public Servant" "Love Is In The Air" "Class Act" Ineptitude Malaise "Deviant Citizen" Chomper "Diminishing Returns" "Calculated Risk" "Logistical Nightmare" "Come Closer" "Soylent Green" "Tunnel of Love" "Gross Negligence" "Another Mouth To Feed" "No Refunds" Blunderbuss "Catch Me If You Can" Obscenity "Holier Than Thou" "Open Wide" Target Bullseye Taxman Solicitor "Red Dread" "Missing Link" "Duct Taped" "Robber Baron" "Affront to Nature" "Queen Xoggra's Revenge" "Total Loss" "Village Idiot" Tattletale Filibuster "Smarmy Toad" "Mangy Cur" Cityslicker "Depth Perception" "This Way" "Mysterious Rash" "Divine Intervention" Crossbones "Jolly Roger" "No Surrender" "No Quarter" "Victim of Circumstance" "Red Flag" "Product of Society" "Under Evaluation" "Flying Coffin" "Gilded Cage" "Disgruntled Worker" "Of Sound Mind" "Ivory Tower" "Bastard Son" "Carpet Sample" "Scarlet Tentacle" "Down In Front" "Learning Experience VII" "Lowest Common Denominator" "Glory Days" "Gripping Appendage" "Desperate Pauper" "Born Lucky" "Boltragg's Folly" "My First Ship IV" "Base Instincts" "Check Please" "Infinite Loop" "Lazy Morning" "Consequences Be Damned" "Runtime Error" "Pointless Platitude" "Grey Matter" "Conscientious Objector" "Unexplained Itch" Anarchist "Out of Control" "Unexpected Obstacle" "Toxic Behavior" "Controlled Explosion" Fugitive "Happy Camper" "Unfortunate Ending" "Criminally Insane" "Not Guilty" "Double Jeopardy" "Perfect Pitch" "Pedal to the Metal" Mistrial "Lump of Coal" "I Am Truly Sorry" "Dark Forecast" "Apologies in Advance" "Reduced To This" "Surprise Encounter" "Meat Locker" "Cardiac Arrest" "Piece of Junk" "I Didn't Want This" "Bottom Line" "With Abandon" "Do Not Respond" "Unsound Methods" "Beast of Burden" "Red Claw" "Flying Dorgabloid" "No Laughing Matter" "Nothing Personal" "Great Experiment" "Looks Like Trouble" "Turning Point" "Curse of Zuldaxim" Scalawag Guttersnipe "Murderous Intent" "If Looks Could Kill" "What Sorcery Is This" Untranslatable "Liquid Courage" "Attention Seeker" "Your Female Parent" "Juvenile Delinquent" "Mystery Meat" "Slippery Slope" Knucklehead "Spirit of Zalussa" "Empty Gesture" "Annoying Pest" "Zarga's Ship" "Zarga's Other Ship" "Killing Implement" "Blunt Object" "The General Xarg" "Blockade Runner" "Innocent Bystander" Reprobate "Lacking Purpose" "Beyond Salvation" "This Too Shall Pass" "Guilty Pleasure" "Exploratory Surgery" "Inelegant Solution" Ragamuffin "Under New Ownership" "Resonance Cascade" "Festering Wound" "Red Smile" Rabble-rouser "Mysterious Stranger" "Process of Elimination" Wastrel Poppycock Hogwash Balderdash "Enough Lollygagging" "Prone to Hysteria" "Star Beggar" "Grace Under Pressure" Brainiac Nogoodnik Pockmark "Dream Shatterer" Oathbreaker Turncoat "Do The Math" "By The Numbers" Mishap Harridan "Big Boy" "Teacher's Pet" Destitute "Hell's Bells" Beguiler "Critical Mass" "Star Wench" "Double Standard" Half-wit Dunderhead Numbskull "Blind Fury" "Curse You All" "Carrion Eater" Unbidden "Pound of Flesh" "Pucker Up" "Short Fuse" Killjoy Footpad "Road Agent" Bushranger Simpleton Ignoramus "Not What It Seems" "Reprehensible" Intolerant Petulant "Deceiving Looks" "Pillage and Reconciliation" "An Arrow in Flight" "Gun-to-Head" Megalomanic "Petty Theft" "Grand Larceny" "Pop Up" "A Promise Kept" "Frag Machine" "Unrepentant Camper" "Impersonal Space" "Fallen Pillar" "Motion Tabled" Aimbot "Attack on Freighter" "The Slings" "The Arrows" "Outrageous Fortune" "Thermopylaeic" "Pyrrhic and Proud" "Wiggling Bait" "Shoot for Loot" "Feature Creep" "Creepy Feats" "Tone Deaf Siren" "No Good" "The Worst Thing" "Oh! That's a Pirate" "Science Ship Killer" Ravageoid "Violence-Liker" "Illegal Repercussions" "Shameless Plagiarist" "Dove & Crow" "Alcheringa" "Barnacle Jim" "Charles in Charge" Ganker "Manus Celer Dei" "Fatum Iustum Stultorum" "Strange Aeons" "Red Queen" Jabberwock Boojum Snark
  4575. + Eyesore Tinderbox Pipedream Deathtrap Jawbreaker Crybaby Spoilsport Pottymouth Whippersnapper Stepchild Homewrecker Roadkill Malcontent "Loose Cannon" Butterfingers Snapperhead "Hissy Fit" Sourpuss "Sucker Punch" Gutbuster "I Hate Everything" Highwayman Outlaw "Turbulent Priest" "Sea Monkey" "Dairy Farmer" "Morally Bankrupt" "Mental Midget" "Bucket of Bolts" "Free Lunch" "Wallet Inspector" "Laughing Stock" Gunslinger Sellsword Rapscallion "Wayward Son" Braindrain "Inconspicuous Asteroid" "One Trick Pony" "Wide Load" "No Refunds" Fencesitter Blindspot "Ugly Stick" "Show's Over" "Four Lights" "Poetic Justice" "Foreign Object" "Why Me" "Last Straw" "Designated Driver" "Comet Sighted!" "Slapped Together" "Lowest Bidder" "Wet Blanket" "Sordid Methods" "Broken Record" Ne'er-do-well Grotesque "Impudent Whelp" "Harsh Language" "Public Servant" "Love Is In The Air" "Class Act" Ineptitude Malaise "Deviant Citizen" Chomper "Diminishing Returns" "Calculated Risk" "Logistical Nightmare" "Come Closer" "Soylent Green" "Tunnel of Love" "Gross Negligence" "Another Mouth To Feed" "No Refunds" Blunderbuss "Catch Me If You Can" Obscenity "Holier Than Thou" "Open Wide" Target Bullseye Taxman Solicitor "Red Dread" "Missing Link" "Duct Taped" "Robber Baron" "Affront to Nature" "Queen Xoggra's Revenge" "Total Loss" "Village Idiot" Tattletale Filibuster "Smarmy Toad" "Mangy Cur" Cityslicker "Depth Perception" "This Way" "Mysterious Rash" "Divine Intervention" Crossbones "Jolly Roger" "No Surrender" "No Quarter" "Victim of Circumstance" "Red Flag" "Product of Society" "Under Evaluation" "Flying Coffin" "Gilded Cage" "Disgruntled Worker" "Of Sound Mind" "Ivory Tower" "Bastard Son" "Carpet Sample" "Scarlet Tentacle" "Down In Front" "Learning Experience VII" "Lowest Common Denominator" "Glory Days" "Gripping Appendage" "Desperate Pauper" "Born Lucky" "Boltragg's Folly" "My First Ship IV" "Base Instincts" "Check Please" "Infinite Loop" "Lazy Morning" "Consequences Be Damned" "Runtime Error" "Pointless Platitude" "Grey Matter" "Conscientious Objector" "Unexplained Itch" Anarchist "Out of Control" "Unexpected Obstacle" "Toxic Behavior" "Controlled Explosion" Fugitive "Happy Camper" "Unfortunate Ending" "Criminally Insane" "Not Guilty" "Double Jeopardy" "Perfect Pitch" "Pedal to the Metal" Mistrial "Lump of Coal" "I Am Truly Sorry" "Dark Forecast" "Apologies in Advance" "Reduced To This" "Surprise Encounter" "Meat Locker" "Cardiac Arrest" "Piece of Junk" "I Didn't Want This" "Bottom Line" "With Abandon" "Do Not Respond" "Unsound Methods" "Beast of Burden" "Red Claw" "Flying Dorgabloid" "No Laughing Matter" "Nothing Personal" "Great Experiment" "Looks Like Trouble" "Turning Point" "Curse of Zuldaxim" Scalawag Guttersnipe "Murderous Intent" "If Looks Could Kill" "What Sorcery Is This" Untranslatable "Liquid Courage" "Attention Seeker" "Your Female Parent" "Juvenile Delinquent" "Mystery Meat" "Slippery Slope" Knucklehead "Spirit of Zalussa" "Empty Gesture" "Annoying Pest" "Zarga's Ship" "Zarga's Other Ship" "Killing Implement" "Blunt Object" "The General Xarg" "Blockade Runner" "Innocent Bystander" Reprobate "Lacking Purpose" "Beyond Salvation" "This Too Shall Pass" "Guilty Pleasure" "Exploratory Surgery" "Inelegant Solution" Ragamuffin "Under New Ownership" "Resonance Cascade" "Festering Wound" "Red Smile" Rabble-rouser "Mysterious Stranger" "Process of Elimination" Wastrel Poppycock Hogwash Balderdash "Enough Lollygagging" "Prone to Hysteria" "Star Beggar" "Grace Under Pressure" Brainiac Nogoodnik Pockmark "Dream Shatterer" Oathbreaker Turncoat "Do The Math" "By The Numbers" Mishap Harridan "Big Boy" "Teacher's Pet" Destitute "Hell's Bells" Beguiler "Critical Mass" "Star Wench" "Double Standard" Half-wit Dunderhead Numbskull "Blind Fury" "Curse You All" "Carrion Eater" Unbidden "Pound of Flesh" "Pucker Up" "Short Fuse" Killjoy Footpad "Road Agent" Bushranger Simpleton Ignoramus "Not What It Seems" "Reprehensible" Intolerant Petulant "Deceiving Looks" "Pillage and Reconciliation" "An Arrow in Flight" "Gun-to-Head" Megalomanic "Petty Theft" "Grand Larceny" "Pop Up" "A Promise Kept" "Frag Machine" "Unrepentant Camper" "Impersonal Space" "Fallen Pillar" "Motion Tabled" Aimbot "Attack on Freighter" "The Slings" "The Arrows" "Outrageous Fortune" "Thermopylaeic" "Pyrrhic and Proud" "Wiggling Bait" "Shoot for Loot" "Feature Creep" "Creepy Feats" "Tone Deaf Siren" "No Good" "The Worst Thing" "Oh! That's a Pirate" "Science Ship Killer" Ravageoid "Violence-Liker" "Illegal Repercussions" "Shameless Plagiarist" "Dove & Crow" "Alcheringa" "Barnacle Jim" "Charles in Charge" Ganker "Manus Celer Dei" "Fatum Iustum Stultorum" "Strange Aeons" "Red Queen" Jabberwock Boojum Snark
  4576. }
  4577.  
  4578. corvette = {
  4579. diff --git a/2.0.0/common/name_lists/REP1.txt b/2.0.2/common/name_lists/REP1.txt
  4580. index 6bfff81..a1cf93a 100755
  4581. --- a/2.0.0/common/name_lists/REP1.txt
  4582. +++ b/2.0.2/common/name_lists/REP1.txt
  4583. @@ -97,6 +97,18 @@ REP1 = {
  4584. gene_warrior_army = {
  4585. sequential_name = "%O% Warrior Order"
  4586. }
  4587. +
  4588. + occupation_army = {
  4589. + sequential_name = "%O% Occupation Guard"
  4590. + }
  4591. +
  4592. + robotic_occupation_army = {
  4593. + sequential_name = "%O% Occupation Nexus"
  4594. + }
  4595. +
  4596. + android_occupation_army = {
  4597. + sequential_name = "%O% Occupation Synths"
  4598. + }
  4599. }
  4600.  
  4601. planet_names = {
  4602. diff --git a/2.0.0/common/name_lists/REP2.txt b/2.0.2/common/name_lists/REP2.txt
  4603. index 9b93577..6aaba1d 100755
  4604. --- a/2.0.0/common/name_lists/REP2.txt
  4605. +++ b/2.0.2/common/name_lists/REP2.txt
  4606. @@ -95,6 +95,18 @@ REP2 = {
  4607. gene_warrior_army = {
  4608. sequential_name = "%O% Mutant Elites"
  4609. }
  4610. +
  4611. + occupation_army = {
  4612. + sequential_name = "%O% Occupation Patrol"
  4613. + }
  4614. +
  4615. + robotic_occupation_army = {
  4616. + sequential_name = "%O% Construct Garrison"
  4617. + }
  4618. +
  4619. + android_occupation_army = {
  4620. + sequential_name = "%O% Android Garrison"
  4621. + }
  4622. }
  4623.  
  4624. planet_names = {
  4625. diff --git a/2.0.0/common/name_lists/REP3.txt b/2.0.2/common/name_lists/REP3.txt
  4626. index 83942b0..63271ef 100755
  4627. --- a/2.0.0/common/name_lists/REP3.txt
  4628. +++ b/2.0.2/common/name_lists/REP3.txt
  4629. @@ -96,6 +96,18 @@ REP3 = {
  4630. gene_warrior_army = {
  4631. sequential_name = "%O% Enhanced Legion"
  4632. }
  4633. +
  4634. + occupation_army = {
  4635. + sequential_name = "%O% Occupation Legion"
  4636. + }
  4637. +
  4638. + robotic_occupation_army = {
  4639. + sequential_name = "%O% Automated Garrison"
  4640. + }
  4641. +
  4642. + android_occupation_army = {
  4643. + sequential_name = "%O% Mimic Garrison"
  4644. + }
  4645. }
  4646.  
  4647. planet_names = {
  4648. diff --git a/2.0.0/common/name_lists/REP4.txt b/2.0.2/common/name_lists/REP4.txt
  4649. index 190cb3f..c56263a 100755
  4650. --- a/2.0.0/common/name_lists/REP4.txt
  4651. +++ b/2.0.2/common/name_lists/REP4.txt
  4652. @@ -109,6 +109,18 @@ REP4 = {
  4653. gene_warrior_army = {
  4654. sequential_name = "%O% Enhanced Force"
  4655. }
  4656. +
  4657. + occupation_army = {
  4658. + sequential_name = "%O% Garrison Force"
  4659. + }
  4660. +
  4661. + robotic_occupation_army = {
  4662. + sequential_name = "%O% Bot Garrison"
  4663. + }
  4664. +
  4665. + android_occupation_army = {
  4666. + sequential_name = "%O% Synth Garrison"
  4667. + }
  4668. }
  4669.  
  4670. planet_names = {
  4671. diff --git a/2.0.0/common/observation_station_missions/00_missions.txt b/2.0.2/common/observation_station_missions/00_missions.txt
  4672. index 84cee00..b587980 100755
  4673. --- a/2.0.0/common/observation_station_missions/00_missions.txt
  4674. +++ b/2.0.2/common/observation_station_missions/00_missions.txt
  4675. @@ -84,7 +84,7 @@ native_indoctrination = {
  4676. }
  4677.  
  4678. gain = {
  4679. - society_research = 6
  4680. + society_research = 10
  4681. }
  4682.  
  4683. #planet_modifier = native_indoctrination
  4684. diff --git a/2.0.0/common/on_actions/00_on_actions.txt b/2.0.2/common/on_actions/00_on_actions.txt
  4685. index 802937f..2193fc0 100755
  4686. --- a/2.0.0/common/on_actions/00_on_actions.txt
  4687. +++ b/2.0.2/common/on_actions/00_on_actions.txt
  4688. @@ -1,7 +1,6 @@
  4689. # No scope, like on_game_start
  4690. on_monthly_pulse = {
  4691. events = {
  4692. - guardian.10
  4693. unrest.162
  4694. unrest.164
  4695. syndaw.100 # servitor morale
  4696. @@ -12,9 +11,11 @@ on_monthly_pulse = {
  4697. marauder.113
  4698. guardian.170
  4699. guardian.172
  4700. + guardian.174
  4701. action.85 # flip planets to starbase owner
  4702. marauder.150 # AI hires Marauder raids
  4703. marauder.151 # AI hires Marauder mercs
  4704. + action.92 # make sure the swarm infests
  4705. action.90 # rebuild outpost for orphaned colonies
  4706. unrest.166
  4707. }
  4708. @@ -23,6 +24,7 @@ on_monthly_pulse = {
  4709. # No scope, like on_game_start
  4710. on_yearly_pulse = {
  4711. events = {
  4712. + guardian.10
  4713. pirate.4
  4714. crisis.204
  4715. crisis.205
  4716. @@ -36,6 +38,7 @@ on_yearly_pulse = {
  4717. crisis.122
  4718. marauder.85
  4719. marauder.160
  4720. + marauder.699
  4721. }
  4722. }
  4723.  
  4724. @@ -84,6 +87,16 @@ on_game_start_country = {
  4725. }
  4726. }
  4727.  
  4728. +on_mid_game_pulse = {
  4729. + events = {
  4730. + guardian.2011 # spawn wraith
  4731. + guardian.20101 # remove too-late wraith discovery
  4732. + }
  4733. +}
  4734. +
  4735. +on_late_game_pulse = {
  4736. +}
  4737. +
  4738. # setup advanced colony. So far it has a pop on the capital and a colony shelter building matching the is_colony trigger
  4739. # scope: planet
  4740. # from: country
  4741. @@ -360,7 +373,6 @@ on_survey = {
  4742. #precursor.2200
  4743. #precursor.2201
  4744. guardian.2010
  4745. - action.54
  4746. }
  4747.  
  4748. random_events = {
  4749. @@ -380,7 +392,6 @@ on_survey = {
  4750. # FromFrom = Fleet of the science ship that surveyed it, if any
  4751. on_planet_surveyed = {
  4752. events = {
  4753. - action.33
  4754. action.46
  4755. country.259
  4756. }
  4757. @@ -437,7 +448,6 @@ on_colonized = {
  4758. tutorial.444 #Increase num_colonies variable
  4759. #factions.105 # Colonialists New Colony
  4760. akx.9499
  4761. - #action.55
  4762. }
  4763. }
  4764.  
  4765. @@ -581,6 +591,7 @@ on_fleet_destroyed_perp = {
  4766. story.409
  4767. anomaly.3101
  4768. anomaly.3120
  4769. + anomaly.3121
  4770. galactic_features.360
  4771. crisis.1111
  4772. crisis.70
  4773. @@ -864,14 +875,6 @@ on_planet_zero_health_ground_combat = {
  4774. }
  4775. }
  4776.  
  4777. -# Planet has reached 0 pops from collateral damage
  4778. -# This = Planet
  4779. -# From = Army Owner
  4780. -on_planet_zero_pops = {
  4781. - events = {
  4782. - }
  4783. -}
  4784. -
  4785. # Pop is enslaved
  4786. # This = Pop scope
  4787. # owner_species = { (species)
  4788. @@ -1061,6 +1064,7 @@ on_tech_increased = {
  4789. #crisis.2190
  4790. anomaly.1191
  4791. anomaly.1193
  4792. + action.55
  4793. }
  4794. }
  4795.  
  4796. @@ -1072,6 +1076,7 @@ on_tech_increased = {
  4797. on_modification_complete = {
  4798. events = {
  4799. tutorial.65
  4800. + utopia.2508 # Handle leader traits after species modification
  4801. utopia.6001 # Hive Mind species integration
  4802. }
  4803. }
  4804. @@ -1112,9 +1117,9 @@ on_emergency_ftl = {
  4805. }
  4806. }
  4807.  
  4808. -#A building construction has been completed.
  4809. -# This = Army
  4810. -# From = Planet
  4811. +#An army construction has been completed.
  4812. +# This = Planet
  4813. +# From = Army
  4814. on_army_recruited = {
  4815. events = {
  4816. }
  4817. @@ -1405,7 +1410,6 @@ on_country_destroyed = {
  4818. # FromFromFrom = Fleet
  4819. on_megastructure_built = {
  4820. events = {
  4821. - #action.52
  4822. utopia.2000
  4823. utopia.4000
  4824. utopia.4100
  4825. @@ -1432,7 +1436,6 @@ on_megastructure_upgrade_begin = {
  4826. # FromFrom = System
  4827. on_megastructure_upgraded = {
  4828. events = {
  4829. - #action.53
  4830. utopia.2003
  4831. utopia.2004
  4832. utopia.4001
  4833. @@ -1639,6 +1642,7 @@ on_colony_10_years_old = {
  4834. # scope: country, from: leader
  4835. on_leader_spawned = {
  4836. events = {
  4837. + utopia.2509 # New Leaders Get Erudite Trait
  4838. utopia.2510 # New Leaders Get Cyborg Trait
  4839. utopia.2560 # New Leaders Get Synthetic Trait
  4840. utopia.2651 # New Leaders Get Psionic Trait
  4841. @@ -1724,3 +1728,10 @@ on_jump_drive = {
  4842. action.89
  4843. }
  4844. }
  4845. +
  4846. +# this = country
  4847. +on_pirate_spawn = {
  4848. + events = {
  4849. + pirate.49
  4850. + }
  4851. +}
  4852. \ No newline at end of file
  4853. diff --git a/2.0.0/common/opinion_modifiers/00_opinion_modifiers.txt b/2.0.2/common/opinion_modifiers/00_opinion_modifiers.txt
  4854. index 6b6bddd..db7d0a9 100755
  4855. --- a/2.0.0/common/opinion_modifiers/00_opinion_modifiers.txt
  4856. +++ b/2.0.2/common/opinion_modifiers/00_opinion_modifiers.txt
  4857. @@ -1424,7 +1424,7 @@ opinion_declared_rival = {
  4858. # Ally of ally
  4859. opinion_ally_of_ally = {
  4860. opinion = {
  4861. - base = 15
  4862. + base = 25
  4863. }
  4864.  
  4865. unique = yes
  4866. @@ -1434,7 +1434,7 @@ opinion_ally_of_ally = {
  4867. # Mutual rival opinion modifier
  4868. opinion_mutual_rival = {
  4869. opinion = {
  4870. - base = 25
  4871. + base = 50
  4872. }
  4873.  
  4874. unique = yes
  4875. @@ -1452,7 +1452,7 @@ opinion_mutual_threat = {
  4876. # Allied to rival opinion modifier
  4877. opinion_allied_to_rival = {
  4878. opinion = {
  4879. - base = -50
  4880. + base = -100
  4881. }
  4882.  
  4883. unique = yes
  4884. @@ -1461,7 +1461,7 @@ opinion_allied_to_rival = {
  4885. # Rivaling ally
  4886. opinion_rivals_with_ally = {
  4887. opinion = {
  4888. - base = -50
  4889. + base = -100
  4890. }
  4891.  
  4892. unique = yes
  4893. @@ -2485,12 +2485,28 @@ opinion_cracked_a_world = {
  4894. opinion = {
  4895. base = -100
  4896. }
  4897. +
  4898. + accumulative = yes
  4899. +
  4900. + min = -500
  4901. +
  4902. + decay = {
  4903. + base = 1
  4904. + }
  4905. }
  4906.  
  4907. opinion_cracked_an_uninhabited_world = {
  4908. opinion = {
  4909. base = -30
  4910. }
  4911. +
  4912. + accumulative = yes
  4913. +
  4914. + min = -150
  4915. +
  4916. + decay = {
  4917. + base = 1
  4918. + }
  4919. }
  4920.  
  4921. # Cracked My Planet Like an Egg (victim Empire's opinion of world cracker)
  4922. @@ -2498,24 +2514,56 @@ opinion_cracked_my_world = {
  4923. opinion = {
  4924. base = -1000
  4925. }
  4926. +
  4927. + accumulative = yes
  4928. +
  4929. + min = -5000
  4930. +
  4931. + decay = {
  4932. + base = 1
  4933. + }
  4934. }
  4935.  
  4936. opinion_cracked_my_uninhabited_world = {
  4937. opinion = {
  4938. base = -300
  4939. }
  4940. +
  4941. + accumulative = yes
  4942. +
  4943. + min = -1500
  4944. +
  4945. + decay = {
  4946. + base = 1
  4947. + }
  4948. }
  4949.  
  4950. opinion_cracked_a_primitive_world = {
  4951. opinion = {
  4952. base = -40
  4953. }
  4954. +
  4955. + accumulative = yes
  4956. +
  4957. + min = -200
  4958. +
  4959. + decay = {
  4960. + base = 1
  4961. + }
  4962. }
  4963.  
  4964. opinion_cracked_a_primitive_world_phile = {
  4965. opinion = {
  4966. base = -60
  4967. }
  4968. +
  4969. + accumulative = yes
  4970. +
  4971. + min = -300
  4972. +
  4973. + decay = {
  4974. + base = 1
  4975. + }
  4976. }
  4977.  
  4978.  
  4979. @@ -2524,70 +2572,166 @@ opinion_swept_a_world = {
  4980. opinion = {
  4981. base = -80
  4982. }
  4983. +
  4984. + accumulative = yes
  4985. +
  4986. + min = -400
  4987. +
  4988. + decay = {
  4989. + base = 1
  4990. + }
  4991. }
  4992.  
  4993. opinion_swept_my_world = {
  4994. opinion = {
  4995. base = -800
  4996. }
  4997. +
  4998. + accumulative = yes
  4999. +
  5000. + min = -4000
  5001. +
  5002. + decay = {
  5003. + base = 1
  5004. + }
  5005. }
  5006.  
  5007. opinion_swept_a_primitive_world = {
  5008. opinion = {
  5009. base = -40
  5010. }
  5011. +
  5012. + accumulative = yes
  5013. +
  5014. + min = -200
  5015. +
  5016. + decay = {
  5017. + base = 1
  5018. + }
  5019. }
  5020.  
  5021. opinion_swept_a_primitive_world_phile = {
  5022. opinion = {
  5023. base = -60
  5024. }
  5025. +
  5026. + accumulative = yes
  5027. +
  5028. + min = -300
  5029. +
  5030. + decay = {
  5031. + base = 1
  5032. + }
  5033. }
  5034.  
  5035. opinion_assimilated_a_world = {
  5036. opinion = {
  5037. base = -60
  5038. }
  5039. +
  5040. + accumulative = yes
  5041. +
  5042. + min = -300
  5043. +
  5044. + decay = {
  5045. + base = 1
  5046. + }
  5047. }
  5048.  
  5049. opinion_assimilated_my_world = {
  5050. opinion = {
  5051. base = -600
  5052. }
  5053. +
  5054. + accumulative = yes
  5055. +
  5056. + min = -3000
  5057. +
  5058. + decay = {
  5059. + base = 1
  5060. + }
  5061. }
  5062.  
  5063. opinion_assimilated_a_primitive_world = {
  5064. opinion = {
  5065. base = -40
  5066. }
  5067. +
  5068. + accumulative = yes
  5069. +
  5070. + min = -200
  5071. +
  5072. + decay = {
  5073. + base = 1
  5074. + }
  5075. }
  5076.  
  5077. opinion_assimilated_a_primitive_world_phile = {
  5078. opinion = {
  5079. base = -60
  5080. }
  5081. +
  5082. + accumulative = yes
  5083. +
  5084. + min = -300
  5085. +
  5086. + decay = {
  5087. + base = 1
  5088. + }
  5089. }
  5090.  
  5091. opinion_converted_a_world = {
  5092. opinion = {
  5093. base = -40
  5094. }
  5095. +
  5096. + accumulative = yes
  5097. +
  5098. + min = -200
  5099. +
  5100. + decay = {
  5101. + base = 1
  5102. + }
  5103. }
  5104.  
  5105. opinion_converted_my_world = {
  5106. opinion = -400
  5107. +
  5108. + accumulative = yes
  5109. +
  5110. + min = -2000
  5111. +
  5112. + decay = {
  5113. + base = 1
  5114. + }
  5115. }
  5116.  
  5117. opinion_shielded_a_world = {
  5118. opinion = {
  5119. base = -20
  5120. }
  5121. +
  5122. + accumulative = yes
  5123. +
  5124. + min = -100
  5125. +
  5126. + decay = {
  5127. + base = 1
  5128. + }
  5129. }
  5130.  
  5131. opinion_shielded_my_world = {
  5132. opinion = {
  5133. base = -200
  5134. }
  5135. +
  5136. + accumulative = yes
  5137. +
  5138. + min = -1000
  5139. +
  5140. + decay = {
  5141. + base = 1
  5142. + }
  5143. }
  5144.  
  5145. opinion_worships_our_holy_world = {
  5146. diff --git a/2.0.0/common/personalities/00_personalities.txt b/2.0.2/common/personalities/00_personalities.txt
  5147. index f29a2ad..684e200 100755
  5148. --- a/2.0.0/common/personalities/00_personalities.txt
  5149. +++ b/2.0.2/common/personalities/00_personalities.txt
  5150. @@ -664,7 +664,16 @@ slaving_despots = {
  5151. }
  5152.  
  5153. weight_modifier = {
  5154. - weight = 200
  5155. + weight = 1
  5156. + modifier = {
  5157. + factor = 100
  5158. + OR = {
  5159. + has_valid_civic = "civic_slaver_guilds"
  5160. + has_trait = "trait_decadent"
  5161. + has_ethic = "ethic_xenophobe"
  5162. + has_ethic = "ethic_fanatic_xenophobe"
  5163. + }
  5164. + }
  5165. }
  5166. }
  5167.  
  5168. diff --git a/2.0.0/common/personalities/01_fallen_empire_personalities.txt b/2.0.2/common/personalities/01_fallen_empire_personalities.txt
  5169. index 8497e10..0f215ad 100755
  5170. --- a/2.0.0/common/personalities/01_fallen_empire_personalities.txt
  5171. +++ b/2.0.2/common/personalities/01_fallen_empire_personalities.txt
  5172. @@ -1,6 +1,6 @@
  5173. fallen_empire_spiritualist = {
  5174. aggressiveness = 1.5
  5175. - trade_willingness = 0.5
  5176. + trade_willingness = 0.33
  5177. bravery = 2.0
  5178. combat_bravery = 1.25
  5179.  
  5180. @@ -40,7 +40,7 @@ fallen_empire_spiritualist = {
  5181.  
  5182. fallen_empire_materialist = {
  5183. aggressiveness = 1.0
  5184. - trade_willingness = 0.75
  5185. + trade_willingness = 0.5
  5186. bravery = 2.0
  5187. combat_bravery = 1.25
  5188.  
  5189. @@ -117,7 +117,7 @@ fallen_empire_xenophobe = {
  5190.  
  5191. fallen_empire_xenophile = {
  5192. aggressiveness = 0.5
  5193. - trade_willingness = 1.0
  5194. + trade_willingness = 0.5
  5195. bravery = 2.0
  5196. combat_bravery = 1.25
  5197.  
  5198. @@ -155,7 +155,7 @@ fallen_empire_xenophile = {
  5199.  
  5200. awakened_fallen_empire_spiritualist = {
  5201. aggressiveness = 1.5
  5202. - trade_willingness = 0.5
  5203. + trade_willingness = 0.33
  5204. bravery = 2.0
  5205. combat_bravery = 1.25
  5206.  
  5207. @@ -193,7 +193,7 @@ awakened_fallen_empire_spiritualist = {
  5208.  
  5209. awakened_fallen_empire_materialist = {
  5210. aggressiveness = 1.0
  5211. - trade_willingness = 0.75
  5212. + trade_willingness = 0.5
  5213. bravery = 2.0
  5214. combat_bravery = 1.25
  5215.  
  5216. @@ -270,7 +270,7 @@ awakened_fallen_empire_xenophobe = {
  5217.  
  5218. awakened_fallen_empire_xenophile = {
  5219. aggressiveness = 0.5
  5220. - trade_willingness = 1.0
  5221. + trade_willingness = 0.5
  5222. bravery = 2.0
  5223. combat_bravery = 1.25
  5224.  
  5225. @@ -309,7 +309,7 @@ awakened_fallen_empire_xenophile = {
  5226.  
  5227. fallen_empire_machine = {
  5228. aggressiveness = 1.0
  5229. - trade_willingness = 0.75
  5230. + trade_willingness = 0.5
  5231. bravery = 2.0
  5232. combat_bravery = 1.25
  5233.  
  5234. @@ -347,7 +347,7 @@ fallen_empire_machine = {
  5235.  
  5236. awakened_fallen_empire_machine = {
  5237. aggressiveness = 1.0
  5238. - trade_willingness = 0.75
  5239. + trade_willingness = 0.5
  5240. bravery = 2.0
  5241. combat_bravery = 1.25
  5242.  
  5243. diff --git a/2.0.0/common/pop_faction_types/00_prosperity.txt b/2.0.2/common/pop_faction_types/00_prosperity.txt
  5244. index 091f63d..dd1e7fa 100755
  5245. --- a/2.0.0/common/pop_faction_types/00_prosperity.txt
  5246. +++ b/2.0.2/common/pop_faction_types/00_prosperity.txt
  5247. @@ -217,14 +217,7 @@ prosperity = {
  5248.  
  5249. trigger = {
  5250. owner = {
  5251. - OR = {
  5252. - has_tradition = tr_prosperity_adopt
  5253. - has_tradition = tr_prosperity_sct
  5254. - has_tradition = tr_prosperity_administrative_operations
  5255. - has_tradition = tr_prosperity_fleet_logistical_corps
  5256. - has_tradition = tr_prosperity_trans_stellar_corporations
  5257. - has_tradition = tr_prosperity_pursuit_of_profit
  5258. - }
  5259. + has_tradition = "tr_prosperity_adopt"
  5260. }
  5261. }
  5262. }
  5263. diff --git a/2.0.0/common/pop_faction_types/00_technologist.txt b/2.0.2/common/pop_faction_types/00_technologist.txt
  5264. index 8862479..f464164 100755
  5265. --- a/2.0.0/common/pop_faction_types/00_technologist.txt
  5266. +++ b/2.0.2/common/pop_faction_types/00_technologist.txt
  5267. @@ -180,6 +180,7 @@ technologist = {
  5268. potential = {
  5269. exists = owner
  5270. owner = {
  5271. + NOT = { has_ascension_perk = ap_synthetic_evolution }
  5272. any_relation = {
  5273. has_communications = root.owner
  5274. any_owned_pop = {
  5275. @@ -225,14 +226,7 @@ technologist = {
  5276.  
  5277. trigger = {
  5278. owner = {
  5279. - OR = {
  5280. - has_tradition = tr_discovery_adopt
  5281. - has_tradition = tr_discovery_to_boldly_go
  5282. - has_tradition = tr_discovery_planetary_survey_corps
  5283. - has_tradition = tr_discovery_science_division
  5284. - has_tradition = tr_discovery_polytechnic_education
  5285. - has_tradition = tr_discovery_faith_in_science
  5286. - }
  5287. + has_tradition = "tr_discovery_adopt"
  5288. }
  5289. }
  5290. }
  5291. diff --git a/2.0.0/common/pop_faction_types/00_totalitarian.txt b/2.0.2/common/pop_faction_types/00_totalitarian.txt
  5292. index 41fc44d..b67368e 100755
  5293. --- a/2.0.0/common/pop_faction_types/00_totalitarian.txt
  5294. +++ b/2.0.2/common/pop_faction_types/00_totalitarian.txt
  5295. @@ -255,14 +255,7 @@ totalitarian = {
  5296.  
  5297. trigger = {
  5298. owner = {
  5299. - OR = {
  5300. has_tradition = "tr_domination_adopt"
  5301. - has_tradition = "tr_domination_colonial_viceroys"
  5302. - has_tradition = "tr_domination_protection_racket"
  5303. - has_tradition = "tr_domination_star_lords"
  5304. - has_tradition = "tr_domination_fleet_levies"
  5305. - has_tradition = "tr_domination_vassal_acculturation"
  5306. - }
  5307. }
  5308. }
  5309. }
  5310. diff --git a/2.0.0/common/pop_faction_types/00_traditionalist.txt b/2.0.2/common/pop_faction_types/00_traditionalist.txt
  5311. index 7f0923a..16e7948 100755
  5312. --- a/2.0.0/common/pop_faction_types/00_traditionalist.txt
  5313. +++ b/2.0.2/common/pop_faction_types/00_traditionalist.txt
  5314. @@ -403,14 +403,7 @@ traditionalist = {
  5315.  
  5316. trigger = {
  5317. owner = {
  5318. - OR = {
  5319. - has_tradition = tr_harmony_adopt
  5320. - has_tradition = tr_harmony_the_greater_good
  5321. - has_tradition = tr_harmony_kinship
  5322. - has_tradition = tr_harmony_utopian_dream
  5323. - has_tradition = tr_harmony_bulwark_of_harmony
  5324. - has_tradition = tr_harmony_mind_and_body
  5325. - }
  5326. + has_tradition = "tr_harmony_adopt"
  5327. }
  5328. }
  5329. }
  5330. diff --git a/2.0.0/common/pop_faction_types/00_xenoist.txt b/2.0.2/common/pop_faction_types/00_xenoist.txt
  5331. index 7e5eded..8bd8fbb 100755
  5332. --- a/2.0.0/common/pop_faction_types/00_xenoist.txt
  5333. +++ b/2.0.2/common/pop_faction_types/00_xenoist.txt
  5334. @@ -367,14 +367,7 @@ xenoist = {
  5335.  
  5336. trigger = {
  5337. owner = {
  5338. - OR = {
  5339. has_tradition = "tr_diplomacy_adopt"
  5340. - has_tradition = "tr_diplomacy_dynamic_ecomorphism"
  5341. - has_tradition = "tr_diplomacy_federal_unity"
  5342. - has_tradition = "tr_diplomacy_the_federation"
  5343. - has_tradition = "tr_diplomacy_entente_coordination"
  5344. - has_tradition = "tr_diplomacy_alien_tourism"
  5345. - }
  5346. }
  5347. }
  5348. }
  5349. diff --git a/2.0.0/common/random_names/base/00_random_names.txt b/2.0.2/common/random_names/base/00_random_names.txt
  5350. index 2d2a5fd..efa4167 100755
  5351. --- a/2.0.0/common/random_names/base/00_random_names.txt
  5352. +++ b/2.0.2/common/random_names/base/00_random_names.txt
  5353. @@ -72,6 +72,7 @@ black_hole_names = {
  5354. "Ascensions_End"
  5355. "Quiet_Dark"
  5356. "Abaddons_Demesne"
  5357. + "Eye_of_Hawking"
  5358. }
  5359.  
  5360. asteroid_prefix = {
  5361. @@ -320,7 +321,6 @@ star_names = {
  5362. "Beta_Hydri"
  5363. "Chi_Draconis"
  5364. "Delta_Pavonis"
  5365. - "Epsilon_Indi"
  5366. "Gamma_Draconis"
  5367. "Lambda_Serpentis"
  5368. "Omicron_Persei"
  5369. @@ -1665,6 +1665,37 @@ star_names = {
  5370. Majek
  5371. "Boro_Baba"
  5372. Kuiper
  5373. + Dristmak
  5374. + Sanach
  5375. + Iresta
  5376. + Kappler
  5377. + Mriik
  5378. + Jangal
  5379. + Baesta
  5380. + Corinth
  5381. + Aethos
  5382. + Unaria
  5383. + Folkel
  5384. + Zom
  5385. + Prythe
  5386. + Halvam
  5387. + Moscot
  5388. + Nietz
  5389. + Yamal
  5390. + Meskeban
  5391. + Fontral
  5392. + Lirril
  5393. + Ibanadar
  5394. + Voldox
  5395. + Prothon
  5396. + Ancastar
  5397. + Xolomon
  5398. + Rizor
  5399. + Gossomir
  5400. + Flestia
  5401. + Trinitar
  5402. + Wymos
  5403. + Immuthin
  5404. }
  5405.  
  5406. nebula_names = {
  5407. diff --git a/2.0.0/common/scripted_effects/00_scripted_effects.txt b/2.0.2/common/scripted_effects/00_scripted_effects.txt
  5408. index 48850df..bd84c47 100755
  5409. --- a/2.0.0/common/scripted_effects/00_scripted_effects.txt
  5410. +++ b/2.0.2/common/scripted_effects/00_scripted_effects.txt
  5411. @@ -4911,26 +4911,99 @@ generate_start_buildings_and_blockers = {
  5412. }
  5413.  
  5414. reset_start_buildings_and_blockers_post_apoc = { #Selectively resets necessary tiles for Post-Apoc Civic users. Relies on "generate_start_buildings_and_blockers" and game_start.32
  5415. + # Find capitol and buildings, and then remove them
  5416. + # this is needed because planet's deposits were re-rolled after
  5417. + every_tile = {
  5418. + limit = { has_building = yes }
  5419. + remove_building = yes
  5420. + }
  5421. + # Set up a new capitol and nearby buildings
  5422. random_tile = {
  5423. - limit = { has_building = "building_capital_1" }
  5424. + limit = { has_blocker = no has_building = no num_adjacent_tiles > 3 }
  5425. + if = {
  5426. + limit = {
  5427. + owner = { has_authority = auth_machine_intelligence }
  5428. + }
  5429. + set_building = "building_machine_capital_1"
  5430. + else = {
  5431. + set_building = "building_capital_1"
  5432. + }
  5433. + }
  5434. set_deposit = d_energy_deposit
  5435. random_neighboring_tile = {
  5436. - limit = { has_building = "building_hydroponics_farm_1" }
  5437. - clear_deposits = yes
  5438. + limit = { has_blocker = no has_building = no }
  5439. + set_building = "building_hydroponics_farm_1"
  5440. + set_deposit = d_farmland_deposit
  5441. }
  5442. random_neighboring_tile = {
  5443. - limit = { has_building = "building_hydroponics_farm_1" }
  5444. - clear_deposits = yes
  5445. + limit = { has_blocker = no has_building = no }
  5446. + set_building = "building_hydroponics_farm_1"
  5447. + set_deposit = d_farmland_deposit
  5448. + }
  5449. + random_neighboring_tile = {
  5450. + limit = { has_blocker = no has_building = no }
  5451. + set_building = "building_power_plant_1"
  5452. + set_deposit = d_rich_energy_deposit
  5453. + }
  5454. + random_neighboring_tile = {
  5455. + limit = { has_blocker = no has_building = no }
  5456. + set_building = "building_mining_network_1"
  5457. + set_deposit = d_rich_mineral_deposit
  5458. }
  5459. }
  5460. +
  5461. + # Add the lab
  5462. + # has pop = yes to make sure they use the tiles that were first generated for this task
  5463. random_tile = {
  5464. - limit = { has_building = "building_basic_science_lab_1" }
  5465. - clear_deposits = yes
  5466. - remove_building = yes
  5467. - set_building = "building_hydroponics_farm_1"
  5468. + limit = { has_blocker = no has_building = no has_pop = yes }
  5469. + set_building = "building_basic_science_lab_1"
  5470. + random_list = {
  5471. + 33 = {
  5472. + set_deposit = d_engineering_deposit
  5473. + }
  5474. + 33 = {
  5475. + set_deposit = d_society_deposit
  5476. + }
  5477. + 33 = {
  5478. + set_deposit = d_physics_deposit
  5479. + }
  5480. + }
  5481. + }
  5482. +
  5483. + # Add mine and power plant
  5484. + # has pop = yes to make sure they use the tiles that were first generated for this task
  5485. + random_tile = {
  5486. + limit = { has_blocker = no has_building = no has_pop = yes }
  5487. + set_building = "building_mining_network_1"
  5488. + set_deposit = d_mineral_deposit
  5489. }
  5490. random_tile = {
  5491. - limit = { has_deposit = "d_engineering_deposit" has_building = no }
  5492. + limit = { has_blocker = no has_building = no has_pop = yes }
  5493. + set_building = "building_power_plant_1"
  5494. + set_deposit = d_rich_energy_deposit
  5495. + }
  5496. +
  5497. + # Move pops to tiles
  5498. + every_tile = {
  5499. + limit = { has_building = yes has_pop = no }
  5500. +
  5501. + save_event_target_as = needs_worker
  5502. + planet = {
  5503. + random_pop = {
  5504. + limit = { tile = { has_building = no } }
  5505. +
  5506. + resettle_pop = {
  5507. + pop = this
  5508. + tile = event_target:needs_worker
  5509. + }
  5510. +
  5511. + }
  5512. + }
  5513. + }
  5514. +
  5515. + # Add blockers
  5516. + random_tile = {
  5517. + limit = { has_blocker = no has_building = no has_pop = no }
  5518. if = {
  5519. limit = {
  5520. owner = { has_civic = civic_machine_terminator }
  5521. @@ -4940,9 +5013,10 @@ reset_start_buildings_and_blockers_post_apoc = { #Selectively resets necessary t
  5522. set_blocker = "tb_bomb_crater"
  5523. }
  5524. }
  5525. + set_deposit = d_engineering_deposit
  5526. }
  5527. random_tile = {
  5528. - limit = { has_deposit = "d_society_deposit" has_building = no }
  5529. + limit = { has_blocker = no has_building = no has_pop = no }
  5530. if = {
  5531. limit = {
  5532. owner = { has_civic = civic_machine_terminator }
  5533. @@ -4952,21 +5026,23 @@ reset_start_buildings_and_blockers_post_apoc = { #Selectively resets necessary t
  5534. set_blocker = "tb_bomb_crater"
  5535. }
  5536. }
  5537. + set_deposit = d_society_deposit
  5538. }
  5539. random_tile = {
  5540. - limit = { has_deposit = "d_physics_deposit" has_building = no }
  5541. + limit = { has_blocker = no has_building = no has_pop = no }
  5542. if = {
  5543. limit = {
  5544. owner = { has_civic = civic_machine_terminator }
  5545. }
  5546. - set_blocker = "tb_exterminators_ruins"
  5547. + set_blocker = "tb_former_battlefield"
  5548. else = {
  5549. - set_blocker = "tb_radioactive_wasteland"
  5550. + set_blocker = "tb_bomb_crater"
  5551. }
  5552. }
  5553. + set_deposit = d_physics_deposit
  5554. }
  5555. random_tile = {
  5556. - limit = { has_deposit = "d_rich_energy_deposit" has_building = no }
  5557. + limit = { has_blocker = no has_building = no has_pop = no }
  5558. if = {
  5559. limit = {
  5560. owner = { has_civic = civic_machine_terminator }
  5561. @@ -4976,123 +5052,33 @@ reset_start_buildings_and_blockers_post_apoc = { #Selectively resets necessary t
  5562. set_blocker = "tb_radioactive_wasteland"
  5563. }
  5564. }
  5565. + set_deposit = d_rich_energy_deposit
  5566. }
  5567. random_tile = {
  5568. - limit = { has_deposit = "d_rich_farmland_deposit" has_building = no }
  5569. - random_list = {
  5570. - 33 = {
  5571. - set_deposit = d_engineering_deposit
  5572. - }
  5573. - 33 = {
  5574. - set_deposit = d_society_deposit
  5575. - }
  5576. - 33 = {
  5577. - set_deposit = d_physics_deposit
  5578. - }
  5579. - }
  5580. - }
  5581. - random_tile = { #turns one farm tile into empty tile
  5582. - limit = {
  5583. - OR = {
  5584. - has_deposit = "d_farmland_deposit"
  5585. - has_deposit = "d_rich_farmland_deposit"
  5586. - has_deposit = "d_mineral_food_deposit"
  5587. - has_deposit = "d_rich_food_mineral_deposit"
  5588. - has_deposit = "d_vast_farmland_deposit"
  5589. - has_deposit = "d_immense_farmland_deposit"
  5590. - }
  5591. - }
  5592. - clear_deposits = yes
  5593. - }
  5594. - every_tile = {
  5595. - limit = { has_deposit = "d_farmland_deposit" }
  5596. - clear_deposits = yes
  5597. - random_list = {
  5598. - 35 = {
  5599. - set_deposit = d_energy_deposit
  5600. - }
  5601. - 35 = {
  5602. - set_deposit = d_mineral_deposit
  5603. - }
  5604. - }
  5605. - }
  5606. - every_tile = {
  5607. + limit = { has_blocker = no has_building = no has_pop = no }
  5608. + if = {
  5609. limit = {
  5610. - OR = {
  5611. - has_deposit = "d_rich_farmland_deposit"
  5612. - has_deposit = "d_mineral_food_deposit"
  5613. - has_deposit = "d_rich_food_mineral_deposit"
  5614. - }
  5615. - }
  5616. - clear_deposits = yes
  5617. - random_list = {
  5618. - 10 = {
  5619. - set_deposit = d_rich_engineering_deposit
  5620. - }
  5621. - 10 = {
  5622. - set_deposit = d_rich_society_deposit
  5623. + owner = { has_civic = civic_machine_terminator }
  5624. }
  5625. - 10 = {
  5626. - set_deposit = d_rich_physics_deposit
  5627. + set_blocker = "tb_exterminators_ruins"
  5628. + else = {
  5629. + set_blocker = "tb_radioactive_wasteland"
  5630. }
  5631. - 35 = {
  5632. - set_deposit = d_rich_energy_deposit
  5633. }
  5634. - 35 = {
  5635. set_deposit = d_rich_mineral_deposit
  5636. }
  5637. - }
  5638. - }
  5639. - every_tile = {
  5640. - limit = { has_deposit = "d_vast_farmland_deposit" }
  5641. - clear_deposits = yes
  5642. - random_list = {
  5643. - 10 = {
  5644. - set_deposit = d_vast_engineering_deposit
  5645. - }
  5646. - 10 = {
  5647. - set_deposit = d_vast_society_deposit
  5648. - }
  5649. - 10 = {
  5650. - set_deposit = d_vast_physics_deposit
  5651. - }
  5652. - 35 = {
  5653. - set_deposit = d_vast_energy_deposit
  5654. - }
  5655. - 35 = {
  5656. - set_deposit = d_vast_mineral_deposit
  5657. - }
  5658. - }
  5659. - }
  5660. - every_tile = {
  5661. - limit = { has_deposit = "d_immense_farmland_deposit" }
  5662. - clear_deposits = yes
  5663. - random_list = {
  5664. - 10 = {
  5665. - set_deposit = d_immense_engineering_deposit
  5666. - }
  5667. - 10 = {
  5668. - set_deposit = d_immense_society_deposit
  5669. - }
  5670. - 10 = {
  5671. - set_deposit = d_immense_physics_deposit
  5672. - }
  5673. - 35 = {
  5674. - set_deposit = d_immense_energy_deposit
  5675. - }
  5676. - 35 = {
  5677. - set_deposit = d_immense_mineral_deposit
  5678. - }
  5679. - }
  5680. - }
  5681. - IF = { #ensures at least one empty tile, if no farm tile was generated to nuke
  5682. - limit = { any_tile = { NOT = { has_deposit = no } } }
  5683. random_tile = {
  5684. - limit = { has_blocker = no has_building = no has_deposit = yes }
  5685. - clear_deposits = yes
  5686. + limit = { has_blocker = no has_building = no has_pop = no }
  5687. + if = {
  5688. + limit = {
  5689. + owner = { has_civic = civic_machine_terminator }
  5690. }
  5691. + set_blocker = "tb_exterminators_ruins"
  5692. + set_deposit = d_rich_energy_deposit
  5693. else = {
  5694. - #do nothing
  5695. + set_blocker = "tb_radioactive_wasteland"
  5696. + set_deposit = d_rich_farmland_deposit
  5697. + }
  5698. }
  5699. }
  5700. }
  5701. @@ -5944,7 +5930,7 @@ create_medium_marauder_auxiliaries = {
  5702. traits = { trait = random_trait }
  5703. }
  5704. create_fleet = {
  5705. - name = "NAME_Marauder_Auxiliary_Fleet"
  5706. + name = "NAME_Horde_Auxiliary_Fleet"
  5707. effect = {
  5708. set_owner = event_target:raider_khanate
  5709. set_fleet_flag = horde_auxuliaries
  5710. @@ -6011,7 +5997,7 @@ create_large_marauder_auxiliaries = {
  5711. traits = { trait = random_trait }
  5712. }
  5713. create_fleet = {
  5714. - name = "NAME_Marauder_Auxiliary_Fleet"
  5715. + name = "NAME_Horde_Auxiliary_Fleet"
  5716. effect = {
  5717. set_owner = event_target:raider_khanate
  5718. set_fleet_flag = horde_auxuliaries
  5719. @@ -6077,7 +6063,7 @@ create_very_large_marauder_auxiliaries = {
  5720. }
  5721. last_created_leader = { set_age = 37 }
  5722. create_fleet = {
  5723. - name = "NAME_Marauder_Auxiliary_Fleet"
  5724. + name = "NAME_Horde_Auxiliary_Fleet"
  5725. effect = {
  5726. set_owner = event_target:raider_khanate
  5727. set_fleet_flag = horde_auxuliaries
  5728. @@ -7749,7 +7735,6 @@ fire_warning_sign = {
  5729. }
  5730.  
  5731. fallen_empire_humiliate_effect = {
  5732. - custom_tooltip = fallen_empire_humiliate_effect_tooltip
  5733. hidden_effect = {
  5734. add_modifier = { modifier = humiliated days = 3600 }
  5735. end_rivalry = event_target:fallen_empire_humiliator
  5736. @@ -8205,3 +8190,172 @@ spawn_ringworld_nanobot_effect = {
  5737. scale = 0.10
  5738. }
  5739. }
  5740. +
  5741. +remove_xuracorp_trades = {
  5742. + remove_modifier = enclave_mineral_trade_1_xur
  5743. + remove_modifier = enclave_mineral_trade_2_xur
  5744. + remove_modifier = enclave_mineral_trade_3_xur
  5745. + remove_modifier = enclave_energy_trade_1_xur
  5746. + remove_modifier = enclave_energy_trade_2_xur
  5747. + remove_modifier = enclave_energy_trade_3_xur
  5748. + remove_modifier = enclave_mineral_food_trade_1_xur
  5749. + remove_modifier = enclave_mineral_food_trade_2_xur
  5750. + remove_modifier = enclave_mineral_food_trade_3_xur
  5751. + remove_modifier = enclave_energy_food_trade_1_xur
  5752. + remove_modifier = enclave_energy_food_trade_2_xur
  5753. + remove_modifier = enclave_energy_food_trade_3_xur
  5754. + remove_modifier = enclave_food_minerals_trade_1_xur
  5755. + remove_modifier = enclave_food_minerals_trade_2_xur
  5756. + remove_modifier = enclave_food_minerals_trade_3_xur
  5757. + remove_modifier = enclave_food_energy_trade_1_xur
  5758. + remove_modifier = enclave_food_energy_trade_2_xur
  5759. + remove_modifier = enclave_food_energy_trade_3_xur
  5760. +}
  5761. +
  5762. +remove_riggan_trades = {
  5763. + remove_modifier = enclave_mineral_trade_1_rig
  5764. + remove_modifier = enclave_mineral_trade_2_rig
  5765. + remove_modifier = enclave_mineral_trade_3_rig
  5766. + remove_modifier = enclave_energy_trade_1_rig
  5767. + remove_modifier = enclave_energy_trade_2_rig
  5768. + remove_modifier = enclave_energy_trade_3_rig
  5769. + remove_modifier = enclave_mineral_food_trade_1_rig
  5770. + remove_modifier = enclave_mineral_food_trade_2_rig
  5771. + remove_modifier = enclave_mineral_food_trade_3_rig
  5772. + remove_modifier = enclave_energy_food_trade_1_rig
  5773. + remove_modifier = enclave_energy_food_trade_2_rig
  5774. + remove_modifier = enclave_energy_food_trade_3_rig
  5775. + remove_modifier = enclave_food_minerals_trade_1_rig
  5776. + remove_modifier = enclave_food_minerals_trade_2_rig
  5777. + remove_modifier = enclave_food_minerals_trade_3_rig
  5778. + remove_modifier = enclave_food_energy_trade_1_rig
  5779. + remove_modifier = enclave_food_energy_trade_2_rig
  5780. + remove_modifier = enclave_food_energy_trade_3_rig
  5781. +}
  5782. +
  5783. +remove_muutagan_trades = {
  5784. + remove_modifier = enclave_mineral_trade_1_mut
  5785. + remove_modifier = enclave_mineral_trade_2_mut
  5786. + remove_modifier = enclave_mineral_trade_3_mut
  5787. + remove_modifier = enclave_energy_trade_1_mut
  5788. + remove_modifier = enclave_energy_trade_2_mut
  5789. + remove_modifier = enclave_energy_trade_3_mut
  5790. + remove_modifier = enclave_mineral_food_trade_1_mut
  5791. + remove_modifier = enclave_mineral_food_trade_2_mut
  5792. + remove_modifier = enclave_mineral_food_trade_3_mut
  5793. + remove_modifier = enclave_energy_food_trade_1_mut
  5794. + remove_modifier = enclave_energy_food_trade_2_mut
  5795. + remove_modifier = enclave_energy_food_trade_3_mut
  5796. + remove_modifier = enclave_food_minerals_trade_1_mut
  5797. + remove_modifier = enclave_food_minerals_trade_2_mut
  5798. + remove_modifier = enclave_food_minerals_trade_3_mut
  5799. + remove_modifier = enclave_food_energy_trade_1_mut
  5800. + remove_modifier = enclave_food_energy_trade_2_mut
  5801. + remove_modifier = enclave_food_energy_trade_3_mut
  5802. +}
  5803. +
  5804. +add_leader_traits_after_modification = {
  5805. + if = {
  5806. + limit = {
  5807. + species = {
  5808. + has_trait = trait_erudite
  5809. + NOR = {
  5810. + has_trait = trait_cybernetic
  5811. + has_trait = trait_psionic
  5812. + has_trait = trait_latent_psionic
  5813. + }
  5814. + }
  5815. + }
  5816. + if = {
  5817. + limit = {
  5818. + leader_class = admiral
  5819. + NOT = { has_trait = leader_trait_admiral_erudite }
  5820. + }
  5821. + add_trait = leader_trait_admiral_erudite
  5822. + add_ruler_trait = leader_trait_ruler_erudite
  5823. + }
  5824. + if = {
  5825. + limit = {
  5826. + leader_class = general
  5827. + NOT = { has_trait = leader_trait_general_erudite }
  5828. + }
  5829. + add_trait = leader_trait_general_erudite
  5830. + add_ruler_trait = leader_trait_ruler_erudite
  5831. + }
  5832. + if = {
  5833. + limit = {
  5834. + leader_class = governor
  5835. + NOT = { has_trait = leader_trait_governor_erudite }
  5836. + }
  5837. + add_trait = leader_trait_governor_erudite
  5838. + add_ruler_trait = leader_trait_ruler_erudite
  5839. + }
  5840. + if = {
  5841. + limit = {
  5842. + leader_class = scientist
  5843. + NOT = { has_trait = leader_trait_scientist_erudite }
  5844. + }
  5845. + add_trait = leader_trait_scientist_erudite
  5846. + add_ruler_trait = leader_trait_ruler_erudite
  5847. + }
  5848. + if = {
  5849. + limit = {
  5850. + leader_class = ruler
  5851. + NOT = { has_trait = leader_trait_ruler_erudite }
  5852. + }
  5853. + add_trait = leader_trait_ruler_erudite
  5854. + add_ruler_trait = leader_trait_ruler_erudite
  5855. +
  5856. + }
  5857. + }
  5858. +}
  5859. +
  5860. +remove_leader_traits_after_modification = {
  5861. + if = {
  5862. + limit = {
  5863. + species = {
  5864. + OR = {
  5865. + NOT = { has_trait = trait_erudite }
  5866. + has_trait = trait_cybernetic
  5867. + has_trait = trait_psionic
  5868. + has_trait = trait_latent_psionic
  5869. + }
  5870. + }
  5871. + }
  5872. + if = {
  5873. + limit = {
  5874. + has_trait = leader_trait_admiral_erudite
  5875. + }
  5876. + remove_trait = leader_trait_admiral_erudite
  5877. + remove_ruler_trait = leader_trait_ruler_erudite
  5878. + }
  5879. + if = {
  5880. + limit = {
  5881. + has_trait = leader_trait_general_erudite
  5882. + }
  5883. + remove_trait = leader_trait_general_erudite
  5884. + remove_ruler_trait = leader_trait_ruler_erudite
  5885. + }
  5886. + if = {
  5887. + limit = {
  5888. + has_trait = leader_trait_governor_erudite
  5889. + }
  5890. + remove_trait = leader_trait_governor_erudite
  5891. + remove_ruler_trait = leader_trait_ruler_erudite
  5892. + }
  5893. + if = {
  5894. + limit = {
  5895. + has_trait = leader_trait_scientist_erudite
  5896. + }
  5897. + remove_trait = leader_trait_scientist_erudite
  5898. + remove_ruler_trait = leader_trait_ruler_erudite
  5899. + }
  5900. + if = {
  5901. + limit = {
  5902. + has_trait = leader_trait_ruler_erudite
  5903. + }
  5904. + remove_trait = leader_trait_ruler_erudite
  5905. + remove_ruler_trait = leader_trait_ruler_erudite
  5906. + }
  5907. + }
  5908. +}
  5909. \ No newline at end of file
  5910. diff --git a/2.0.2/common/scripted_effects/marauder_tribute_effects.txt b/2.0.2/common/scripted_effects/marauder_tribute_effects.txt
  5911. new file mode 100755
  5912. index 0000000..1c6aeb2
  5913. --- /dev/null
  5914. +++ b/2.0.2/common/scripted_effects/marauder_tribute_effects.txt
  5915. @@ -0,0 +1,189 @@
  5916. +
  5917. +@tributecost1 = -250
  5918. +
  5919. +@tributecost2 = -500
  5920. +
  5921. +@tributecost3 = -1000
  5922. +
  5923. +@tributecost4 = -1500
  5924. +
  5925. +@tributecost5 = -2000
  5926. +
  5927. +@tributecost6 = -2500
  5928. +
  5929. +
  5930. +@tributecostraided1 = -500
  5931. +
  5932. +@tributecostraided2 = -1000
  5933. +
  5934. +@tributecostraided3 = -2000
  5935. +
  5936. +@tributecostraided4 = -3000
  5937. +
  5938. +@tributecostraided5 = -4000
  5939. +
  5940. +@tributecostraided6 = -5000
  5941. +
  5942. +
  5943. +
  5944. +tribute_cost_energy = {
  5945. + if = {
  5946. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  5947. + add_energy = @tributecost1
  5948. + }
  5949. + if = {
  5950. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  5951. + add_energy = @tributecost2
  5952. + }
  5953. + if = {
  5954. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  5955. + add_energy = @tributecost3
  5956. + }
  5957. + if = {
  5958. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  5959. + add_energy = @tributecost4
  5960. + }
  5961. + if = {
  5962. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  5963. + add_energy = @tributecost5
  5964. + }
  5965. + if = {
  5966. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  5967. + add_energy = @tributecost6
  5968. + }
  5969. +}
  5970. +
  5971. +tribute_cost_minerals = {
  5972. + if = {
  5973. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  5974. + add_minerals = @tributecost1
  5975. + }
  5976. + if = {
  5977. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  5978. + add_minerals = @tributecost2
  5979. + }
  5980. + if = {
  5981. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  5982. + add_minerals = @tributecost3
  5983. + }
  5984. + if = {
  5985. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  5986. + add_minerals = @tributecost4
  5987. + }
  5988. + if = {
  5989. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  5990. + add_minerals = @tributecost5
  5991. + }
  5992. + if = {
  5993. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  5994. + add_minerals = @tributecost6
  5995. + }
  5996. +}
  5997. +
  5998. +tribute_cost_food = {
  5999. + if = {
  6000. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  6001. + add_food = @tributecost1
  6002. + }
  6003. + if = {
  6004. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  6005. + add_food = @tributecost2
  6006. + }
  6007. + if = {
  6008. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  6009. + add_food = @tributecost3
  6010. + }
  6011. + if = {
  6012. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  6013. + add_food = @tributecost4
  6014. + }
  6015. + if = {
  6016. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  6017. + add_food = @tributecost5
  6018. + }
  6019. + if = {
  6020. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  6021. + add_food = @tributecost6
  6022. + }
  6023. +}
  6024. +
  6025. +tribute_cost_energy_raided = {
  6026. + if = {
  6027. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6028. + add_energy = @tributecostraided1
  6029. + }
  6030. + if = {
  6031. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6032. + add_energy = @tributecostraided2
  6033. + }
  6034. + if = {
  6035. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6036. + add_energy = @tributecostraided3
  6037. + }
  6038. + if = {
  6039. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6040. + add_energy = @tributecostraided4
  6041. + }
  6042. + if = {
  6043. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6044. + add_energy = @tributecostraided5
  6045. + }
  6046. + if = {
  6047. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6048. + add_energy = @tributecostraided6
  6049. + }
  6050. +}
  6051. +
  6052. +tribute_cost_minerals_raided = {
  6053. + if = {
  6054. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6055. + add_minerals = @tributecostraided1
  6056. + }
  6057. + if = {
  6058. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6059. + add_minerals = @tributecostraided2
  6060. + }
  6061. + if = {
  6062. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6063. + add_minerals = @tributecostraided3
  6064. + }
  6065. + if = {
  6066. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6067. + add_minerals = @tributecostraided4
  6068. + }
  6069. + if = {
  6070. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6071. + add_minerals = @tributecostraided5
  6072. + }
  6073. + if = {
  6074. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6075. + add_minerals = @tributecostraided6
  6076. + }
  6077. +}
  6078. +
  6079. +tribute_cost_food_raided = {
  6080. + if = {
  6081. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6082. + add_food = @tributecostraided1
  6083. + }
  6084. + if = {
  6085. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6086. + add_food = @tributecostraided2
  6087. + }
  6088. + if = {
  6089. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6090. + add_food = @tributecostraided3
  6091. + }
  6092. + if = {
  6093. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6094. + add_food = @tributecostraided4
  6095. + }
  6096. + if = {
  6097. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6098. + add_food = @tributecostraided5
  6099. + }
  6100. + if = {
  6101. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6102. + add_food = @tributecostraided6
  6103. + }
  6104. +}
  6105. \ No newline at end of file
  6106. diff --git a/2.0.0/common/scripted_effects/pirate_fleet_effects.txt b/2.0.2/common/scripted_effects/pirate_fleet_effects.txt
  6107. index b8f019c..74ce28e 100755
  6108. --- a/2.0.0/common/scripted_effects/pirate_fleet_effects.txt
  6109. +++ b/2.0.2/common/scripted_effects/pirate_fleet_effects.txt
  6110. @@ -383,18 +383,48 @@ create_pirate_fleet = {
  6111. }
  6112. }
  6113.  
  6114. -
  6115. assign_leader = last_created_leader
  6116. set_location = event_target:pirate_home
  6117. set_fleet_stance = aggressive
  6118. set_aggro_range_measure_from = self
  6119. set_aggro_range = 150
  6120.  
  6121. + # retroactively convert any ship pirate_homes to planet
  6122. + # only needed for 2.0.2 beta
  6123. + if = {
  6124. + limit = {
  6125. + exists = event_target:pirate_home
  6126. + NOT = {
  6127. + event_target:pirate_home = {
  6128. + solar_system = {
  6129. + any_planet = {
  6130. + is_same_value = prevprev
  6131. + }
  6132. + }
  6133. + }
  6134. + }
  6135. + }
  6136. + event_target:pirate_home = {
  6137. + fleet = {
  6138. + orbit = {
  6139. + save_event_target_as = pirate_home
  6140. + }
  6141. + }
  6142. + }
  6143. + }
  6144. +
  6145. + # don't do things if targets don't exist!
  6146. + if = {
  6147. + limit = {
  6148. + exists = event_target:pirate_target
  6149. + exists = event_target:pirate_home
  6150. + }
  6151. queue_actions = {
  6152. repeat = {
  6153. find_closest_system = {
  6154. trigger = {
  6155. id = "pirate.50.trigger.1"
  6156. + exists = event_target:pirate_target
  6157. NOT = {
  6158. has_star_flag = hostile_system
  6159. is_same_value = event_target:capital_system
  6160. @@ -407,11 +437,11 @@ create_pirate_fleet = {
  6161. exists = controller
  6162. controller = { is_same_value = event_target:pirate_target }
  6163. }
  6164. - distance = {
  6165. - source = PREV
  6166. - max_distance = 100
  6167. - min_distance = 20
  6168. - }
  6169. + #distance = {
  6170. + # source = PREV
  6171. + # max_distance = 100
  6172. + # min_distance = 20
  6173. + #}
  6174. }
  6175. found_system = {
  6176. move_to = THIS
  6177. @@ -435,8 +465,9 @@ create_pirate_fleet = {
  6178. find_random_system = {
  6179. trigger = {
  6180. id = "pirate.50.trigger.3"
  6181. + exists = event_target:pirate_home
  6182. any_planet = {
  6183. - is_planet = event_target:pirate_home
  6184. + is_same_value = event_target:pirate_home
  6185. }
  6186. }
  6187. found_system = {
  6188. @@ -446,7 +477,7 @@ create_pirate_fleet = {
  6189. find_closest_planet = {
  6190. trigger = {
  6191. id = "pirate.50.trigger.4"
  6192. - is_planet = event_target:pirate_home
  6193. + is_same_value = event_target:pirate_home
  6194. }
  6195. found_planet = {
  6196. orbit_planet = THIS
  6197. @@ -462,6 +493,7 @@ create_pirate_fleet = {
  6198. }
  6199. }
  6200. }
  6201. +}
  6202.  
  6203. # ~135 fleet power
  6204. create_pirate_ships_0 = {
  6205. diff --git a/2.0.0/common/scripted_loc/00_scripted_loc.txt b/2.0.2/common/scripted_loc/00_scripted_loc.txt
  6206. index 1a52513..d6c6027 100755
  6207. --- a/2.0.0/common/scripted_loc/00_scripted_loc.txt
  6208. +++ b/2.0.2/common/scripted_loc/00_scripted_loc.txt
  6209. @@ -339,3 +339,19 @@ defined_text = {
  6210. localization_key = tradition_diplomacy
  6211. }
  6212. }
  6213. +
  6214. +defined_text = {
  6215. + name = GetTradingHubType
  6216. + text = {
  6217. + trigger = {
  6218. + has_ethic = ethic_gestalt_consciousness
  6219. + }
  6220. + localization_key = sm_trading_hub_gestalt
  6221. + }
  6222. + text = {
  6223. + trigger = {
  6224. + NOT = { has_ethic = ethic_gestalt_consciousness }
  6225. + }
  6226. + localization_key = sm_trading_hub
  6227. + }
  6228. +}
  6229. diff --git a/2.0.0/common/scripted_triggers/00_scripted_triggers.txt b/2.0.2/common/scripted_triggers/00_scripted_triggers.txt
  6230. index 112bdfc..b4ac955 100755
  6231. --- a/2.0.0/common/scripted_triggers/00_scripted_triggers.txt
  6232. +++ b/2.0.2/common/scripted_triggers/00_scripted_triggers.txt
  6233. @@ -866,10 +866,7 @@ has_total_war_cb = {
  6234. OR = {
  6235. is_country_type = awakened_fallen_empire
  6236. has_valid_civic = civic_hive_devouring_swarm
  6237. - AND = {
  6238. - has_technology = "tech_colossus"
  6239. - is_rival = from
  6240. - }
  6241. + has_valid_civic = civic_machine_assimilator
  6242. AND = {
  6243. has_valid_civic = civic_machine_terminator
  6244. from = {
  6245. @@ -892,22 +889,16 @@ has_total_war_cb = {
  6246. is_country_type = awakened_fallen_empire
  6247. has_valid_civic = civic_fanatic_purifiers
  6248. has_valid_civic = civic_hive_devouring_swarm
  6249. + has_valid_civic = civic_machine_assimilator
  6250. has_valid_civic = civic_machine_terminator
  6251. - AND = {
  6252. - is_rival = root
  6253. - has_technology = "tech_colossus"
  6254. - }
  6255. }
  6256. from = {
  6257. OR = {
  6258. is_country_type = awakened_fallen_empire
  6259. has_valid_civic = civic_fanatic_purifiers
  6260. has_valid_civic = civic_hive_devouring_swarm
  6261. + has_valid_civic = civic_machine_assimilator
  6262. has_valid_civic = civic_machine_terminator
  6263. - AND = {
  6264. - is_rival = root
  6265. - has_technology = "tech_colossus"
  6266. - }
  6267. }
  6268. }
  6269. }
  6270. @@ -1048,3 +1039,82 @@ is_homicidal = {
  6271. has_valid_civic = civic_hive_devouring_swarm
  6272. }
  6273. }
  6274. +
  6275. +has_subjugation_req = {
  6276. + OR = {
  6277. + has_tradition = tr_domination_adopt
  6278. + has_valid_civic = civic_inwards_perfection
  6279. + has_valid_civic = civic_machine_terminator
  6280. + has_valid_civic = civic_fanatic_purifiers
  6281. + has_valid_civic = civic_hive_devouring_swarm
  6282. + }
  6283. +}
  6284. +
  6285. +has_active_xuracorp_trade = {
  6286. + OR = {
  6287. + has_modifier = enclave_mineral_trade_1_xur
  6288. + has_modifier = enclave_mineral_trade_2_xur
  6289. + has_modifier = enclave_mineral_trade_3_xur
  6290. + has_modifier = enclave_energy_trade_1_xur
  6291. + has_modifier = enclave_energy_trade_2_xur
  6292. + has_modifier = enclave_energy_trade_3_xur
  6293. + has_modifier = enclave_mineral_food_trade_1_xur
  6294. + has_modifier = enclave_mineral_food_trade_2_xur
  6295. + has_modifier = enclave_mineral_food_trade_3_xur
  6296. + has_modifier = enclave_energy_food_trade_1_xur
  6297. + has_modifier = enclave_energy_food_trade_2_xur
  6298. + has_modifier = enclave_energy_food_trade_3_xur
  6299. + has_modifier = enclave_food_minerals_trade_1_xur
  6300. + has_modifier = enclave_food_minerals_trade_2_xur
  6301. + has_modifier = enclave_food_minerals_trade_3_xur
  6302. + has_modifier = enclave_food_energy_trade_1_xur
  6303. + has_modifier = enclave_food_energy_trade_2_xur
  6304. + has_modifier = enclave_food_energy_trade_3_xur
  6305. + }
  6306. +}
  6307. +
  6308. +has_active_riggan_trade = {
  6309. + OR = {
  6310. + has_modifier = enclave_mineral_trade_1_rig
  6311. + has_modifier = enclave_mineral_trade_2_rig
  6312. + has_modifier = enclave_mineral_trade_3_rig
  6313. + has_modifier = enclave_energy_trade_1_rig
  6314. + has_modifier = enclave_energy_trade_2_rig
  6315. + has_modifier = enclave_energy_trade_3_rig
  6316. + has_modifier = enclave_mineral_food_trade_1_rig
  6317. + has_modifier = enclave_mineral_food_trade_2_rig
  6318. + has_modifier = enclave_mineral_food_trade_3_rig
  6319. + has_modifier = enclave_energy_food_trade_1_rig
  6320. + has_modifier = enclave_energy_food_trade_2_rig
  6321. + has_modifier = enclave_energy_food_trade_3_rig
  6322. + has_modifier = enclave_food_minerals_trade_1_rig
  6323. + has_modifier = enclave_food_minerals_trade_2_rig
  6324. + has_modifier = enclave_food_minerals_trade_3_rig
  6325. + has_modifier = enclave_food_energy_trade_1_rig
  6326. + has_modifier = enclave_food_energy_trade_2_rig
  6327. + has_modifier = enclave_food_energy_trade_3_rig
  6328. + }
  6329. +}
  6330. +
  6331. +has_active_muutagan_trade = {
  6332. + OR = {
  6333. + has_modifier = enclave_mineral_trade_1_mut
  6334. + has_modifier = enclave_mineral_trade_2_mut
  6335. + has_modifier = enclave_mineral_trade_3_mut
  6336. + has_modifier = enclave_energy_trade_1_mut
  6337. + has_modifier = enclave_energy_trade_2_mut
  6338. + has_modifier = enclave_energy_trade_3_mut
  6339. + has_modifier = enclave_mineral_food_trade_1_mut
  6340. + has_modifier = enclave_mineral_food_trade_2_mut
  6341. + has_modifier = enclave_mineral_food_trade_3_mut
  6342. + has_modifier = enclave_energy_food_trade_1_mut
  6343. + has_modifier = enclave_energy_food_trade_2_mut
  6344. + has_modifier = enclave_energy_food_trade_3_mut
  6345. + has_modifier = enclave_food_minerals_trade_1_mut
  6346. + has_modifier = enclave_food_minerals_trade_2_mut
  6347. + has_modifier = enclave_food_minerals_trade_3_mut
  6348. + has_modifier = enclave_food_energy_trade_1_mut
  6349. + has_modifier = enclave_food_energy_trade_2_mut
  6350. + has_modifier = enclave_food_energy_trade_3_mut
  6351. + }
  6352. +}
  6353. \ No newline at end of file
  6354. diff --git a/2.0.2/common/scripted_triggers/01_scripted_triggers_marauder_tribute.txt b/2.0.2/common/scripted_triggers/01_scripted_triggers_marauder_tribute.txt
  6355. new file mode 100755
  6356. index 0000000..055051b
  6357. --- /dev/null
  6358. +++ b/2.0.2/common/scripted_triggers/01_scripted_triggers_marauder_tribute.txt
  6359. @@ -0,0 +1,187 @@
  6360. +
  6361. +@tributeallow1 = 250
  6362. +
  6363. +@tributeallow2 = 500
  6364. +
  6365. +@tributeallow3 = 1000
  6366. +
  6367. +@tributeallow4 = 1500
  6368. +
  6369. +@tributeallow5 = 2000
  6370. +
  6371. +@tributeallow6 = 2500
  6372. +
  6373. +@tributeallowraided1 = 500
  6374. +
  6375. +@tributeallowraided2 = 1000
  6376. +
  6377. +@tributeallowraided3 = 2000
  6378. +
  6379. +@tributeallowraided4 = 3000
  6380. +
  6381. +@tributeallowraided5 = 4000
  6382. +
  6383. +@tributeallowraided6 = 5000
  6384. +
  6385. +
  6386. +determine_energy_tribute = {
  6387. + if = {
  6388. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  6389. + energy >= @tributeallow1
  6390. + }
  6391. + if = {
  6392. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  6393. + energy >= @tributeallow2
  6394. + }
  6395. + if = {
  6396. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  6397. + energy >= @tributeallow3
  6398. + }
  6399. + if = {
  6400. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  6401. + energy >= @tributeallow4
  6402. + }
  6403. + if = {
  6404. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  6405. + energy >= @tributeallow5
  6406. + }
  6407. + if = {
  6408. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  6409. + energy >= @tributeallow6
  6410. + }
  6411. +}
  6412. +
  6413. +determine_mineral_tribute = {
  6414. + if = {
  6415. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  6416. + minerals >= @tributeallow1
  6417. + }
  6418. + if = {
  6419. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  6420. + minerals >= @tributeallow2
  6421. + }
  6422. + if = {
  6423. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  6424. + minerals >= @tributeallow3
  6425. + }
  6426. + if = {
  6427. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  6428. + minerals >= @tributeallow4
  6429. + }
  6430. + if = {
  6431. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  6432. + minerals >= @tributeallow5
  6433. + }
  6434. + if = {
  6435. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  6436. + minerals >= @tributeallow6
  6437. + }
  6438. +}
  6439. +
  6440. +determine_food_tribute = {
  6441. + if = {
  6442. + limit = { has_country_flag = marauder_tribute_1@event_target:raiding_marauder }
  6443. + food >= @tributeallow1
  6444. + }
  6445. + if = {
  6446. + limit = { has_country_flag = marauder_tribute_2@event_target:raiding_marauder }
  6447. + food >= @tributeallow2
  6448. + }
  6449. + if = {
  6450. + limit = { has_country_flag = marauder_tribute_3@event_target:raiding_marauder }
  6451. + food >= @tributeallow3
  6452. + }
  6453. + if = {
  6454. + limit = { has_country_flag = marauder_tribute_4@event_target:raiding_marauder }
  6455. + food >= @tributeallow4
  6456. + }
  6457. + if = {
  6458. + limit = { has_country_flag = marauder_tribute_5@event_target:raiding_marauder }
  6459. + food >= @tributeallow5
  6460. + }
  6461. + if = {
  6462. + limit = { has_country_flag = marauder_tribute_6@event_target:raiding_marauder }
  6463. + food >= @tributeallow6
  6464. + }
  6465. +}
  6466. +
  6467. +determine_energy_tribute_raided = {
  6468. + if = {
  6469. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6470. + energy >= @tributeallowraided1
  6471. + }
  6472. + if = {
  6473. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6474. + energy >= @tributeallowraided2
  6475. + }
  6476. + if = {
  6477. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6478. + energy >= @tributeallowraided3
  6479. + }
  6480. + if = {
  6481. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6482. + energy >= @tributeallowraided4
  6483. + }
  6484. + if = {
  6485. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6486. + energy >= @tributeallowraided5
  6487. + }
  6488. + if = {
  6489. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6490. + energy >= @tributeallowraided6
  6491. + }
  6492. +}
  6493. +
  6494. +determine_mineral_tribute_raided = {
  6495. + if = {
  6496. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6497. + minerals >= @tributeallowraided1
  6498. + }
  6499. + if = {
  6500. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6501. + minerals >= @tributeallowraided2
  6502. + }
  6503. + if = {
  6504. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6505. + minerals >= @tributeallowraided3
  6506. + }
  6507. + if = {
  6508. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6509. + minerals >= @tributeallowraided4
  6510. + }
  6511. + if = {
  6512. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6513. + minerals >= @tributeallowraided5
  6514. + }
  6515. + if = {
  6516. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6517. + minerals >= @tributeallowraided6
  6518. + }
  6519. +}
  6520. +
  6521. +determine_food_tribute_raided = {
  6522. + if = {
  6523. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  6524. + food >= @tributeallowraided1
  6525. + }
  6526. + if = {
  6527. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  6528. + food >= @tributeallowraided2
  6529. + }
  6530. + if = {
  6531. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  6532. + food >= @tributeallowraided3
  6533. + }
  6534. + if = {
  6535. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  6536. + food >= @tributeallowraided4
  6537. + }
  6538. + if = {
  6539. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  6540. + food >= @tributeallowraided5
  6541. + }
  6542. + if = {
  6543. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  6544. + food >= @tributeallowraided6
  6545. + }
  6546. +}
  6547. \ No newline at end of file
  6548. diff --git a/2.0.0/common/scripted_triggers/01_scripted_triggers_planet_killers.txt b/2.0.2/common/scripted_triggers/01_scripted_triggers_planet_killers.txt
  6549. index e647cbd..ad83672 100755
  6550. --- a/2.0.0/common/scripted_triggers/01_scripted_triggers_planet_killers.txt
  6551. +++ b/2.0.2/common/scripted_triggers/01_scripted_triggers_planet_killers.txt
  6552. @@ -72,14 +72,12 @@ can_destroy_planet_with_PLANET_KILLER_CRACKER = {
  6553. }
  6554. custom_tooltip = {
  6555. text = not_barren_molten_frozen_toxic_test_fire
  6556. - AND = {
  6557. - OR = {
  6558. NOT = { exists = owner }
  6559. + OR = {
  6560. + NOT = { exists = space_owner }
  6561. AND = {
  6562. - exists = owner
  6563. - owner = {
  6564. - is_same_value = from.owner
  6565. - }
  6566. + exists = space_owner
  6567. + space_owner = { is_same_value = from.owner }
  6568. }
  6569. }
  6570. OR = {
  6571. @@ -88,7 +86,16 @@ can_destroy_planet_with_PLANET_KILLER_CRACKER = {
  6572. is_planet_class = pc_frozen
  6573. is_planet_class = pc_molten
  6574. is_planet_class = pc_toxic
  6575. - }
  6576. + is_planet_class = pc_desert
  6577. + is_planet_class = pc_tropical
  6578. + is_planet_class = pc_arid
  6579. + is_planet_class = pc_continental
  6580. + is_planet_class = pc_ocean
  6581. + is_planet_class = pc_tundra
  6582. + is_planet_class = pc_arctic
  6583. + is_planet_class = pc_alpine
  6584. + is_planet_class = pc_savannah
  6585. + is_planet_class = pc_gaia
  6586. }
  6587. }
  6588. }
  6589. @@ -98,7 +105,10 @@ can_destroy_planet_with_PLANET_KILLER_CRACKER = {
  6590. can_destroy_planet_with_PLANET_KILLER_SHIELDER = {
  6591. custom_tooltip = {
  6592. fail_text = is_not_a_habitable_planet_or_megastructure
  6593. + OR = {
  6594. is_a_habitable_planet_megastructure = yes
  6595. + is_planet_class = pc_ai
  6596. + }
  6597. }
  6598. custom_tooltip = {
  6599. fail_text = is_not_hostile_or_primitive
  6600. @@ -172,7 +182,10 @@ can_destroy_planet_with_PLANET_KILLER_NEUTRON = {
  6601. }
  6602. custom_tooltip = {
  6603. fail_text = is_unpopulated
  6604. + OR = {
  6605. num_pops > 0
  6606. + is_planet_class = pc_infested
  6607. + }
  6608. }
  6609. }
  6610.  
  6611. @@ -322,6 +335,7 @@ is_a_planet_megastructure = {
  6612. is_a_habitable_planet_megastructure = {
  6613. OR = {
  6614. is_planet_class = pc_nuked
  6615. + is_planet_class = pc_infested
  6616. habitable_planet = yes
  6617. habitable_structure = yes
  6618. }
  6619. diff --git a/2.0.0/common/section_templates/cruiser.txt b/2.0.2/common/section_templates/cruiser.txt
  6620. index 428c84d..366e2b6 100755
  6621. --- a/2.0.0/common/section_templates/cruiser.txt
  6622. +++ b/2.0.2/common/section_templates/cruiser.txt
  6623. @@ -14,7 +14,7 @@ ship_section_template = {
  6624. locatorname = "large_gun_01"
  6625. }
  6626.  
  6627. - medium_utility_slots = 3
  6628. + medium_utility_slots = 4
  6629.  
  6630. cost = 100
  6631. }
  6632. @@ -58,7 +58,7 @@ ship_section_template = {
  6633. locatorname = "small_gun_02"
  6634. }
  6635.  
  6636. - medium_utility_slots = 3
  6637. + medium_utility_slots = 4
  6638.  
  6639. cost = 100
  6640. }
  6641. @@ -84,7 +84,7 @@ ship_section_template = {
  6642. locatorname = "medium_gun_02"
  6643. }
  6644.  
  6645. - medium_utility_slots = 3
  6646. + medium_utility_slots = 4
  6647.  
  6648. cost = 100
  6649. }
  6650. @@ -128,7 +128,7 @@ ship_section_template = {
  6651. locatorname = "strike_craft_locator_01"
  6652. }
  6653.  
  6654. - medium_utility_slots = 3
  6655. + medium_utility_slots = 4
  6656.  
  6657. cost = 100
  6658. }
  6659. @@ -153,7 +153,7 @@ ship_section_template = {
  6660. locatorname = "medium_gun_01"
  6661. }
  6662.  
  6663. - medium_utility_slots = 3
  6664. + medium_utility_slots = 4
  6665.  
  6666. cost = 100
  6667. }
  6668. @@ -186,7 +186,7 @@ ship_section_template = {
  6669. locatorname = "medium_gun_03"
  6670. }
  6671.  
  6672. - medium_utility_slots = 3
  6673. + medium_utility_slots = 4
  6674.  
  6675. cost = 100
  6676. }
  6677. @@ -237,7 +237,7 @@ ship_section_template = {
  6678. locatorname = "small_gun_02"
  6679. }
  6680.  
  6681. - medium_utility_slots = 3
  6682. + medium_utility_slots = 4
  6683.  
  6684. cost = 100
  6685. }
  6686. diff --git a/2.0.0/common/section_templates/generic_ships.txt b/2.0.2/common/section_templates/generic_ships.txt
  6687. index b533ea1..bd6ec99 100755
  6688. --- a/2.0.0/common/section_templates/generic_ships.txt
  6689. +++ b/2.0.2/common/section_templates/generic_ships.txt
  6690. @@ -36,14 +36,26 @@ ship_section_template = {
  6691. slot_type = weapon
  6692. locatorname = "root"
  6693. }
  6694. + component_slot = {
  6695. + name = "MEDIUM_GUN_03"
  6696. + slot_size = medium
  6697. + slot_type = weapon
  6698. + locatorname = "root"
  6699. + }
  6700. component_slot = {
  6701. name = "LARGE_GUN_01"
  6702. slot_size = large
  6703. slot_type = weapon
  6704. locatorname = "root"
  6705. }
  6706. + component_slot = {
  6707. + name = "LARGE_GUN_02"
  6708. + slot_size = large
  6709. + slot_type = weapon
  6710. + locatorname = "root"
  6711. + }
  6712.  
  6713. - medium_utility_slots = 6
  6714. + medium_utility_slots = 8
  6715. aux_utility_slots = 1
  6716. }
  6717.  
  6718. diff --git a/2.0.0/common/ship_behaviors/01_standard_ship_behaviors.txt b/2.0.2/common/ship_behaviors/01_standard_ship_behaviors.txt
  6719. index ca66a25..8cf32e0 100755
  6720. --- a/2.0.0/common/ship_behaviors/01_standard_ship_behaviors.txt
  6721. +++ b/2.0.2/common/ship_behaviors/01_standard_ship_behaviors.txt
  6722. @@ -44,9 +44,9 @@ ship_behavior = {
  6723. ship_behavior = {
  6724. name = "picket"
  6725.  
  6726. - preferred_attack_range = 40
  6727. - formation_distance = 40 #when orbing/following ship will try to keep this distance to assigned position
  6728. - return_to_formation_distance = 50 #when attacking the ship will switch to passive mode if distance to assigned position is greater that this
  6729. + preferred_attack_range = 30
  6730. + formation_distance = 30 #when orbing/following ship will try to keep this distance to assigned position
  6731. + return_to_formation_distance = 40 #when attacking the ship will switch to passive mode if distance to assigned position is greater that this
  6732.  
  6733. collision_awareness = 0.75 #how much we try to avoid other ships
  6734. collision_strafe = 0.75 #collision_strafe allows the ship to move in any direction while colliding with another
  6735. @@ -60,10 +60,10 @@ ship_behavior = {
  6736.  
  6737. ship_behavior = {
  6738. name = "line"
  6739. - preferred_attack_range = 70 #max/min/median/12/412.. #this is the distance to target the ship wants to keep when attacking
  6740. + preferred_attack_range = 50 #max/min/median/12/412.. #this is the distance to target the ship wants to keep when attacking
  6741.  
  6742. - formation_distance = 70 #when orbing/following ship will try to keep this distance to assigned position
  6743. - return_to_formation_distance = 80 #when attacking the ship will switch to passive mode if distance to assigned position is greater that this
  6744. + formation_distance = 50 #when orbing/following ship will try to keep this distance to assigned position
  6745. + return_to_formation_distance = 60 #when attacking the ship will switch to passive mode if distance to assigned position is greater that this
  6746.  
  6747. collision_awareness = 0.75
  6748. collision_radius = 1.0
  6749. @@ -77,9 +77,9 @@ ship_behavior = {
  6750.  
  6751. ship_behavior = {
  6752. name = "artillery"
  6753. - preferred_attack_range = 100
  6754. - formation_distance = 100
  6755. - return_to_formation_distance = 110
  6756. + preferred_attack_range = 80
  6757. + formation_distance = 80
  6758. + return_to_formation_distance = 90
  6759.  
  6760. combat_target_anchor = root
  6761.  
  6762. diff --git a/2.0.0/common/ship_sizes/00_ship_sizes.txt b/2.0.2/common/ship_sizes/00_ship_sizes.txt
  6763. index 86e465e..ea40dc6 100755
  6764. --- a/2.0.0/common/ship_sizes/00_ship_sizes.txt
  6765. +++ b/2.0.2/common/ship_sizes/00_ship_sizes.txt
  6766. @@ -2,28 +2,41 @@
  6767. # This file is where you start when you want to configure something new, then go to sections
  6768.  
  6769. @corvette_collision_radius = 2.0
  6770. -@corvette_formation_priority = 4
  6771. +@corvette_formation_priority = 20
  6772.  
  6773. @destroyer_collision_radius = 2.5
  6774. -@destroyer_formation_priority = 2
  6775. +@destroyer_formation_priority = 10
  6776.  
  6777. @cruiser_collision_radius = 3.5
  6778. -@cruiser_formation_priority = 3
  6779. +@cruiser_formation_priority = 30
  6780.  
  6781. @battleship_collision_radius = 6
  6782. -@battleship_formation_priority = 5
  6783. +@battleship_formation_priority = 50
  6784.  
  6785. @titan_collision_radius = 12
  6786. -@titan_formation_priority = 1
  6787. +@titan_formation_priority = 40
  6788.  
  6789. @build_block_radius_none = 0
  6790. @build_block_radius_civilian = 20
  6791. @build_block_radius_military = 200
  6792.  
  6793. -@speed_slow = 80
  6794. -@speed_default = 100
  6795. -@speed_fast = 120
  6796. -@speed_very_fast = 170
  6797. +@speed_very_slow = 80
  6798. +@speed_slow = 100
  6799. +@speed_default = 120
  6800. +@speed_fast = 140
  6801. +@speed_very_fast = 160
  6802. +
  6803. +####################
  6804. +# NOTE FOR MODDERS #
  6805. +####################
  6806. +# modifier = { } only takes the following modifiers
  6807. +# hull, shield & armor add/mult and regen add perc/static
  6808. +# evasion add/mult
  6809. +# speed/base speed mult
  6810. +# weapon damage mult
  6811. +# upkeep mult
  6812. +# for other modifiers, use ship_modifier = { }
  6813. +####################
  6814.  
  6815. ############
  6816. # STANDARD #
  6817. @@ -49,6 +62,8 @@ corvette = {
  6818. can_have_federation_design = yes
  6819. enable_default_design = yes #if yes, countries will have an auto-generated design at start
  6820.  
  6821. + default_behavior = swarm
  6822. +
  6823. prerequisites = { "tech_corvettes" }
  6824.  
  6825. combat_disengage_chance = 1.75
  6826. @@ -83,6 +98,8 @@ destroyer = {
  6827. can_have_federation_design = yes
  6828. enable_default_design = yes #if yes, countries will have an auto-generated design at start
  6829.  
  6830. + default_behavior = picket
  6831. +
  6832. prerequisites = { "tech_destroyers" }
  6833.  
  6834. combat_disengage_chance = 1.50
  6835. @@ -99,11 +116,11 @@ destroyer = {
  6836.  
  6837. cruiser = {
  6838. formation_priority = @cruiser_formation_priority
  6839. - max_speed = @speed_fast
  6840. + max_speed = @speed_default
  6841. acceleration = 0.25
  6842. rotation_speed = 0.175
  6843. collision_radius = @cruiser_collision_radius
  6844. - max_hitpoints = 1400
  6845. + max_hitpoints = 1800
  6846. modifier = {
  6847. ship_evasion_add = 10
  6848. }
  6849. @@ -117,6 +134,8 @@ cruiser = {
  6850. can_have_federation_design = yes
  6851. enable_default_design = yes #if yes, countries will have an auto-generated design at start
  6852.  
  6853. + default_behavior = line
  6854. +
  6855. prerequisites = { "tech_cruisers" }
  6856.  
  6857. combat_disengage_chance = 1.25
  6858. @@ -133,7 +152,7 @@ cruiser = {
  6859.  
  6860. battleship = {
  6861. formation_priority = @battleship_formation_priority
  6862. - max_speed = @speed_default
  6863. + max_speed = @speed_slow
  6864. acceleration = 0.2
  6865. rotation_speed = 0.15
  6866. collision_radius = @battleship_collision_radius
  6867. @@ -151,6 +170,8 @@ battleship = {
  6868. can_have_federation_design = yes
  6869. enable_default_design = yes #if yes, countries will have an auto-generated design at start
  6870.  
  6871. + default_behavior = line
  6872. +
  6873. prerequisites = { "tech_battleships" }
  6874.  
  6875. combat_disengage_chance = 1.00
  6876. @@ -167,7 +188,7 @@ battleship = {
  6877.  
  6878. titan = {
  6879. formation_priority = @titan_formation_priority
  6880. - max_speed = @speed_default
  6881. + max_speed = @speed_slow
  6882. acceleration = 0.2
  6883. rotation_speed = 0.15
  6884. collision_radius = @titan_collision_radius
  6885. @@ -185,9 +206,11 @@ titan = {
  6886. can_have_federation_design = yes
  6887. enable_default_design = yes #if yes, countries will have an auto-generated design at start
  6888.  
  6889. + default_behavior = artillery
  6890. +
  6891. prerequisites = { "tech_titans" }
  6892.  
  6893. - combat_disengage_chance = 0.50
  6894. + combat_disengage_chance = 1.00
  6895.  
  6896. has_mineral_upkeep = yes
  6897. class = shipclass_military
  6898. @@ -206,19 +229,18 @@ titan = {
  6899.  
  6900. empire_limit = {
  6901. base = 1
  6902. - max = 3
  6903. + max = 20
  6904. naval_cap_div = 200
  6905. }
  6906. }
  6907.  
  6908. constructor = {
  6909. - #max_speed = 3.75
  6910. - max_speed = @speed_slow
  6911. + max_speed = @speed_fast
  6912. acceleration = 0.3
  6913. rotation_speed = 0.2
  6914. max_hitpoints = 300
  6915. modifier = {
  6916. - ship_evasion_add = 15
  6917. + ship_evasion_add = 25
  6918. }
  6919. size_multiplier = 1
  6920. fleet_slot_size = 1
  6921. @@ -252,12 +274,12 @@ constructor = {
  6922. }
  6923.  
  6924. colonizer = {
  6925. - max_speed = @speed_slow
  6926. + max_speed = @speed_very_slow
  6927. acceleration = 0.3
  6928. rotation_speed = 0.2
  6929. max_hitpoints = 300
  6930. modifier = {
  6931. - ship_evasion_add = 15
  6932. + ship_evasion_add = 10
  6933. }
  6934. size_multiplier = 1
  6935. fleet_slot_size = 1
  6936. @@ -291,13 +313,12 @@ colonizer = {
  6937. }
  6938.  
  6939. science = {
  6940. - #max_speed = 4.5
  6941. - max_speed = @speed_default
  6942. + max_speed = @speed_very_fast
  6943. acceleration = 0.3
  6944. rotation_speed = 0.2
  6945. max_hitpoints = 300
  6946. modifier = {
  6947. - ship_evasion_add = 15
  6948. + ship_evasion_add = 40
  6949. }
  6950. size_multiplier = 1
  6951. fleet_slot_size = 1
  6952. @@ -371,9 +392,11 @@ military_station_small = {
  6953. max_hitpoints = 1000
  6954. modifier = {
  6955. ship_evasion_mult = -1
  6956. - ship_weapon_range_mult = 0.20
  6957. ship_upkeep_mult = -0.25
  6958. }
  6959. + ship_modifier = {
  6960. + ship_weapon_range_mult = 0.20
  6961. + }
  6962. combat_size_multiplier = 2
  6963. size_multiplier = 1
  6964. fleet_slot_size = 2
  6965. @@ -407,11 +430,12 @@ military_station_medium = {
  6966. modifier = {
  6967. ship_evasion_mult = -1
  6968. ship_armor_add = 30
  6969. - ship_weapon_range_mult = 0.20
  6970. - ship_fire_rate_mult = 1
  6971. ship_shield_mult = 1
  6972. ship_upkeep_mult = -0.25
  6973. }
  6974. + ship_modifier = {
  6975. + ship_weapon_range_mult = 0.20
  6976. + }
  6977. max_hitpoints = 10000
  6978. size_multiplier = 8
  6979. fleet_slot_size = 4
  6980. @@ -445,11 +469,12 @@ military_station_large = {
  6981. modifier = {
  6982. ship_evasion_mult = -1
  6983. ship_armor_add = 44
  6984. - ship_weapon_range_mult = 0.20
  6985. - ship_fire_rate_mult = 1
  6986. ship_shield_mult = 1
  6987. ship_upkeep_mult = -0.25
  6988. }
  6989. + ship_modifier = {
  6990. + ship_weapon_range_mult = 0.20
  6991. + }
  6992. max_hitpoints = 15000
  6993. size_multiplier = 16
  6994. fleet_slot_size = 8
  6995. diff --git a/2.0.0/common/ship_sizes/00_starbases.txt b/2.0.2/common/ship_sizes/00_starbases.txt
  6996. index c25323b..09bccf2 100755
  6997. --- a/2.0.0/common/ship_sizes/00_starbases.txt
  6998. +++ b/2.0.2/common/ship_sizes/00_starbases.txt
  6999. @@ -12,10 +12,12 @@ starbase_outpost = {
  7000. modifier = {
  7001. ship_evasion_mult = -1
  7002. ship_armor_add = 1000
  7003. - ship_weapon_range_mult = 0.20
  7004. - ship_fire_rate_mult = 0.5
  7005. starbase_defense_platform_capacity_add = 3
  7006. }
  7007. + ship_modifier = {
  7008. + ship_fire_rate_mult = 0.50
  7009. + ship_weapon_range_mult = 0.20
  7010. + }
  7011. max_hitpoints = 5000
  7012. base_buildtime = 360
  7013. cost = 200
  7014. @@ -48,7 +50,7 @@ starbase_outpost = {
  7015. icon_frame = 1
  7016.  
  7017. upkeep_override = {
  7018. - energy = 0
  7019. + energy = 1
  7020. minerals = 0
  7021. }
  7022. }
  7023. @@ -60,12 +62,14 @@ starbase_starport = {
  7024. modifier = {
  7025. ship_evasion_mult = -1
  7026. ship_armor_add = 2000
  7027. - ship_weapon_range_mult = 0.20
  7028. - ship_fire_rate_mult = 0.5
  7029. starbase_module_capacity_add = 2
  7030. starbase_building_capacity_add = 1
  7031. starbase_defense_platform_capacity_add = 6
  7032. }
  7033. + ship_modifier = {
  7034. + ship_fire_rate_mult = 0.50
  7035. + ship_weapon_range_mult = 0.20
  7036. + }
  7037. max_hitpoints = 10000
  7038. base_buildtime = 360
  7039. cost = 300
  7040. @@ -100,7 +104,7 @@ starbase_starport = {
  7041. icon_frame = 2
  7042.  
  7043. upkeep_override = {
  7044. - energy = 1
  7045. + energy = 2
  7046. minerals = 0
  7047. }
  7048. }
  7049. @@ -112,12 +116,14 @@ starbase_starhold = {
  7050. modifier = {
  7051. ship_evasion_mult = -1
  7052. ship_armor_add = 5000
  7053. - ship_weapon_range_mult = 0.20
  7054. - ship_fire_rate_mult = 0.5
  7055. starbase_module_capacity_add = 4
  7056. starbase_building_capacity_add = 2
  7057. starbase_defense_platform_capacity_add = 9
  7058. }
  7059. + ship_modifier = {
  7060. + ship_fire_rate_mult = 0.50
  7061. + ship_weapon_range_mult = 0.20
  7062. + }
  7063. max_hitpoints = 20000
  7064. base_buildtime = 720
  7065. cost = 750
  7066. @@ -154,7 +160,7 @@ starbase_starhold = {
  7067. icon_frame = 3
  7068.  
  7069. upkeep_override = {
  7070. - energy = 2
  7071. + energy = 3
  7072. minerals = 0
  7073. }
  7074. }
  7075. @@ -166,12 +172,14 @@ starbase_starfortress = {
  7076. modifier = {
  7077. ship_evasion_mult = -1
  7078. ship_armor_add = 10000
  7079. - ship_weapon_range_mult = 0.20
  7080. - ship_fire_rate_mult = 0.5
  7081. starbase_module_capacity_add = 6
  7082. starbase_building_capacity_add = 3
  7083. starbase_defense_platform_capacity_add = 12
  7084. }
  7085. + ship_modifier = {
  7086. + ship_fire_rate_mult = 0.50
  7087. + ship_weapon_range_mult = 0.20
  7088. + }
  7089. max_hitpoints = 40000
  7090. base_buildtime = 1080
  7091. cost = 2500
  7092. @@ -210,7 +218,7 @@ starbase_starfortress = {
  7093. icon_frame = 4
  7094.  
  7095. upkeep_override = {
  7096. - energy = 3
  7097. + energy = 4
  7098. minerals = 0
  7099. }
  7100. }
  7101. @@ -222,12 +230,14 @@ starbase_citadel = {
  7102. modifier = {
  7103. ship_evasion_mult = -1
  7104. ship_armor_add = 20000
  7105. - ship_weapon_range_mult = 0.20
  7106. - ship_fire_rate_mult = 0.5
  7107. starbase_module_capacity_add = 6
  7108. starbase_building_capacity_add = 4
  7109. starbase_defense_platform_capacity_add = 15
  7110. }
  7111. + ship_modifier = {
  7112. + ship_fire_rate_mult = 0.50
  7113. + ship_weapon_range_mult = 0.20
  7114. + }
  7115. max_hitpoints = 80000
  7116. base_buildtime = 1440
  7117. cost = 7500
  7118. @@ -266,7 +276,7 @@ starbase_citadel = {
  7119. icon_frame = 5
  7120.  
  7121. upkeep_override = {
  7122. - energy = 6
  7123. + energy = 5
  7124. minerals = 0
  7125. }
  7126. }
  7127. @@ -283,6 +293,8 @@ starbase_swarm = {
  7128. modifier = {
  7129. ship_evasion_mult = -1
  7130. ship_armor_add = 30000
  7131. + }
  7132. + ship_modifier = {
  7133. ship_weapon_range_mult = 0.20
  7134. }
  7135. max_hitpoints = 30000
  7136. @@ -320,6 +332,8 @@ starbase_ai = {
  7137. ship_evasion_mult = -1
  7138. ship_armor_add = 20000
  7139. ship_shield_add = 20000
  7140. + }
  7141. + ship_modifier = {
  7142. ship_weapon_range_mult = 0.20
  7143. }
  7144. max_hitpoints = 20000
  7145. @@ -357,6 +371,8 @@ starbase_exd = {
  7146. modifier = {
  7147. ship_evasion_mult = -1
  7148. ship_shield_add = 40000
  7149. + }
  7150. + ship_modifier = {
  7151. ship_weapon_range_mult = 0.20
  7152. }
  7153. max_hitpoints = 20000
  7154. @@ -395,6 +411,8 @@ starbase_marauder = {
  7155. ship_evasion_mult = -1
  7156. ship_shield_add = 10000
  7157. ship_armor_add = 10000
  7158. + }
  7159. + ship_modifier = {
  7160. ship_weapon_range_mult = 0.20
  7161. }
  7162. max_hitpoints = 20000
  7163. @@ -436,13 +454,15 @@ ion_cannon = {
  7164. max_hitpoints = 10000
  7165. modifier = {
  7166. ship_evasion_mult = -1
  7167. + }
  7168. + ship_modifier = {
  7169. ship_weapon_range_mult = 0.20
  7170. }
  7171. size_multiplier = 8
  7172. fleet_slot_size = 8
  7173. combat_size_multiplier = 8
  7174. section_slots = { "ship" = { locator = "part1" } }
  7175. - is_designable = no
  7176. + is_designable = yes
  7177. components_add_to_cost = no
  7178. uses_name_prefix = no
  7179. takes_name_from_ship_design = yes
  7180. diff --git a/2.0.0/common/ship_sizes/01_colossi.txt b/2.0.2/common/ship_sizes/01_colossi.txt
  7181. index fad2fa0..58c1865 100755
  7182. --- a/2.0.0/common/ship_sizes/01_colossi.txt
  7183. +++ b/2.0.2/common/ship_sizes/01_colossi.txt
  7184. @@ -1,9 +1,15 @@
  7185. @colossus_collision_radius = 4
  7186. @colossus_formation_priority = 4
  7187.  
  7188. +@speed_very_slow = 80
  7189. +@speed_slow = 100
  7190. +@speed_default = 120
  7191. +@speed_fast = 140
  7192. +@speed_very_fast = 160
  7193. +
  7194. colossus = {
  7195. formation_priority = @colossus_formation_priority
  7196. - max_speed = 80
  7197. + max_speed = @speed_very_slow
  7198. acceleration = 0.2
  7199. rotation_speed = 0.15
  7200. collision_radius = @colossus_collision_radius
  7201. diff --git a/2.0.0/common/ship_sizes/02_event_ships.txt b/2.0.2/common/ship_sizes/02_event_ships.txt
  7202. index a543e61..5177bb7 100755
  7203. --- a/2.0.0/common/ship_sizes/02_event_ships.txt
  7204. +++ b/2.0.2/common/ship_sizes/02_event_ships.txt
  7205. @@ -15,10 +15,11 @@
  7206. @build_block_radius_civilian = 20
  7207. @build_block_radius_military = 200
  7208.  
  7209. -@speed_slow = 80
  7210. -@speed_default = 100
  7211. -@speed_fast = 120
  7212. -@speed_very_fast = 170
  7213. +@speed_very_slow = 80
  7214. +@speed_slow = 100
  7215. +@speed_default = 120
  7216. +@speed_fast = 140
  7217. +@speed_very_fast = 160
  7218.  
  7219. ##################
  7220. # EVENT SPECIFIC #
  7221. @@ -183,11 +184,10 @@ eventship_01 = {
  7222. rotation_speed = 0.175
  7223. collision_radius = 4
  7224. modifier = {
  7225. - ship_evasion_add = 12
  7226. - ship_armor_add = 35
  7227. + ship_evasion_add = 15
  7228. }
  7229. - max_hitpoints = 960
  7230. - size_multiplier = 1
  7231. + max_hitpoints = 2000
  7232. + size_multiplier = 4
  7233. fleet_slot_size = 3
  7234. section_slots = { "mid" = { locator = "root" } }
  7235. num_target_locators = 0
  7236. diff --git a/2.0.0/common/ship_sizes/03_swarm_ships.txt b/2.0.2/common/ship_sizes/03_swarm_ships.txt
  7237. index 5da44fe..0a6bf92 100755
  7238. --- a/2.0.0/common/ship_sizes/03_swarm_ships.txt
  7239. +++ b/2.0.2/common/ship_sizes/03_swarm_ships.txt
  7240. @@ -15,10 +15,11 @@
  7241. @build_block_radius_civilian = 20
  7242. @build_block_radius_military = 200
  7243.  
  7244. -@speed_slow = 80
  7245. -@speed_default = 100
  7246. -@speed_fast = 120
  7247. -@speed_very_fast = 170
  7248. +@speed_very_slow = 80
  7249. +@speed_slow = 100
  7250. +@speed_default = 120
  7251. +@speed_fast = 140
  7252. +@speed_very_fast = 160
  7253.  
  7254. #########
  7255. # SWARM #
  7256. diff --git a/2.0.0/common/ship_sizes/04_fallen_empires.txt b/2.0.2/common/ship_sizes/04_fallen_empires.txt
  7257. index 5040efe..48dae0d 100755
  7258. --- a/2.0.0/common/ship_sizes/04_fallen_empires.txt
  7259. +++ b/2.0.2/common/ship_sizes/04_fallen_empires.txt
  7260. @@ -20,11 +20,11 @@
  7261. @build_block_radius_civilian = 20
  7262. @build_block_radius_military = 200
  7263.  
  7264. -@speed_very_slow = 60
  7265. -@speed_slow = 80
  7266. -@speed_default = 100
  7267. -@speed_fast = 120
  7268. -@speed_very_fast = 170
  7269. +@speed_very_slow = 80
  7270. +@speed_slow = 100
  7271. +@speed_default = 120
  7272. +@speed_fast = 140
  7273. +@speed_very_fast = 160
  7274.  
  7275. #################
  7276. # FALLEN EMPIRE #
  7277. @@ -35,7 +35,7 @@ massive_ship_fallen_empire = {
  7278. formation_priority = @titan_formation_priority
  7279. #entity = titan_entity
  7280. graphical_culture = { "fallen_empire_01" "fallen_empire_02" "fallen_empire_03" "fallen_empire_04" "fallen_machine_empire_01" }
  7281. - max_speed = @speed_very_slow
  7282. + max_speed = @speed_slow
  7283. acceleration = 0.15
  7284. rotation_speed = 0.1
  7285. collision_radius = @titan_collision_radius
  7286. @@ -139,6 +139,9 @@ military_station_small_fallen_empire = {
  7287. ship_armor_regen_add_perc = 0.5
  7288. ship_upkeep_mult = -0.25
  7289. }
  7290. + ship_modifier = {
  7291. + ship_weapon_range_mult = 0.20
  7292. + }
  7293. max_hitpoints = 5000
  7294.  
  7295. combat_size_multiplier = 4
  7296. @@ -171,9 +174,11 @@ military_station_large_fallen_empire = {
  7297. acceleration = 10
  7298. modifier = {
  7299. ship_evasion_mult = -1
  7300. - ship_weapon_range_mult = 0.5
  7301. ship_upkeep_mult = -0.25
  7302. }
  7303. + ship_modifier = {
  7304. + ship_weapon_range_mult = 0.20
  7305. + }
  7306. max_hitpoints = 10000
  7307. combat_size_multiplier = 20
  7308. size_multiplier = 8
  7309. diff --git a/2.0.0/common/ship_sizes/05_extra_dimensional.txt b/2.0.2/common/ship_sizes/05_extra_dimensional.txt
  7310. index 893d442..5d46b2c 100755
  7311. --- a/2.0.0/common/ship_sizes/05_extra_dimensional.txt
  7312. +++ b/2.0.2/common/ship_sizes/05_extra_dimensional.txt
  7313. @@ -15,10 +15,11 @@
  7314. @build_block_radius_civilian = 20
  7315. @build_block_radius_military = 200
  7316.  
  7317. -@speed_slow = 80
  7318. -@speed_default = 100
  7319. -@speed_fast = 120
  7320. -@speed_very_fast = 170
  7321. +@speed_very_slow = 80
  7322. +@speed_slow = 100
  7323. +@speed_default = 120
  7324. +@speed_fast = 140
  7325. +@speed_very_fast = 160
  7326.  
  7327. ####################
  7328. # EXTRADIMENSIONAL #
  7329. diff --git a/2.0.0/common/ship_sizes/06_crystal_entities.txt b/2.0.2/common/ship_sizes/06_crystal_entities.txt
  7330. index db9c5b1..eec737c 100755
  7331. --- a/2.0.0/common/ship_sizes/06_crystal_entities.txt
  7332. +++ b/2.0.2/common/ship_sizes/06_crystal_entities.txt
  7333. @@ -10,10 +10,11 @@
  7334. @cruiser_evasion = 15
  7335. @cruiser_hp = 1400
  7336.  
  7337. -@speed_slow = 80
  7338. -@speed_default = 100
  7339. -@speed_fast = 120
  7340. -@speed_very_fast = 170
  7341. +@speed_very_slow = 80
  7342. +@speed_slow = 100
  7343. +@speed_default = 120
  7344. +@speed_fast = 140
  7345. +@speed_very_fast = 160
  7346.  
  7347. @build_block_radius_civilian = 20
  7348.  
  7349. diff --git a/2.0.0/common/ship_sizes/07_space_monsters.txt b/2.0.2/common/ship_sizes/07_space_monsters.txt
  7350. index 18d17b2..7aeb98e 100755
  7351. --- a/2.0.0/common/ship_sizes/07_space_monsters.txt
  7352. +++ b/2.0.2/common/ship_sizes/07_space_monsters.txt
  7353. @@ -15,11 +15,11 @@
  7354. @build_block_radius_civilian = 20
  7355. @build_block_radius_military = 200
  7356.  
  7357. -@speed_very_slow = 60
  7358. -@speed_slow = 80
  7359. -@speed_default = 100
  7360. -@speed_fast = 120
  7361. -@speed_very_fast = 170
  7362. +@speed_very_slow = 80
  7363. +@speed_slow = 100
  7364. +@speed_default = 120
  7365. +@speed_fast = 140
  7366. +@speed_very_fast = 160
  7367.  
  7368. #################
  7369. # SPACE MONSTER #
  7370. diff --git a/2.0.0/common/ship_sizes/08_marauder_ships.txt b/2.0.2/common/ship_sizes/08_marauder_ships.txt
  7371. index 2a2de9d..53d2c3f 100755
  7372. --- a/2.0.0/common/ship_sizes/08_marauder_ships.txt
  7373. +++ b/2.0.2/common/ship_sizes/08_marauder_ships.txt
  7374. @@ -23,12 +23,11 @@
  7375. @build_block_radius_civilian = 20
  7376. @build_block_radius_military = 200
  7377.  
  7378. -@speed_crawl = 30
  7379. -@speed_very_slow = 60
  7380. -@speed_slow = 80
  7381. -@speed_default = 100
  7382. -@speed_fast = 120
  7383. -@speed_very_fast = 170
  7384. +@speed_very_slow = 80
  7385. +@speed_slow = 100
  7386. +@speed_default = 120
  7387. +@speed_fast = 140
  7388. +@speed_very_fast = 160
  7389.  
  7390. # Marauder Corvette
  7391. marauder_corvette = {
  7392. diff --git a/2.0.0/common/ship_sizes/09_pirates_ships.txt b/2.0.2/common/ship_sizes/09_pirates_ships.txt
  7393. index 47cca49..368be4a 100755
  7394. --- a/2.0.0/common/ship_sizes/09_pirates_ships.txt
  7395. +++ b/2.0.2/common/ship_sizes/09_pirates_ships.txt
  7396. @@ -15,11 +15,11 @@
  7397. @build_block_radius_civilian = 20
  7398. @build_block_radius_military = 200
  7399.  
  7400. -@speed_very_slow = 60
  7401. -@speed_slow = 80
  7402. -@speed_default = 100
  7403. -@speed_fast = 120
  7404. -@speed_very_fast = 170
  7405. +@speed_very_slow = 80
  7406. +@speed_slow = 100
  7407. +@speed_default = 120
  7408. +@speed_fast = 140
  7409. +@speed_very_fast = 160
  7410.  
  7411. ##########
  7412. # PIRATE #
  7413. @@ -117,9 +117,11 @@ pirate_station = {
  7414. modifier = {
  7415. ship_evasion_mult = -1
  7416. ship_armor_add = 35
  7417. - ship_weapon_range_mult = 0.20
  7418. ship_upkeep_mult = -0.25
  7419. }
  7420. + ship_modifier = {
  7421. + ship_weapon_range_mult = 0.20
  7422. + }
  7423. max_hitpoints = 2000
  7424. size_multiplier = 4
  7425. fleet_slot_size = 4
  7426. diff --git a/2.0.0/common/ship_sizes/10_ai_ships.txt b/2.0.2/common/ship_sizes/10_ai_ships.txt
  7427. index 3d39e87..e661cf2 100755
  7428. --- a/2.0.0/common/ship_sizes/10_ai_ships.txt
  7429. +++ b/2.0.2/common/ship_sizes/10_ai_ships.txt
  7430. @@ -15,11 +15,11 @@
  7431. @build_block_radius_civilian = 20
  7432. @build_block_radius_military = 200
  7433.  
  7434. -@speed_very_slow = 60
  7435. -@speed_slow = 80
  7436. -@speed_default = 100
  7437. -@speed_fast = 120
  7438. -@speed_very_fast = 170
  7439. +@speed_very_slow = 80
  7440. +@speed_slow = 100
  7441. +@speed_default = 120
  7442. +@speed_fast = 140
  7443. +@speed_very_fast = 160
  7444.  
  7445. ######
  7446. # AI #
  7447. @@ -77,8 +77,9 @@ military_station_large_ai = {
  7448. rotation_speed = 0.0
  7449. modifier = {
  7450. ship_evasion_mult = -1
  7451. + }
  7452. + ship_modifier = {
  7453. ship_weapon_range_mult = 0.20
  7454. - ship_upkeep_mult = -0.25
  7455. }
  7456. max_hitpoints = 4000
  7457. size_multiplier = 8
  7458. @@ -100,8 +101,9 @@ military_station_small_ai = {
  7459. rotation_speed = 0.0
  7460. modifier = {
  7461. ship_evasion_mult = -1
  7462. + }
  7463. + ship_modifier = {
  7464. ship_weapon_range_mult = 0.20
  7465. - ship_upkeep_mult = -0.25
  7466. }
  7467. max_hitpoints = 2000
  7468. size_multiplier = 8
  7469. @@ -123,8 +125,9 @@ core_ai = {
  7470. rotation_speed = 0.0
  7471. modifier = {
  7472. ship_evasion_mult = -1
  7473. + }
  7474. + ship_modifier = {
  7475. ship_weapon_range_mult = 0.20
  7476. - ship_upkeep_mult = -0.25
  7477. }
  7478. max_hitpoints = 50000
  7479. combat_size_multiplier = 50
  7480. @@ -148,8 +151,9 @@ final_core_ai = {
  7481. modifier = {
  7482. ship_evasion_mult = -1
  7483. ship_armor_add = 100
  7484. - ship_weapon_range_mult = 0.50
  7485. - ship_upkeep_mult = -0.25
  7486. + }
  7487. + ship_modifier = {
  7488. + ship_weapon_range_mult = 0.20
  7489. }
  7490. max_hitpoints = 140000
  7491. combat_size_multiplier = 50
  7492. @@ -246,8 +250,9 @@ blue_core_ai = {
  7493. modifier = {
  7494. ship_evasion_mult = -1
  7495. ship_armor_add = 100
  7496. - ship_weapon_range_mult = 0.50
  7497. - ship_upkeep_mult = -0.25
  7498. + }
  7499. + ship_modifier = {
  7500. + ship_weapon_range_mult = 0.20
  7501. }
  7502. max_hitpoints = 40000
  7503. size_multiplier = 8
  7504. @@ -270,8 +275,9 @@ blue_military_station_large_ai = {
  7505. modifier = {
  7506. ship_evasion_mult = -1
  7507. ship_armor_add = 45
  7508. - ship_weapon_range_mult = 0.50
  7509. - ship_upkeep_mult = -0.25
  7510. + }
  7511. + ship_modifier = {
  7512. + ship_weapon_range_mult = 0.20
  7513. }
  7514. max_hitpoints = 20000
  7515. size_multiplier = 8
  7516. @@ -294,8 +300,9 @@ blue_military_station_small_ai = {
  7517. modifier = {
  7518. ship_evasion_mult = -1
  7519. ship_armor_add = 20
  7520. - ship_weapon_range_mult = 0.50
  7521. - ship_upkeep_mult = -0.25
  7522. + }
  7523. + ship_modifier = {
  7524. + ship_weapon_range_mult = 0.20
  7525. }
  7526. max_hitpoints = 10000
  7527. size_multiplier = 8
  7528. diff --git a/2.0.0/common/ship_sizes/11_guardians.txt b/2.0.2/common/ship_sizes/11_guardians.txt
  7529. index 7055455..9d3bce9 100755
  7530. --- a/2.0.0/common/ship_sizes/11_guardians.txt
  7531. +++ b/2.0.2/common/ship_sizes/11_guardians.txt
  7532. @@ -16,11 +16,11 @@
  7533. @build_block_radius_military = 200
  7534.  
  7535. @speed_crawl = 30
  7536. -@speed_very_slow = 60
  7537. -@speed_slow = 80
  7538. -@speed_default = 100
  7539. -@speed_fast = 120
  7540. -@speed_very_fast = 170
  7541. +@speed_very_slow = 80
  7542. +@speed_slow = 100
  7543. +@speed_default = 120
  7544. +@speed_fast = 140
  7545. +@speed_very_fast = 160
  7546.  
  7547. # Dragon Test
  7548. # Swarm Queen
  7549. @@ -266,6 +266,8 @@ dimensional_horror = {
  7550. ship_evasion_mult = -1
  7551. ship_shield_add = 100000
  7552. ship_armor_add = 100000
  7553. + }
  7554. + ship_modifier = {
  7555. ship_weapon_range_mult = 0.50
  7556. }
  7557. max_hitpoints = 100000
  7558. @@ -297,7 +299,6 @@ npc_warship_01 = {
  7559. modifier = {
  7560. ship_evasion_add = 2
  7561. ship_upkeep_mult = -1
  7562. - ship_fire_rate_mult = 1
  7563. ship_weapon_damage = 2
  7564. ship_shield_mult = 3
  7565. ship_armor_add = 5000
  7566. diff --git a/2.0.0/common/ship_sizes/12_psionic.txt b/2.0.2/common/ship_sizes/12_psionic.txt
  7567. index 9dc16b8..b780b4c 100755
  7568. --- a/2.0.0/common/ship_sizes/12_psionic.txt
  7569. +++ b/2.0.2/common/ship_sizes/12_psionic.txt
  7570. @@ -15,7 +15,11 @@
  7571. @build_block_radius_civilian = 20
  7572. @build_block_radius_military = 200
  7573.  
  7574. -@speed_slow = 80
  7575. +@speed_very_slow = 80
  7576. +@speed_slow = 100
  7577. +@speed_default = 120
  7578. +@speed_fast = 140
  7579. +@speed_very_fast = 160
  7580.  
  7581. #################
  7582. # AVATAR #
  7583. @@ -54,7 +58,6 @@ corrupted_avatar = {
  7584. ship_evasion_add = 25
  7585. ship_shield_add = 150000
  7586. ship_shield_regen_add_static = 20
  7587. - ship_weapon_range_mult = 1
  7588. }
  7589. max_hitpoints = 17500
  7590. size_multiplier = 16
  7591. @@ -76,7 +79,6 @@ shroud_manifestation = {
  7592. modifier = {
  7593. ship_evasion_add = 25
  7594. ship_shield_add = 50000
  7595. - ship_weapon_range_mult = 1
  7596. }
  7597. max_hitpoints = 10000
  7598. size_multiplier = 16
  7599. @@ -98,7 +100,6 @@ warped_consciousness = {
  7600. modifier = {
  7601. ship_evasion_add = 25
  7602. ship_shield_add = 50000
  7603. - ship_weapon_range_mult = 2
  7604. }
  7605. max_hitpoints = 10000
  7606. size_multiplier = 16
  7607. diff --git a/2.0.0/common/solar_system_initializers/hostile_system_initializers.txt b/2.0.2/common/solar_system_initializers/hostile_system_initializers.txt
  7608. index 4f605a7..18a4420 100755
  7609. --- a/2.0.0/common/solar_system_initializers/hostile_system_initializers.txt
  7610. +++ b/2.0.2/common/solar_system_initializers/hostile_system_initializers.txt
  7611. @@ -2595,7 +2595,10 @@ hostile_init_18 = {
  7612. }
  7613. modifier = {
  7614. factor = 0
  7615. + OR = {
  7616. has_star_flag = empire_cluster
  7617. + host_has_dlc = "Apocalypse"
  7618. + }
  7619. }
  7620. }
  7621.  
  7622. diff --git a/2.0.0/common/solar_system_initializers/prescripted_species_systems.txt b/2.0.2/common/solar_system_initializers/prescripted_species_systems.txt
  7623. index 900bd16..14b6e4d 100755
  7624. --- a/2.0.0/common/solar_system_initializers/prescripted_species_systems.txt
  7625. +++ b/2.0.2/common/solar_system_initializers/prescripted_species_systems.txt
  7626. @@ -673,6 +673,16 @@ vultaumar_system = {
  7627. type = "medium_debris_01_object"
  7628. location = THIS
  7629. }
  7630. + add_modifier = {
  7631. + modifier = "vultaum_homeworld"
  7632. + days = -1
  7633. + }
  7634. + orbital_deposit_tile = {
  7635. + clear_deposits = yes
  7636. + add_deposit = d_enormous3_engineering_deposit
  7637. + add_deposit = d_enormous3_physics_deposit
  7638. + add_deposit = d_enormous3_society_deposit
  7639. + }
  7640.  
  7641. }
  7642.  
  7643. @@ -719,6 +729,17 @@ vultaumar_system = {
  7644. orbit_angle = 210
  7645. size = 25
  7646. has_ring = yes
  7647. +
  7648. + init_effect = {
  7649. + add_modifier = {
  7650. + modifier = "vultaum_minerals"
  7651. + days = -1
  7652. + }
  7653. + orbital_deposit_tile = {
  7654. + clear_deposits = yes
  7655. + add_deposit = d_enormous3_mineral_deposit
  7656. + }
  7657. + }
  7658. }
  7659.  
  7660. planet = {
  7661. @@ -729,6 +750,17 @@ vultaumar_system = {
  7662. size = 40
  7663. has_ring = no
  7664.  
  7665. + init_effect = {
  7666. + add_modifier = {
  7667. + modifier = "vultaum_energy"
  7668. + days = -1
  7669. + }
  7670. + orbital_deposit_tile = {
  7671. + clear_deposits = yes
  7672. + add_deposit = d_enormous3_energy_deposit
  7673. + }
  7674. + }
  7675. +
  7676. moon = {
  7677. name = "NAME_Vultaumar_IVa"
  7678. class = "pc_frozen"
  7679. @@ -790,6 +822,16 @@ yuhtaan_system = {
  7680. angle = random
  7681. }
  7682. }
  7683. + add_modifier = {
  7684. + modifier = "yuht_homeworld"
  7685. + days = -1
  7686. + }
  7687. + orbital_deposit_tile = {
  7688. + clear_deposits = yes
  7689. + add_deposit = d_enormous3_engineering_deposit
  7690. + add_deposit = d_enormous3_physics_deposit
  7691. + add_deposit = d_enormous3_society_deposit
  7692. + }
  7693. }
  7694.  
  7695. moon = {
  7696. @@ -834,6 +876,17 @@ yuhtaan_system = {
  7697. orbit_angle = -95
  7698. size = 5
  7699. has_ring = no
  7700. +
  7701. + init_effect = {
  7702. + add_modifier = {
  7703. + modifier = "yuht_minerals"
  7704. + days = -1
  7705. + }
  7706. + orbital_deposit_tile = {
  7707. + clear_deposits = yes
  7708. + add_deposit = d_enormous3_mineral_deposit
  7709. + }
  7710. + }
  7711. }
  7712.  
  7713. planet = {
  7714. @@ -888,6 +941,17 @@ yuhtaan_system = {
  7715. has_ring = yes
  7716. change_orbit = 6
  7717.  
  7718. + init_effect = {
  7719. + add_modifier = {
  7720. + modifier = "yuht_energy"
  7721. + days = -1
  7722. + }
  7723. + orbital_deposit_tile = {
  7724. + clear_deposits = yes
  7725. + add_deposit = d_enormous3_energy_deposit
  7726. + }
  7727. + }
  7728. +
  7729. moon = {
  7730. name = "NAME_Yuthaan_Va"
  7731. class = "pc_frozen"
  7732. @@ -939,6 +1003,17 @@ fen_habbanis_system = {
  7733. orbit_angle = -210
  7734. size = 5
  7735. has_ring = no
  7736. +
  7737. + init_effect = {
  7738. + add_modifier = {
  7739. + modifier = "first_league_minerals"
  7740. + days = -1
  7741. + }
  7742. + orbital_deposit_tile = {
  7743. + clear_deposits = yes
  7744. + add_deposit = d_enormous3_mineral_deposit
  7745. + }
  7746. + }
  7747. }
  7748.  
  7749. planet = {
  7750. @@ -966,6 +1041,19 @@ fen_habbanis_system = {
  7751. has_ring = no
  7752. #anomaly = "FEN_HABBANIS"
  7753. flags = { first_league_homeworld }
  7754. +
  7755. + init_effect = {
  7756. + add_modifier = {
  7757. + modifier = "first_league_homeworld"
  7758. + days = -1
  7759. + }
  7760. + orbital_deposit_tile = {
  7761. + clear_deposits = yes
  7762. + add_deposit = d_enormous3_engineering_deposit
  7763. + add_deposit = d_enormous3_physics_deposit
  7764. + add_deposit = d_enormous3_society_deposit
  7765. + }
  7766. + }
  7767. }
  7768.  
  7769. planet = {
  7770. @@ -993,6 +1081,17 @@ fen_habbanis_system = {
  7771. orbit_angle = -160
  7772. size = 35
  7773. has_ring = no
  7774. +
  7775. + init_effect = {
  7776. + add_modifier = {
  7777. + modifier = "first_league_energy"
  7778. + days = -1
  7779. + }
  7780. + orbital_deposit_tile = {
  7781. + clear_deposits = yes
  7782. + add_deposit = d_enormous3_energy_deposit
  7783. + }
  7784. + }
  7785. }
  7786. }
  7787.  
  7788. @@ -1033,6 +1132,17 @@ irass_system = {
  7789. orbit_angle = 70
  7790. size = 20
  7791. has_ring = no
  7792. +
  7793. + init_effect = {
  7794. + add_modifier = {
  7795. + modifier = "irassian_minerals"
  7796. + days = -1
  7797. + }
  7798. + orbital_deposit_tile = {
  7799. + clear_deposits = yes
  7800. + add_deposit = d_enormous3_mineral_deposit
  7801. + }
  7802. + }
  7803. }
  7804.  
  7805. planet = {
  7806. @@ -1086,6 +1196,19 @@ irass_system = {
  7807. has_ring = no
  7808. #anomaly = "IRASSIA"
  7809. flags = { irassian_homeworld }
  7810. +
  7811. + init_effect = {
  7812. + add_modifier = {
  7813. + modifier = "irassian_homeworld"
  7814. + days = -1
  7815. + }
  7816. + orbital_deposit_tile = {
  7817. + clear_deposits = yes
  7818. + add_deposit = d_enormous3_engineering_deposit
  7819. + add_deposit = d_enormous3_physics_deposit
  7820. + add_deposit = d_enormous3_society_deposit
  7821. + }
  7822. + }
  7823. }
  7824. }
  7825.  
  7826. @@ -1123,6 +1246,17 @@ irass_system = {
  7827. orbit_angle = 145
  7828. size = 25
  7829. has_ring = no
  7830. +
  7831. + init_effect = {
  7832. + add_modifier = {
  7833. + modifier = "irassian_energy"
  7834. + days = -1
  7835. + }
  7836. + orbital_deposit_tile = {
  7837. + clear_deposits = yes
  7838. + add_deposit = d_enormous3_energy_deposit
  7839. + }
  7840. + }
  7841. }
  7842.  
  7843. planet = {
  7844. diff --git a/2.0.0/common/solar_system_initializers/special_system_initializers.txt b/2.0.2/common/solar_system_initializers/special_system_initializers.txt
  7845. index a53ddba..61aaefa 100755
  7846. --- a/2.0.0/common/solar_system_initializers/special_system_initializers.txt
  7847. +++ b/2.0.2/common/solar_system_initializers/special_system_initializers.txt
  7848. @@ -1,3 +1,4 @@
  7849. +@distance = 50
  7850. @base_moon_distance = 10
  7851.  
  7852. # Black Holes
  7853. @@ -4102,7 +4103,7 @@ com_sol_system = {
  7854. civic = civic_idealistic_foundation
  7855. }
  7856. species = event_target:human_species
  7857. - name_list = "HUM3"
  7858. + name_list = "HUMAN1"
  7859. #ship_prefix = "UNS"
  7860. ethos = {
  7861. ethic = "ethic_xenophile"
  7862. diff --git a/2.0.0/common/special_projects/00_projects.txt b/2.0.2/common/special_projects/00_projects.txt
  7863. index bd7753b..8259180 100755
  7864. --- a/2.0.0/common/special_projects/00_projects.txt
  7865. +++ b/2.0.2/common/special_projects/00_projects.txt
  7866. @@ -554,7 +554,7 @@ special_project = {
  7867. cost = 0
  7868. days_to_research = 180
  7869. tech_department = physics_technology
  7870. - timelimit = 730
  7871. + timelimit = 1080
  7872.  
  7873. event_scope = ship_event
  7874.  
  7875. @@ -579,7 +579,7 @@ special_project = {
  7876. days_to_research = 180
  7877. tech_department = society_technology
  7878. picture = GFX_evt_gas_giant
  7879. - timelimit = 360 # in days
  7880. + timelimit = 1080
  7881.  
  7882. event_scope = ship_event
  7883.  
  7884. @@ -604,7 +604,7 @@ special_project = {
  7885. days_to_research = 180
  7886. tech_department = society_technology
  7887. picture = GFX_evt_gas_giant
  7888. - timelimit = 730 # in days
  7889. + timelimit = 1080
  7890.  
  7891. event_scope = ship_event
  7892.  
  7893. @@ -743,7 +743,7 @@ special_project = {
  7894. cost = 0
  7895. days_to_research = 180
  7896. tech_department = society_technology
  7897. - timelimit = 730 # in days
  7898. + timelimit = 1080
  7899.  
  7900. event_scope = ship_event
  7901.  
  7902. @@ -767,7 +767,7 @@ special_project = {
  7903. cost = 0
  7904. days_to_research = 180
  7905. tech_department = society_technology
  7906. - timelimit = 730 # in days
  7907. + timelimit = 1080
  7908.  
  7909. event_scope = ship_event
  7910.  
  7911. @@ -2546,7 +2546,7 @@ special_project = {
  7912. days_to_research = 60
  7913. tech_department = society_technology
  7914. picture = GFX_evt_smugglers_in_bar
  7915. - timelimit = 720
  7916. + timelimit = 1080
  7917.  
  7918. event_scope = ship_event
  7919.  
  7920. @@ -2570,7 +2570,7 @@ special_project = {
  7921. days_to_research = 60
  7922. tech_department = society_technology
  7923. picture = GFX_evt_smugglers_in_bar
  7924. - timelimit = 720
  7925. + timelimit = 1080
  7926.  
  7927. event_scope = ship_event
  7928.  
  7929. @@ -2594,7 +2594,7 @@ special_project = {
  7930. days_to_research = 60
  7931. tech_department = society_technology
  7932. picture = GFX_evt_smugglers_in_bar
  7933. - timelimit = 720
  7934. + timelimit = 1080
  7935.  
  7936. event_scope = ship_event
  7937.  
  7938. @@ -3079,7 +3079,7 @@ special_project = {
  7939. days_to_research = 60
  7940. tech_department = society_technology
  7941. picture = GFX_evt_cybernetics
  7942. - timelimit = 720
  7943. + timelimit = 1080
  7944.  
  7945. event_scope = ship_event
  7946.  
  7947. diff --git a/2.0.0/common/special_projects/00_projects_2.txt b/2.0.2/common/special_projects/00_projects_2.txt
  7948. index 979343c..593483f 100755
  7949. --- a/2.0.0/common/special_projects/00_projects_2.txt
  7950. +++ b/2.0.2/common/special_projects/00_projects_2.txt
  7951. @@ -97,7 +97,7 @@ special_project = {
  7952. #cost = 0
  7953. days_to_research = 20
  7954. tech_department = society_technology
  7955. - timelimit = 720
  7956. + timelimit = 1080
  7957. picture = GFX_evt_alien_planet
  7958. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  7959.  
  7960. @@ -122,7 +122,7 @@ special_project = {
  7961. #cost = 200
  7962. days_to_research = 30
  7963. tech_department = society_technology
  7964. - timelimit = 720
  7965. + timelimit = 1080
  7966. picture = GFX_evt_alien_planet
  7967. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  7968.  
  7969. @@ -147,7 +147,7 @@ special_project = {
  7970. #cost = 400
  7971. days_to_research = 10
  7972. tech_department = society_technology
  7973. - timelimit = 400
  7974. + timelimit = 1080
  7975. picture = GFX_evt_alien_planet
  7976. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  7977.  
  7978. @@ -433,7 +433,7 @@ special_project = {
  7979. #cost = 100
  7980. days_to_research = 10
  7981. tech_department = engineering_technology
  7982. - timelimit = 90
  7983. + timelimit = 1080
  7984. picture = GFX_evt_satellite_in_orbit
  7985.  
  7986. event_scope = ship_event
  7987. diff --git a/2.0.0/common/special_projects/00_projects_3.txt b/2.0.2/common/special_projects/00_projects_3.txt
  7988. index e0984d6..f22f360 100755
  7989. --- a/2.0.0/common/special_projects/00_projects_3.txt
  7990. +++ b/2.0.2/common/special_projects/00_projects_3.txt
  7991. @@ -62,7 +62,7 @@ special_project = {
  7992. #cost = 0
  7993. days_to_research = 30
  7994. tech_department = society_technology
  7995. - timelimit = 100
  7996. + timelimit = 1080
  7997. picture = GFX_evt_sapient_AI
  7998. icon = "gfx/interface/icons/situation_log/situation_log_ai.dds"
  7999.  
  8000. @@ -184,7 +184,7 @@ special_project = {
  8001. #cost = 0
  8002. days_to_research = 60
  8003. tech_department = engineering_technology
  8004. - timelimit = 365
  8005. + timelimit = 1080
  8006. picture = GFX_evt_mining_station
  8007. icon = "gfx/interface/icons/situation_log/situation_log_engineering.dds"
  8008.  
  8009. @@ -233,7 +233,7 @@ special_project = {
  8010. #cost = 0
  8011. days_to_research = 45
  8012. tech_department = engineering_technology
  8013. - timelimit = 500
  8014. + timelimit = 1080
  8015. picture = GFX_evt_ship_in_orbit
  8016. icon = "gfx/interface/icons/situation_log/situation_log_engineering.dds"
  8017.  
  8018. @@ -335,7 +335,7 @@ special_project = {
  8019. #cost = 0
  8020. days_to_research = 7
  8021. tech_department = society_technology
  8022. - timelimit = 90
  8023. + timelimit = 1080
  8024. picture = GFX_evt_ship_under_attack
  8025. icon = "gfx/interface/icons/situation_log/situation_log_extradimensional.dds"
  8026.  
  8027. @@ -558,8 +558,8 @@ special_project = {
  8028. on_success = {
  8029. root = {
  8030. random_list = {
  8031. - 30 = { planet_event = { id = colony.2006 } } #ship can be used
  8032. - 50 = { planet_event = { id = colony.2007 } } #ship can be salvaged
  8033. + 50 = { planet_event = { id = colony.2006 } } #ship can be used
  8034. + 30 = { planet_event = { id = colony.2007 } } #ship can be salvaged
  8035. 20 = { planet_event = { id = colony.2008 } } #ship cannot be salvaged
  8036. }
  8037. }
  8038. diff --git a/2.0.0/common/special_projects/00_projects_4.txt b/2.0.2/common/special_projects/00_projects_4.txt
  8039. index 32c3566..1900a8f 100755
  8040. --- a/2.0.0/common/special_projects/00_projects_4.txt
  8041. +++ b/2.0.2/common/special_projects/00_projects_4.txt
  8042. @@ -194,7 +194,7 @@ special_project = {
  8043.  
  8044. special_project = {
  8045. key = "disappearing_pops_project"
  8046. - timelimit = 360
  8047. + timelimit = 1080
  8048. cost = 100
  8049. tech_department = society_technology
  8050. picture = GFX_evt_alien_planet
  8051. diff --git a/2.0.0/common/special_projects/00_projects_guardian.txt b/2.0.2/common/special_projects/00_projects_guardian.txt
  8052. index 32f1268..a4f141c 100755
  8053. --- a/2.0.0/common/special_projects/00_projects_guardian.txt
  8054. +++ b/2.0.2/common/special_projects/00_projects_guardian.txt
  8055. @@ -167,7 +167,7 @@ special_project = {
  8056. cost = 0
  8057. days_to_research = 30
  8058. tech_department = engineering_technology
  8059. - timelimit = 720
  8060. + timelimit = 1080
  8061.  
  8062. event_scope = ship_event
  8063.  
  8064. @@ -189,7 +189,7 @@ special_project = {
  8065. cost = 0
  8066. days_to_research = 30
  8067. tech_department = engineering_technology
  8068. - timelimit = 720
  8069. + timelimit = 1080
  8070.  
  8071. same_option_group_as = { ENIGMATIC_FORTRESS_1A }
  8072.  
  8073. @@ -213,7 +213,7 @@ special_project = {
  8074. cost = 0
  8075. days_to_research = 60
  8076. tech_department = engineering_technology
  8077. - timelimit = 360
  8078. + timelimit = 1080
  8079.  
  8080. event_scope = ship_event
  8081.  
  8082. @@ -237,7 +237,7 @@ special_project = {
  8083. cost = 0
  8084. days_to_research = 120
  8085. tech_department = engineering_technology
  8086. - timelimit = 360
  8087. + timelimit = 1080
  8088.  
  8089. event_scope = ship_event
  8090.  
  8091. @@ -262,7 +262,7 @@ special_project = {
  8092. cost = 0
  8093. days_to_research = 30
  8094. tech_department = engineering_technology
  8095. - timelimit = 360
  8096. + timelimit = 1080
  8097.  
  8098. event_scope = ship_event
  8099.  
  8100. @@ -287,7 +287,7 @@ special_project = {
  8101. cost = 0
  8102. days_to_research = 10
  8103. tech_department = engineering_technology
  8104. - timelimit = 360
  8105. + timelimit = 1080
  8106.  
  8107. event_scope = ship_event
  8108.  
  8109. diff --git a/2.0.0/common/special_projects/00_projects_horizonsignal.txt b/2.0.2/common/special_projects/00_projects_horizonsignal.txt
  8110. index 9240eaa..e13c4ca 100755
  8111. --- a/2.0.0/common/special_projects/00_projects_horizonsignal.txt
  8112. +++ b/2.0.2/common/special_projects/00_projects_horizonsignal.txt
  8113. @@ -133,7 +133,7 @@ special_project = {
  8114. #cost = 0
  8115. days_to_research = 1
  8116. tech_department = society_technology
  8117. - timelimit = 360
  8118. + timelimit = 1080
  8119. picture = GFX_evt_alien_city
  8120. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  8121.  
  8122. @@ -164,7 +164,7 @@ special_project = {
  8123. #cost = 0
  8124. days_to_research = 1
  8125. tech_department = society_technology
  8126. - timelimit = 360
  8127. + timelimit = 1080
  8128. picture = GFX_evt_alien_city
  8129. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  8130.  
  8131. @@ -191,7 +191,7 @@ special_project = {
  8132. #cost = 0
  8133. days_to_research = 1
  8134. tech_department = society_technology
  8135. - timelimit = 360
  8136. + timelimit = 1080
  8137. picture = GFX_evt_alien_city
  8138. icon = "gfx/interface/icons/situation_log/situation_log_quest.dds"
  8139.  
  8140. diff --git a/2.0.0/common/special_projects/00_projects_utopia.txt b/2.0.2/common/special_projects/00_projects_utopia.txt
  8141. index 84db764..e1e05f6 100755
  8142. --- a/2.0.0/common/special_projects/00_projects_utopia.txt
  8143. +++ b/2.0.2/common/special_projects/00_projects_utopia.txt
  8144. @@ -54,6 +54,16 @@ special_project = {
  8145.  
  8146. on_success = {
  8147. owner = {
  8148. + if = {
  8149. + limit = {
  8150. + has_policy_flag = robots_outlawed
  8151. + }
  8152. + set_policy = {
  8153. + policy = robot_pop_policy
  8154. + option = robot_pops_allowed
  8155. + cooldown = no
  8156. + }
  8157. + }
  8158. country_event = { id = utopia.2551 }
  8159. }
  8160. }
  8161. diff --git a/2.0.0/common/species_names/machine_names_SC.txt b/2.0.0/common/species_names/machine_names_SC.txt
  8162. deleted file mode 100755
  8163. index 195b5be..0000000
  8164. --- a/2.0.0/common/species_names/machine_names_SC.txt
  8165. +++ /dev/null
  8166. @@ -1,150 +0,0 @@
  8167. -# Generated species derive their names from here
  8168. -
  8169. -### MACHINES
  8170. -
  8171. -MACHINE = {
  8172. - xt-489 = {
  8173. - language = "l_simp_chinese"
  8174. - name = XT-489
  8175. - plural = XT-489s
  8176. - home_planet = X-01
  8177. - home_system = VX-2291
  8178. - name_list = "MACHINE1"
  8179. - }
  8180. -
  8181. - shazarak = {
  8182. - language = "l_simp_chinese"
  8183. - name = 沙扎拉克
  8184. - plural = 沙扎拉克斯
  8185. - home_planet = 沙兹乌
  8186. - home_system = 沙兹卡
  8187. - name_list = "MACHINE2"
  8188. - }
  8189. -
  8190. - mechazur = {
  8191. - language = "l_simp_chinese"
  8192. - name = 麦克佐
  8193. - plural = 麦克佐斯
  8194. - home_planet = "麦卡斯至尊"
  8195. - home_system = Mechaz
  8196. - name_list = "MACHINE1"
  8197. - }
  8198. -
  8199. - zero-zero-one = {
  8200. - language = "l_simp_chinese"
  8201. - name = 零-零-壹
  8202. - plural = 零-零-壹
  8203. - home_planet = 零-壹
  8204. - home_system = 零
  8205. - name_list = "MACHINE3"
  8206. - }
  8207. -
  8208. - prime = {
  8209. - language = "l_simp_chinese"
  8210. - name = 至尊
  8211. - plural = 至尊
  8212. - home_planet = "至尊者"
  8213. - home_system = "基地群"
  8214. - name_list = "MACHINE3"
  8215. - }
  8216. -
  8217. - zenak = {
  8218. - language = "l_simp_chinese"
  8219. - name = 则纳克
  8220. - plural = 则纳基
  8221. - home_planet = 则纳克-普鲁
  8222. - home_system = 则纳空
  8223. - name_list = "MACHINE2"
  8224. - }
  8225. -
  8226. - omni = {
  8227. - language = "l_simp_chinese"
  8228. - name = 奥姆
  8229. - plural = 奥姆
  8230. - home_planet = "阿尔法阵列"
  8231. - home_system = 欧姆纳克
  8232. - name_list = "MACHINE1"
  8233. - }
  8234. -
  8235. - daar = {
  8236. - language = "l_simp_chinese"
  8237. - name = 达尔
  8238. - plural = 达尔
  8239. - home_planet = 达尔-1
  8240. - home_system = 达尔鲁兹
  8241. - name_list = "MACHINE2"
  8242. - }
  8243. -
  8244. - tronzaru = {
  8245. - language = "l_simp_chinese"
  8246. - name = 创泽鲁
  8247. - plural = 创泽鲁
  8248. - home_planet = 创兹
  8249. - home_system = "创兹_卡拉斯"
  8250. - name_list = "MACHINE1"
  8251. - }
  8252. -
  8253. - techarus = {
  8254. - language = "l_simp_chinese"
  8255. - name = 塔夏鲁斯
  8256. - plural = 塔其斯
  8257. - home_planet = 塔夏
  8258. - home_system = "塔夏-尤巴斯"
  8259. - name_list = "MACHINE3"
  8260. - }
  8261. -
  8262. - jonus = {
  8263. - language = "l_simp_chinese"
  8264. - name = 乔纳斯
  8265. - plural = 乔纳西
  8266. - home_planet = 贾拉
  8267. - home_system = 杰尼萨
  8268. - name_list = "MACHINE3"
  8269. - }
  8270. -
  8271. - iribot = {
  8272. - language = "l_simp_chinese"
  8273. - name = 伊利波特
  8274. - plural = 伊利波特
  8275. - home_planet = 伊尔
  8276. - home_system = 伊利
  8277. - name_list = "MACHINE2"
  8278. - }
  8279. -
  8280. - silicron = {
  8281. - language = "l_simp_chinese"
  8282. - name = 西利克隆
  8283. - plural = 西利克隆斯
  8284. - home_planet = "主管道"
  8285. - home_system = SI-1
  8286. - name_list = "MACHINE1"
  8287. - }
  8288. -
  8289. - dekron = {
  8290. - language = "l_simp_chinese"
  8291. - name = 戴克隆
  8292. - plural = 戴克隆斯
  8293. - home_planet = 戴克隆尼亚
  8294. - home_system = 戴克鲁斯
  8295. - name_list = "MACHINE3"
  8296. - }
  8297. -
  8298. - tebrid = {
  8299. - language = "l_simp_chinese"
  8300. - name = 泰伯瑞德
  8301. - plural = 泰伯瑞茨
  8302. - home_planet = 零
  8303. - home_system = 泰伯瑞亚
  8304. - name_list = "MACHINE2"
  8305. - }
  8306. -
  8307. - synthoid = {
  8308. - language = "l_simp_chinese"
  8309. - name = 合成人
  8310. - plural = 合成人
  8311. - home_planet = 合成子
  8312. - home_system = 合成者
  8313. - name_list = "MACHINE2"
  8314. - }
  8315. -
  8316. -}
  8317. diff --git a/2.0.0/common/species_rights/species_rights.txt b/2.0.2/common/species_rights/species_rights.txt
  8318. index 985a838..75cf59e 100755
  8319. --- a/2.0.0/common/species_rights/species_rights.txt
  8320. +++ b/2.0.2/common/species_rights/species_rights.txt
  8321. @@ -142,7 +142,7 @@ citizenship_assimilation = {
  8322. hidden_trigger = { exists = from }
  8323. custom_tooltip = {
  8324. fail_text = MUST_NOT_BE_DOMINANT_SPECIES
  8325. - NOT = { is_same_species = from }
  8326. + NOT = { is_exact_same_species = from }
  8327. }
  8328. custom_tooltip = {
  8329. fail_text = "lonely_hive_mind_pops_kill_themselves_citizenship"
  8330. @@ -728,15 +728,16 @@ citizenship_purge = {
  8331. is_same_species = from
  8332. }
  8333. }
  8334. - custom_tooltip = {
  8335. - fail_text = same_species_disallowed
  8336. - NOT = { is_same_species = from }
  8337. - }
  8338. if = {
  8339. limit = { is_lonely_hive_mind_pop = yes }
  8340. always = yes
  8341.  
  8342. else = {
  8343. + custom_tooltip = {
  8344. + fail_text = same_species_disallowed
  8345. + NOT = { is_same_species = from }
  8346. + }
  8347. +
  8348. OR = {
  8349. custom_tooltip = {
  8350. #fail_text = default
  8351. @@ -2321,6 +2322,12 @@ population_control_yes = {
  8352.  
  8353. allow = {
  8354. hidden_trigger = { exists = from }
  8355. + if = {
  8356. + limit = {
  8357. + has_citizenship_type = { country = from type = citizenship_purge }
  8358. + }
  8359. + always = yes
  8360. + else = {
  8361. custom_tooltip = {
  8362. fail_text = same_species_disallowed
  8363. OR = {
  8364. @@ -2338,6 +2345,8 @@ population_control_yes = {
  8365. }
  8366. }
  8367. }
  8368. + }
  8369. + }
  8370. ai_will_do = {
  8371. factor = 2
  8372. modifier = {
  8373. @@ -2399,11 +2408,19 @@ colonization_control_yes = {
  8374.  
  8375. allow = {
  8376. hidden_trigger = { exists = from }
  8377. + if = {
  8378. + limit = {
  8379. + has_citizenship_type = { country = from type = citizenship_purge }
  8380. + }
  8381. + always = yes
  8382. + else = {
  8383. custom_tooltip = {
  8384. fail_text = same_species_disallowed
  8385. NOT = { is_same_species = from }
  8386. }
  8387. }
  8388. + }
  8389. + }
  8390.  
  8391. ai_will_do = {
  8392. factor = 2
  8393. diff --git a/2.0.0/common/starbase_buildings/00_starbase_buildings.txt b/2.0.2/common/starbase_buildings/00_starbase_buildings.txt
  8394. index 18400a3..e334f7e 100755
  8395. --- a/2.0.0/common/starbase_buildings/00_starbase_buildings.txt
  8396. +++ b/2.0.2/common/starbase_buildings/00_starbase_buildings.txt
  8397. @@ -150,7 +150,10 @@ offworld_trading_company = {
  8398.  
  8399. potential = {
  8400. exists = owner
  8401. - owner = { has_technology = tech_space_trading }
  8402. + owner = {
  8403. + has_technology = tech_space_trading
  8404. + #NOT = { has_ethic = ethic_gestalt_consciousness }
  8405. + }
  8406. }
  8407.  
  8408. possible = {
  8409. @@ -166,6 +169,7 @@ offworld_trading_company = {
  8410. }
  8411.  
  8412. custom_tooltip = sm_offworld_trading_company_desc_modifier
  8413. +
  8414. show_in_tech = "tech_space_trading"
  8415.  
  8416. ai_build_at_chokepoint = no
  8417. @@ -477,7 +481,7 @@ deep_space_black_site = {
  8418. fail_text = "requires_colonized_planet"
  8419. solar_system = {
  8420. any_planet = {
  8421. - is_colony = yes
  8422. + is_owned_by = from
  8423. }
  8424. }
  8425. }
  8426. @@ -779,3 +783,45 @@ command_center = {
  8427. weight = 10
  8428. }
  8429. }
  8430. +
  8431. +#offworld_trading_company_gestalt = {
  8432. +# icon = "GFX_starbase_offworld_trading_company"
  8433. +# construction_days = 360
  8434. +#
  8435. +# potential = {
  8436. +# exists = owner
  8437. +# owner = {
  8438. +# has_technology = tech_space_trading
  8439. +# has_ethic = ethic_gestalt_consciousness
  8440. +# }
  8441. +# }
  8442. +#
  8443. +# possible = {
  8444. +# custom_tooltip = {
  8445. +# fail_text = "requires_starport"
  8446. +# has_starbase_size >= starbase_starport
  8447. +# }
  8448. +# has_starbase_module = trading_hub_gestalt
  8449. +# }
  8450. +#
  8451. +# cost = {
  8452. +# minerals = 200
  8453. +# }
  8454. +#
  8455. +# custom_tooltip = sm_offworld_trading_company_gestalt_desc_modifier
  8456. +# show_in_tech = "tech_space_trading"
  8457. +# #show_tech_unlock_if = { has_ethic = auth_machine_intelligence }
  8458. +#
  8459. +# ai_build_at_chokepoint = no
  8460. +# ai_build_outside_chokepoint = yes
  8461. +# ai_weight = {
  8462. +# weight = 200
  8463. +# modifier = {
  8464. +# factor = 0
  8465. +# count_starbase_modules = {
  8466. +# type = trading_hub
  8467. +# count < 3
  8468. +# }
  8469. +# }
  8470. +# }
  8471. +#}
  8472. \ No newline at end of file
  8473. diff --git a/2.0.0/common/starbase_modules/00_starbase_modules.txt b/2.0.2/common/starbase_modules/00_starbase_modules.txt
  8474. index a30956e..ae454c7 100755
  8475. --- a/2.0.0/common/starbase_modules/00_starbase_modules.txt
  8476. +++ b/2.0.2/common/starbase_modules/00_starbase_modules.txt
  8477. @@ -27,11 +27,11 @@ shipyard = {
  8478. ai_build_at_chokepoint = no
  8479. ai_build_outside_chokepoint = yes
  8480. ai_weight = {
  8481. - weight = 10
  8482. - modifier = {
  8483. - factor = 100
  8484. - NOT = { has_starbase_module = shipyard }
  8485. - }
  8486. + weight = 30
  8487. + # modifier = {
  8488. + # factor = 100
  8489. + # NOT = { has_starbase_module = shipyard }
  8490. + # }
  8491. }
  8492. }
  8493.  
  8494. @@ -61,7 +61,7 @@ anchorage = {
  8495. ai_weight = {
  8496. weight = 20
  8497. modifier = {
  8498. - factor = 10
  8499. + factor = 2
  8500. count_starbase_modules = {
  8501. type = anchorage
  8502. count < 2
  8503. @@ -180,15 +180,17 @@ trading_hub = {
  8504.  
  8505. potential = {
  8506. exists = owner
  8507. + #owner = { NOT = { has_ethic = ethic_gestalt_consciousness } }
  8508. }
  8509.  
  8510. possible = {
  8511. custom_tooltip = {
  8512. - fail_text = "requires_colonized_planet"
  8513. + fail_text = "requires_trade_planet"
  8514. solar_system = {
  8515. OR = {
  8516. any_planet = {
  8517. - is_colony = yes
  8518. + exists = owner
  8519. + owner = { is_country_type = default }
  8520. }
  8521. AND = {
  8522. has_star_flag = enclave
  8523. @@ -238,7 +240,76 @@ trading_hub = {
  8524.  
  8525. ai_build_at_chokepoint = no
  8526. ai_weight = {
  8527. - weight = 10
  8528. + weight = 15
  8529. }
  8530. }
  8531.  
  8532. +#trading_hub_gestalt = {
  8533. +# icon = "GFX_starbase_trading_hub"
  8534. +# section = "REFINERY_STARBASE_SECTION"
  8535. +# construction_days = 180
  8536. +#
  8537. +# potential = {
  8538. +# exists = owner
  8539. +# owner = { has_ethic = ethic_gestalt_consciousness }
  8540. +# }
  8541. +#
  8542. +# possible = {
  8543. +# custom_tooltip = {
  8544. +# fail_text = "requires_trade_planet"
  8545. +# solar_system = {
  8546. +# OR = {
  8547. +# any_planet = {
  8548. +# is_colony = yes
  8549. +# }
  8550. +# AND = {
  8551. +# has_star_flag = enclave
  8552. +# any_ship_in_system = {
  8553. +# exists = owner
  8554. +# owner = {
  8555. +# has_country_flag = trader_enclave_country
  8556. +# }
  8557. +# }
  8558. +# }
  8559. +# }
  8560. +# }
  8561. +# }
  8562. +# }
  8563. +#
  8564. +# cost = {
  8565. +# minerals = 100
  8566. +# }
  8567. +#
  8568. +# produced_resources = {
  8569. +# energy = 4
  8570. +# }
  8571. +#
  8572. +# produced_resource_trigger = {
  8573. +# modifier = {
  8574. +# hidden_trigger = { exists = this }
  8575. +# has_starbase_building = offworld_trading_company_gestalt
  8576. +# resources = {
  8577. +# energy = 2
  8578. +# }
  8579. +# }
  8580. +# modifier = {
  8581. +# hidden_trigger = { exists = this }
  8582. +# owner = { has_civic = civic_corporate_dominion }
  8583. +# resources = {
  8584. +# energy = 1
  8585. +# }
  8586. +# }
  8587. +# modifier = {
  8588. +# hidden_trigger = { exists = this }
  8589. +# owner = { has_non_swapped_tradition = tr_prosperity_trans_stellar_corporations }
  8590. +# resources = {
  8591. +# energy = 1
  8592. +# }
  8593. +# }
  8594. +# }
  8595. +#
  8596. +# ai_build_at_chokepoint = no
  8597. +# ai_weight = {
  8598. +# weight = 10
  8599. +# }
  8600. +#}
  8601. diff --git a/2.0.0/common/starbase_types/00_starbase_types.txt b/2.0.2/common/starbase_types/00_starbase_types.txt
  8602. index 2814a6b..bbf9163 100755
  8603. --- a/2.0.0/common/starbase_types/00_starbase_types.txt
  8604. +++ b/2.0.2/common/starbase_types/00_starbase_types.txt
  8605. @@ -49,6 +49,65 @@ stb_shipyard = {
  8606. }
  8607. }
  8608. }
  8609. +
  8610. + ai_design = {
  8611. + min = {
  8612. + base = 1
  8613. + }
  8614. +
  8615. + ratio = {
  8616. + base = 0.25
  8617. + modifier = {
  8618. + add = 0.10
  8619. + owner = {
  8620. + has_ethic = ethic_militarist
  8621. + }
  8622. + }
  8623. + modifier = {
  8624. + add = 0.05
  8625. + owner = {
  8626. + has_ethic = ethic_fanatic_militarist
  8627. + }
  8628. + }
  8629. + }
  8630. +
  8631. + # token followed by priority
  8632. + buildings = {
  8633. + crew_quarters = {
  8634. + base = 1.00
  8635. + }
  8636. +
  8637. + fleet_academy = {
  8638. + base = 0.25
  8639. + }
  8640. +
  8641. + naval_logistics_office = {
  8642. + base = 0.05
  8643. + }
  8644. +
  8645. + titan_yards = {
  8646. + base = 0.01
  8647. + }
  8648. +
  8649. + colossus_yards = {
  8650. + base = 0.01
  8651. + }
  8652. + }
  8653. +
  8654. + modules = {
  8655. + shipyard = {
  8656. + base = 1.00
  8657. + }
  8658. +
  8659. + anchorage = {
  8660. + base = 0.50
  8661. + }
  8662. +
  8663. + hangar_bay = {
  8664. + base = 0.45
  8665. + }
  8666. + }
  8667. + }
  8668. }
  8669.  
  8670. # Anchorage
  8671. @@ -99,6 +158,61 @@ stb_anchorage = {
  8672. }
  8673. }
  8674. }
  8675. +
  8676. + ai_design = {
  8677. + min = {
  8678. + base = 1
  8679. + }
  8680. +
  8681. + ratio = {
  8682. + base = 0.15
  8683. + modifier = {
  8684. + add = 0.05
  8685. + owner = {
  8686. + has_ethic = ethic_militarist
  8687. + }
  8688. + }
  8689. + modifier = {
  8690. + add = 0.02
  8691. + owner = {
  8692. + has_ethic = ethic_fanatic_militarist
  8693. + }
  8694. + }
  8695. + }
  8696. +
  8697. + # token followed by priority
  8698. + buildings = {
  8699. + crew_quarters = {
  8700. + base = 1.00
  8701. + }
  8702. +
  8703. + fleet_academy = {
  8704. + base = 0.05
  8705. + }
  8706. +
  8707. + naval_logistics_office = {
  8708. + base = 0.05
  8709. + }
  8710. +
  8711. + curator_think_tank = {
  8712. + base = 0.03
  8713. + }
  8714. +
  8715. + art_college = {
  8716. + base = 0.03
  8717. + }
  8718. + }
  8719. +
  8720. + modules = {
  8721. + anchorage = {
  8722. + base = 1.00
  8723. + }
  8724. +
  8725. + hangar_bay = {
  8726. + base = 0.60
  8727. + }
  8728. + }
  8729. + }
  8730. }
  8731.  
  8732. # Trading Hub
  8733. @@ -109,6 +223,7 @@ stb_trading_hub = {
  8734. type = trading_hub
  8735. count > 0
  8736. }
  8737. + owner = { NOT = { has_ethic = ethic_gestalt_consciousness } }
  8738. }
  8739.  
  8740. weight_modifier = {
  8741. @@ -149,6 +264,61 @@ stb_trading_hub = {
  8742. }
  8743. }
  8744. }
  8745. +
  8746. + ai_design = {
  8747. + min = {
  8748. + base = 1
  8749. + }
  8750. +
  8751. + ratio = {
  8752. + base = 0.3
  8753. + modifier = {
  8754. + add = 0.10
  8755. + owner = {
  8756. + has_ethic = ethic_materialist
  8757. + }
  8758. + }
  8759. + modifier = {
  8760. + add = 0.05
  8761. + owner = {
  8762. + has_ethic = ethic_fanatic_materialist
  8763. + }
  8764. + }
  8765. + }
  8766. +
  8767. + # token followed by priority
  8768. + buildings = {
  8769. + offworld_trading_company = {
  8770. + base = 1.00
  8771. + }
  8772. +
  8773. + nebula_refinery = {
  8774. + base = 0.8
  8775. + }
  8776. +
  8777. + naval_logistics_office = {
  8778. + base = 0.05
  8779. + }
  8780. +
  8781. + art_college = {
  8782. + base = 0.03
  8783. + }
  8784. +
  8785. + curator_think_tank = {
  8786. + base = 0.03
  8787. + }
  8788. + }
  8789. +
  8790. + modules = {
  8791. + trading_hub = {
  8792. + base = 1.0
  8793. + }
  8794. +
  8795. + resource_silo = {
  8796. + base = 0.80
  8797. + }
  8798. + }
  8799. + }
  8800. }
  8801.  
  8802. # Fortress System
  8803. @@ -291,4 +461,118 @@ stb_fortress = {
  8804. }
  8805. }
  8806. }
  8807. +
  8808. + ai_design = {
  8809. + min = {
  8810. + base = 1
  8811. + }
  8812. +
  8813. + ratio = {
  8814. + base = 0.25
  8815. + modifier = {
  8816. + add = 0.10
  8817. + owner = {
  8818. + has_ethic = ethic_militarist
  8819. + }
  8820. + }
  8821. + modifier = {
  8822. + add = 0.1
  8823. + owner = {
  8824. + has_ethic = ethic_fanatic_militarist
  8825. + }
  8826. + }
  8827. + }
  8828. +
  8829. + # token followed by priority
  8830. + buildings = {
  8831. + target_uplink_computer = {
  8832. + base = 1.00
  8833. + }
  8834. +
  8835. + command_center = {
  8836. + base = 1.00
  8837. + }
  8838. +
  8839. + defense_grid = {
  8840. + base = 1.00
  8841. + }
  8842. +
  8843. + communications_jammer = {
  8844. + base = 0.90
  8845. + }
  8846. +
  8847. + disruption_field = {
  8848. + base = 0.90
  8849. + }
  8850. +
  8851. + warp_fluctuator = {
  8852. + base = 0.90
  8853. + }
  8854. + }
  8855. +
  8856. + modules = {
  8857. + hangar_bay = {
  8858. + base = 0.80
  8859. + }
  8860. +
  8861. + missile_battery = {
  8862. + base = 1.00
  8863. + }
  8864. +
  8865. + gun_battery = {
  8866. + base = 1.00
  8867. + }
  8868. + }
  8869. + }
  8870. +}
  8871. +
  8872. +# Trading Hub - Gestalts
  8873. +stb_trading_hub_gestalt = {
  8874. + potential = {
  8875. + has_starbase_size >= starbase_starport
  8876. + count_starbase_modules = {
  8877. + type = trading_hub
  8878. + count > 0
  8879. + }
  8880. + owner = { has_ethic = ethic_gestalt_consciousness }
  8881. + }
  8882. +
  8883. + weight_modifier = {
  8884. + base = 100
  8885. + modifier = {
  8886. + add = 100
  8887. + count_starbase_modules = {
  8888. + type = trading_hub
  8889. + count > 1
  8890. + }
  8891. + }
  8892. + modifier = {
  8893. + add = 100
  8894. + count_starbase_modules = {
  8895. + type = trading_hub
  8896. + count > 2
  8897. + }
  8898. + }
  8899. + modifier = {
  8900. + add = 100
  8901. + count_starbase_modules = {
  8902. + type = trading_hub
  8903. + count > 3
  8904. + }
  8905. + }
  8906. + modifier = {
  8907. + add = 100
  8908. + count_starbase_modules = {
  8909. + type = trading_hub
  8910. + count > 4
  8911. + }
  8912. + }
  8913. + modifier = {
  8914. + add = 100
  8915. + count_starbase_modules = {
  8916. + type = trading_hub
  8917. + count > 5
  8918. + }
  8919. + }
  8920. + }
  8921. }
  8922. \ No newline at end of file
  8923. diff --git a/2.0.0/common/static_modifiers/00_static_modifiers.txt b/2.0.2/common/static_modifiers/00_static_modifiers.txt
  8924. index be1576b..cba0bbb 100755
  8925. --- a/2.0.0/common/static_modifiers/00_static_modifiers.txt
  8926. +++ b/2.0.2/common/static_modifiers/00_static_modifiers.txt
  8927. @@ -9,6 +9,7 @@
  8928. ##########################################################################
  8929. empire_base = {
  8930. max_rivalries = 3
  8931. + country_occupation_armies_add = 3
  8932. }
  8933.  
  8934. # Applies to Awakened Empires too
  8935. @@ -23,70 +24,108 @@ defensive_war = {
  8936. pop_consumer_goods_mult = -0.33
  8937. }
  8938.  
  8939. +##########################################################################
  8940. +# High War Exhaustion
  8941. +##########################################################################
  8942. +high_war_exhaustion = {
  8943. +}
  8944. +
  8945. ##########################################################################
  8946. # Difficulty Modifiers - not applied to vassals of players
  8947. ##########################################################################
  8948.  
  8949. -difficulty_insane_ai = {
  8950. - tile_resource_minerals_mult = 1
  8951. - tile_resource_energy_mult = 1
  8952. - tile_resource_physics_research_mult = 1
  8953. - tile_resource_society_research_mult = 1
  8954. - tile_resource_engineering_research_mult = 1
  8955. - country_naval_cap_mult = 1
  8956. +# For playable empires
  8957. +difficulty_scaling = {
  8958. + country_resource_food_mult = 0.5
  8959. + country_resource_minerals_mult = 0.5
  8960. + country_resource_energy_mult = 0.5
  8961. + country_resource_unity_mult = 0.5
  8962. + all_technology_research_speed = 0.5
  8963. + country_naval_cap_mult = 0.5
  8964. }
  8965.  
  8966. -difficulty_very_hard_ai = {
  8967. - tile_resource_minerals_mult = 0.5
  8968. - tile_resource_energy_mult = 0.5
  8969. - tile_resource_physics_research_mult = 0.5
  8970. - tile_resource_society_research_mult = 0.5
  8971. - tile_resource_engineering_research_mult = 0.5
  8972. - country_naval_cap_mult = 0.5
  8973. +difficulty_grand_admiral = {
  8974. + country_resource_food_mult = 1
  8975. + country_resource_minerals_mult = 1
  8976. + country_resource_energy_mult = 1
  8977. + country_resource_unity_mult = 0.6
  8978. + all_technology_research_speed = 0.6
  8979. + country_naval_cap_mult = 0.6
  8980. }
  8981.  
  8982. +difficulty_admiral = {
  8983. + country_resource_food_mult = 0.75
  8984. + country_resource_minerals_mult = 0.75
  8985. + country_resource_energy_mult = 0.75
  8986. + country_resource_unity_mult = 0.45
  8987. + all_technology_research_speed = 0.45
  8988. + country_naval_cap_mult = 0.45
  8989. +}
  8990.  
  8991. -difficulty_hard_ai = {
  8992. - tile_resource_minerals_mult = 0.25
  8993. - tile_resource_energy_mult = 0.25
  8994. - tile_resource_physics_research_mult = 0.25
  8995. - tile_resource_society_research_mult = 0.25
  8996. - tile_resource_engineering_research_mult = 0.25
  8997. - country_naval_cap_mult = 0.25
  8998. +difficulty_commodore = {
  8999. + country_resource_food_mult = 0.5
  9000. + country_resource_minerals_mult = 0.5
  9001. + country_resource_energy_mult = 0.5
  9002. + country_resource_unity_mult = 0.3
  9003. + all_technology_research_speed = 0.3
  9004. + country_naval_cap_mult = 0.3
  9005. +}
  9006. +
  9007. +difficulty_captain = {
  9008. + country_resource_food_mult = 0.25
  9009. + country_resource_minerals_mult = 0.25
  9010. + country_resource_energy_mult = 0.25
  9011. + country_resource_unity_mult = 0.15
  9012. + all_technology_research_speed = 0.15
  9013. + country_naval_cap_mult = 0.15
  9014. }
  9015.  
  9016. -difficulty_normal_ai = {
  9017. +difficulty_ensign = {
  9018. }
  9019.  
  9020. -# For non-playable empires, scales to galaxy size
  9021. -difficulty_scaled_insane = {
  9022. +# For non-playable empires, scales to setting in country type
  9023. +difficulty_scaling_npc = {
  9024. + ship_weapon_damage = 0.5
  9025. + ship_hull_mult = 0.5
  9026. + ship_armor_mult = 0.5
  9027. + ship_shield_mult = 0.5
  9028. +}
  9029. +
  9030. +difficulty_grand_admiral_npc = {
  9031. ship_weapon_damage = 1.0
  9032. ship_hull_mult = 1.0
  9033. ship_armor_mult = 1.0
  9034. ship_shield_mult = 1.0
  9035. }
  9036.  
  9037. -difficulty_scaled_very_hard = {
  9038. +difficulty_admiral_npc = {
  9039. ship_weapon_damage = 0.75
  9040. ship_hull_mult = 0.75
  9041. ship_armor_mult = 0.75
  9042. ship_shield_mult = 0.75
  9043. }
  9044.  
  9045. -difficulty_scaled_hard = {
  9046. +difficulty_commodore_npc = {
  9047. ship_weapon_damage = 0.66
  9048. ship_hull_mult = 0.66
  9049. ship_armor_mult = 0.66
  9050. ship_shield_mult = 0.66
  9051. }
  9052.  
  9053. -difficulty_scaled_normal = {
  9054. +difficulty_captain_npc = {
  9055. ship_weapon_damage = 0.5
  9056. ship_hull_mult = 0.5
  9057. ship_armor_mult = 0.5
  9058. ship_shield_mult = 0.5
  9059. }
  9060.  
  9061. +difficulty_ensign_npc = {
  9062. + ship_weapon_damage = 0.33
  9063. + ship_hull_mult = 0.33
  9064. + ship_armor_mult = 0.33
  9065. + ship_shield_mult = 0.33
  9066. +}
  9067. +
  9068. # Awakened Empires grow weaker over time
  9069. awakened_empire_decadence = {
  9070. pop_resource_output = -0.75
  9071. @@ -97,6 +136,7 @@ awakened_empire_decadence = {
  9072. ship_shield_mult = -0.25
  9073. }
  9074.  
  9075. +
  9076. ##########################################################################
  9077. # Pop Modifiers
  9078. ##########################################################################
  9079. @@ -113,16 +153,24 @@ pop_habitability = {
  9080.  
  9081. # Happiness Levels
  9082. pop_happiness_positive = {
  9083. - pop_non_slave_resource_output = 0.20
  9084. + pop_resource_output = 0.20
  9085. pop_government_ethic_attraction = 0.20
  9086. }
  9087.  
  9088. +pop_happiness_positive_slave = {
  9089. + pop_ethic_authoritarian_attraction_mult = 1
  9090. +}
  9091. +
  9092. # Also causes unrest
  9093. pop_happiness_negative = {
  9094. - pop_non_slave_resource_output = -0.20
  9095. + pop_non_food_resource_output = -0.20
  9096. pop_government_ethic_attraction = -0.20
  9097. }
  9098.  
  9099. +pop_happiness_negative_slave = {
  9100. + pop_ethic_egalitarian_attraction_mult = 5
  9101. +}
  9102. +
  9103. recently_migrated = {
  9104. pop_happiness = 0.1
  9105. }
  9106. @@ -548,11 +596,11 @@ capital = {
  9107. # Multiplied by the distance from the Capital solar system
  9108. # Distance 650 is about edge-to-edge in a 600 system map
  9109. distance_from_capital = {
  9110. - pop_government_ethic_attraction = -0.001
  9111. + #pop_government_ethic_attraction = -0.001
  9112. }
  9113.  
  9114. managed_by_sector = {
  9115. - pop_government_ethic_attraction = -0.1
  9116. + pop_government_ethic_attraction = -0.3
  9117. }
  9118.  
  9119. migrating_forests = {
  9120. @@ -756,13 +804,6 @@ assist_research = {
  9121. icon_frame = 1
  9122. }
  9123.  
  9124. -faith_in_science = {
  9125. - planet_resource_unity_add = 1
  9126. -
  9127. - icon = "gfx/interface/icons/planet_modifiers/pm_assist_research.dds"
  9128. - icon_frame = 1
  9129. -}
  9130. -
  9131. ancient_automation = {
  9132. icon = "gfx/interface/icons/planet_modifiers/pm_robots.dds"
  9133. icon_frame = 2
  9134. @@ -899,7 +940,7 @@ stellarite_low_temp = {
  9135. }
  9136.  
  9137. planet_unrest = {
  9138. - pop_resource_output = -0.5
  9139. + pop_non_food_resource_output = -0.5
  9140. pop_processing_output = -1.0
  9141. }
  9142.  
  9143. @@ -907,6 +948,54 @@ land_appropriation = {
  9144. planet_migration_all_pull = 1
  9145. }
  9146.  
  9147. +vultaum_homeworld = {
  9148. + icon = "gfx/interface/icons/planet_modifiers/pm_factory.dds"
  9149. +}
  9150. +
  9151. +vultaum_minerals = {
  9152. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_impacts.dds"
  9153. +}
  9154. +
  9155. +vultaum_energy = {
  9156. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9157. +}
  9158. +
  9159. +yuht_homeworld = {
  9160. + icon = "gfx/interface/icons/planet_modifiers/pm_factory.dds"
  9161. +}
  9162. +
  9163. +yuht_minerals = {
  9164. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9165. +}
  9166. +
  9167. +yuht_energy = {
  9168. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9169. +}
  9170. +
  9171. +first_league_homeworld = {
  9172. + icon = "gfx/interface/icons/planet_modifiers/pm_factory.dds"
  9173. +}
  9174. +
  9175. +first_league_minerals = {
  9176. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9177. +}
  9178. +
  9179. +first_league_energy = {
  9180. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9181. +}
  9182. +
  9183. +irassian_homeworld = {
  9184. + icon = "gfx/interface/icons/planet_modifiers/pm_factory.dds"
  9185. +}
  9186. +
  9187. +irassian_minerals = {
  9188. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9189. +}
  9190. +
  9191. +irassian_energy = {
  9192. + icon = "gfx/interface/icons/planet_modifiers/pm_asteroid_belt.dds"
  9193. +}
  9194. +
  9195. ##########################################################################
  9196. # Leader Skill Modifiers
  9197. ##########################################################################
  9198. @@ -984,6 +1073,9 @@ ship_rank_elite = {
  9199. ##########################################################################
  9200. # Country modifiers
  9201. ##########################################################################
  9202. +piracy_risk = {
  9203. +}
  9204. +
  9205. over_starbase_capacity = {
  9206. country_starbase_upkeep_mult = 0.25
  9207. }
  9208. @@ -1110,6 +1202,10 @@ marauder_2_tribute = {
  9209. marauder_3_tribute = {
  9210. }
  9211.  
  9212. +marauder_skirmishing = {
  9213. + ship_fire_rate_mult = 0.10
  9214. +}
  9215. +
  9216. sentinel_data = {
  9217. damage_vs_country_type_swarm_mult = 0.2
  9218. }
  9219. @@ -1132,6 +1228,24 @@ enclave_mineral_trade_3_xur = {
  9220. static_resource_energy_add = -100
  9221. }
  9222.  
  9223. +enclave_mineral_food_trade_1_xur = {
  9224. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9225. + static_resource_minerals_add = 10
  9226. + static_resource_food_add = -20
  9227. +}
  9228. +
  9229. +enclave_mineral_food_trade_2_xur = {
  9230. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9231. + static_resource_minerals_add = 25
  9232. + static_resource_food_add = -50
  9233. +}
  9234. +
  9235. +enclave_mineral_food_trade_3_xur = {
  9236. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9237. + static_resource_minerals_add = 50
  9238. + static_resource_food_add = -100
  9239. +}
  9240. +
  9241. enclave_energy_trade_1_xur = {
  9242. icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9243. static_resource_energy_add = 10
  9244. @@ -1150,6 +1264,60 @@ enclave_energy_trade_3_xur = {
  9245. static_resource_minerals_add = -100
  9246. }
  9247.  
  9248. +enclave_energy_food_trade_1_xur = {
  9249. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9250. + static_resource_energy_add = 10
  9251. + static_resource_food_add = -20
  9252. +}
  9253. +
  9254. +enclave_energy_food_trade_2_xur = {
  9255. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9256. + static_resource_energy_add = 25
  9257. + static_resource_food_add = -50
  9258. +}
  9259. +
  9260. +enclave_energy_food_trade_3_xur = {
  9261. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9262. + static_resource_energy_add = 50
  9263. + static_resource_food_add = -100
  9264. +}
  9265. +
  9266. +enclave_food_minerals_trade_1_xur = {
  9267. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9268. + static_resource_food_add = 10
  9269. + static_resource_minerals_add = -20
  9270. +}
  9271. +
  9272. +enclave_food_minerals_trade_2_xur = {
  9273. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9274. + static_resource_food_add = 25
  9275. + static_resource_minerals_add = -50
  9276. +}
  9277. +
  9278. +enclave_food_minerals_trade_3_xur = {
  9279. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9280. + static_resource_food_add = 50
  9281. + static_resource_minerals_add = -100
  9282. +}
  9283. +
  9284. +enclave_food_energy_trade_1_xur = {
  9285. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9286. + static_resource_food_add = 10
  9287. + static_resource_energy_add = -20
  9288. +}
  9289. +
  9290. +enclave_food_energy_trade_2_xur = {
  9291. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9292. + static_resource_food_add = 25
  9293. + static_resource_energy_add = -50
  9294. +}
  9295. +
  9296. +enclave_food_energy_trade_3_xur = {
  9297. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9298. + static_resource_food_add = 50
  9299. + static_resource_energy_add = -100
  9300. +}
  9301. +
  9302. enclave_mineral_trade_1_rig = {
  9303. icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9304. static_resource_minerals_add = 10
  9305. @@ -1168,6 +1336,24 @@ enclave_mineral_trade_3_rig = {
  9306. static_resource_energy_add = -100
  9307. }
  9308.  
  9309. +enclave_mineral_food_trade_1_rig = {
  9310. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9311. + static_resource_minerals_add = 10
  9312. + static_resource_food_add = -20
  9313. +}
  9314. +
  9315. +enclave_mineral_food_trade_2_rig = {
  9316. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9317. + static_resource_minerals_add = 25
  9318. + static_resource_food_add = -50
  9319. +}
  9320. +
  9321. +enclave_mineral_food_trade_3_rig = {
  9322. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9323. + static_resource_minerals_add = 50
  9324. + static_resource_food_add = -100
  9325. +}
  9326. +
  9327. enclave_energy_trade_1_rig = {
  9328. icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9329. static_resource_energy_add = 10
  9330. @@ -1186,6 +1372,60 @@ enclave_energy_trade_3_rig = {
  9331. static_resource_minerals_add = -100
  9332. }
  9333.  
  9334. +enclave_energy_food_trade_1_rig = {
  9335. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9336. + static_resource_energy_add = 10
  9337. + static_resource_food_add = -20
  9338. +}
  9339. +
  9340. +enclave_energy_food_trade_2_rig = {
  9341. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9342. + static_resource_energy_add = 25
  9343. + static_resource_food_add = -50
  9344. +}
  9345. +
  9346. +enclave_energy_food_trade_3_rig = {
  9347. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9348. + static_resource_energy_add = 50
  9349. + static_resource_food_add = -100
  9350. +}
  9351. +
  9352. +enclave_food_minerals_trade_1_rig = {
  9353. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9354. + static_resource_food_add = 10
  9355. + static_resource_minerals_add = -20
  9356. +}
  9357. +
  9358. +enclave_food_minerals_trade_2_rig = {
  9359. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9360. + static_resource_food_add = 25
  9361. + static_resource_minerals_add = -50
  9362. +}
  9363. +
  9364. +enclave_food_minerals_trade_3_rig = {
  9365. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9366. + static_resource_food_add = 50
  9367. + static_resource_minerals_add = -100
  9368. +}
  9369. +
  9370. +enclave_food_energy_trade_1_rig = {
  9371. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9372. + static_resource_food_add = 10
  9373. + static_resource_energy_add = -20
  9374. +}
  9375. +
  9376. +enclave_food_energy_trade_2_rig = {
  9377. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9378. + static_resource_food_add = 25
  9379. + static_resource_energy_add = -50
  9380. +}
  9381. +
  9382. +enclave_food_energy_trade_3_rig = {
  9383. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9384. + static_resource_food_add = 50
  9385. + static_resource_energy_add = -100
  9386. +}
  9387. +
  9388. enclave_mineral_trade_1_mut = {
  9389. icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9390. static_resource_minerals_add = 10
  9391. @@ -1204,6 +1444,24 @@ enclave_mineral_trade_3_mut = {
  9392. static_resource_energy_add = -100
  9393. }
  9394.  
  9395. +enclave_mineral_food_trade_1_mut = {
  9396. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9397. + static_resource_minerals_add = 10
  9398. + static_resource_food_add = -20
  9399. +}
  9400. +
  9401. +enclave_mineral_food_trade_2_mut = {
  9402. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9403. + static_resource_minerals_add = 25
  9404. + static_resource_food_add = -50
  9405. +}
  9406. +
  9407. +enclave_mineral_food_trade_3_mut = {
  9408. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9409. + static_resource_minerals_add = 50
  9410. + static_resource_food_add = -100
  9411. +}
  9412. +
  9413. enclave_energy_trade_1_mut = {
  9414. icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9415. static_resource_energy_add = 10
  9416. @@ -1222,6 +1480,60 @@ enclave_energy_trade_3_mut = {
  9417. static_resource_minerals_add = -100
  9418. }
  9419.  
  9420. +enclave_energy_food_trade_1_mut = {
  9421. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9422. + static_resource_energy_add = 10
  9423. + static_resource_food_add = -20
  9424. +}
  9425. +
  9426. +enclave_energy_food_trade_2_mut = {
  9427. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9428. + static_resource_energy_add = 25
  9429. + static_resource_food_add = -50
  9430. +}
  9431. +
  9432. +enclave_energy_food_trade_3_mut = {
  9433. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9434. + static_resource_energy_add = 50
  9435. + static_resource_food_add = -100
  9436. +}
  9437. +
  9438. +enclave_food_minerals_trade_1_mut = {
  9439. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9440. + static_resource_food_add = 10
  9441. + static_resource_minerals_add = -20
  9442. +}
  9443. +
  9444. +enclave_food_minerals_trade_2_mut = {
  9445. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9446. + static_resource_food_add = 25
  9447. + static_resource_minerals_add = -50
  9448. +}
  9449. +
  9450. +enclave_food_minerals_trade_3_mut = {
  9451. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9452. + static_resource_food_add = 50
  9453. + static_resource_minerals_add = -100
  9454. +}
  9455. +
  9456. +enclave_food_energy_trade_1_mut = {
  9457. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9458. + static_resource_food_add = 10
  9459. + static_resource_energy_add = -20
  9460. +}
  9461. +
  9462. +enclave_food_energy_trade_2_mut = {
  9463. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9464. + static_resource_food_add = 25
  9465. + static_resource_energy_add = -50
  9466. +}
  9467. +
  9468. +enclave_food_energy_trade_3_mut = {
  9469. + icon = "gfx/interface/icons/modifiers/mod_country_previous_deals.dds"
  9470. + static_resource_food_add = 50
  9471. + static_resource_energy_add = -100
  9472. +}
  9473. +
  9474. #applied based on the "should_apply_neighbor_rival_modifier" game rule
  9475. #scales with number of rivals that are bordering the country
  9476. per_neighbor_rival = {
  9477. diff --git a/2.0.0/common/static_modifiers/01_static_modifers.txt b/2.0.2/common/static_modifiers/01_static_modifers.txt
  9478. index 9609f25..c62fcac 100755
  9479. --- a/2.0.0/common/static_modifiers/01_static_modifers.txt
  9480. +++ b/2.0.2/common/static_modifiers/01_static_modifers.txt
  9481. @@ -199,8 +199,8 @@ humiliated = {
  9482. }
  9483.  
  9484. raided = {
  9485. - pop_happiness = -0.10
  9486. - country_resource_influence_mult = -0.20
  9487. + country_resource_energy_mult = -0.20
  9488. + country_resource_minerals_mult = -0.20
  9489. }
  9490.  
  9491. drone_processing = {
  9492. diff --git a/2.0.0/common/static_modifiers/06_static_modifiers_apocalypse.txt b/2.0.2/common/static_modifiers/06_static_modifiers_apocalypse.txt
  9493. index 283617d..d50169b 100755
  9494. --- a/2.0.0/common/static_modifiers/06_static_modifiers_apocalypse.txt
  9495. +++ b/2.0.2/common/static_modifiers/06_static_modifiers_apocalypse.txt
  9496. @@ -11,6 +11,13 @@ god_rayed = {
  9497. icon_frame = 2
  9498. }
  9499.  
  9500. +# Neutron Bombarded
  9501. +neutron_bombarded = {
  9502. + icon = "gfx/interface/icons/planet_modifiers/pm_atmospheric_hallucinogen.dds"
  9503. + pop_environment_tolerance = -0.30
  9504. + icon_frame = 3
  9505. +}
  9506. +
  9507. # Uneasy Faith
  9508. uneasy_faith = {
  9509. icon = "gfx/interface/icons/planet_modifiers/pm_atmospheric_hallucinogen.dds"
  9510. diff --git a/2.0.0/common/strategic_resources/00_strategic_resources.txt b/2.0.2/common/strategic_resources/00_strategic_resources.txt
  9511. index 5f90518..24b3e57 100755
  9512. --- a/2.0.0/common/strategic_resources/00_strategic_resources.txt
  9513. +++ b/2.0.2/common/strategic_resources/00_strategic_resources.txt
  9514. @@ -80,7 +80,7 @@ unity = {
  9515. accumulative = yes
  9516. collect_if_wrong_building = no
  9517. AI_category = unity
  9518. - base_income = 1
  9519. + base_income = 2
  9520. }
  9521.  
  9522. ###########################
  9523. diff --git a/2.0.0/common/system_types/00_system_types.txt b/2.0.2/common/system_types/00_system_types.txt
  9524. index d838d7b..e31c5f2 100755
  9525. --- a/2.0.0/common/system_types/00_system_types.txt
  9526. +++ b/2.0.2/common/system_types/00_system_types.txt
  9527. @@ -194,10 +194,11 @@ sys_anchorage = {
  9528. }
  9529. }
  9530.  
  9531. -# Anchorage System
  9532. +# Trade System
  9533. sys_trading_hub = {
  9534. potential = {
  9535. exists = owner
  9536. + owner = { NOT = { has_ethic = ethic_gestalt_consciousness } }
  9537. exists = starbase
  9538. starbase = {
  9539. has_starbase_size >= starbase_starport
  9540. @@ -503,3 +504,77 @@ sys_homeworld = {
  9541. base = 2000
  9542. }
  9543. }
  9544. +
  9545. +# Trade System - Gestalt
  9546. +sys_trading_hub_gestalt = {
  9547. + potential = {
  9548. + exists = owner
  9549. + owner = { has_ethic = ethic_gestalt_consciousness }
  9550. + exists = starbase
  9551. + starbase = {
  9552. + has_starbase_size >= starbase_starport
  9553. + count_starbase_modules = {
  9554. + type = trading_hub
  9555. + count > 1
  9556. + }
  9557. + }
  9558. + }
  9559. +
  9560. + weight_modifier = {
  9561. + base = 100
  9562. + modifier = {
  9563. + add = 100
  9564. + starbase = {
  9565. + count_starbase_modules = {
  9566. + type = trading_hub
  9567. + count > 2
  9568. + }
  9569. + }
  9570. + }
  9571. + modifier = {
  9572. + add = 100
  9573. + starbase = {
  9574. + count_starbase_modules = {
  9575. + type = trading_hub
  9576. + count > 2
  9577. + }
  9578. + }
  9579. + }
  9580. + modifier = {
  9581. + add = 100
  9582. + starbase = {
  9583. + count_starbase_modules = {
  9584. + type = trading_hub
  9585. + count > 2
  9586. + }
  9587. + }
  9588. + }
  9589. + modifier = {
  9590. + add = 100
  9591. + starbase = {
  9592. + count_starbase_modules = {
  9593. + type = trading_hub
  9594. + count > 2
  9595. + }
  9596. + }
  9597. + }
  9598. + }
  9599. +}
  9600. +
  9601. +# Marauder System
  9602. +sys_marauder = {
  9603. + potential = {
  9604. + exists = owner
  9605. + owner = {
  9606. + OR = {
  9607. + is_country_type = dormant_marauders
  9608. + is_country_type = ruined_marauders
  9609. + is_country_type = awakened_marauders
  9610. + }
  9611. + }
  9612. + }
  9613. +
  9614. + weight_modifier = {
  9615. + base = 1000
  9616. + }
  9617. +}
  9618. \ No newline at end of file
  9619. diff --git a/2.0.0/common/technology/00_apocalypse_tech.txt b/2.0.2/common/technology/00_apocalypse_tech.txt
  9620. index 9ffc32b..3a02000 100755
  9621. --- a/2.0.0/common/technology/00_apocalypse_tech.txt
  9622. +++ b/2.0.2/common/technology/00_apocalypse_tech.txt
  9623. @@ -4,24 +4,24 @@
  9624. #If you change any of these, use replace in files so the values are the same across all files
  9625.  
  9626. @tier1cost1 = 500
  9627. -@tier1cost2 = 640
  9628. -@tier1cost3 = 780
  9629. +@tier1cost2 = 750
  9630. +@tier1cost3 = 1000
  9631.  
  9632. -@tier2cost1 = 1000
  9633. -@tier2cost2 = 1300
  9634. -@tier2cost3 = 1600
  9635. +@tier2cost1 = 1500
  9636. +@tier2cost2 = 2000
  9637. +@tier2cost3 = 2500
  9638.  
  9639. -@tier3cost1 = 2000
  9640. -@tier3cost2 = 2500
  9641. -@tier3cost3 = 3000
  9642. +@tier3cost1 = 4000
  9643. +@tier3cost2 = 5000
  9644. +@tier3cost3 = 6000
  9645.  
  9646. -@tier4cost1 = 4000
  9647. -@tier4cost2 = 5000
  9648. -@tier4cost3 = 6000
  9649. +@tier4cost1 = 8000
  9650. +@tier4cost2 = 10000
  9651. +@tier4cost3 = 12000
  9652.  
  9653. -@tier5cost1 = 10000
  9654. -@tier5cost2 = 12000
  9655. -@tier5cost3 = 14000
  9656. +@tier5cost1 = 15000
  9657. +@tier5cost2 = 17500
  9658. +@tier5cost3 = 20000
  9659.  
  9660. ####################
  9661. ### TECH WEIGHTS ###
  9662. diff --git a/2.0.0/common/technology/00_eng_tech.txt b/2.0.2/common/technology/00_eng_tech.txt
  9663. index 30a7b57..0b61c1c 100755
  9664. --- a/2.0.0/common/technology/00_eng_tech.txt
  9665. +++ b/2.0.2/common/technology/00_eng_tech.txt
  9666. @@ -4,23 +4,23 @@
  9667. #If you change any of these, use replace in files so the values are the same across all files
  9668.  
  9669. @tier1cost1 = 500
  9670. -@tier1cost2 = 640
  9671. -@tier1cost3 = 780
  9672. +@tier1cost2 = 750
  9673. +@tier1cost3 = 1000
  9674.  
  9675. -@tier2cost1 = 1000
  9676. -@tier2cost2 = 1500
  9677. -@tier2cost3 = 2000
  9678. +@tier2cost1 = 1500
  9679. +@tier2cost2 = 2000
  9680. +@tier2cost3 = 2500
  9681.  
  9682. -@tier3cost1 = 3000
  9683. -@tier3cost2 = 4000
  9684. -@tier3cost3 = 5000
  9685. +@tier3cost1 = 4000
  9686. +@tier3cost2 = 5000
  9687. +@tier3cost3 = 6000
  9688.  
  9689. -@tier4cost1 = 6000
  9690. -@tier4cost2 = 8000
  9691. -@tier4cost3 = 10000
  9692. +@tier4cost1 = 8000
  9693. +@tier4cost2 = 10000
  9694. +@tier4cost3 = 12000
  9695.  
  9696. -@tier5cost1 = 14000
  9697. -@tier5cost2 = 17000
  9698. +@tier5cost1 = 15000
  9699. +@tier5cost2 = 17500
  9700. @tier5cost3 = 20000
  9701.  
  9702. ####################
  9703. @@ -297,6 +297,7 @@ tech_titans = {
  9704. category = { voidcraft }
  9705. prerequisites = { "tech_battleships" }
  9706. weight = @tier5weight1
  9707. + ai_update_type = military
  9708.  
  9709. modifier = {
  9710. country_command_limit_add = 10
  9711. @@ -381,6 +382,7 @@ tech_corvette_build_speed = {
  9712.  
  9713. modifier = {
  9714. shipsize_corvette_build_speed_mult = 0.25
  9715. + shipsize_corvette_build_cost_mult = -0.05
  9716. }
  9717.  
  9718. weight_modifier = {
  9719. @@ -504,6 +506,7 @@ tech_destroyer_build_speed = {
  9720.  
  9721. modifier = {
  9722. shipsize_destroyer_build_speed_mult = 0.25
  9723. + shipsize_destroyer_build_cost_mult = -0.05
  9724. }
  9725.  
  9726. weight_modifier = {
  9727. @@ -635,6 +638,7 @@ tech_cruiser_build_speed = {
  9728.  
  9729. modifier = {
  9730. shipsize_cruiser_build_speed_mult = 0.25
  9731. + shipsize_cruiser_build_cost_mult = -0.05
  9732. }
  9733.  
  9734. weight_modifier = {
  9735. @@ -667,7 +671,7 @@ tech_cruiser_hull_1 = {
  9736. weight = @tier3weight3
  9737.  
  9738. modifier = {
  9739. - shipsize_cruiser_hull_add = 400
  9740. + shipsize_cruiser_hull_add = 500
  9741. }
  9742.  
  9743. weight_modifier = {
  9744. @@ -706,7 +710,7 @@ tech_cruiser_hull_2 = {
  9745. weight = @tier4weight1
  9746.  
  9747. modifier = {
  9748. - shipsize_cruiser_hull_add = 400
  9749. + shipsize_cruiser_hull_add = 500
  9750. }
  9751.  
  9752. weight_modifier = {
  9753. @@ -766,6 +770,7 @@ tech_battleship_build_speed = {
  9754.  
  9755. modifier = {
  9756. shipsize_battleship_build_speed_mult = 0.25
  9757. + shipsize_battleship_build_cost_mult = -0.05
  9758. }
  9759.  
  9760. weight_modifier = {
  9761. diff --git a/2.0.0/common/technology/00_eng_weapon_tech.txt b/2.0.2/common/technology/00_eng_weapon_tech.txt
  9762. index dc2ffa6..fada39a 100755
  9763. --- a/2.0.0/common/technology/00_eng_weapon_tech.txt
  9764. +++ b/2.0.2/common/technology/00_eng_weapon_tech.txt
  9765. @@ -4,23 +4,23 @@
  9766. #If you change any of these, use replace in files so the values are the same across all files
  9767.  
  9768. @tier1cost1 = 500
  9769. -@tier1cost2 = 640
  9770. -@tier1cost3 = 780
  9771. +@tier1cost2 = 750
  9772. +@tier1cost3 = 1000
  9773.  
  9774. -@tier2cost1 = 1000
  9775. -@tier2cost2 = 1500
  9776. -@tier2cost3 = 2000
  9777. +@tier2cost1 = 1500
  9778. +@tier2cost2 = 2000
  9779. +@tier2cost3 = 2500
  9780.  
  9781. -@tier3cost1 = 3000
  9782. -@tier3cost2 = 4000
  9783. -@tier3cost3 = 5000
  9784. +@tier3cost1 = 4000
  9785. +@tier3cost2 = 5000
  9786. +@tier3cost3 = 6000
  9787.  
  9788. -@tier4cost1 = 6000
  9789. -@tier4cost2 = 8000
  9790. -@tier4cost3 = 10000
  9791. +@tier4cost1 = 8000
  9792. +@tier4cost2 = 10000
  9793. +@tier4cost3 = 12000
  9794.  
  9795. -@tier5cost1 = 14000
  9796. -@tier5cost2 = 17000
  9797. +@tier5cost1 = 15000
  9798. +@tier5cost2 = 17500
  9799. @tier5cost3 = 20000
  9800.  
  9801. ####################
  9802. diff --git a/2.0.0/common/technology/00_fallen_empire_tech.txt b/2.0.2/common/technology/00_fallen_empire_tech.txt
  9803. index 325bde4..de79af2 100755
  9804. --- a/2.0.0/common/technology/00_fallen_empire_tech.txt
  9805. +++ b/2.0.2/common/technology/00_fallen_empire_tech.txt
  9806. @@ -59,3 +59,32 @@ tech_dark_matter_power_core = {
  9807. }
  9808. }
  9809. }
  9810. +
  9811. +# Dark Matter Thrusters
  9812. +tech_dark_matter_propulsion = {
  9813. + cost = @fallentechcost
  9814. + area = engineering
  9815. + tier = @fallentechtier
  9816. + category = { propulsion }
  9817. + ai_update_type = all
  9818. + weight = 1
  9819. + is_rare = yes
  9820. +
  9821. + prereqfor_desc = {
  9822. + hide_prereq_for_desc = component
  9823. + custom = {
  9824. + title = "TECH_UNLOCK_DARK_MATTER_PROPULSION_TITLE"
  9825. + desc = "TECH_UNLOCK_DARK_MATTER_PROPULSION_DESC"
  9826. + }
  9827. + }
  9828. +
  9829. + weight_modifier = {
  9830. + modifier = {
  9831. + factor = 0
  9832. + NOR = {
  9833. + is_country_type = fallen_empire
  9834. + is_country_type = awakened_fallen_empire
  9835. + }
  9836. + }
  9837. + }
  9838. +}
  9839. \ No newline at end of file
  9840. diff --git a/2.0.0/common/technology/00_horizonsignal_tech.txt b/2.0.2/common/technology/00_horizonsignal_tech.txt
  9841. index d711b44..2570dca 100755
  9842. --- a/2.0.0/common/technology/00_horizonsignal_tech.txt
  9843. +++ b/2.0.2/common/technology/00_horizonsignal_tech.txt
  9844. @@ -58,15 +58,15 @@ tech_akx_worm_3 = {
  9845. tier = @horizontechtier
  9846. category = { particles }
  9847. prerequisites = { "tech_akx_worm_1" "tech_akx_worm_2" }
  9848. - weight = 0
  9849. + weight = 60
  9850.  
  9851. - weight_modifier = {
  9852. - modifier = {
  9853. - add = 60
  9854. - has_technology = tech_akx_worm_1
  9855. - has_technology = tech_akx_worm_2
  9856. - }
  9857. - }
  9858. + #weight_modifier = {
  9859. + # modifier = {
  9860. + # add = 60
  9861. + # has_technology = tech_akx_worm_1
  9862. + # has_technology = tech_akx_worm_2
  9863. + # }
  9864. + #}
  9865.  
  9866. ai_weight = {
  9867. factor = 0
  9868. diff --git a/2.0.0/common/technology/00_phys_tech.txt b/2.0.2/common/technology/00_phys_tech.txt
  9869. index 67e0639..460f8c6 100755
  9870. --- a/2.0.0/common/technology/00_phys_tech.txt
  9871. +++ b/2.0.2/common/technology/00_phys_tech.txt
  9872. @@ -4,23 +4,23 @@
  9873. #If you change any of these, use replace in files so the values are the same across all files
  9874.  
  9875. @tier1cost1 = 500
  9876. -@tier1cost2 = 640
  9877. -@tier1cost3 = 780
  9878. +@tier1cost2 = 750
  9879. +@tier1cost3 = 1000
  9880.  
  9881. -@tier2cost1 = 1000
  9882. -@tier2cost2 = 1500
  9883. -@tier2cost3 = 2000
  9884. +@tier2cost1 = 1500
  9885. +@tier2cost2 = 2000
  9886. +@tier2cost3 = 2500
  9887.  
  9888. -@tier3cost1 = 3000
  9889. -@tier3cost2 = 4000
  9890. -@tier3cost3 = 5000
  9891. +@tier3cost1 = 4000
  9892. +@tier3cost2 = 5000
  9893. +@tier3cost3 = 6000
  9894.  
  9895. -@tier4cost1 = 6000
  9896. -@tier4cost2 = 8000
  9897. -@tier4cost3 = 10000
  9898. +@tier4cost1 = 8000
  9899. +@tier4cost2 = 10000
  9900. +@tier4cost3 = 12000
  9901.  
  9902. -@tier5cost1 = 14000
  9903. -@tier5cost2 = 17000
  9904. +@tier5cost1 = 15000
  9905. +@tier5cost2 = 17500
  9906. @tier5cost3 = 20000
  9907.  
  9908. ####################
  9909. @@ -55,72 +55,17 @@
  9910.  
  9911. tech_databank_uplinks = {
  9912. area = physics
  9913. - cost = @tier1cost1
  9914. + cost = 0
  9915. tier = 1
  9916. category = { computing }
  9917. - weight = @tier1weight1
  9918. + weight = 0
  9919. +
  9920. + potential = { always = no }
  9921.  
  9922. # allows Science Ships to boost the research-output of a planet
  9923. + # unlocked by tradition
  9924.  
  9925. feature_flags = { assist_research }
  9926. -
  9927. - weight_modifier = {
  9928. - modifier = {
  9929. - factor = 1.25
  9930. - research_leader = {
  9931. - area = physics
  9932. - has_trait = "leader_trait_expertise_computing"
  9933. - }
  9934. - }
  9935. - }
  9936. -
  9937. - ai_weight = {
  9938. - modifier = {
  9939. - factor = 1.25
  9940. - research_leader = {
  9941. - area = physics
  9942. - has_trait = "leader_trait_expertise_computing"
  9943. - }
  9944. - }
  9945. - }
  9946. -}
  9947. -
  9948. -tech_improved_databank_uplinks = {
  9949. - area = physics
  9950. - cost = @tier2cost2
  9951. - tier = 2
  9952. - category = { computing }
  9953. - prerequisites = { "tech_databank_uplinks" }
  9954. - weight = @tier2weight2
  9955. -
  9956. - # unlocks uplink-component, assist research-action is twice as effective
  9957. -
  9958. - weight_modifier = {
  9959. - modifier = {
  9960. - factor = 1.25
  9961. - research_leader = {
  9962. - area = physics
  9963. - has_trait = "leader_trait_expertise_computing"
  9964. - }
  9965. - }
  9966. - }
  9967. -
  9968. - prereqfor_desc = {
  9969. - ship = {
  9970. - title = "TECH_UNLOCK_IMPROVED_UPLINKS_FORMS_TITLE"
  9971. - desc = "TECH_UNLOCK_IMPROVED_UPLINKS_FORMS_DESC"
  9972. - }
  9973. - }
  9974. -
  9975. - ai_weight = {
  9976. - modifier = {
  9977. - factor = 1.25
  9978. - research_leader = {
  9979. - area = physics
  9980. - has_trait = "leader_trait_expertise_computing"
  9981. - }
  9982. - }
  9983. - }
  9984. }
  9985.  
  9986. # ##################
  9987. @@ -661,7 +606,44 @@ tech_sapient_ai = {
  9988. }
  9989.  
  9990. potential = {
  9991. - NOT = { has_authority = auth_machine_intelligence }
  9992. + NOT = { has_ethic = ethic_gestalt_consciousness }
  9993. + }
  9994. +
  9995. + weight_modifier = {
  9996. + modifier = {
  9997. + factor = 1.25
  9998. + research_leader = {
  9999. + area = physics
  10000. + has_trait = "leader_trait_expertise_computing"
  10001. + }
  10002. + }
  10003. + }
  10004. +
  10005. + ai_weight = {
  10006. + modifier = {
  10007. + factor = 1.25
  10008. + research_leader = {
  10009. + area = physics
  10010. + has_trait = "leader_trait_expertise_computing"
  10011. + }
  10012. + }
  10013. + }
  10014. +}
  10015. +
  10016. +tech_positronic_implants = {
  10017. + area = physics
  10018. + tier = 4
  10019. + cost = @tier4cost1
  10020. + category = { computing }
  10021. + prerequisites = { "tech_self_aware_logic" }
  10022. + weight = @tier4weight1
  10023. +
  10024. + modifier = {
  10025. + all_technology_research_speed = 0.05
  10026. + }
  10027. +
  10028. + potential = {
  10029. + has_ethic = ethic_gestalt_consciousness
  10030. }
  10031.  
  10032. weight_modifier = {
  10033. @@ -955,13 +937,13 @@ tech_auxiliary_fire_control = {
  10034.  
  10035. tech_synchronized_defences = {
  10036. area = physics
  10037. - tier = 3
  10038. - cost = @tier3cost3
  10039. + tier = 4
  10040. + cost = @tier4cost2
  10041. category = { computing }
  10042. ai_update_type = military
  10043. prerequisites = { "tech_self_aware_logic" }
  10044. is_rare = yes
  10045. - weight = @tier3weight3
  10046. + weight = @tier4weight2
  10047.  
  10048. # unlocks starbase building - defense-grid supercomputer
  10049.  
  10050. @@ -1982,7 +1964,14 @@ tech_wormhole_stabilization = {
  10051. }
  10052. modifier = {
  10053. factor = 0
  10054. - NOT = { has_seen_any_bypass = wormhole }
  10055. + NOR = {
  10056. + has_seen_any_bypass = wormhole
  10057. + any_relation = {
  10058. + is_country_type = default
  10059. + has_communications = ROOT
  10060. + has_technology = tech_wormhole_stabilization
  10061. + }
  10062. + }
  10063. }
  10064. modifier = {
  10065. factor = 4
  10066. @@ -2050,7 +2039,14 @@ tech_gateway_activation = {
  10067. }
  10068. modifier = {
  10069. factor = 0
  10070. - NOT = { has_seen_any_bypass = gateway }
  10071. + NOR = {
  10072. + has_seen_any_bypass = gateway
  10073. + any_relation = {
  10074. + is_country_type = default
  10075. + has_communications = ROOT
  10076. + has_technology = tech_gateway_activation
  10077. + }
  10078. + }
  10079. }
  10080. modifier = {
  10081. factor = 4
  10082. diff --git a/2.0.0/common/technology/00_phys_weapon_tech.txt b/2.0.2/common/technology/00_phys_weapon_tech.txt
  10083. index b0d44c2..043fdd0 100755
  10084. --- a/2.0.0/common/technology/00_phys_weapon_tech.txt
  10085. +++ b/2.0.2/common/technology/00_phys_weapon_tech.txt
  10086. @@ -4,23 +4,23 @@
  10087. #If you change any of these, use replace in files so the values are the same across all files
  10088.  
  10089. @tier1cost1 = 500
  10090. -@tier1cost2 = 640
  10091. -@tier1cost3 = 780
  10092. +@tier1cost2 = 750
  10093. +@tier1cost3 = 1000
  10094.  
  10095. -@tier2cost1 = 1000
  10096. -@tier2cost2 = 1500
  10097. -@tier2cost3 = 2000
  10098. +@tier2cost1 = 1500
  10099. +@tier2cost2 = 2000
  10100. +@tier2cost3 = 2500
  10101.  
  10102. -@tier3cost1 = 3000
  10103. -@tier3cost2 = 4000
  10104. -@tier3cost3 = 5000
  10105. +@tier3cost1 = 4000
  10106. +@tier3cost2 = 5000
  10107. +@tier3cost3 = 6000
  10108.  
  10109. -@tier4cost1 = 6000
  10110. -@tier4cost2 = 8000
  10111. -@tier4cost3 = 10000
  10112. +@tier4cost1 = 8000
  10113. +@tier4cost2 = 10000
  10114. +@tier4cost3 = 12000
  10115.  
  10116. -@tier5cost1 = 14000
  10117. -@tier5cost2 = 17000
  10118. +@tier5cost1 = 15000
  10119. +@tier5cost2 = 17500
  10120. @tier5cost3 = 20000
  10121.  
  10122. ####################
  10123. diff --git a/2.0.0/common/technology/00_soc_tech.txt b/2.0.2/common/technology/00_soc_tech.txt
  10124. index b1fdd58..74fddee 100755
  10125. --- a/2.0.0/common/technology/00_soc_tech.txt
  10126. +++ b/2.0.2/common/technology/00_soc_tech.txt
  10127. @@ -4,23 +4,23 @@
  10128. #If you change any of these, use replace in files so the values are the same across all files
  10129.  
  10130. @tier1cost1 = 500
  10131. -@tier1cost2 = 640
  10132. -@tier1cost3 = 780
  10133. +@tier1cost2 = 750
  10134. +@tier1cost3 = 1000
  10135.  
  10136. -@tier2cost1 = 1000
  10137. -@tier2cost2 = 1500
  10138. -@tier2cost3 = 2000
  10139. +@tier2cost1 = 1500
  10140. +@tier2cost2 = 2000
  10141. +@tier2cost3 = 2500
  10142.  
  10143. -@tier3cost1 = 3000
  10144. -@tier3cost2 = 4000
  10145. -@tier3cost3 = 5000
  10146. +@tier3cost1 = 4000
  10147. +@tier3cost2 = 5000
  10148. +@tier3cost3 = 6000
  10149.  
  10150. -@tier4cost1 = 6000
  10151. -@tier4cost2 = 8000
  10152. -@tier4cost3 = 10000
  10153. +@tier4cost1 = 8000
  10154. +@tier4cost2 = 10000
  10155. +@tier4cost3 = 12000
  10156.  
  10157. -@tier5cost1 = 14000
  10158. -@tier5cost2 = 17000
  10159. +@tier5cost1 = 15000
  10160. +@tier5cost2 = 17500
  10161. @tier5cost3 = 20000
  10162.  
  10163. ####################
  10164. @@ -1707,10 +1707,6 @@ tech_ecological_adaptation = {
  10165. has_trait = "leader_trait_expertise_new_worlds"
  10166. }
  10167. }
  10168. - modifier = {
  10169. - factor = 3
  10170. - has_ascension_perk = ap_world_shaper
  10171. - }
  10172. }
  10173.  
  10174. ai_weight = {
  10175. @@ -1758,10 +1754,6 @@ tech_climate_restoration = {
  10176. has_trait = "leader_trait_expertise_new_worlds"
  10177. }
  10178. }
  10179. - modifier = {
  10180. - factor = 3
  10181. - has_ascension_perk = ap_world_shaper
  10182. - }
  10183. }
  10184.  
  10185. ai_weight = {
  10186. @@ -3258,6 +3250,10 @@ tech_centralized_command = {
  10187.  
  10188. # unlocks military academy
  10189.  
  10190. + modifier = {
  10191. + country_occupation_armies_add = 2
  10192. + }
  10193. +
  10194. weight_modifier = {
  10195. modifier = {
  10196. factor = 1.25
  10197. @@ -3931,6 +3927,7 @@ tech_interstellar_campaigns = {
  10198.  
  10199. modifier = {
  10200. country_claim_influence_cost_mult = -0.1
  10201. + country_war_exhaustion_mult = -0.1
  10202. }
  10203.  
  10204. weight_modifier = {
  10205. @@ -3996,6 +3993,7 @@ tech_galactic_campaigns = {
  10206.  
  10207. modifier = {
  10208. country_claim_influence_cost_mult = -0.1
  10209. + country_war_exhaustion_mult = -0.1
  10210. }
  10211.  
  10212. weight_modifier = {
  10213. @@ -4830,11 +4828,11 @@ tech_neural_implants = {
  10214.  
  10215. #Artificial Moral Codes
  10216. tech_artificial_moral_codes = {
  10217. - cost = @tier3cost1
  10218. + cost = @tier2cost3
  10219. area = society
  10220. tier = 2
  10221. category = { statecraft }
  10222. - weight = @tier3weight1
  10223. + weight = @tier2weight3
  10224.  
  10225. modifier = {
  10226. edict_cost = -0.15
  10227. @@ -4846,6 +4844,7 @@ tech_artificial_moral_codes = {
  10228. }
  10229.  
  10230. weight_modifier = {
  10231. + factor = 1.5
  10232. modifier = {
  10233. factor = 1.25
  10234. research_leader = {
  10235. @@ -4885,6 +4884,7 @@ tech_synthetic_thought_patterns = {
  10236. }
  10237.  
  10238. weight_modifier = {
  10239. + factor = 1.5
  10240. modifier = {
  10241. factor = 1.25
  10242. research_leader = {
  10243. @@ -4892,16 +4892,89 @@ tech_synthetic_thought_patterns = {
  10244. has_trait = "leader_trait_expertise_statecraft"
  10245. }
  10246. }
  10247. + }
  10248. +
  10249. + ai_weight = {
  10250. modifier = {
  10251. factor = 1.25
  10252. research_leader = {
  10253. area = society
  10254. - has_trait = "leader_trait_spark_of_genius"
  10255. + has_trait = "leader_trait_expertise_statecraft"
  10256. + }
  10257. + }
  10258. + }
  10259. +}
  10260. +
  10261. +# Collective Production Methods
  10262. +tech_collective_production_methods = {
  10263. + cost = @tier3cost3
  10264. + area = society
  10265. + tier = 3
  10266. + category = { statecraft }
  10267. + weight = @tier3weight1
  10268. +
  10269. + modifier = {
  10270. + pop_resource_output = 0.10
  10271. + }
  10272. +
  10273. + potential = {
  10274. + OR = {
  10275. + has_authority = auth_hive_mind
  10276. + has_civic = civic_machine_assimilator
  10277. + }
  10278. + }
  10279. +
  10280. + weight_modifier = {
  10281. + modifier = {
  10282. + factor = 1.25
  10283. + research_leader = {
  10284. + area = society
  10285. + has_trait = "leader_trait_expertise_statecraft"
  10286. + }
  10287. + }
  10288. + }
  10289. +
  10290. + ai_weight = {
  10291. + weight = 2
  10292. + modifier = {
  10293. + factor = 1.25
  10294. + research_leader = {
  10295. + area = society
  10296. + has_trait = "leader_trait_expertise_statecraft"
  10297. + }
  10298. + }
  10299. + }
  10300. +}
  10301. +
  10302. +# Resource Processing Algorithms
  10303. +tech_resource_processing_algorithms = {
  10304. + cost = @tier3cost1
  10305. + area = society
  10306. + tier = 3
  10307. + category = { statecraft }
  10308. + weight = @tier3weight1
  10309. +
  10310. + modifier = {
  10311. + pop_robot_production_output = 0.10
  10312. + }
  10313. +
  10314. + potential = {
  10315. + has_authority = auth_machine_intelligence
  10316. + NOT = { has_civic = civic_machine_assimilator }
  10317. + }
  10318. +
  10319. + weight_modifier = {
  10320. + modifier = {
  10321. + factor = 1.25
  10322. + research_leader = {
  10323. + area = society
  10324. + has_trait = "leader_trait_expertise_statecraft"
  10325. }
  10326. }
  10327. }
  10328.  
  10329. ai_weight = {
  10330. + weight = 2
  10331. modifier = {
  10332. factor = 1.25
  10333. research_leader = {
  10334. @@ -5186,9 +5259,6 @@ tech_ascension_theory = {
  10335.  
  10336. weight_modifier = {
  10337. factor = 0.5
  10338. - modifier = {
  10339. - factor = 0
  10340. - }
  10341. modifier = {
  10342. factor = 0.20
  10343. NOR = {
  10344. @@ -5267,6 +5337,7 @@ tech_psionic_shield = {
  10345. is_rare = yes
  10346. prerequisites = { "tech_psionic_theory" }
  10347. weight = 0
  10348. + is_reverse_engineerable = no
  10349.  
  10350. weight_modifier = {
  10351. factor = 0
  10352. diff --git a/2.0.0/common/technology/00_soc_weapon_tech.txt b/2.0.2/common/technology/00_soc_weapon_tech.txt
  10353. index febfbc0..f912298 100755
  10354. --- a/2.0.0/common/technology/00_soc_weapon_tech.txt
  10355. +++ b/2.0.2/common/technology/00_soc_weapon_tech.txt
  10356. @@ -4,23 +4,23 @@
  10357. #If you change any of these, use replace in files so the values are the same across all files
  10358.  
  10359. @tier1cost1 = 500
  10360. -@tier1cost2 = 640
  10361. -@tier1cost3 = 780
  10362. +@tier1cost2 = 750
  10363. +@tier1cost3 = 1000
  10364.  
  10365. -@tier2cost1 = 1000
  10366. -@tier2cost2 = 1500
  10367. -@tier2cost3 = 2000
  10368. +@tier2cost1 = 1500
  10369. +@tier2cost2 = 2000
  10370. +@tier2cost3 = 2500
  10371.  
  10372. -@tier3cost1 = 3000
  10373. -@tier3cost2 = 4000
  10374. -@tier3cost3 = 5000
  10375. +@tier3cost1 = 4000
  10376. +@tier3cost2 = 5000
  10377. +@tier3cost3 = 6000
  10378.  
  10379. -@tier4cost1 = 6000
  10380. -@tier4cost2 = 8000
  10381. -@tier4cost3 = 10000
  10382. +@tier4cost1 = 8000
  10383. +@tier4cost2 = 10000
  10384. +@tier4cost3 = 12000
  10385.  
  10386. -@tier5cost1 = 14000
  10387. -@tier5cost2 = 17000
  10388. +@tier5cost1 = 15000
  10389. +@tier5cost2 = 17500
  10390. @tier5cost3 = 20000
  10391.  
  10392. ####################
  10393. diff --git a/2.0.0/common/technology/00_strategic_resources_tech.txt b/2.0.2/common/technology/00_strategic_resources_tech.txt
  10394. index 8d04e93..649ce1e 100755
  10395. --- a/2.0.0/common/technology/00_strategic_resources_tech.txt
  10396. +++ b/2.0.2/common/technology/00_strategic_resources_tech.txt
  10397. @@ -4,23 +4,23 @@
  10398. #If you change any of these, use replace in files so the values are the same across all files
  10399.  
  10400. @tier1cost1 = 500
  10401. -@tier1cost2 = 640
  10402. -@tier1cost3 = 780
  10403. +@tier1cost2 = 750
  10404. +@tier1cost3 = 1000
  10405.  
  10406. -@tier2cost1 = 1000
  10407. -@tier2cost2 = 1500
  10408. -@tier2cost3 = 2000
  10409. +@tier2cost1 = 1500
  10410. +@tier2cost2 = 2000
  10411. +@tier2cost3 = 2500
  10412.  
  10413. -@tier3cost1 = 3000
  10414. -@tier3cost2 = 4000
  10415. -@tier3cost3 = 5000
  10416. +@tier3cost1 = 4000
  10417. +@tier3cost2 = 5000
  10418. +@tier3cost3 = 6000
  10419.  
  10420. -@tier4cost1 = 6000
  10421. -@tier4cost2 = 8000
  10422. -@tier4cost3 = 10000
  10423. +@tier4cost1 = 8000
  10424. +@tier4cost2 = 10000
  10425. +@tier4cost3 = 12000
  10426.  
  10427. -@tier5cost1 = 14000
  10428. -@tier5cost2 = 17000
  10429. +@tier5cost1 = 15000
  10430. +@tier5cost2 = 17500
  10431. @tier5cost3 = 20000
  10432.  
  10433. ####################
  10434. diff --git a/2.0.0/common/technology/00_synthetic_dawn_tech.txt b/2.0.2/common/technology/00_synthetic_dawn_tech.txt
  10435. index c2202ed..abe9998 100755
  10436. --- a/2.0.0/common/technology/00_synthetic_dawn_tech.txt
  10437. +++ b/2.0.2/common/technology/00_synthetic_dawn_tech.txt
  10438. @@ -4,23 +4,23 @@
  10439. #If you change any of these, use replace in files so the values are the same across all files
  10440.  
  10441. @tier1cost1 = 500
  10442. -@tier1cost2 = 640
  10443. -@tier1cost3 = 780
  10444. +@tier1cost2 = 750
  10445. +@tier1cost3 = 1000
  10446.  
  10447. -@tier2cost1 = 1000
  10448. -@tier2cost2 = 1500
  10449. -@tier2cost3 = 2000
  10450. +@tier2cost1 = 1500
  10451. +@tier2cost2 = 2000
  10452. +@tier2cost3 = 2500
  10453.  
  10454. -@tier3cost1 = 3000
  10455. -@tier3cost2 = 4000
  10456. -@tier3cost3 = 5000
  10457. +@tier3cost1 = 4000
  10458. +@tier3cost2 = 5000
  10459. +@tier3cost3 = 6000
  10460.  
  10461. -@tier4cost1 = 6000
  10462. -@tier4cost2 = 8000
  10463. -@tier4cost3 = 10000
  10464. +@tier4cost1 = 8000
  10465. +@tier4cost2 = 10000
  10466. +@tier4cost3 = 12000
  10467.  
  10468. -@tier5cost1 = 14000
  10469. -@tier5cost2 = 17000
  10470. +@tier5cost1 = 15000
  10471. +@tier5cost2 = 17500
  10472. @tier5cost3 = 20000
  10473.  
  10474. ####################
  10475. diff --git a/2.0.0/common/tradition_categories/00_discovery.txt b/2.0.2/common/tradition_categories/00_discovery.txt
  10476. index 6a2914a..663f96f 100755
  10477. --- a/2.0.0/common/tradition_categories/00_discovery.txt
  10478. +++ b/2.0.2/common/tradition_categories/00_discovery.txt
  10479. @@ -3,7 +3,7 @@ tradition_discovery = {
  10480. finish_bonus = "tr_discovery_finish"
  10481. traditions = {
  10482. "tr_discovery_to_boldly_go"
  10483. - "tr_discovery_planetary_survey_corps"
  10484. + "tr_discovery_databank_uplinks"
  10485. "tr_discovery_science_division"
  10486. "tr_discovery_polytechnic_education"
  10487. "tr_discovery_faith_in_science"
  10488. diff --git a/2.0.0/common/traditions/00_discovery.txt b/2.0.2/common/traditions/00_discovery.txt
  10489. index def0ec5..897e456 100755
  10490. --- a/2.0.0/common/traditions/00_discovery.txt
  10491. +++ b/2.0.2/common/traditions/00_discovery.txt
  10492. @@ -7,18 +7,13 @@ tr_discovery_adopt = {
  10493.  
  10494. tradition_swap = {
  10495. name = tr_discovery_adopt_machine
  10496. - inherit_effects = no
  10497. + inherit_effects = yes
  10498. #inherit_icon = no
  10499. inherit_name = no
  10500. trigger = {
  10501. has_authority = auth_machine_intelligence
  10502. }
  10503.  
  10504. - modifier = {
  10505. - ship_anomaly_fail_risk = -0.10
  10506. - ship_anomaly_generation_chance_mult = 0.15
  10507. - }
  10508. -
  10509. weight = {
  10510. factor = 1
  10511. }
  10512. @@ -26,18 +21,13 @@ tr_discovery_adopt = {
  10513.  
  10514. tradition_swap = {
  10515. name = tr_discovery_adopt_hive
  10516. - inherit_effects = no
  10517. + inherit_effects = yes
  10518. #inherit_icon = no
  10519. inherit_name = no
  10520. trigger = {
  10521. has_authority = auth_hive_mind
  10522. }
  10523.  
  10524. - modifier = {
  10525. - ship_anomaly_fail_risk = -0.10
  10526. - ship_anomaly_generation_chance_mult = 0.15
  10527. - }
  10528. -
  10529. weight = {
  10530. factor = 1
  10531. }
  10532. @@ -68,18 +58,13 @@ tr_discovery_finish = {
  10533.  
  10534. tradition_swap = {
  10535. name = tr_discovery_finish_machine
  10536. - inherit_effects = no
  10537. + inherit_effects = yes
  10538. inherit_icon = yes
  10539. inherit_name = no
  10540. trigger = {
  10541. has_authority = auth_machine_intelligence
  10542. }
  10543.  
  10544. - modifier = {
  10545. - all_technology_research_speed = 0.10
  10546. - ascension_perks_add = 1
  10547. - }
  10548. -
  10549. weight = {
  10550. factor = 1
  10551. }
  10552. @@ -87,18 +72,13 @@ tr_discovery_finish = {
  10553.  
  10554. tradition_swap = {
  10555. name = tr_discovery_finish_hive
  10556. - inherit_effects = no
  10557. + inherit_effects = yes
  10558. inherit_icon = yes
  10559. inherit_name = no
  10560. trigger = {
  10561. has_authority = auth_hive_mind
  10562. }
  10563.  
  10564. - modifier = {
  10565. - all_technology_research_speed = 0.10
  10566. - ascension_perks_add = 1
  10567. - }
  10568. -
  10569. weight = {
  10570. factor = 1
  10571. }
  10572. @@ -108,7 +88,7 @@ tr_discovery_finish = {
  10573. tr_discovery_to_boldly_go = {
  10574. modifier = {
  10575. science_ship_survey_speed = 0.35
  10576. - shipclass_science_ship_evasion_add = 30
  10577. + shipclass_science_ship_disengage_mult = 0.5
  10578. }
  10579.  
  10580. tradition_swap = {
  10581. @@ -144,38 +124,13 @@ tr_discovery_to_boldly_go = {
  10582. }
  10583. }
  10584.  
  10585. -tr_discovery_planetary_survey_corps = {
  10586. +tr_discovery_databank_uplinks = {
  10587. possible = {
  10588. has_tradition = tr_discovery_to_boldly_go
  10589. }
  10590. - # Bonus implementation see action.54.
  10591.  
  10592. - tradition_swap = {
  10593. - name = tr_discovery_planetary_survey_corps_machine
  10594. - inherit_effects = yes
  10595. - inherit_icon = yes
  10596. - inherit_name = no
  10597. - trigger = {
  10598. - has_authority = auth_machine_intelligence
  10599. - }
  10600. -
  10601. - weight = {
  10602. - factor = 1
  10603. - }
  10604. - }
  10605. -
  10606. - tradition_swap = {
  10607. - name = tr_discovery_planetary_survey_corps_hive
  10608. - inherit_effects = yes
  10609. - inherit_icon = yes
  10610. - inherit_name = no
  10611. - trigger = {
  10612. - has_authority = auth_hive_mind
  10613. - }
  10614. -
  10615. - weight = {
  10616. - factor = 1
  10617. - }
  10618. + on_enabled = {
  10619. + give_technology = { message = no tech = tech_databank_uplinks }
  10620. }
  10621.  
  10622. ai_weight = {
  10623. @@ -227,7 +182,7 @@ tr_discovery_polytechnic_education = {
  10624. }
  10625.  
  10626. modifier = {
  10627. - species_leader_exp_gain = 0.33
  10628. + species_leader_exp_gain = 0.25
  10629. }
  10630.  
  10631. tradition_swap = {
  10632. diff --git a/2.0.0/common/traditions/00_domination.txt b/2.0.2/common/traditions/00_domination.txt
  10633. index 4977e6e..6e49aeb 100755
  10634. --- a/2.0.0/common/traditions/00_domination.txt
  10635. +++ b/2.0.2/common/traditions/00_domination.txt
  10636. @@ -23,7 +23,7 @@ tr_domination_adopt = {
  10637.  
  10638. tradition_swap = {
  10639. name = tr_domination_adopt_machine
  10640. - inherit_effects = no
  10641. + inherit_effects = yes
  10642. inherit_icon = yes
  10643. inherit_name = no
  10644. trigger = {
  10645. @@ -31,10 +31,6 @@ tr_domination_adopt = {
  10646. NOT = { has_civic = civic_machine_terminator }
  10647. }
  10648.  
  10649. - modifier = {
  10650. - country_subject_acceptance_add = 20
  10651. - }
  10652. -
  10653. weight = {
  10654. factor = 1
  10655. }
  10656. @@ -42,16 +38,10 @@ tr_domination_adopt = {
  10657.  
  10658. ai_weight = {
  10659. factor = 20
  10660. - # generally don't pick unless we have subjects
  10661. modifier = {
  10662. factor = 0.01
  10663. NOT = {
  10664. - any_subject = {
  10665. - OR = {
  10666. - is_subject_type = tributary
  10667. - is_subject_type = vassal
  10668. - }
  10669. - }
  10670. + has_ai_personality_behaviour = subjugator
  10671. }
  10672. }
  10673. modifier = {
  10674. @@ -158,7 +148,7 @@ tr_domination_protection_racket = {
  10675. has_tradition = tr_domination_colonial_viceroys
  10676. }
  10677. modifier = {
  10678. - subject_tribute_mult = 0.125
  10679. + subject_tribute_mult = 0.5
  10680. }
  10681.  
  10682. tradition_swap = {
  10683. @@ -330,7 +320,7 @@ tr_domination_fleet_levies = {
  10684. }
  10685.  
  10686. modifier = {
  10687. - country_vassal_naval_capacity_contribution_mult = 0.50
  10688. + country_vassal_naval_capacity_contribution_mult = 1.00
  10689. }
  10690.  
  10691. tradition_swap = {
  10692. diff --git a/2.0.0/common/traditions/00_expansion.txt b/2.0.2/common/traditions/00_expansion.txt
  10693. index da369a2..185fb73 100755
  10694. --- a/2.0.0/common/traditions/00_expansion.txt
  10695. +++ b/2.0.2/common/traditions/00_expansion.txt
  10696. @@ -1,22 +1,18 @@
  10697. tr_expansion_adopt = {
  10698.  
  10699. modifier = {
  10700. - planet_colony_development_speed_mult = 1.00
  10701. + planet_colony_development_speed_mult = 0.50
  10702. }
  10703.  
  10704. tradition_swap = {
  10705. name = tr_expansion_adopt_machine
  10706. - inherit_effects = no
  10707. + inherit_effects = yes
  10708. inherit_icon = yes
  10709. inherit_name = no
  10710. trigger = {
  10711. has_authority = auth_machine_intelligence
  10712. }
  10713.  
  10714. - modifier = {
  10715. - planet_colony_development_speed_mult = 1.00
  10716. - }
  10717. -
  10718. weight = {
  10719. factor = 1
  10720. }
  10721. @@ -24,17 +20,13 @@ tr_expansion_adopt = {
  10722.  
  10723. tradition_swap = {
  10724. name = tr_expansion_adopt_hive
  10725. - inherit_effects = no
  10726. + inherit_effects = yes
  10727. inherit_icon = yes
  10728. inherit_name = no
  10729. trigger = {
  10730. has_authority = auth_hive_mind
  10731. }
  10732.  
  10733. - modifier = {
  10734. - planet_colony_development_speed_mult = 1.00
  10735. - }
  10736. -
  10737. weight = {
  10738. factor = 1
  10739. }
  10740. @@ -57,18 +49,13 @@ tr_expansion_finish = {
  10741.  
  10742. tradition_swap = {
  10743. name = tr_expansion_adopt_machine
  10744. - inherit_effects = no
  10745. + inherit_effects = yes
  10746. inherit_icon = yes
  10747. inherit_name = no
  10748. trigger = {
  10749. has_authority = auth_machine_intelligence
  10750. }
  10751.  
  10752. - modifier = {
  10753. - country_core_sector_system_cap = 2
  10754. - ascension_perks_add = 1
  10755. - }
  10756. -
  10757. weight = {
  10758. factor = 1
  10759. }
  10760. @@ -76,18 +63,13 @@ tr_expansion_finish = {
  10761.  
  10762. tradition_swap = {
  10763. name = tr_expansion_adopt_machine # uses same name and desc
  10764. - inherit_effects = no
  10765. + inherit_effects = yes
  10766. inherit_icon = yes
  10767. inherit_name = no
  10768. trigger = {
  10769. has_authority = auth_hive_mind
  10770. }
  10771.  
  10772. - modifier = {
  10773. - country_core_sector_system_cap = 2
  10774. - ascension_perks_add = 1
  10775. - }
  10776. -
  10777. weight = {
  10778. factor = 1
  10779. }
  10780. @@ -258,7 +240,7 @@ tr_expansion_galactic_ambition = {
  10781. }
  10782.  
  10783. modifier = {
  10784. - country_starbase_capacity_add = 2
  10785. + country_starbase_upkeep_mult = -0.2
  10786. }
  10787.  
  10788. tradition_swap = {
  10789. diff --git a/2.0.0/common/traditions/00_harmony.txt b/2.0.2/common/traditions/00_harmony.txt
  10790. index c8a0ab5..304ca1e 100755
  10791. --- a/2.0.0/common/traditions/00_harmony.txt
  10792. +++ b/2.0.2/common/traditions/00_harmony.txt
  10793. @@ -124,7 +124,7 @@ tr_harmony_the_greater_good = {
  10794. tr_harmony_kinship = {
  10795.  
  10796. modifier = {
  10797. - mod_distance_to_capital_static_modifier_efficiency_mult = -0.5
  10798. + pop_government_ethic_attraction = 0.25
  10799. }
  10800.  
  10801. tradition_swap = {
  10802. diff --git a/2.0.0/common/traditions/00_supremacy.txt b/2.0.2/common/traditions/00_supremacy.txt
  10803. index 09c4a4c..e533105 100755
  10804. --- a/2.0.0/common/traditions/00_supremacy.txt
  10805. +++ b/2.0.2/common/traditions/00_supremacy.txt
  10806. @@ -176,7 +176,7 @@ tr_supremacy_right_of_conquest = {
  10807. }
  10808.  
  10809. tradition_swap = {
  10810. - name = tr_supremacy_natural_order
  10811. + name = tr_supremacy_natural_preeminence
  10812. inherit_effects = no
  10813. inherit_icon = yes
  10814. inherit_name = no
  10815. diff --git a/2.0.0/common/traits/00_admiral_traits.txt b/2.0.2/common/traits/00_admiral_traits.txt
  10816. index 59581a2..382a68e 100755
  10817. --- a/2.0.0/common/traits/00_admiral_traits.txt
  10818. +++ b/2.0.2/common/traits/00_admiral_traits.txt
  10819. @@ -83,7 +83,10 @@ leader_trait_scout = {
  10820. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_scout.dds"
  10821. modifier = {
  10822. ship_sensor_range_add = 1
  10823. - ship_speed_mult = 0.2
  10824. + ship_speed_mult = 0.1
  10825. + }
  10826. + leader_potential_add = {
  10827. + from = { has_technology = tech_sensors_2 }
  10828. }
  10829. leader_trait = yes
  10830. leader_class = { admiral }
  10831. @@ -229,8 +232,22 @@ leader_trait_dragonslayer = {
  10832. randomized = no
  10833. }
  10834.  
  10835. +leader_trait_admiral_erudite = {
  10836. + cost = 0
  10837. + modification = no
  10838. + icon = "gfx/interface/icons/traits/trait_erudite.dds"
  10839. + modifier = {
  10840. + ship_fire_rate_mult = 0.05
  10841. + ship_disengage_chance_mult = 0.10
  10842. + }
  10843. + leader_trait = yes
  10844. + leader_class = { admiral }
  10845. + initial = no
  10846. + randomized = no
  10847. +}
  10848. +
  10849. leader_trait_admiral_cyborg = {
  10850. - cost = 1
  10851. + cost = 0
  10852. modification = no
  10853. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_cyborg.dds"
  10854. modifier = {
  10855. diff --git a/2.0.0/common/traits/00_general_traits.txt b/2.0.2/common/traits/00_general_traits.txt
  10856. index 9b44cc4..771a1da 100755
  10857. --- a/2.0.0/common/traits/00_general_traits.txt
  10858. +++ b/2.0.2/common/traits/00_general_traits.txt
  10859. @@ -101,8 +101,22 @@ leader_trait_army_logistician = {
  10860. leader_class = { general }
  10861. }
  10862.  
  10863. +leader_trait_general_erudite = {
  10864. + cost = 0
  10865. + modification = no
  10866. + icon = "gfx/interface/icons/traits/trait_erudite.dds"
  10867. + modifier = {
  10868. + army_damage_mult = 0.05
  10869. + army_disengage_chance_mult = 0.10
  10870. + }
  10871. + leader_trait = yes
  10872. + leader_class = { general }
  10873. + initial = no
  10874. + randomized = no
  10875. +}
  10876. +
  10877. leader_trait_general_cyborg = {
  10878. - cost = 1
  10879. + cost = 0
  10880. modification = no
  10881. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_cyborg.dds"
  10882. modifier = {
  10883. diff --git a/2.0.0/common/traits/00_governor_traits.txt b/2.0.2/common/traits/00_governor_traits.txt
  10884. index 0b3394f..fb390b5 100755
  10885. --- a/2.0.0/common/traits/00_governor_traits.txt
  10886. +++ b/2.0.2/common/traits/00_governor_traits.txt
  10887. @@ -22,7 +22,7 @@ leader_trait_iron_fist = {
  10888. }
  10889. leader_potential_add = {
  10890. from = { allows_slavery = yes }
  10891. - NOT = { from = { has_authority = "auth_machine_intelligence" } }
  10892. + NOT = { from = { has_ethic = ethic_gestalt_consciousness } }
  10893. }
  10894. leader_trait = yes
  10895. leader_class = { governor }
  10896. @@ -121,8 +121,23 @@ leader_trait_environmental_engineer = {
  10897. leader_class = { governor }
  10898. }
  10899.  
  10900. +leader_trait_governor_erudite = {
  10901. + cost = 0
  10902. + modification = no
  10903. + icon = "gfx/interface/icons/traits/trait_erudite.dds"
  10904. + modifier = {
  10905. + tile_resource_engineering_research_mult = 0.05
  10906. + tile_resource_physics_research_mult = 0.05
  10907. + tile_resource_society_research_mult = 0.05
  10908. + }
  10909. + leader_trait = yes
  10910. + leader_class = { governor }
  10911. + initial = no
  10912. + randomized = no
  10913. +}
  10914. +
  10915. leader_trait_governor_cyborg = {
  10916. - cost = 1
  10917. + cost = 0
  10918. modification = no
  10919. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_cyborg.dds"
  10920. modifier = {
  10921. diff --git a/2.0.0/common/traits/00_ruler_traits.txt b/2.0.2/common/traits/00_ruler_traits.txt
  10922. index d1044b1..3a0b1c5 100755
  10923. --- a/2.0.0/common/traits/00_ruler_traits.txt
  10924. +++ b/2.0.2/common/traits/00_ruler_traits.txt
  10925. @@ -28,7 +28,7 @@ trait_ruler_corvette_focus = {
  10926. }
  10927. leader_trait = yes
  10928. leader_class = { ruler }
  10929. - prerequisites = { tech_corvettes }
  10930. + prerequisites = { tech_destroyers } # 'corvette focus' is a bit silly when it's the only available ship
  10931. opposites = { "trait_ruler_destroyer_focus" "trait_ruler_cruiser_focus" "trait_ruler_battleship_focus" }
  10932. }
  10933.  
  10934. @@ -413,8 +413,21 @@ leader_trait_reformer = {
  10935. leader_class = { ruler }
  10936. }
  10937.  
  10938. +leader_trait_ruler_erudite = {
  10939. + cost = 0
  10940. + modification = no
  10941. + icon = "gfx/interface/icons/traits/trait_erudite.dds"
  10942. + modifier = {
  10943. + all_technology_research_speed = 0.05
  10944. + }
  10945. + leader_trait = yes
  10946. + leader_class = { ruler }
  10947. + initial = no
  10948. + randomized = no
  10949. +}
  10950. +
  10951. leader_trait_ruler_cyborg = {
  10952. - cost = 1
  10953. + cost = 0
  10954. modification = no
  10955. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_cyborg.dds"
  10956. leader_trait = yes
  10957. @@ -424,12 +437,9 @@ leader_trait_ruler_cyborg = {
  10958. }
  10959.  
  10960. leader_trait_ruler_synthetic = {
  10961. - cost = 1
  10962. + cost = 0
  10963. modification = no
  10964. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_synthetic.dds"
  10965. - leader_potential_add = {
  10966. - NOT = { from = { has_ethic = "ethic_gestalt_consciousness" } }
  10967. - }
  10968. modifier = {
  10969. pop_robot_production_output = 0.05
  10970. }
  10971. @@ -443,9 +453,6 @@ leader_trait_ruler_psionic = {
  10972. cost = 0
  10973. modification = no
  10974. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_psionic_leader.dds"
  10975. - leader_potential_add = {
  10976. - NOT = { from = { has_ethic = "ethic_gestalt_consciousness" } }
  10977. - }
  10978. modifier = {
  10979. pop_government_ethic_attraction = 0.10
  10980. country_resource_influence_add = 0.5
  10981. @@ -461,9 +468,6 @@ leader_trait_ruler_chosen = {
  10982. modification = no
  10983. icon = "gfx/interface/icons/traits/leader_traits/leader_trait_psionic_chosen_one.dds"
  10984. immortal_leaders = yes
  10985. - leader_potential_add = {
  10986. - NOT = { from = { has_ethic = "ethic_gestalt_consciousness" } }
  10987. - }
  10988. modifier = {
  10989. pop_government_ethic_attraction = 0.20
  10990. country_resource_influence_add = 1
  10991. diff --git a/2.0.0/common/traits/00_scientist_traits.txt b/2.0.2/common/traits/00_scientist_traits.txt
  10992. index 9c08298..05330ce 100755
  10993. --- a/2.0.0/common/traits/00_scientist_traits.txt
  10994. +++ b/2.0.2/common/traits/00_scientist_traits.txt
  10995. @@ -789,10 +789,33 @@ leader_trait_curator = {
  10996. }
  10997. }
  10998.  
  10999. +leader_trait_scientist_erudite = {
  11000. + cost = 0
  11001. + modification = no
  11002. + icon = "gfx/interface/icons/traits/trait_erudite.dds"
  11003. + modifier = {
  11004. + all_technology_research_speed = 0.05
  11005. + }
  11006. + leader_trait = yes
  11007. + leader_class = { scientist }
  11008. + initial = no
  11009. + randomized = no
  11010. +
  11011. + ai_categories = {
  11012. + physics
  11013. + society
  11014. + engineering
  11015. + }
  11016. +
  11017. + ai_weight = {
  11018. + weight = 100
  11019. + }
  11020. +}
  11021. +
  11022. leader_trait_scientist_cyborg = {
  11023. - cost = 1
  11024. + cost = 0
  11025. modification = no
  11026. - icon = "gfx/interface/icons/traits/leader_traits/leader_trait_cyborg.dds"
  11027. + icon = "gfx/interface/icons/traits/leader_traits/leader_trait_synthetic.dds"
  11028. modifier = {
  11029. all_technology_research_speed = 0.05
  11030. }
  11031. @@ -805,7 +828,6 @@ leader_trait_scientist_cyborg = {
  11032. physics
  11033. society
  11034. engineering
  11035. - survey
  11036. }
  11037.  
  11038. ai_weight = {
  11039. diff --git a/2.0.0/common/traits/02_species_traits_basic_characteristics.txt b/2.0.2/common/traits/02_species_traits_basic_characteristics.txt
  11040. index 2f2f194..3449659 100755
  11041. --- a/2.0.0/common/traits/02_species_traits_basic_characteristics.txt
  11042. +++ b/2.0.2/common/traits/02_species_traits_basic_characteristics.txt
  11043. @@ -16,7 +16,6 @@ trait_hive_mind = {
  11044. randomized = no
  11045. modification = no
  11046. forced_happiness = yes
  11047. - alters_species_identity = yes
  11048.  
  11049. leader_age_min = 10
  11050. leader_age_max = 20
  11051. @@ -127,8 +126,8 @@ trait_syncretic_proles = {
  11052. cost = 1
  11053. opposites = { "trait_intelligent" "trait_erudite" "trait_natural_engineers" "trait_natural_physicists" "trait_natural_sociologists" }
  11054. initial = no
  11055. - sapient = no
  11056. - modification = no
  11057. + modification = yes
  11058. + species_potential_add = { always = no }
  11059. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11060. allowed_archetypes = { BIOLOGICAL }
  11061. modifier = {
  11062. diff --git a/2.0.0/common/traits/03_species_traits_presapients.txt b/2.0.2/common/traits/03_species_traits_presapients.txt
  11063. index 67d8e19..9190515 100755
  11064. --- a/2.0.0/common/traits/03_species_traits_presapients.txt
  11065. +++ b/2.0.2/common/traits/03_species_traits_presapients.txt
  11066. @@ -3,7 +3,8 @@ trait_presapient_starborn = {
  11067. opposites = { "trait_presapient_earthbound" "trait_sedentary" }
  11068. initial = no
  11069. sapient = no
  11070. - modification = no
  11071. + modification = yes
  11072. + species_potential_add = { always = no }
  11073. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11074. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11075. modifier = {
  11076. @@ -18,7 +19,8 @@ trait_presapient_earthbound = {
  11077. opposites = { "trait_presapient_starborn" "trait_nomadic" }
  11078. initial = no
  11079. sapient = no
  11080. - modification = no
  11081. + modification = yes
  11082. + species_potential_add = { always = no }
  11083. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11084. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11085. modifier = {
  11086. @@ -32,7 +34,8 @@ trait_presapient_natural_intellectuals = {
  11087. opposites = { "trait_presapient_proles" }
  11088. initial = no
  11089. sapient = no
  11090. - modification = no
  11091. + modification = yes
  11092. + species_potential_add = { always = no }
  11093. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11094. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11095. modifier = {
  11096. @@ -49,7 +52,8 @@ trait_presapient_proles = {
  11097. opposites = { "trait_presapient_natural_intellectuals" }
  11098. initial = no
  11099. sapient = no
  11100. - modification = no
  11101. + modification = yes
  11102. + species_potential_add = { always = no }
  11103. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11104. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11105. modifier = {
  11106. @@ -66,7 +70,8 @@ trait_presapient_conservative = {
  11107. cost = 1
  11108. initial = no
  11109. sapient = no
  11110. - modification = no
  11111. + modification = yes
  11112. + species_potential_add = { always = no }
  11113. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11114. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11115. modifier = {
  11116. @@ -80,7 +85,8 @@ trait_presapient_irradiated = {
  11117. cost = 1
  11118. initial = no
  11119. sapient = no
  11120. - modification = no
  11121. + modification = yes
  11122. + species_potential_add = { always = no }
  11123. icon = "gfx/interface/icons/traits/trait_primitive.dds"
  11124. allowed_archetypes = { BIOLOGICAL PRESAPIENT }
  11125. modifier = {
  11126. diff --git a/2.0.0/common/traits/04_species_traits.txt b/2.0.2/common/traits/04_species_traits.txt
  11127. index 4f747a8..7a41c5c 100755
  11128. --- a/2.0.0/common/traits/04_species_traits.txt
  11129. +++ b/2.0.2/common/traits/04_species_traits.txt
  11130. @@ -111,6 +111,7 @@ trait_slow_breeders = {
  11131. trait_talented = {
  11132. cost = 1
  11133. allowed_archetypes = { BIOLOGICAL }
  11134. + opposites = { "trait_nerve_stapled" }
  11135. modifier = {
  11136. leader_skill_levels = 1
  11137. }
  11138. @@ -242,7 +243,7 @@ trait_charismatic = {
  11139. modifier = {
  11140. pop_other_species_owner_happiness = 0.05
  11141. }
  11142. - opposites = { "trait_repugnant" }
  11143. + opposites = { "trait_repugnant" "trait_fertile" }
  11144. allowed_archetypes = { BIOLOGICAL }
  11145. custom_tooltip = TRAIT_CHARISMATIC_EFFECT
  11146. }
  11147. @@ -252,7 +253,7 @@ trait_repugnant = {
  11148. modifier = {
  11149. pop_other_species_owner_happiness = -0.05
  11150. }
  11151. - opposites = { "trait_charismatic" }
  11152. + opposites = { "trait_charismatic" "trait_fertile" }
  11153. allowed_archetypes = { BIOLOGICAL }
  11154. custom_tooltip = TRAIT_REPUGNANT_EFFECT
  11155. ai_weight = {
  11156. @@ -369,10 +370,12 @@ trait_wasteful = {
  11157. trait_cybernetic = {
  11158. cost = 0
  11159.  
  11160. + opposites = { "trait_latent_psionic" "trait_psionic" }
  11161. +
  11162. + improves_leaders = yes
  11163. initial = no
  11164. randomized = no
  11165. modification = no
  11166. - alters_species_identity = yes
  11167.  
  11168. allowed_archetypes = { BIOLOGICAL }
  11169.  
  11170. @@ -388,10 +391,11 @@ trait_latent_psionic = {
  11171. cost = 0
  11172. icon = "gfx/interface/icons/traits/trait_psionic_species.dds"
  11173.  
  11174. + opposites = { "trait_cybernetic" }
  11175. +
  11176. initial = no
  11177. randomized = no
  11178. modification = no
  11179. - alters_species_identity = yes
  11180.  
  11181. allowed_archetypes = { BIOLOGICAL }
  11182.  
  11183. @@ -407,10 +411,12 @@ trait_psionic = {
  11184. cost = 0
  11185. icon = "gfx/interface/icons/traits/trait_psionic_species.dds"
  11186.  
  11187. + opposites = { "trait_cybernetic" }
  11188. +
  11189. + improves_leaders = yes
  11190. initial = no
  11191. randomized = no
  11192. modification = no
  11193. - alters_species_identity = yes
  11194.  
  11195. allowed_archetypes = { BIOLOGICAL }
  11196.  
  11197. @@ -430,7 +436,6 @@ trait_self_modified = {
  11198. initial = no
  11199. randomized = no
  11200. modification = no
  11201. - alters_species_identity = yes
  11202.  
  11203. allowed_archetypes = { BIOLOGICAL }
  11204.  
  11205. @@ -453,7 +458,7 @@ trait_delicious = {
  11206.  
  11207. trait_nerve_stapled = {
  11208. cost = 3
  11209. - opposites = { "trait_intelligent" "trait_erudite" "trait_natural_engineers" "trait_natural_physicists" "trait_natural_sociologists" "trait_communal" "trait_solitary" }
  11210. + opposites = { "trait_intelligent" "trait_erudite" "trait_natural_engineers" "trait_natural_physicists" "trait_natural_sociologists" "trait_communal" "trait_solitary" "trait_talented" }
  11211. initial = no
  11212. randomized = no
  11213. advanced_trait = yes
  11214. @@ -467,6 +472,7 @@ trait_nerve_stapled = {
  11215. tile_resource_physics_research_mult = -0.75
  11216. tile_resource_engineering_research_mult = -0.75
  11217. tile_resource_society_research_mult = -0.75
  11218. + leader_skill_levels = -2
  11219. }
  11220. }
  11221.  
  11222. @@ -475,42 +481,43 @@ trait_fertile = {
  11223. initial = no
  11224. randomized = no
  11225. advanced_trait = yes
  11226. - opposites = { "trait_slow_breeders" "trait_rapid_breeders" }
  11227. + opposites = { "trait_slow_breeders" "trait_rapid_breeders" "trait_charismatic" "trait_repugnant" }
  11228. allowed_archetypes = { BIOLOGICAL }
  11229. modifier = {
  11230. pop_growth_speed = 0.3
  11231. tile_resource_unity_mult = 0.1
  11232. - pop_other_species_owner_happiness = 0.05
  11233. + pop_other_species_owner_happiness = 0.1
  11234. pop_happiness = 0.05
  11235. }
  11236. }
  11237.  
  11238. -trait_erudite = {
  11239. +trait_robust = {
  11240. cost = 4
  11241. initial = no
  11242. randomized = no
  11243. advanced_trait = yes
  11244. - opposites = { "trait_nerve_stapled" "trait_intelligent" }
  11245. + opposites = { "trait_nonadaptive" "trait_adaptive" "trait_extremely_adaptive" }
  11246. allowed_archetypes = { BIOLOGICAL }
  11247. modifier = {
  11248. - tile_resource_engineering_research_mult = 0.2
  11249. - tile_resource_physics_research_mult = 0.2
  11250. - tile_resource_society_research_mult = 0.2
  11251. - leader_skill_levels = 2
  11252. + pop_environment_tolerance = 0.30
  11253. + pop_resource_output = 0.05
  11254. + leader_age = 50
  11255. }
  11256. }
  11257.  
  11258. -trait_robust = {
  11259. +trait_erudite = {
  11260. cost = 4
  11261. initial = no
  11262. randomized = no
  11263. + improves_leaders = yes
  11264. advanced_trait = yes
  11265. - opposites = { "trait_nonadaptive" "trait_adaptive" "trait_extremely_adaptive" }
  11266. + opposites = { "trait_nerve_stapled" "trait_intelligent" }
  11267. allowed_archetypes = { BIOLOGICAL }
  11268. modifier = {
  11269. - pop_environment_tolerance = 0.30
  11270. - pop_resource_output = 0.05
  11271. - leader_age = 50
  11272. + tile_resource_engineering_research_mult = 0.2
  11273. + tile_resource_physics_research_mult = 0.2
  11274. + tile_resource_society_research_mult = 0.2
  11275. + leader_skill_levels = 1
  11276. }
  11277. }
  11278.  
  11279. diff --git a/2.0.0/common/traits/05_species_traits_robotic.txt b/2.0.2/common/traits/05_species_traits_robotic.txt
  11280. index 2dd74a8..6ae9314 100755
  11281. --- a/2.0.0/common/traits/05_species_traits_robotic.txt
  11282. +++ b/2.0.2/common/traits/05_species_traits_robotic.txt
  11283. @@ -50,6 +50,7 @@ trait_robot_loyalty_circuits = {
  11284. opposites = { trait_robotic_2 trait_robotic_1 } # Synth only
  11285.  
  11286. species_potential_add = {
  11287. + exists = from
  11288. from = {
  11289. NOT = { has_policy_flag = ai_outlawed }
  11290. }
  11291. @@ -70,6 +71,7 @@ trait_robot_domestic_protocols = {
  11292. allowed_archetypes = { ROBOT }
  11293.  
  11294. species_potential_add = {
  11295. + exists = from
  11296. from = {
  11297. NOT = { has_policy_flag = ai_full_rights }
  11298. }
  11299. diff --git a/2.0.0/common/war_goals/00_war_goals.txt b/2.0.2/common/war_goals/00_war_goals.txt
  11300. index e5d9266..23e033e 100755
  11301. --- a/2.0.0/common/war_goals/00_war_goals.txt
  11302. +++ b/2.0.2/common/war_goals/00_war_goals.txt
  11303. @@ -99,6 +99,48 @@ wg_end_threat_swarm = {
  11304. }
  11305. }
  11306.  
  11307. +wg_end_threat_assimilators = {
  11308. + casus_belli = cb_containment
  11309. +
  11310. + hide_if_no_cb = yes
  11311. + total_war = yes
  11312. + set_defender_wargoal = wg_absorption
  11313. +
  11314. + surrender_acceptance = -1000
  11315. +
  11316. + potential = {
  11317. + from = { has_valid_civic = civic_machine_assimilator }
  11318. + }
  11319. + possible = {
  11320. + always = yes
  11321. + }
  11322. +
  11323. + ai_weight = {
  11324. + weight = 100
  11325. + }
  11326. +}
  11327. +
  11328. +wg_assimilation = {
  11329. + casus_belli = cb_sublimation
  11330. +
  11331. + hide_if_no_cb = yes
  11332. + total_war = yes
  11333. + set_defender_wargoal = wg_end_threat_assimilators
  11334. +
  11335. + surrender_acceptance = -1000
  11336. +
  11337. + potential = {
  11338. + always = yes
  11339. + }
  11340. + possible = {
  11341. + always = yes
  11342. + }
  11343. +
  11344. + ai_weight = {
  11345. + weight = 100
  11346. + }
  11347. +}
  11348. +
  11349. wg_cleansing = {
  11350. casus_belli = cb_purification
  11351.  
  11352. @@ -147,7 +189,7 @@ wg_plunder = {
  11353. hide_if_no_cb = no
  11354. total_war = no
  11355.  
  11356. - surrender_acceptance = -50
  11357. + surrender_acceptance = -25
  11358.  
  11359. potential = {
  11360. has_total_war_cb = no
  11361. @@ -157,11 +199,56 @@ wg_plunder = {
  11362. always = yes
  11363. }
  11364. on_accept = {
  11365. - custom_tooltip = wg_plunder_accept
  11366. - hidden_effect = {
  11367. - add_energy = 500
  11368. - from = { add_modifier = { modifier = raided days = 3600 } }
  11369. + custom_tooltip = wg_plunder_accept_them
  11370. + if = {
  11371. + limit = {
  11372. + from = {
  11373. + num_owned_planets < 5
  11374. + }
  11375. }
  11376. + custom_tooltip = wg_plunder_accept_us_1
  11377. + hidden_effect = { add_energy = 500 add_minerals = 500 }
  11378. + }
  11379. + if = {
  11380. + limit = {
  11381. + from = {
  11382. + num_owned_planets > 4
  11383. + num_owned_planets < 10
  11384. + }
  11385. + }
  11386. + custom_tooltip = wg_plunder_accept_us_2
  11387. + hidden_effect = { add_energy = 1000 add_minerals = 1000 }
  11388. + }
  11389. + if = {
  11390. + limit = {
  11391. + from = {
  11392. + num_owned_planets > 9
  11393. + num_owned_planets < 15
  11394. + }
  11395. + }
  11396. + custom_tooltip = wg_plunder_accept_us_3
  11397. + hidden_effect = { add_energy = 1500 add_minerals = 1500 }
  11398. + }
  11399. + if = {
  11400. + limit = {
  11401. + from = {
  11402. + num_owned_planets > 14
  11403. + num_owned_planets < 20
  11404. + }
  11405. + }
  11406. + custom_tooltip = wg_plunder_accept_us_4
  11407. + hidden_effect = { add_energy = 2000 add_minerals = 2000 }
  11408. + }
  11409. + if = {
  11410. + limit = {
  11411. + from = {
  11412. + num_owned_planets > 19
  11413. + }
  11414. + }
  11415. + custom_tooltip = wg_plunder_accept_us_5
  11416. + hidden_effect = { add_energy = 2500 add_minerals = 2500 }
  11417. + }
  11418. + hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
  11419. }
  11420.  
  11421. ai_weight = {
  11422. @@ -200,7 +287,7 @@ wg_end_threat_colossus = {
  11423. surrender_acceptance = -1000
  11424.  
  11425. potential = {
  11426. - from = { has_technology = "tech_colossus" }
  11427. + always = yes
  11428. }
  11429. possible = {
  11430. always = yes
  11431. @@ -256,7 +343,7 @@ wg_tribute = {
  11432.  
  11433. hide_if_no_cb = no
  11434.  
  11435. - surrender_acceptance = -100
  11436. + surrender_acceptance = -75
  11437.  
  11438. potential = {
  11439. has_total_war_cb = no
  11440. @@ -297,9 +384,12 @@ wg_force_ideology = {
  11441.  
  11442. surrender_acceptance = -100
  11443.  
  11444. + war_exhaustion = 0.75
  11445. +
  11446. potential = {
  11447. has_policy_flag = liberation_wars
  11448. has_total_war_cb = no
  11449. + from = { is_country_type = default }
  11450. }
  11451. possible = {
  11452. always = yes
  11453. @@ -312,12 +402,30 @@ wg_force_ideology = {
  11454. from = { add_opinion_modifier = { modifier = opinion_liberated_us who = root } }
  11455. end_rivalry = from
  11456. from = { end_rivalry = root }
  11457. + every_system_within_border = {
  11458. + limit = {
  11459. + from = { has_claim = prev }
  11460. + }
  11461. + remove_claims = { who = from }
  11462. + }
  11463. every_country = {
  11464. - limit = { is_in_federation_with = root }
  11465. + limit = {
  11466. + OR = {
  11467. + is_in_federation_with = root
  11468. + is_subject = yes
  11469. + overlord = { is_same_value = root }
  11470. + }
  11471. + }
  11472. end_rivalry = from
  11473. from = { end_rivalry = prev }
  11474. add_opinion_modifier = { modifier = opinion_we_liberated who = from }
  11475. from = { add_opinion_modifier = { modifier = opinion_liberated_us who = prev } }
  11476. + every_system_within_border = {
  11477. + limit = {
  11478. + from = { has_claim = prev }
  11479. + }
  11480. + remove_claims = { who = from }
  11481. + }
  11482. }
  11483. from = {
  11484. add_threat = {
  11485. @@ -325,6 +433,9 @@ wg_force_ideology = {
  11486. amount = 0.25
  11487. }
  11488. }
  11489. + from = {
  11490. + leave_alliance = { override_requirements = yes }
  11491. + }
  11492. }
  11493. }
  11494.  
  11495. @@ -340,8 +451,6 @@ wg_conquest = {
  11496.  
  11497. threat_multiplier = 0.75
  11498.  
  11499. - show_claims_in_description = yes
  11500. -
  11501. potential = {
  11502. has_total_war_cb = no
  11503. }
  11504. @@ -360,7 +469,7 @@ wg_humiliation = {
  11505. hide_if_no_cb = no
  11506. defender_default = yes
  11507.  
  11508. - surrender_acceptance = -50
  11509. + surrender_acceptance = -25
  11510.  
  11511. potential = {
  11512. has_total_war_cb = no
  11513. diff --git a/2.0.0/common/war_goals/01_fallen_empire_war_goals.txt b/2.0.2/common/war_goals/01_fallen_empire_war_goals.txt
  11514. index 6511e6e..181690c 100755
  11515. --- a/2.0.0/common/war_goals/01_fallen_empire_war_goals.txt
  11516. +++ b/2.0.2/common/war_goals/01_fallen_empire_war_goals.txt
  11517. @@ -12,6 +12,7 @@ wg_fe_humiliation = {
  11518. always = yes
  11519. }
  11520. on_accept = {
  11521. + custom_tooltip = wg_humiliation_fe_accept
  11522. save_event_target_as = fallen_empire_humiliator
  11523. from = {
  11524. fallen_empire_humiliate_effect = yes
  11525. @@ -36,6 +37,7 @@ wg_fe_stop_atrocities = {
  11526. from = { is_valid_target_fe_stop_atrocities = yes }
  11527. }
  11528. on_accept = {
  11529. + custom_tooltip = wg_humiliation_fe_accept
  11530. save_event_target_as = fallen_empire_humiliator
  11531. from = {
  11532. fallen_empire_stop_atrocities_effect = yes
  11533. @@ -61,6 +63,7 @@ wg_fe_stop_ai = {
  11534. from = { is_valid_target_fe_stop_ai = yes }
  11535. }
  11536. on_accept = {
  11537. + custom_tooltip = wg_humiliation_fe_accept
  11538. save_event_target_as = fallen_empire_humiliator
  11539. from = {
  11540. fallen_empire_stop_ai_effect = yes
  11541. @@ -86,6 +89,7 @@ wg_fe_cleanse_holy_worlds = {
  11542. from = { is_valid_target_fe_cleanse_holy_worlds = yes }
  11543. }
  11544. on_accept = {
  11545. + custom_tooltip = wg_humiliation_fe_accept
  11546. save_event_target_as = fallen_empire_humiliator
  11547. from = {
  11548. fallen_empire_cleanse_holy_worlds_effect = yes
  11549. @@ -111,6 +115,7 @@ wg_fe_cleanse_border_worlds = {
  11550. is_neighbor_of = from
  11551. }
  11552. on_accept = {
  11553. + custom_tooltip = wg_humiliation_fe_accept
  11554. save_event_target_as = fallen_empire_humiliator
  11555. from = {
  11556. fallen_empire_cleanse_border_worlds_effect = yes
  11557. diff --git a/2.0.0/common/war_goals/02_event_war_goals.txt b/2.0.2/common/war_goals/02_event_war_goals.txt
  11558. index 659cb5b..91ccf20 100755
  11559. --- a/2.0.0/common/war_goals/02_event_war_goals.txt
  11560. +++ b/2.0.2/common/war_goals/02_event_war_goals.txt
  11561. @@ -37,6 +37,25 @@ wg_war_in_heaven = {
  11562. always = yes
  11563. }
  11564.  
  11565. + on_accept = {
  11566. + hidden_effect = {
  11567. + save_event_target_as = WarInHeavenFEOne
  11568. + every_playable_country = {
  11569. + country_event = { id = war_in_heaven.5 }
  11570. + }
  11571. + }
  11572. + }
  11573. +
  11574. + on_status_quo = {
  11575. + hidden_effect = {
  11576. + save_event_target_as = WarInHeavenFEOne
  11577. + from = { save_event_target_as = WarInHeavenFETwo }
  11578. + every_playable_country = {
  11579. + country_event = { id = war_in_heaven.6 }
  11580. + }
  11581. + }
  11582. + }
  11583. +
  11584. ai_weight = {
  11585. weight = 100
  11586. }
  11587. diff --git a/2.0.0/events/anomaly_events_2.txt b/2.0.2/events/anomaly_events_2.txt
  11588. index c30e835..a24b340 100755
  11589. --- a/2.0.0/events/anomaly_events_2.txt
  11590. +++ b/2.0.2/events/anomaly_events_2.txt
  11591. @@ -117,7 +117,9 @@ ship_event = {
  11592.  
  11593. is_triggered_only = yes
  11594.  
  11595. - immediate = { owner = { country_event = { id = story.6 days = 30 } } }
  11596. + immediate = {
  11597. + owner = { country_event = { id = story.6 days = 30 } }
  11598. + }
  11599.  
  11600. option = {
  11601. name = "ONSCREEN"
  11602. @@ -161,25 +163,6 @@ country_event = {
  11603.  
  11604. immediate = {
  11605. save_event_target_as = MyCountry
  11606. - if = {
  11607. - limit = {
  11608. - any_system = {
  11609. - distance = {
  11610. - source = FROMFROM
  11611. - max_distance = 50
  11612. - min_distance = 5
  11613. - }
  11614. - any_planet = {
  11615. - is_planet_class = pc_gas_giant
  11616. - is_surveyed = {
  11617. - who = event_target:MyCountry
  11618. - status = no
  11619. - }
  11620. - }
  11621. - }
  11622. - }
  11623. - set_country_flag = itisreal
  11624. - }
  11625. }
  11626.  
  11627. picture_event_data = {
  11628. @@ -204,20 +187,17 @@ country_event = {
  11629. option = {
  11630. name = anomaly.5003.d
  11631. response_text = anomaly.5003.d.response
  11632. - trigger = { has_country_flag = itisreal }
  11633. - random_planet = {
  11634. + closest_system = {
  11635. limit = {
  11636. - is_planet_class = pc_gas_giant
  11637. - is_surveyed = {
  11638. - who = event_target:MyCountry
  11639. - status = no
  11640. - }
  11641. - distance = {
  11642. - source = FROMFROM
  11643. - max_distance = 50
  11644. - min_distance = 5
  11645. + OR = {
  11646. + has_owner = no
  11647. + owner = { is_same_value = root }
  11648. }
  11649. + any_planet = { is_planet_class = pc_gas_giant }
  11650. }
  11651. + min_steps = 1
  11652. + random_system_planet = {
  11653. + limit = { is_planet_class = pc_gas_giant }
  11654. hidden_effect = {
  11655. set_planet_flag = baldarak
  11656. save_event_target_as = baldarak_planet
  11657. @@ -230,33 +210,6 @@ country_event = {
  11658. }
  11659. }
  11660. }
  11661. - option = {
  11662. - name = anomaly.5003.d
  11663. - response_text = anomaly.5003.d.response
  11664. - trigger = { NOT = { has_country_flag = itisreal } }
  11665. - random_planet = {
  11666. - limit = {
  11667. - is_planet_class = pc_gas_giant
  11668. - is_surveyed = {
  11669. - who = event_target:MyCountry
  11670. - status = no
  11671. - }
  11672. - distance = {
  11673. - source = FROMFROM
  11674. - max_distance = 300
  11675. - min_distance = 50
  11676. - }
  11677. - }
  11678. - hidden_effect = {
  11679. - set_planet_flag = baldarak
  11680. - orbital_deposit_tile = { clear_deposits = yes }
  11681. - }
  11682. - enable_special_project = {
  11683. - name = "GAS_GIANT_RELOCATION"
  11684. - location = this
  11685. - owner = root
  11686. - }
  11687. - }
  11688. }
  11689. option = {
  11690. name = anomaly.5003.e
  11691. @@ -283,6 +236,10 @@ ship_event = {
  11692. }
  11693. random_planet = {
  11694. limit = { has_planet_flag = baldarak }
  11695. + surveyed = {
  11696. + set_surveyed = yes
  11697. + surveyor = root.owner
  11698. + }
  11699. set_name = "NAME_Baldarak"
  11700. add_modifier = {
  11701. modifier = "gas_giant_civ"
  11702. @@ -293,7 +250,7 @@ ship_event = {
  11703. random_planet = {
  11704. limit = { has_planet_flag = baldarak }
  11705. orbital_deposit_tile = {
  11706. - add_deposit = d_immense_society_deposit
  11707. + add_deposit = d_enormous1_society_deposit
  11708. }
  11709. }
  11710. }
  11711. @@ -387,17 +344,27 @@ country_event = {
  11712. name = anomaly.5007.a
  11713. response_text = anomaly.5007.a.response
  11714. capital_scope = {
  11715. - random_planet = {
  11716. + closest_system = {
  11717. limit = {
  11718. + OR = {
  11719. + has_owner = no
  11720. + owner = { is_same_value = root }
  11721. + }
  11722. + any_planet = {
  11723. is_planet_class = pc_gas_giant
  11724. NOT = {
  11725. has_planet_flag = baldarak
  11726. has_planet_flag = tollok_rong
  11727. }
  11728. - distance = {
  11729. - source = PREV
  11730. - max_distance = 50
  11731. - min_distance = 0
  11732. + }
  11733. + }
  11734. + min_steps = 1
  11735. + random_system_planet = {
  11736. + limit = {
  11737. + is_planet_class = pc_gas_giant
  11738. + NOT = {
  11739. + has_planet_flag = baldarak
  11740. + has_planet_flag = tollok_rong
  11741. }
  11742. }
  11743. hidden_effect = {
  11744. @@ -413,6 +380,7 @@ country_event = {
  11745. }
  11746. }
  11747. }
  11748. + }
  11749.  
  11750. option = {
  11751. name = anomaly.5007.b
  11752. @@ -445,6 +413,10 @@ ship_event = {
  11753. limit = { has_planet_flag = new_baldarak }
  11754. hidden_effect = {
  11755. set_name = "NAME_New_Baldarak"
  11756. + surveyed = {
  11757. + set_surveyed = yes
  11758. + surveyor = root.owner
  11759. + }
  11760. add_modifier = {
  11761. modifier = "gas_giant_colony"
  11762. days = -1
  11763. diff --git a/2.0.0/events/anomaly_events_3.txt b/2.0.2/events/anomaly_events_3.txt
  11764. index 2ddd728..856d3b3 100755
  11765. --- a/2.0.0/events/anomaly_events_3.txt
  11766. +++ b/2.0.2/events/anomaly_events_3.txt
  11767. @@ -1199,8 +1199,8 @@ ship_event = {
  11768. }
  11769. has_access_fleet = root.owner
  11770. }
  11771. - min_steps = 10
  11772. - max_steps = 80
  11773. + min_steps = 1
  11774. + max_steps = 8
  11775. set_star_flag = old_gods_system_1@root.owner
  11776. }
  11777. closest_system = {
  11778. @@ -1214,8 +1214,8 @@ ship_event = {
  11779. }
  11780. has_access_fleet = root.owner
  11781. }
  11782. - min_steps = 20
  11783. - max_steps = 90
  11784. + min_steps = 2
  11785. + max_steps = 9
  11786. set_star_flag = old_gods_system_2@root.owner
  11787. }
  11788. closest_system = {
  11789. @@ -1230,8 +1230,8 @@ ship_event = {
  11790. }
  11791. has_access_fleet = root.owner
  11792. }
  11793. - min_steps = 30
  11794. - max_steps = 100
  11795. + min_steps = 3
  11796. + max_steps = 10
  11797. set_star_flag = old_gods_system_3@root.owner
  11798. }
  11799. }
  11800. @@ -2485,7 +2485,6 @@ ship_event = {
  11801. immediate = { from = { orbital_deposit_tile = { clear_deposits = yes } } }
  11802.  
  11803. option = {
  11804. - trigger = { owner = { energy > 199 } }
  11805. name = anomaly.230.a
  11806. custom_tooltip = anomaly.230.a.tooltip
  11807. hidden_effect = {
  11808. @@ -2503,7 +2502,7 @@ ship_event = {
  11809. }
  11810.  
  11811. option = {
  11812. - trigger = { owner = { energy > 199 } }
  11813. + allow = { owner = { energy > 199 } }
  11814. name = anomaly.230.b
  11815. custom_tooltip = anomaly.230.b.tooltip
  11816. owner = { add_energy = -200 }
  11817. @@ -2514,24 +2513,6 @@ ship_event = {
  11818. }
  11819. }
  11820. }
  11821. -
  11822. - option = {
  11823. - trigger = { owner = { energy < 199 } }
  11824. - name = anomaly.230.c
  11825. - custom_tooltip = anomaly.230.a.tooltip
  11826. - hidden_effect = {
  11827. - from = {
  11828. - orbital_deposit_tile = {
  11829. - add_deposit = d_vast_physics_deposit
  11830. - add_deposit = d_vast_physics_deposit
  11831. - }
  11832. - add_modifier = {
  11833. - modifier = grimacing
  11834. - days = -1
  11835. - }
  11836. - }
  11837. - }
  11838. - }
  11839. }
  11840.  
  11841. # Grimacing - can enable special project
  11842. @@ -3076,6 +3057,7 @@ ship_event = {
  11843. desc = anomaly.270.desc
  11844. picture = GFX_evt_asteroid_approaching_planet
  11845. show_sound = event_default
  11846. + location = from
  11847.  
  11848. is_triggered_only = yes
  11849.  
  11850. diff --git a/2.0.0/events/anomaly_events_4.txt b/2.0.2/events/anomaly_events_4.txt
  11851. index 0568ed0..0c9cfec 100755
  11852. --- a/2.0.0/events/anomaly_events_4.txt
  11853. +++ b/2.0.2/events/anomaly_events_4.txt
  11854. @@ -1315,8 +1315,9 @@ country_event = {
  11855. any_system = {
  11856. distance = {
  11857. source = event_target:buoy
  11858. - max_distance = 120
  11859. - min_distance = 5
  11860. + use_bypasses = no
  11861. + min_jumps = 1
  11862. + max_jumps = 6
  11863. }
  11864. NOR = {
  11865. exists = space_owner
  11866. @@ -1330,8 +1331,9 @@ country_event = {
  11867. limit = {
  11868. distance = {
  11869. source = event_target:buoy
  11870. - max_distance = 120
  11871. - min_distance = 5
  11872. + use_bypasses = no
  11873. + min_jumps = 1
  11874. + max_jumps = 6
  11875. }
  11876. NOR = {
  11877. exists = space_owner
  11878. @@ -1348,8 +1350,9 @@ country_event = {
  11879. limit = {
  11880. distance = {
  11881. source = event_target:buoy
  11882. - max_distance = 120
  11883. - min_distance = 5
  11884. + use_bypasses = no
  11885. + min_jumps = 1
  11886. + max_jumps = 6
  11887. }
  11888. is_owned_by = ROOT
  11889. any_planet = { is_asteroid = yes }
  11890. @@ -2289,7 +2292,7 @@ country_event = {
  11891. }
  11892. if = {
  11893. limit = {
  11894. - NOT = { has_technology = tech_destroyers }
  11895. + NOT = { has_technology = tech_cruisers }
  11896. }
  11897. set_country_flag = goodies
  11898. }
  11899. @@ -2317,16 +2320,16 @@ country_event = {
  11900. }
  11901. if = {
  11902. limit = {
  11903. - has_tech_option = tech_destroyers
  11904. + has_tech_option = tech_cruisers
  11905. }
  11906. add_tech_progress = {
  11907. - tech = tech_destroyers
  11908. + tech = tech_cruisers
  11909. progress = 0.90
  11910. }
  11911. else = {
  11912. - add_research_option = tech_destroyers
  11913. + add_research_option = tech_cruisers
  11914. add_tech_progress = {
  11915. - tech = tech_destroyers
  11916. + tech = tech_cruisers
  11917. progress = 0.6
  11918. }
  11919. }
  11920. @@ -2334,6 +2337,35 @@ country_event = {
  11921. }
  11922. }
  11923.  
  11924. +# This = owner of fleet 1 (combatant)
  11925. +# From = owner of fleet 2 (destroyed)
  11926. +# FromFrom = fleet 1
  11927. +# FromFromFrom = fleet 2
  11928. +#on_fleet_destroyed_perp = {
  11929. +country_event = {
  11930. + id = anomaly.3121
  11931. + hide_window = yes
  11932. +
  11933. + is_triggered_only = yes
  11934. +
  11935. + trigger = {
  11936. + exists = from
  11937. + from = {
  11938. + NOT = {
  11939. + has_relation_flag = {
  11940. + who = root
  11941. + flag = wrecker_relation
  11942. + }
  11943. + }
  11944. + }
  11945. + fromfromfrom = { has_fleet_flag = wrecker_base_flag }
  11946. + }
  11947. +
  11948. + immediate = {
  11949. + from = { destroy_country = yes }
  11950. + }
  11951. +}
  11952. +
  11953. # Manufactory
  11954. ship_event = {
  11955. id = anomaly.3125
  11956. diff --git a/2.0.0/events/anomaly_events_5.txt b/2.0.2/events/anomaly_events_5.txt
  11957. index aa2f8fc..368efdf 100755
  11958. --- a/2.0.0/events/anomaly_events_5.txt
  11959. +++ b/2.0.2/events/anomaly_events_5.txt
  11960. @@ -426,8 +426,9 @@ country_event = {
  11961. limit = {
  11962. distance = {
  11963. source = event_target:anomaly_planet
  11964. - max_distance = 120
  11965. - min_distance = 1
  11966. + use_bypasses = no
  11967. + min_jumps = 1
  11968. + max_jumps = 8
  11969. }
  11970. has_owner = yes
  11971. owner = {
  11972. @@ -808,8 +809,9 @@ ship_event = {
  11973. limit = {
  11974. distance = {
  11975. source = event_target:anomaly_star
  11976. - max_distance = 80
  11977. - min_distance = 40
  11978. + use_bypasses = no
  11979. + min_jumps = 3
  11980. + max_jumps = 8
  11981. }
  11982. NOT = {
  11983. has_star_flag = current_system
  11984. @@ -825,8 +827,9 @@ ship_event = {
  11985. limit = {
  11986. distance = {
  11987. source = event_target:anomaly_star
  11988. - max_distance = 80
  11989. - min_distance = 25
  11990. + use_bypasses = no
  11991. + min_jumps = 2
  11992. + max_jumps = 7
  11993. }
  11994. NOT = {
  11995. has_star_flag = current_system
  11996. @@ -2691,10 +2694,8 @@ ship_event = {
  11997. }
  11998. option = {
  11999. name = "anomaly.4086.b"
  12000. - custom_tooltip = "anomaly.4086.b.tooltip"
  12001. - hidden_effect = {
  12002. - fromfrom = {
  12003. - owner = {
  12004. + #custom_tooltip = "anomaly.4086.b.tooltip"
  12005. + root.owner = {
  12006. add_modifier = {
  12007. modifier = army_speed_boost
  12008. days = -1
  12009. @@ -2702,8 +2703,6 @@ ship_event = {
  12010. }
  12011. }
  12012. }
  12013. - }
  12014. -}
  12015.  
  12016. ### Refugees #############################################################################################
  12017. #story8
  12018. @@ -2742,6 +2741,16 @@ ship_event = {
  12019. }
  12020. #Find some available planets
  12021. owner = {
  12022. + IF = {
  12023. + LIMIT = {
  12024. + NOT = {
  12025. + any_owned_planet = {
  12026. + habitability = { who = event_target:RefugeeAliens value > 0.5 }
  12027. + }
  12028. + }
  12029. + }
  12030. + set_country_flag = uninhabitable_for_refugees
  12031. + }
  12032. random_owned_planet = {
  12033. limit = {
  12034. NOR = {
  12035. @@ -3045,6 +3054,20 @@ ship_event = {
  12036. }
  12037. }
  12038. }
  12039. +
  12040. + option = {
  12041. + name = "anomaly.4090.uninhabitable"
  12042. + exclusive_trigger = {
  12043. + owner = {
  12044. + has_country_flag = uninhabitable_for_refugees
  12045. + }
  12046. + }
  12047. + hidden_effect = {
  12048. + owner = {
  12049. + remove_country_flag = uninhabitable_for_refugees
  12050. + }
  12051. + }
  12052. + }
  12053. }
  12054. country_event = {
  12055. id = anomaly.4091
  12056. diff --git a/2.0.0/events/apocalypse_events.txt b/2.0.2/events/apocalypse_events.txt
  12057. index 76f83e6..1a3d9ff 100755
  12058. --- a/2.0.0/events/apocalypse_events.txt
  12059. +++ b/2.0.2/events/apocalypse_events.txt
  12060. @@ -76,12 +76,28 @@ country_event = {
  12061. text = apoc.10.desc.1
  12062. trigger = {
  12063. num_active_gateways = 2
  12064. + NOT = { has_country_flag = did_not_repair_gateway }
  12065. }
  12066. }
  12067. desc = {
  12068. text = apoc.10.desc.2
  12069. trigger = {
  12070. num_active_gateways > 2
  12071. + NOT = { has_country_flag = did_not_repair_gateway }
  12072. + }
  12073. + }
  12074. + desc = {
  12075. + text = apoc.10.desc.3
  12076. + trigger = {
  12077. + has_country_flag = did_not_repair_gateway
  12078. + has_technology = "tech_gateway_activation"
  12079. + }
  12080. + }
  12081. + desc = {
  12082. + text = apoc.10.desc.4
  12083. + trigger = {
  12084. + has_country_flag = did_not_repair_gateway
  12085. + NOT = { has_technology = "tech_gateway_activation" }
  12086. }
  12087. }
  12088. picture = GFX_evt_drifting_gateway
  12089. @@ -91,7 +107,6 @@ country_event = {
  12090. is_triggered_only = yes
  12091.  
  12092. trigger = {
  12093. - #FROM = { is_megastructure_type = gateway_restored }
  12094. NOR = {
  12095. has_country_flag = gateway_reactivated
  12096. has_country_flag = gateway_built
  12097. @@ -103,8 +118,40 @@ country_event = {
  12098. set_country_flag = gateway_reactivated
  12099. }
  12100.  
  12101. + after = {
  12102. + hidden_effect = {
  12103. + if = {
  12104. + limit = { has_country_flag = did_not_repair_gateway }
  12105. + remove_country_flag = did_not_repair_gateway
  12106. + }
  12107. + }
  12108. + }
  12109. +
  12110. option = {
  12111. name = EXCELLENT
  12112. + trigger = {
  12113. + NOT = { has_country_flag = did_not_repair_gateway }
  12114. + }
  12115. + }
  12116. + option = {
  12117. + name = INTERESTING
  12118. + trigger = {
  12119. + has_country_flag = did_not_repair_gateway
  12120. + has_technology = "tech_gateway_activation"
  12121. + }
  12122. + }
  12123. + option = {
  12124. + name = apoc.10.a
  12125. + trigger = {
  12126. + has_country_flag = did_not_repair_gateway
  12127. + NOT = { has_technology = "tech_gateway_activation" }
  12128. + }
  12129. + if = {
  12130. + limit = {
  12131. + NOT = { has_tech_option = tech_gateway_activation }
  12132. + }
  12133. + add_research_option = tech_gateway_activation
  12134. + }
  12135. }
  12136. }
  12137.  
  12138. diff --git a/2.0.0/events/colony_events.txt b/2.0.2/events/colony_events.txt
  12139. index 0b1d4c3..1eb6ce8 100755
  12140. --- a/2.0.0/events/colony_events.txt
  12141. +++ b/2.0.2/events/colony_events.txt
  12142. @@ -258,6 +258,10 @@ planet_event = {
  12143. create_country = {
  12144. name = "NAME_Rampaging_Forests"
  12145. type = faction
  12146. + effect = {
  12147. + establish_communications_no_message = root.owner
  12148. + establish_contact = { who = root.owner location = root.solar_system }
  12149. + }
  12150. }
  12151. create_species = {
  12152. name = "NAME_Migrating_Trees"
  12153. @@ -269,19 +273,19 @@ planet_event = {
  12154. name = "NAME_Rampaging_Forest"
  12155. owner = last_created
  12156. species = last_created
  12157. - type = "assault_army"
  12158. + type = "tree_army"
  12159. }
  12160. create_army = {
  12161. name = "NAME_Rampaging_Forest"
  12162. owner = last_created
  12163. species = last_created
  12164. - type = "assault_army"
  12165. + type = "tree_army"
  12166. }
  12167. create_army = {
  12168. name = "NAME_Rampaging_Forest"
  12169. owner = last_created
  12170. species = last_created
  12171. - type = "assault_army"
  12172. + type = "tree_army"
  12173. }
  12174. }
  12175.  
  12176. @@ -2602,6 +2606,9 @@ planet_event = {
  12177. create_country = {
  12178. name = "NAME_Deformed_Creatures"
  12179. type = faction
  12180. + effect = {
  12181. + establish_communications_no_message = root.owner
  12182. + }
  12183. }
  12184. create_army = {
  12185. name = "NAME_Deformed_Creatures"
  12186. @@ -2821,6 +2828,9 @@ planet_event = {
  12187. create_country = {
  12188. name = "NAME_Marauding_Creatures"
  12189. type = faction
  12190. + effect = {
  12191. + establish_communications_no_message = root.owner
  12192. + }
  12193. }
  12194. create_army = {
  12195. name = "NAME_Marauding_Swarms"
  12196. @@ -3877,6 +3887,7 @@ planet_event = {
  12197. is_occupied_flag = no
  12198. num_pops > 0
  12199. is_capital = no
  12200. + years_passed < 50
  12201. NOR = {
  12202. is_planet_class = pc_habitat
  12203. is_planet_class = pc_ringworld_habitable
  12204. diff --git a/2.0.0/events/colony_events_4.txt b/2.0.2/events/colony_events_4.txt
  12205. index d71f2c0..1c0cd73 100755
  12206. --- a/2.0.0/events/colony_events_4.txt
  12207. +++ b/2.0.2/events/colony_events_4.txt
  12208. @@ -113,7 +113,7 @@ planet_event = {
  12209. }
  12210. has_ground_combat = no
  12211. is_occupied_flag = no
  12212. - num_pops > 3
  12213. + num_pops > 0
  12214. is_capital = no
  12215. OR = {
  12216. is_planet_class = pc_continental
  12217. @@ -335,8 +335,7 @@ planet_event = {
  12218. }
  12219. has_ground_combat = no
  12220. is_occupied_flag = no
  12221. - num_pops > 4
  12222. - num_pops < 8
  12223. + num_pops > 0
  12224. is_capital = no
  12225. NOT = {
  12226. has_planet_flag = colony_event
  12227. @@ -1339,7 +1338,7 @@ planet_event = {
  12228. }
  12229. has_ground_combat = no
  12230. is_occupied_flag = no
  12231. - num_pops > 3
  12232. + num_pops > 0
  12233. free_building_tiles > 0
  12234. is_capital = no
  12235. NOR = {
  12236. @@ -1725,7 +1724,7 @@ planet_event = {
  12237. }
  12238. has_ground_combat = no
  12239. is_occupied_flag = no
  12240. - num_pops > 4
  12241. + num_pops > 0
  12242. is_capital = no
  12243. NOR = {
  12244. has_planet_flag = colony_event
  12245. @@ -2004,7 +2003,7 @@ planet_event = {
  12246. }
  12247. }
  12248. }
  12249. - num_pops > 4
  12250. + num_pops > 0
  12251. has_ground_combat = no
  12252. is_occupied_flag = no
  12253. exists = leader
  12254. @@ -2154,9 +2153,12 @@ planet_event = {
  12255. sector_controlled = no
  12256. owner = {
  12257. is_ai = no
  12258. - NOT = { has_country_flag = colony_infected }
  12259. + NOT = {
  12260. + has_country_flag = colony_infected
  12261. + has_ethic = ethic_gestalt_consciousness
  12262. }
  12263. - num_pops > 5
  12264. + }
  12265. + num_pops > 0
  12266. has_ground_combat = no
  12267. is_occupied_flag = no
  12268. NOR = {
  12269. @@ -2952,6 +2954,8 @@ planet_event = {
  12270. show_sound = event_red_alert
  12271. location = root
  12272.  
  12273. + mean_time_to_happen = { days = 100 }
  12274. +
  12275. trigger = {
  12276. has_planet_flag = colony_infected_active
  12277. NOT = {
  12278. @@ -3465,7 +3469,7 @@ planet_event = {
  12279. has_country_flag = alien_infection_isolated
  12280. }
  12281. }
  12282. - num_pops > 1
  12283. + num_pops > 0
  12284. count_pops = {
  12285. limit = {
  12286. OR = {
  12287. @@ -3544,7 +3548,7 @@ planet_event = {
  12288. is_capital = no
  12289. has_ground_combat = no
  12290. is_occupied_flag = no
  12291. - num_pops > 10
  12292. + num_pops > 0
  12293. free_building_tiles > 0
  12294. any_tile = { has_building = yes }
  12295. NOR = {
  12296. diff --git a/2.0.0/events/communications_spread.txt b/2.0.2/events/communications_spread.txt
  12297. index d3f0aa2..f6fb31f 100755
  12298. --- a/2.0.0/events/communications_spread.txt
  12299. +++ b/2.0.2/events/communications_spread.txt
  12300. @@ -210,3 +210,37 @@ country_event = {
  12301. }
  12302. }
  12303. }
  12304. +
  12305. +# Primitives gain comms with anyone that has comms with their system owner
  12306. +country_event = {
  12307. + id = communications_spread.4
  12308. + hide_window = yes
  12309. +
  12310. + trigger = {
  12311. + is_country_type = primitive
  12312. + capital_scope.solar_system = {
  12313. + exists = owner
  12314. + owner = {
  12315. + NOT = { is_same_value = root }
  12316. + }
  12317. + }
  12318. + any_playable_country = {
  12319. + has_communications = capital_scope.solar_system.owner
  12320. + NOT = { has_communications = root }
  12321. + }
  12322. + }
  12323. +
  12324. + mean_time_to_happen = {
  12325. + months = 1
  12326. + }
  12327. +
  12328. + immediate = {
  12329. + every_playable_country = {
  12330. + limit = {
  12331. + has_communications = root.capital_scope.solar_system.owner
  12332. + NOT = { has_communications = root }
  12333. + }
  12334. + establish_communications_no_message = root
  12335. + }
  12336. + }
  12337. +}
  12338. diff --git a/2.0.0/events/country_events.txt b/2.0.2/events/country_events.txt
  12339. index c89beac..b9c2fab 100755
  12340. --- a/2.0.0/events/country_events.txt
  12341. +++ b/2.0.2/events/country_events.txt
  12342. @@ -142,8 +142,9 @@ country_event = {
  12343. limit = {
  12344. distance = {
  12345. source = event_target:capital
  12346. - max_distance = 80
  12347. - min_distance = 5
  12348. + use_bypasses = no
  12349. + min_jumps = 2
  12350. + max_jumps = 6
  12351. }
  12352. NOT = {
  12353. exists = space_owner
  12354. @@ -157,8 +158,9 @@ country_event = {
  12355. limit = {
  12356. distance = {
  12357. source = event_target:capital
  12358. - max_distance = 80
  12359. - min_distance = 5
  12360. + use_bypasses = no
  12361. + min_jumps = 2
  12362. + max_jumps = 6
  12363. }
  12364. NOT = {
  12365. exists = space_owner
  12366. @@ -173,8 +175,9 @@ country_event = {
  12367. limit = {
  12368. distance = {
  12369. source = event_target:capital
  12370. - max_distance = 80
  12371. - min_distance = 5
  12372. + use_bypasses = no
  12373. + min_jumps = 2
  12374. + max_jumps = 6
  12375. }
  12376. NOT = {
  12377. exists = space_owner
  12378. @@ -190,8 +193,9 @@ country_event = {
  12379. limit = {
  12380. distance = {
  12381. source = event_target:capital
  12382. - max_distance = 80
  12383. - min_distance = 5
  12384. + use_bypasses = no
  12385. + min_jumps = 2
  12386. + max_jumps = 6
  12387. }
  12388. NOT = {
  12389. exists = space_owner
  12390. @@ -515,13 +519,8 @@ ship_event = {
  12391. set_country_flag = chasing_ion_trail
  12392. set_country_flag = probe_salvage_flag
  12393. }
  12394. - random_system = {
  12395. + closest_system = {
  12396. limit = {
  12397. - distance = {
  12398. - source = event_target:ion_trail_system
  12399. - max_distance = 30
  12400. - min_distance = 5
  12401. - }
  12402. NOT = {
  12403. exists = space_owner
  12404. has_star_flag = probe_system_1
  12405. @@ -2200,7 +2199,7 @@ country_event = {
  12406. id = country.200
  12407. title = "country.200.name"
  12408. desc = "country.200.desc"
  12409. - picture = GFX_evt_big_landing_ship
  12410. + picture = GFX_evt_alien_propaganda
  12411. show_sound = event_ship_thrusters
  12412. location = event_target:cultist_ship
  12413.  
  12414. @@ -2334,12 +2333,6 @@ ship_event = {
  12415. flag = cultist_rebels
  12416. }
  12417. }
  12418. - #fleet.owner = {
  12419. - # has_relation_flag = {
  12420. - # who = root.from.owner
  12421. - # flag = cultist_rebels
  12422. - # }
  12423. - #}
  12424. }
  12425.  
  12426. immediate = {
  12427. @@ -2352,7 +2345,7 @@ country_event = {
  12428. id = country.202
  12429. title = "country.202.name"
  12430. desc = "country.202.desc"
  12431. - picture = GFX_evt_interior_battle
  12432. + picture = GFX_evt_sabotaged_ship
  12433. show_sound = event_space_battle
  12434. location = FROM
  12435.  
  12436. @@ -2418,7 +2411,7 @@ country_event = {
  12437. id = country.218
  12438. title = "country.218.name"
  12439. desc = "country.218.desc"
  12440. - picture = GFX_evt_interior_battle
  12441. + picture = GFX_evt_sabotaged_ship
  12442. show_sound = event_space_battle
  12443. location = FROM
  12444.  
  12445. @@ -2446,7 +2439,7 @@ ship_event = {
  12446. id = country.203
  12447. title = "country.203.name"
  12448. desc = "country.203.desc"
  12449. - picture = GFX_evt_hangar_bay
  12450. + picture = GFX_evt_interior_battle
  12451. show_sound = event_ground_battle
  12452.  
  12453. is_triggered_only = yes
  12454. @@ -2466,42 +2459,57 @@ ship_event = {
  12455. owner = { save_event_target_as = cult_name }
  12456. fleet = { destroy_fleet = this }
  12457. }
  12458. - closest_system = {
  12459. + random_system = {
  12460. limit = {
  12461. + distance = {
  12462. + source = event_target:capital
  12463. + use_bypasses = no
  12464. + min_jumps = 1
  12465. + max_jumps = 5
  12466. + }
  12467. NOT = {
  12468. + exists = space_owner
  12469. has_star_flag = hostile_system
  12470. is_star_class = sc_black_hole
  12471. }
  12472. - has_owner = no
  12473. }
  12474. - min_steps = 10
  12475. save_event_target_as = cultists_1
  12476. set_star_flag = cultists_1
  12477. }
  12478. - closest_system = {
  12479. + random_system = {
  12480. limit = {
  12481. + distance = {
  12482. + source = event_target:capital
  12483. + use_bypasses = no
  12484. + min_jumps = 1
  12485. + max_jumps = 5
  12486. + }
  12487. NOT = {
  12488. + exists = space_owner
  12489. has_star_flag = cultists_1
  12490. has_star_flag = hostile_system
  12491. is_star_class = sc_black_hole
  12492. }
  12493. - has_owner = no
  12494. }
  12495. - min_steps = 20
  12496. save_event_target_as = cultists_2
  12497. set_star_flag = cultists_2
  12498. }
  12499. - closest_system = {
  12500. + random_system = {
  12501. limit = {
  12502. + distance = {
  12503. + source = event_target:capital
  12504. + use_bypasses = no
  12505. + min_jumps = 1
  12506. + max_jumps = 5
  12507. + }
  12508. NOT = {
  12509. + exists = space_owner
  12510. has_star_flag = cultists_1
  12511. has_star_flag = cultists_2
  12512. has_star_flag = hostile_system
  12513. is_star_class = sc_black_hole
  12514. }
  12515. - has_owner = no
  12516. }
  12517. - min_steps = 30
  12518. save_event_target_as = cultists_3
  12519. set_star_flag = cultists_3
  12520. }
  12521. @@ -3257,7 +3265,7 @@ country_event = {
  12522. title = "country.210.name"
  12523. desc = "country.210.desc"
  12524. picture = GFX_evt_ship_in_orbit
  12525. - show_sound = event_air_raid_siren # Should be Red Alert
  12526. + show_sound = event_red_alert
  12527.  
  12528. is_triggered_only = yes
  12529.  
  12530. @@ -3265,13 +3273,8 @@ country_event = {
  12531. hidden_effect = {
  12532. set_country_flag = hunting_cult_flagship
  12533. capital_scope = { save_event_target_as = capital }
  12534. - random_system = {
  12535. + closest_system = {
  12536. limit = {
  12537. - distance = {
  12538. - source = event_target:capital
  12539. - max_distance = 150
  12540. - min_distance = 5
  12541. - }
  12542. NOT = {
  12543. has_star_flag = hostile_system
  12544. is_star_class = sc_black_hole
  12545. @@ -3611,8 +3614,9 @@ country_event = {
  12546. }
  12547. distance = {
  12548. source = root.capital_scope
  12549. - max_distance = 60
  12550. - min_distance = 5
  12551. + use_bypasses = no
  12552. + min_jumps = 2
  12553. + max_jumps = 5
  12554. }
  12555. NOT = { has_star_flag = hostile_system }
  12556. has_owner = no
  12557. @@ -3623,8 +3627,9 @@ country_event = {
  12558. }
  12559. distance = {
  12560. source = root.capital_scope
  12561. - max_distance = 60
  12562. - min_distance = 5
  12563. + use_bypasses = no
  12564. + min_jumps = 2
  12565. + max_jumps = 5
  12566. }
  12567. NOR = {
  12568. has_star_flag = hostile_system
  12569. @@ -3638,8 +3643,9 @@ country_event = {
  12570. }
  12571. distance = {
  12572. source = root.capital_scope
  12573. - max_distance = 60
  12574. - min_distance = 5
  12575. + use_bypasses = no
  12576. + min_jumps = 2
  12577. + max_jumps = 5
  12578. }
  12579. NOR = {
  12580. has_star_flag = hostile_system
  12581. @@ -3653,7 +3659,7 @@ country_event = {
  12582. }
  12583.  
  12584. mean_time_to_happen = {
  12585. - months = 80
  12586. + months = 1 #80
  12587. }
  12588.  
  12589. immediate = {
  12590. @@ -3676,8 +3682,9 @@ country_event = {
  12591. }
  12592. distance = {
  12593. source = event_target:capital
  12594. - max_distance = 60
  12595. - min_distance = 5
  12596. + use_bypasses = no
  12597. + min_jumps = 2
  12598. + max_jumps = 5
  12599. }
  12600. NOT = { has_star_flag = hostile_system }
  12601. has_owner = no
  12602. @@ -3693,8 +3700,9 @@ country_event = {
  12603. }
  12604. distance = {
  12605. source = event_target:capital
  12606. - max_distance = 60
  12607. - min_distance = 5
  12608. + use_bypasses = no
  12609. + min_jumps = 2
  12610. + max_jumps = 5
  12611. }
  12612. NOT = {
  12613. has_star_flag = hyacinth_system_1
  12614. @@ -3713,8 +3721,9 @@ country_event = {
  12615. }
  12616. distance = {
  12617. source = event_target:capital
  12618. - max_distance = 60
  12619. - min_distance = 5
  12620. + use_bypasses = no
  12621. + min_jumps = 2
  12622. + max_jumps = 5
  12623. }
  12624. NOT = {
  12625. has_star_flag = hyacinth_system_1
  12626. diff --git a/2.0.0/events/country_events_2.txt b/2.0.2/events/country_events_2.txt
  12627. index 6621452..eb2855b 100755
  12628. --- a/2.0.0/events/country_events_2.txt
  12629. +++ b/2.0.2/events/country_events_2.txt
  12630. @@ -407,8 +407,9 @@ country_event = {
  12631. is_pirate_system = no
  12632. distance = {
  12633. source = event_target:capital_location
  12634. - max_distance = 60
  12635. - min_distance = 2
  12636. + use_bypasses = no
  12637. + min_jumps = 1
  12638. + max_jumps = 5
  12639. }
  12640. }
  12641. set_star_flag = scientist_system_1
  12642. @@ -436,8 +437,9 @@ country_event = {
  12643. is_pirate_system = no
  12644. distance = {
  12645. source = event_target:capital_location
  12646. - max_distance = 60
  12647. - min_distance = 2
  12648. + use_bypasses = no
  12649. + min_jumps = 1
  12650. + max_jumps = 5
  12651. }
  12652. }
  12653. set_star_flag = scientist_system_2
  12654. @@ -466,8 +468,9 @@ country_event = {
  12655. is_pirate_system = no
  12656. distance = {
  12657. source = event_target:capital_location
  12658. - max_distance = 60
  12659. - min_distance = 2
  12660. + use_bypasses = no
  12661. + min_jumps = 1
  12662. + max_jumps = 5
  12663. }
  12664. }
  12665. set_star_flag = scientist_system_3
  12666. @@ -996,8 +999,9 @@ country_event = {
  12667. is_pirate_system = no
  12668. distance = {
  12669. source = event_target:capital_location
  12670. - max_distance = 120
  12671. - min_distance = 40
  12672. + use_bypasses = no
  12673. + min_jumps = 3
  12674. + max_jumps = 8
  12675. }
  12676. }
  12677. set_star_flag = scientist_system_4
  12678. @@ -1483,8 +1487,9 @@ country_event = {
  12679. is_pirate_system = no
  12680. distance = {
  12681. source = event_target:capital_location
  12682. - max_distance = 160
  12683. - min_distance = 40
  12684. + use_bypasses = no
  12685. + min_jumps = 3
  12686. + max_jumps = 8
  12687. }
  12688. }
  12689. set_star_flag = scientist_system_5
  12690. @@ -1816,8 +1821,9 @@ country_event = {
  12691. any_planet = { is_planet_class = pc_asteroid }
  12692. distance = {
  12693. source = event_target:capital_location
  12694. - max_distance = 190
  12695. - min_distance = 5
  12696. + use_bypasses = no
  12697. + min_jumps = 1
  12698. + max_jumps = 8
  12699. }
  12700. }
  12701. random_system_planet = {
  12702. @@ -1856,8 +1862,9 @@ country_event = {
  12703. any_planet = { is_planet_class = pc_molten }
  12704. distance = {
  12705. source = event_target:capital_location
  12706. - max_distance = 190
  12707. - min_distance = 5
  12708. + use_bypasses = no
  12709. + min_jumps = 1
  12710. + max_jumps = 8
  12711. }
  12712. }
  12713. random_system_planet = {
  12714. @@ -1896,8 +1903,9 @@ country_event = {
  12715. any_planet = { is_planet_class = pc_barren }
  12716. distance = {
  12717. source = event_target:capital_location
  12718. - max_distance = 190
  12719. - min_distance = 5
  12720. + use_bypasses = no
  12721. + min_jumps = 1
  12722. + max_jumps = 8
  12723. }
  12724. }
  12725. random_system_planet = {
  12726. @@ -1936,8 +1944,9 @@ country_event = {
  12727. any_planet = { is_planet_class = pc_toxic }
  12728. distance = {
  12729. source = event_target:capital_location
  12730. - max_distance = 190
  12731. - min_distance = 5
  12732. + use_bypasses = no
  12733. + min_jumps = 1
  12734. + max_jumps = 8
  12735. }
  12736. }
  12737. random_system_planet = {
  12738. @@ -1976,8 +1985,9 @@ country_event = {
  12739. any_planet = { is_planet_class = pc_frozen }
  12740. distance = {
  12741. source = event_target:capital_location
  12742. - max_distance = 190
  12743. - min_distance = 5
  12744. + use_bypasses = no
  12745. + min_jumps = 1
  12746. + max_jumps = 8
  12747. }
  12748. }
  12749. random_system_planet = {
  12750. @@ -2138,8 +2148,9 @@ country_event = {
  12751. any_planet = { is_planet_class = pc_asteroid }
  12752. distance = {
  12753. source = event_target:capital_location
  12754. - max_distance = 190
  12755. - min_distance = 5
  12756. + use_bypasses = no
  12757. + min_jumps = 1
  12758. + max_jumps = 8
  12759. }
  12760. }
  12761. random_system_planet = {
  12762. @@ -2249,8 +2260,9 @@ country_event = {
  12763. any_planet = { is_planet_class = pc_molten }
  12764. distance = {
  12765. source = event_target:capital_location
  12766. - max_distance = 190
  12767. - min_distance = 5
  12768. + use_bypasses = no
  12769. + min_jumps = 1
  12770. + max_jumps = 8
  12771. }
  12772. }
  12773. random_system_planet = {
  12774. @@ -2360,8 +2372,9 @@ country_event = {
  12775. any_planet = { is_planet_class = pc_barren }
  12776. distance = {
  12777. source = event_target:capital_location
  12778. - max_distance = 190
  12779. - min_distance = 5
  12780. + use_bypasses = no
  12781. + min_jumps = 1
  12782. + max_jumps = 8
  12783. }
  12784. }
  12785. random_system_planet = {
  12786. @@ -2471,8 +2484,9 @@ country_event = {
  12787. any_planet = { is_planet_class = pc_toxic }
  12788. distance = {
  12789. source = event_target:capital_location
  12790. - max_distance = 190
  12791. - min_distance = 5
  12792. + use_bypasses = no
  12793. + min_jumps = 1
  12794. + max_jumps = 8
  12795. }
  12796. }
  12797. random_system_planet = {
  12798. @@ -2582,8 +2596,9 @@ country_event = {
  12799. any_planet = { is_planet_class = pc_frozen }
  12800. distance = {
  12801. source = event_target:capital_location
  12802. - max_distance = 190
  12803. - min_distance = 5
  12804. + use_bypasses = no
  12805. + min_jumps = 1
  12806. + max_jumps = 8
  12807. }
  12808. }
  12809. random_system_planet = {
  12810. diff --git a/2.0.0/events/crisis_events_1.txt b/2.0.2/events/crisis_events_1.txt
  12811. index e78b121..b7a8fff 100755
  12812. --- a/2.0.0/events/crisis_events_1.txt
  12813. +++ b/2.0.2/events/crisis_events_1.txt
  12814. @@ -3161,7 +3161,7 @@ country_event = {
  12815. }
  12816. add_modifier = {
  12817. modifier = "prethoryn_defeated"
  12818. - days = 360
  12819. + days = 3600
  12820. }
  12821. add_monthly_resource_mult = {
  12822. resource = unity
  12823. diff --git a/2.0.0/events/crisis_events_2.txt b/2.0.2/events/crisis_events_2.txt
  12824. index a3bca05..2f6240c 100755
  12825. --- a/2.0.0/events/crisis_events_2.txt
  12826. +++ b/2.0.2/events/crisis_events_2.txt
  12827. @@ -892,32 +892,21 @@ country_event = {
  12828. }
  12829. }
  12830. FROM = { save_event_target_as = portal_killer }
  12831. - every_country = {
  12832. - limit = {
  12833. - is_country_type = default
  12834. - has_communications = FROM
  12835. - }
  12836. + every_playable_country = {
  12837. + if = {
  12838. + limit = { has_communications = FROM }
  12839. add_opinion_modifier = {
  12840. who = FROM
  12841. modifier = opinion_destroyed_portal
  12842. }
  12843. }
  12844. - every_country = {
  12845. - limit = { is_country_type = default }
  12846. add_modifier = {
  12847. modifier = "extradimensionals_defeated"
  12848. days = 360
  12849. }
  12850. - }
  12851. - every_country = {
  12852. - limit = {
  12853. - #is_ai = no
  12854. - is_country_type = default
  12855. - }
  12856. country_event = { id = crisis.1013 }
  12857. }
  12858. - break = yes
  12859. - }
  12860. + else = {
  12861. if = {
  12862. limit = {
  12863. has_global_flag = extradimensional_second_portal
  12864. @@ -926,16 +915,14 @@ country_event = {
  12865. has_global_flag = extradimensional_third_portal_destroyed
  12866. }
  12867. }
  12868. - every_country = {
  12869. - limit = {
  12870. - #is_ai = no
  12871. - is_country_type = default
  12872. - }
  12873. + every_playable_country = {
  12874. country_event = { id = crisis.1016 }
  12875. }
  12876. }
  12877. }
  12878. }
  12879. + }
  12880. +}
  12881.  
  12882. # Portal Destroyed
  12883. country_event = {
  12884. diff --git a/2.0.0/events/crisis_events_3.txt b/2.0.2/events/crisis_events_3.txt
  12885. index 4ca0ca6..6f6cab1 100755
  12886. --- a/2.0.0/events/crisis_events_3.txt
  12887. +++ b/2.0.2/events/crisis_events_3.txt
  12888. @@ -1309,12 +1309,20 @@ country_event = {
  12889.  
  12890. desc = {
  12891. text = crisis.2037.desc
  12892. - trigger = { NOT = { has_global_flag = first_machine_world_destroyed } }
  12893. + trigger = {
  12894. + NOT = { has_global_flag = first_machine_world_destroyed }
  12895. + NOT = {
  12896. + from = { has_planet_flag = destroyed_by_colossus }
  12897. + }
  12898. + }
  12899. }
  12900. desc = {
  12901. text = crisis.2037.alt.desc
  12902. trigger = {
  12903. has_global_flag = first_machine_world_destroyed
  12904. + NOT = {
  12905. + from = { has_planet_flag = destroyed_by_colossus }
  12906. + }
  12907. OR = {
  12908. NOT = { has_authority = auth_machine_intelligence }
  12909. AND = {
  12910. @@ -1335,6 +1343,24 @@ country_event = {
  12911. NOT = { has_country_flag = ghost_signal_blocked }
  12912. }
  12913. }
  12914. + desc = {
  12915. + text = crisis.2037.alt.cracked.desc
  12916. + trigger = {
  12917. + from = {
  12918. + has_planet_flag = destroyed_by_colossus
  12919. + has_planet_flag = planet_cracked
  12920. + }
  12921. + }
  12922. + }
  12923. + desc = {
  12924. + text = crisis.2037.alt.shielded.desc
  12925. + trigger = {
  12926. + from = {
  12927. + has_planet_flag = destroyed_by_colossus
  12928. + has_planet_flag = planet_shielded
  12929. + }
  12930. + }
  12931. + }
  12932.  
  12933. picture = GFX_evt_exploding_planet
  12934. show_sound = event_super_explosion
  12935. @@ -1367,7 +1393,32 @@ country_event = {
  12936. country_event = {
  12937. id = crisis.2038
  12938. title = "crisis.2038.name"
  12939. - desc = "crisis.2038.desc"
  12940. + desc = {
  12941. + text = crisis.2038.desc
  12942. + trigger = {
  12943. + NOT = {
  12944. + from = { has_planet_flag = destroyed_by_colossus }
  12945. + }
  12946. + }
  12947. + }
  12948. + desc = {
  12949. + text = crisis.2038.cracker.desc
  12950. + trigger = {
  12951. + from = {
  12952. + has_planet_flag = destroyed_by_colossus
  12953. + has_planet_flag = planet_cracked
  12954. + }
  12955. + }
  12956. + }
  12957. + desc = {
  12958. + text = crisis.2038.shield.desc
  12959. + trigger = {
  12960. + from = {
  12961. + has_planet_flag = destroyed_by_colossus
  12962. + has_planet_flag = planet_shielded
  12963. + }
  12964. + }
  12965. + }
  12966. picture = GFX_evt_exploding_planet
  12967. show_sound = event_super_explosion
  12968. location = from
  12969. @@ -1420,17 +1471,20 @@ planet_event = {
  12970. remove_point_of_interest = ai_crisis_poi.4
  12971. }
  12972. }
  12973. + if = {
  12974. + limit = {
  12975. + NOT = { has_planet_flag = destroyed_by_colossus }
  12976. + }
  12977. destroy_colony = yes
  12978. change_pc = pc_broken
  12979. reset_planet = yes
  12980. - #set_planet_entity = { entity = "barren_planet_01_destroyed_entity" }
  12981. orbital_deposit_tile = {
  12982. hidden_effect = { clear_deposits = yes }
  12983. add_deposit = d_living_metal_deposit
  12984. add_deposit = d_vast_mineral_deposit
  12985. add_deposit = d_vast_energy_deposit
  12986. }
  12987. -
  12988. + }
  12989.  
  12990. every_country = {
  12991. limit = { has_event_chain = "ai_crisis_chain" }
  12992. @@ -1745,10 +1799,14 @@ planet_event = {
  12993. remove_global_flag = synth_terror
  12994. remove_global_flag = ai_ghost_signal
  12995. remove_global_flag = ai_invasion_ongoing
  12996. + if = {
  12997. + limit = {
  12998. + NOT = { has_planet_flag = destroyed_by_colossus }
  12999. + }
  13000. destroy_colony = yes
  13001. change_pc = pc_broken
  13002. reset_planet = yes
  13003. - #set_planet_entity = { entity = "barren_planet_01_destroyed_entity" }
  13004. + }
  13005. every_country = {
  13006. limit = { has_notification_modifier = ghost_signal_1 }
  13007. remove_notification_modifier = ghost_signal_1
  13008. @@ -2022,6 +2080,7 @@ pop_event = {
  13009. has_notification_modifier = ghost_signal_2
  13010. has_notification_modifier = ghost_signal_1
  13011. }
  13012. + NOT = { has_country_flag = synthetic_empire }
  13013. }
  13014. }
  13015.  
  13016. diff --git a/2.0.0/events/fallen_empire_awakening_events.txt b/2.0.2/events/fallen_empire_awakening_events.txt
  13017. index ae7545b..1fd2765 100755
  13018. --- a/2.0.0/events/fallen_empire_awakening_events.txt
  13019. +++ b/2.0.2/events/fallen_empire_awakening_events.txt
  13020. @@ -226,6 +226,7 @@ country_event = {
  13021.  
  13022. trigger = {
  13023. has_global_flag = galactic_crisis_happened
  13024. + NOT = { has_global_flag = sleepers_awake_rival_waking } # Not if WiH happened
  13025. has_country_flag = guardians_of_the_galaxy
  13026. NOT = { has_global_flag = guardians_of_the_galaxy_happened }
  13027. NOT = { has_country_flag = timed_guardians_of_the_galaxy }
  13028. diff --git a/2.0.0/events/game_start.txt b/2.0.2/events/game_start.txt
  13029. index 768694f..1ccd3e4 100755
  13030. --- a/2.0.0/events/game_start.txt
  13031. +++ b/2.0.2/events/game_start.txt
  13032. @@ -1050,7 +1050,17 @@ country_event = {
  13033. random_owned_planet ={
  13034. limit = { is_capital = yes }
  13035. change_pc = pc_nuked
  13036. + reroll_deposits = yes
  13037. reset_start_buildings_and_blockers_post_apoc = yes
  13038. + if = {
  13039. + limit = { root = { has_civic = civic_machine_terminator } }
  13040. + every_tile = {
  13041. + limit = { has_building = building_hydroponics_farm_1 }
  13042. + remove_building = yes
  13043. + set_building = building_power_plant_1
  13044. + clear_deposits = yes
  13045. + }
  13046. + }
  13047. }
  13048. }
  13049. }
  13050. diff --git a/2.0.0/events/guardian_events.txt b/2.0.2/events/guardian_events.txt
  13051. index 290c29b..eea4869 100755
  13052. --- a/2.0.0/events/guardian_events.txt
  13053. +++ b/2.0.2/events/guardian_events.txt
  13054. @@ -131,7 +131,7 @@ country_event = {
  13055. }
  13056. }
  13057.  
  13058. -# Enclave Monthly Border Opinion
  13059. +# Enclave Yearly Border Opinion
  13060. event = {
  13061. id = guardian.10
  13062. hide_window = yes
  13063. @@ -266,6 +266,8 @@ country_event = {
  13064. id = guardian.97
  13065. hide_window = yes
  13066.  
  13067. + is_triggered_only = yes
  13068. +
  13069. trigger = {
  13070. exists = event_target:pc_home
  13071. event_target:pc_home = {
  13072. @@ -575,12 +577,7 @@ country_event = {
  13073. has_valid_civic = civic_fanatic_purifiers
  13074. has_valid_civic = civic_hive_devouring_swarm
  13075. has_valid_civic = civic_machine_terminator
  13076. - has_modifier = enclave_mineral_trade_1_xur
  13077. - has_modifier = enclave_mineral_trade_2_xur
  13078. - has_modifier = enclave_mineral_trade_3_xur
  13079. - has_modifier = enclave_energy_trade_1_xur
  13080. - has_modifier = enclave_energy_trade_2_xur
  13081. - has_modifier = enclave_energy_trade_3_xur
  13082. + has_active_xuracorp_trade = yes
  13083. }
  13084. }
  13085. hidden_effect = {
  13086. @@ -596,12 +593,7 @@ country_event = {
  13087. has_valid_civic = civic_fanatic_purifiers
  13088. has_valid_civic = civic_hive_devouring_swarm
  13089. has_valid_civic = civic_machine_terminator
  13090. - has_modifier = enclave_mineral_trade_1_xur
  13091. - has_modifier = enclave_mineral_trade_2_xur
  13092. - has_modifier = enclave_mineral_trade_3_xur
  13093. - has_modifier = enclave_energy_trade_1_xur
  13094. - has_modifier = enclave_energy_trade_2_xur
  13095. - has_modifier = enclave_energy_trade_3_xur
  13096. + has_active_xuracorp_trade = yes
  13097. }
  13098. }
  13099. hidden_effect = {
  13100. @@ -609,6 +601,22 @@ country_event = {
  13101. }
  13102. }
  13103.  
  13104. + option = { # Food
  13105. + name = guardian.105.f
  13106. + custom_gui = "enclave_trader_option"
  13107. + trigger = {
  13108. + NOR = {
  13109. + has_valid_civic = civic_fanatic_purifiers
  13110. + has_valid_civic = civic_hive_devouring_swarm
  13111. + has_valid_civic = civic_machine_terminator
  13112. + has_active_xuracorp_trade = yes
  13113. + }
  13114. + }
  13115. + hidden_effect = {
  13116. + country_event = { id = guardian.125 }
  13117. + }
  13118. + }
  13119. +
  13120. option = { # Strategic Resource
  13121. name = guardian.105.c
  13122. custom_gui = "enclave_trader_option"
  13123. @@ -643,23 +651,11 @@ country_event = {
  13124. name = guardian.105.e
  13125. custom_gui = "enclave_trader_option"
  13126. trigger = {
  13127. - OR = {
  13128. - has_modifier = enclave_mineral_trade_1_xur
  13129. - has_modifier = enclave_mineral_trade_2_xur
  13130. - has_modifier = enclave_mineral_trade_3_xur
  13131. - has_modifier = enclave_energy_trade_1_xur
  13132. - has_modifier = enclave_energy_trade_2_xur
  13133. - has_modifier = enclave_energy_trade_3_xur
  13134. - }
  13135. + has_active_xuracorp_trade = yes
  13136. }
  13137. custom_tooltip = end_trade_1
  13138. hidden_effect = {
  13139. - remove_modifier = enclave_mineral_trade_1_xur
  13140. - remove_modifier = enclave_mineral_trade_2_xur
  13141. - remove_modifier = enclave_mineral_trade_3_xur
  13142. - remove_modifier = enclave_energy_trade_1_xur
  13143. - remove_modifier = enclave_energy_trade_2_xur
  13144. - remove_modifier = enclave_energy_trade_3_xur
  13145. + remove_xuracorp_trades = yes
  13146. }
  13147. is_dialog_only = yes
  13148. response_text = guardian.105.e.response
  13149. @@ -755,12 +751,7 @@ country_event = {
  13150. has_valid_civic = civic_fanatic_purifiers
  13151. has_valid_civic = civic_hive_devouring_swarm
  13152. has_valid_civic = civic_machine_terminator
  13153. - has_modifier = enclave_mineral_trade_1_rig
  13154. - has_modifier = enclave_mineral_trade_2_rig
  13155. - has_modifier = enclave_mineral_trade_3_rig
  13156. - has_modifier = enclave_energy_trade_1_rig
  13157. - has_modifier = enclave_energy_trade_2_rig
  13158. - has_modifier = enclave_energy_trade_3_rig
  13159. + has_active_riggan_trade = yes
  13160. }
  13161. }
  13162. hidden_effect = {
  13163. @@ -776,12 +767,7 @@ country_event = {
  13164. has_valid_civic = civic_fanatic_purifiers
  13165. has_valid_civic = civic_hive_devouring_swarm
  13166. has_valid_civic = civic_machine_terminator
  13167. - has_modifier = enclave_mineral_trade_1_rig
  13168. - has_modifier = enclave_mineral_trade_2_rig
  13169. - has_modifier = enclave_mineral_trade_3_rig
  13170. - has_modifier = enclave_energy_trade_1_rig
  13171. - has_modifier = enclave_energy_trade_2_rig
  13172. - has_modifier = enclave_energy_trade_3_rig
  13173. + has_active_riggan_trade = yes
  13174. }
  13175. }
  13176. hidden_effect = {
  13177. @@ -789,6 +775,22 @@ country_event = {
  13178. }
  13179. }
  13180.  
  13181. + option = { # Food
  13182. + name = guardian.105.f
  13183. + custom_gui = "enclave_trader_option"
  13184. + trigger = {
  13185. + NOR = {
  13186. + has_valid_civic = civic_fanatic_purifiers
  13187. + has_valid_civic = civic_hive_devouring_swarm
  13188. + has_valid_civic = civic_machine_terminator
  13189. + has_active_riggan_trade = yes
  13190. + }
  13191. + }
  13192. + hidden_effect = {
  13193. + country_event = { id = guardian.125 }
  13194. + }
  13195. + }
  13196. +
  13197. option = { # Strategic Resource
  13198. name = guardian.105.c
  13199. custom_gui = "enclave_trader_option"
  13200. @@ -823,23 +825,11 @@ country_event = {
  13201. name = guardian.105.e
  13202. custom_gui = "enclave_trader_option"
  13203. trigger = {
  13204. - OR = {
  13205. - has_modifier = enclave_mineral_trade_1_rig
  13206. - has_modifier = enclave_mineral_trade_2_rig
  13207. - has_modifier = enclave_mineral_trade_3_rig
  13208. - has_modifier = enclave_energy_trade_1_rig
  13209. - has_modifier = enclave_energy_trade_2_rig
  13210. - has_modifier = enclave_energy_trade_3_rig
  13211. - }
  13212. + has_active_riggan_trade = yes
  13213. }
  13214. custom_tooltip = end_trade_2
  13215. hidden_effect = {
  13216. - remove_modifier = enclave_mineral_trade_1_rig
  13217. - remove_modifier = enclave_mineral_trade_2_rig
  13218. - remove_modifier = enclave_mineral_trade_3_rig
  13219. - remove_modifier = enclave_energy_trade_1_rig
  13220. - remove_modifier = enclave_energy_trade_2_rig
  13221. - remove_modifier = enclave_energy_trade_3_rig
  13222. + remove_riggan_trades = yes
  13223. }
  13224. is_dialog_only = yes
  13225. response_text = guardian.105.e.response
  13226. @@ -932,12 +922,7 @@ country_event = {
  13227. has_valid_civic = civic_fanatic_purifiers
  13228. has_valid_civic = civic_hive_devouring_swarm
  13229. has_valid_civic = civic_machine_terminator
  13230. - has_modifier = enclave_mineral_trade_1_mut
  13231. - has_modifier = enclave_mineral_trade_2_mut
  13232. - has_modifier = enclave_mineral_trade_3_mut
  13233. - has_modifier = enclave_energy_trade_1_mut
  13234. - has_modifier = enclave_energy_trade_2_mut
  13235. - has_modifier = enclave_energy_trade_3_mut
  13236. + has_active_muutagan_trade = yes
  13237. }
  13238. }
  13239. hidden_effect = {
  13240. @@ -953,12 +938,7 @@ country_event = {
  13241. has_valid_civic = civic_fanatic_purifiers
  13242. has_valid_civic = civic_hive_devouring_swarm
  13243. has_valid_civic = civic_machine_terminator
  13244. - has_modifier = enclave_mineral_trade_1_mut
  13245. - has_modifier = enclave_mineral_trade_2_mut
  13246. - has_modifier = enclave_mineral_trade_3_mut
  13247. - has_modifier = enclave_energy_trade_1_mut
  13248. - has_modifier = enclave_energy_trade_2_mut
  13249. - has_modifier = enclave_energy_trade_3_mut
  13250. + has_active_muutagan_trade = yes
  13251. }
  13252. }
  13253. hidden_effect = {
  13254. @@ -966,6 +946,22 @@ country_event = {
  13255. }
  13256. }
  13257.  
  13258. + option = { # Food
  13259. + name = guardian.105.f
  13260. + custom_gui = "enclave_trader_option"
  13261. + trigger = {
  13262. + NOR = {
  13263. + has_valid_civic = civic_fanatic_purifiers
  13264. + has_valid_civic = civic_hive_devouring_swarm
  13265. + has_valid_civic = civic_machine_terminator
  13266. + has_active_muutagan_trade = yes
  13267. + }
  13268. + }
  13269. + hidden_effect = {
  13270. + country_event = { id = guardian.125 }
  13271. + }
  13272. + }
  13273. +
  13274. option = { # Strategic Resource
  13275. name = guardian.105.c
  13276. custom_gui = "enclave_trader_option"
  13277. @@ -1000,23 +996,11 @@ country_event = {
  13278. name = guardian.105.e
  13279. custom_gui = "enclave_trader_option"
  13280. trigger = {
  13281. - OR = {
  13282. - has_modifier = enclave_mineral_trade_1_mut
  13283. - has_modifier = enclave_mineral_trade_2_mut
  13284. - has_modifier = enclave_mineral_trade_3_mut
  13285. - has_modifier = enclave_energy_trade_1_mut
  13286. - has_modifier = enclave_energy_trade_2_mut
  13287. - has_modifier = enclave_energy_trade_3_mut
  13288. - }
  13289. + has_active_muutagan_trade = yes
  13290. }
  13291. custom_tooltip = end_trade_3
  13292. hidden_effect = {
  13293. - remove_modifier = enclave_mineral_trade_1_mut
  13294. - remove_modifier = enclave_mineral_trade_2_mut
  13295. - remove_modifier = enclave_mineral_trade_3_mut
  13296. - remove_modifier = enclave_energy_trade_1_mut
  13297. - remove_modifier = enclave_energy_trade_2_mut
  13298. - remove_modifier = enclave_energy_trade_3_mut
  13299. + remove_muutagan_trades = yes
  13300. }
  13301. is_dialog_only = yes
  13302. response_text = guardian.105.e.response
  13303. @@ -1070,14 +1054,7 @@ country_event = {
  13304. name = guardian.105.a
  13305. custom_gui = "enclave_trader_option"
  13306. trigger = {
  13307. - NOR = {
  13308. - has_modifier = enclave_mineral_trade_1_xur
  13309. - has_modifier = enclave_mineral_trade_2_xur
  13310. - has_modifier = enclave_mineral_trade_3_xur
  13311. - has_modifier = enclave_energy_trade_1_xur
  13312. - has_modifier = enclave_energy_trade_2_xur
  13313. - has_modifier = enclave_energy_trade_3_xur
  13314. - }
  13315. + has_active_xuracorp_trade = no
  13316. }
  13317. hidden_effect = {
  13318. country_event = { id = guardian.110 }
  13319. @@ -1088,20 +1065,24 @@ country_event = {
  13320. name = guardian.105.b
  13321. custom_gui = "enclave_trader_option"
  13322. trigger = {
  13323. - NOR = {
  13324. - has_modifier = enclave_mineral_trade_1_xur
  13325. - has_modifier = enclave_mineral_trade_2_xur
  13326. - has_modifier = enclave_mineral_trade_3_xur
  13327. - has_modifier = enclave_energy_trade_1_xur
  13328. - has_modifier = enclave_energy_trade_2_xur
  13329. - has_modifier = enclave_energy_trade_3_xur
  13330. - }
  13331. + has_active_xuracorp_trade = no
  13332. }
  13333. hidden_effect = {
  13334. country_event = { id = guardian.120 }
  13335. }
  13336. }
  13337.  
  13338. + option = { # Food
  13339. + name = guardian.105.f
  13340. + custom_gui = "enclave_trader_option"
  13341. + trigger = {
  13342. + has_active_xuracorp_trade = no
  13343. + }
  13344. + hidden_effect = {
  13345. + country_event = { id = guardian.125 }
  13346. + }
  13347. + }
  13348. +
  13349. option = { # Strategic Resource
  13350. name = guardian.105.c
  13351. custom_gui = "enclave_trader_option"
  13352. @@ -1129,23 +1110,11 @@ country_event = {
  13353. name = guardian.105.e
  13354. custom_gui = "enclave_trader_option"
  13355. trigger = {
  13356. - OR = {
  13357. - has_modifier = enclave_mineral_trade_1_xur
  13358. - has_modifier = enclave_mineral_trade_2_xur
  13359. - has_modifier = enclave_mineral_trade_3_xur
  13360. - has_modifier = enclave_energy_trade_1_xur
  13361. - has_modifier = enclave_energy_trade_2_xur
  13362. - has_modifier = enclave_energy_trade_3_xur
  13363. - }
  13364. + has_active_xuracorp_trade = yes
  13365. }
  13366. custom_tooltip = end_trade_1
  13367. hidden_effect = {
  13368. - remove_modifier = enclave_mineral_trade_1_xur
  13369. - remove_modifier = enclave_mineral_trade_2_xur
  13370. - remove_modifier = enclave_mineral_trade_3_xur
  13371. - remove_modifier = enclave_energy_trade_1_xur
  13372. - remove_modifier = enclave_energy_trade_2_xur
  13373. - remove_modifier = enclave_energy_trade_3_xur
  13374. + remove_xuracorp_trades = yes
  13375. }
  13376. is_dialog_only = yes
  13377. response_text = guardian.105.e.response
  13378. @@ -1195,14 +1164,7 @@ country_event = {
  13379. name = guardian.105.a
  13380. custom_gui = "enclave_trader_option"
  13381. trigger = {
  13382. - NOR = {
  13383. - has_modifier = enclave_mineral_trade_1_rig
  13384. - has_modifier = enclave_mineral_trade_2_rig
  13385. - has_modifier = enclave_mineral_trade_3_rig
  13386. - has_modifier = enclave_energy_trade_1_rig
  13387. - has_modifier = enclave_energy_trade_2_rig
  13388. - has_modifier = enclave_energy_trade_3_rig
  13389. - }
  13390. + has_active_riggan_trade = no
  13391. }
  13392. hidden_effect = {
  13393. country_event = { id = guardian.110 }
  13394. @@ -1213,20 +1175,24 @@ country_event = {
  13395. name = guardian.105.b
  13396. custom_gui = "enclave_trader_option"
  13397. trigger = {
  13398. - NOR = {
  13399. - has_modifier = enclave_mineral_trade_1_rig
  13400. - has_modifier = enclave_mineral_trade_2_rig
  13401. - has_modifier = enclave_mineral_trade_3_rig
  13402. - has_modifier = enclave_energy_trade_1_rig
  13403. - has_modifier = enclave_energy_trade_2_rig
  13404. - has_modifier = enclave_energy_trade_3_rig
  13405. - }
  13406. + has_active_riggan_trade = no
  13407. }
  13408. hidden_effect = {
  13409. country_event = { id = guardian.120 }
  13410. }
  13411. }
  13412.  
  13413. + option = { # Food
  13414. + name = guardian.105.f
  13415. + custom_gui = "enclave_trader_option"
  13416. + trigger = {
  13417. + has_active_riggan_trade = no
  13418. + }
  13419. + hidden_effect = {
  13420. + country_event = { id = guardian.125 }
  13421. + }
  13422. + }
  13423. +
  13424. option = { # Strategic Resource
  13425. name = guardian.105.c
  13426. custom_gui = "enclave_trader_option"
  13427. @@ -1254,23 +1220,11 @@ country_event = {
  13428. name = guardian.105.e
  13429. custom_gui = "enclave_trader_option"
  13430. trigger = {
  13431. - OR = {
  13432. - has_modifier = enclave_mineral_trade_1_rig
  13433. - has_modifier = enclave_mineral_trade_2_rig
  13434. - has_modifier = enclave_mineral_trade_3_rig
  13435. - has_modifier = enclave_energy_trade_1_rig
  13436. - has_modifier = enclave_energy_trade_2_rig
  13437. - has_modifier = enclave_energy_trade_3_rig
  13438. - }
  13439. + has_active_riggan_trade = yes
  13440. }
  13441. custom_tooltip = end_trade_2
  13442. hidden_effect = {
  13443. - remove_modifier = enclave_mineral_trade_1_rig
  13444. - remove_modifier = enclave_mineral_trade_2_rig
  13445. - remove_modifier = enclave_mineral_trade_3_rig
  13446. - remove_modifier = enclave_energy_trade_1_rig
  13447. - remove_modifier = enclave_energy_trade_2_rig
  13448. - remove_modifier = enclave_energy_trade_3_rig
  13449. + remove_riggan_trades = yes
  13450. }
  13451. is_dialog_only = yes
  13452. response_text = guardian.105.e.response
  13453. @@ -1320,14 +1274,7 @@ country_event = {
  13454. name = guardian.105.a
  13455. custom_gui = "enclave_trader_option"
  13456. trigger = {
  13457. - NOR = {
  13458. - has_modifier = enclave_mineral_trade_1_mut
  13459. - has_modifier = enclave_mineral_trade_2_mut
  13460. - has_modifier = enclave_mineral_trade_3_mut
  13461. - has_modifier = enclave_energy_trade_1_mut
  13462. - has_modifier = enclave_energy_trade_2_mut
  13463. - has_modifier = enclave_energy_trade_3_mut
  13464. - }
  13465. + has_active_muutagan_trade = no
  13466. }
  13467. hidden_effect = {
  13468. country_event = { id = guardian.110 }
  13469. @@ -1338,20 +1285,24 @@ country_event = {
  13470. name = guardian.105.b
  13471. custom_gui = "enclave_trader_option"
  13472. trigger = {
  13473. - NOR = {
  13474. - has_modifier = enclave_mineral_trade_1_mut
  13475. - has_modifier = enclave_mineral_trade_2_mut
  13476. - has_modifier = enclave_mineral_trade_3_mut
  13477. - has_modifier = enclave_energy_trade_1_mut
  13478. - has_modifier = enclave_energy_trade_2_mut
  13479. - has_modifier = enclave_energy_trade_3_mut
  13480. - }
  13481. + has_active_muutagan_trade = no
  13482. }
  13483. hidden_effect = {
  13484. country_event = { id = guardian.120 }
  13485. }
  13486. }
  13487.  
  13488. + option = { # Food
  13489. + name = guardian.105.f
  13490. + custom_gui = "enclave_trader_option"
  13491. + trigger = {
  13492. + has_active_muutagan_trade = no
  13493. + }
  13494. + hidden_effect = {
  13495. + country_event = { id = guardian.125 }
  13496. + }
  13497. + }
  13498. +
  13499. option = { # Strategic Resource
  13500. name = guardian.105.c
  13501. custom_gui = "enclave_trader_option"
  13502. @@ -1379,23 +1330,11 @@ country_event = {
  13503. name = guardian.105.e
  13504. custom_gui = "enclave_trader_option"
  13505. trigger = {
  13506. - OR = {
  13507. - has_modifier = enclave_mineral_trade_1_mut
  13508. - has_modifier = enclave_mineral_trade_2_mut
  13509. - has_modifier = enclave_mineral_trade_3_mut
  13510. - has_modifier = enclave_energy_trade_1_mut
  13511. - has_modifier = enclave_energy_trade_2_mut
  13512. - has_modifier = enclave_energy_trade_3_mut
  13513. - }
  13514. + has_active_muutagan_trade = yes
  13515. }
  13516. custom_tooltip = end_trade_3
  13517. hidden_effect = {
  13518. - remove_modifier = enclave_mineral_trade_1_mut
  13519. - remove_modifier = enclave_mineral_trade_2_mut
  13520. - remove_modifier = enclave_mineral_trade_3_mut
  13521. - remove_modifier = enclave_energy_trade_1_mut
  13522. - remove_modifier = enclave_energy_trade_2_mut
  13523. - remove_modifier = enclave_energy_trade_3_mut
  13524. + remove_muutagan_trades = yes
  13525. }
  13526. is_dialog_only = yes
  13527. response_text = guardian.105.e.response
  13528. @@ -1482,12 +1421,6 @@ country_event = {
  13529. }
  13530. custom_tooltip = monthly_opinion1
  13531. hidden_effect = {
  13532. - event_target:traders = {
  13533. - add_trust = {
  13534. - who = root
  13535. - amount = 1
  13536. - }
  13537. - }
  13538. country_event = { id = guardian.111 }
  13539. country_event = { id = guardian.122 days = 30 }
  13540. }
  13541. @@ -1538,12 +1471,6 @@ country_event = {
  13542. }
  13543. custom_tooltip = monthly_opinion2
  13544. hidden_effect = {
  13545. - event_target:traders = {
  13546. - add_trust = {
  13547. - who = root
  13548. - amount = 2
  13549. - }
  13550. - }
  13551. country_event = { id = guardian.111 }
  13552. country_event = { id = guardian.122 days = 30 }
  13553. }
  13554. @@ -1594,24 +1521,168 @@ country_event = {
  13555. }
  13556. custom_tooltip = monthly_opinion3
  13557. hidden_effect = {
  13558. - event_target:traders = {
  13559. - add_trust = {
  13560. - who = root
  13561. - amount = 3
  13562. - }
  13563. - }
  13564. country_event = { id = guardian.111 }
  13565. country_event = { id = guardian.122 days = 30 }
  13566. }
  13567. }
  13568.  
  13569. option = {
  13570. - name = guardian.110.d
  13571. + name = guardian.110.food.a
  13572. custom_gui = "enclave_trader_option"
  13573. - hidden_effect = {
  13574. - if = {
  13575. - limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13576. - country_event = { id = guardian.105 }
  13577. + allow = {
  13578. + food > 20
  13579. + hidden_trigger = {
  13580. + NOT = {
  13581. + AND = {
  13582. + has_country_flag = attacked_xuracorp
  13583. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13584. + }
  13585. + AND = {
  13586. + has_country_flag = attacked_riggans
  13587. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13588. + }
  13589. + AND = {
  13590. + has_country_flag = attacked_muutagans
  13591. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13592. + }
  13593. + }
  13594. + }
  13595. + }
  13596. + if = {
  13597. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13598. + add_modifier = {
  13599. + modifier = "enclave_mineral_food_trade_1_xur"
  13600. + days = -1
  13601. + }
  13602. + }
  13603. + if = {
  13604. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13605. + add_modifier = {
  13606. + modifier = "enclave_mineral_food_trade_1_rig"
  13607. + days = -1
  13608. + }
  13609. + }
  13610. + if = {
  13611. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13612. + add_modifier = {
  13613. + modifier = "enclave_mineral_food_trade_1_mut"
  13614. + days = -1
  13615. + }
  13616. + }
  13617. + custom_tooltip = monthly_opinion1
  13618. + hidden_effect = {
  13619. + country_event = { id = guardian.111 }
  13620. + country_event = { id = guardian.122 days = 30 }
  13621. + }
  13622. + }
  13623. +
  13624. + option = {
  13625. + name = guardian.110.food.b
  13626. + custom_gui = "enclave_trader_option"
  13627. + allow = {
  13628. + food > 50
  13629. + hidden_trigger = {
  13630. + NOT = {
  13631. + AND = {
  13632. + has_country_flag = attacked_xuracorp
  13633. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13634. + }
  13635. + AND = {
  13636. + has_country_flag = attacked_riggans
  13637. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13638. + }
  13639. + AND = {
  13640. + has_country_flag = attacked_muutagans
  13641. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13642. + }
  13643. + }
  13644. + }
  13645. + }
  13646. + if = {
  13647. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13648. + add_modifier = {
  13649. + modifier = "enclave_mineral_food_trade_2_xur"
  13650. + days = -1
  13651. + }
  13652. + }
  13653. + if = {
  13654. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13655. + add_modifier = {
  13656. + modifier = "enclave_mineral_food_trade_2_rig"
  13657. + days = -1
  13658. + }
  13659. + }
  13660. + if = {
  13661. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13662. + add_modifier = {
  13663. + modifier = "enclave_mineral_food_trade_2_mut"
  13664. + days = -1
  13665. + }
  13666. + }
  13667. + custom_tooltip = monthly_opinion2
  13668. + hidden_effect = {
  13669. + country_event = { id = guardian.111 }
  13670. + country_event = { id = guardian.122 days = 30 }
  13671. + }
  13672. + }
  13673. +
  13674. + option = {
  13675. + name = guardian.110.food.c
  13676. + custom_gui = "enclave_trader_option"
  13677. + allow = {
  13678. + food > 100
  13679. + hidden_trigger = {
  13680. + NOT = {
  13681. + AND = {
  13682. + has_country_flag = attacked_xuracorp
  13683. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13684. + }
  13685. + AND = {
  13686. + has_country_flag = attacked_riggans
  13687. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13688. + }
  13689. + AND = {
  13690. + has_country_flag = attacked_muutagans
  13691. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13692. + }
  13693. + }
  13694. + }
  13695. + }
  13696. + if = {
  13697. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13698. + add_modifier = {
  13699. + modifier = "enclave_mineral_food_trade_3_xur"
  13700. + days = -1
  13701. + }
  13702. + }
  13703. + if = {
  13704. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13705. + add_modifier = {
  13706. + modifier = "enclave_mineral_food_trade_3_rig"
  13707. + days = -1
  13708. + }
  13709. + }
  13710. + if = {
  13711. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13712. + add_modifier = {
  13713. + modifier = "enclave_mineral_food_trade_3_mut"
  13714. + days = -1
  13715. + }
  13716. + }
  13717. + custom_tooltip = monthly_opinion3
  13718. + hidden_effect = {
  13719. + country_event = { id = guardian.111 }
  13720. + country_event = { id = guardian.122 days = 30 }
  13721. + }
  13722. + }
  13723. +
  13724. + option = {
  13725. + name = guardian.110.d
  13726. + custom_gui = "enclave_trader_option"
  13727. + hidden_effect = {
  13728. + if = {
  13729. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13730. + country_event = { id = guardian.105 }
  13731. }
  13732. if = {
  13733. limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13734. @@ -1644,15 +1715,24 @@ country_event = {
  13735. OR = {
  13736. AND = {
  13737. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13738. + OR = {
  13739. has_modifier = enclave_mineral_trade_1_xur
  13740. + has_modifier = enclave_mineral_food_trade_1_xur
  13741. + }
  13742. }
  13743. AND = {
  13744. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13745. + OR = {
  13746. has_modifier = enclave_mineral_trade_1_rig
  13747. + has_modifier = enclave_mineral_food_trade_1_rig
  13748. + }
  13749. }
  13750. AND = {
  13751. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13752. + OR = {
  13753. has_modifier = enclave_mineral_trade_1_mut
  13754. + has_modifier = enclave_mineral_food_trade_1_mut
  13755. + }
  13756. }
  13757. }
  13758. }
  13759. @@ -1663,15 +1743,24 @@ country_event = {
  13760. OR = {
  13761. AND = {
  13762. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13763. + OR = {
  13764. has_modifier = enclave_mineral_trade_2_xur
  13765. + has_modifier = enclave_mineral_food_trade_2_xur
  13766. + }
  13767. }
  13768. AND = {
  13769. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13770. + OR = {
  13771. has_modifier = enclave_mineral_trade_2_rig
  13772. + has_modifier = enclave_mineral_food_trade_2_rig
  13773. + }
  13774. }
  13775. AND = {
  13776. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13777. + OR = {
  13778. has_modifier = enclave_mineral_trade_2_mut
  13779. + has_modifier = enclave_mineral_food_trade_2_mut
  13780. + }
  13781. }
  13782. }
  13783. }
  13784. @@ -1682,15 +1771,24 @@ country_event = {
  13785. OR = {
  13786. AND = {
  13787. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13788. + OR = {
  13789. has_modifier = enclave_mineral_trade_3_xur
  13790. + has_modifier = enclave_mineral_food_trade_3_xur
  13791. + }
  13792. }
  13793. AND = {
  13794. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13795. + OR = {
  13796. has_modifier = enclave_mineral_trade_3_rig
  13797. + has_modifier = enclave_mineral_food_trade_3_rig
  13798. + }
  13799. }
  13800. AND = {
  13801. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13802. + OR = {
  13803. has_modifier = enclave_mineral_trade_3_mut
  13804. + has_modifier = enclave_mineral_food_trade_3_mut
  13805. + }
  13806. }
  13807. }
  13808. }
  13809. @@ -1760,22 +1858,674 @@ country_event = {
  13810. portrait = event_target:traders
  13811. room = enclave_trader_room
  13812. }
  13813. -
  13814. - immediate = {
  13815. - set_country_flag = trader_enclave_diplomacy_engaged
  13816. +
  13817. + immediate = {
  13818. + set_country_flag = trader_enclave_diplomacy_engaged
  13819. + }
  13820. +
  13821. + after = {
  13822. + hidden_effect = {
  13823. + remove_country_flag = trader_enclave_diplomacy_engaged
  13824. + }
  13825. + }
  13826. +
  13827. + option = {
  13828. + name = guardian.120.a
  13829. + custom_gui = "enclave_trader_option"
  13830. + allow = {
  13831. + minerals > 20
  13832. + hidden_trigger = {
  13833. + NOT = {
  13834. + AND = {
  13835. + has_country_flag = attacked_xuracorp
  13836. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13837. + }
  13838. + AND = {
  13839. + has_country_flag = attacked_riggans
  13840. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13841. + }
  13842. + AND = {
  13843. + has_country_flag = attacked_muutagans
  13844. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13845. + }
  13846. + }
  13847. + }
  13848. + }
  13849. + if = {
  13850. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13851. + add_modifier = {
  13852. + modifier = "enclave_energy_trade_1_xur"
  13853. + days = -1
  13854. + }
  13855. + }
  13856. + if = {
  13857. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13858. + add_modifier = {
  13859. + modifier = "enclave_energy_trade_1_rig"
  13860. + days = -1
  13861. + }
  13862. + }
  13863. + if = {
  13864. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13865. + add_modifier = {
  13866. + modifier = "enclave_energy_trade_1_mut"
  13867. + days = -1
  13868. + }
  13869. + }
  13870. +
  13871. + custom_tooltip = monthly_opinion1
  13872. + hidden_effect = {
  13873. + country_event = { id = guardian.121 }
  13874. + country_event = { id = guardian.122 days = 30 }
  13875. + }
  13876. + }
  13877. +
  13878. + option = {
  13879. + name = guardian.120.b
  13880. + custom_gui = "enclave_trader_option"
  13881. + allow = {
  13882. + minerals > 50
  13883. + hidden_trigger = {
  13884. + NOT = {
  13885. + AND = {
  13886. + has_country_flag = attacked_xuracorp
  13887. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13888. + }
  13889. + AND = {
  13890. + has_country_flag = attacked_riggans
  13891. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13892. + }
  13893. + AND = {
  13894. + has_country_flag = attacked_muutagans
  13895. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13896. + }
  13897. + }
  13898. + }
  13899. + }
  13900. + if = {
  13901. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13902. + add_modifier = {
  13903. + modifier = "enclave_energy_trade_2_xur"
  13904. + days = -1
  13905. + }
  13906. + }
  13907. + if = {
  13908. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13909. + add_modifier = {
  13910. + modifier = "enclave_energy_trade_2_rig"
  13911. + days = -1
  13912. + }
  13913. + }
  13914. + if = {
  13915. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13916. + add_modifier = {
  13917. + modifier = "enclave_energy_trade_2_mut"
  13918. + days = -1
  13919. + }
  13920. + }
  13921. +
  13922. + custom_tooltip = monthly_opinion2
  13923. + hidden_effect = {
  13924. + country_event = { id = guardian.121 }
  13925. + country_event = { id = guardian.122 days = 30 }
  13926. + }
  13927. + }
  13928. +
  13929. + option = {
  13930. + name = guardian.120.c
  13931. + custom_gui = "enclave_trader_option"
  13932. + allow = {
  13933. + minerals > 100
  13934. + hidden_trigger = {
  13935. + NOT = {
  13936. + AND = {
  13937. + has_country_flag = attacked_xuracorp
  13938. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13939. + }
  13940. + AND = {
  13941. + has_country_flag = attacked_riggans
  13942. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13943. + }
  13944. + AND = {
  13945. + has_country_flag = attacked_muutagans
  13946. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13947. + }
  13948. + }
  13949. + }
  13950. + }
  13951. + if = {
  13952. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  13953. + add_modifier = {
  13954. + modifier = "enclave_energy_trade_3_xur"
  13955. + days = -1
  13956. + }
  13957. + }
  13958. + if = {
  13959. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  13960. + add_modifier = {
  13961. + modifier = "enclave_energy_trade_3_rig"
  13962. + days = -1
  13963. + }
  13964. + }
  13965. + if = {
  13966. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  13967. + add_modifier = {
  13968. + modifier = "enclave_energy_trade_3_mut"
  13969. + days = -1
  13970. + }
  13971. + }
  13972. +
  13973. + custom_tooltip = monthly_opinion3
  13974. + hidden_effect = {
  13975. + country_event = { id = guardian.121 }
  13976. + country_event = { id = guardian.122 days = 30 }
  13977. + }
  13978. + }
  13979. +
  13980. + option = {
  13981. + name = guardian.120.food.a
  13982. + custom_gui = "enclave_trader_option"
  13983. + allow = {
  13984. + food > 20
  13985. + hidden_trigger = {
  13986. + NOT = {
  13987. + AND = {
  13988. + has_country_flag = attacked_xuracorp
  13989. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  13990. + }
  13991. + AND = {
  13992. + has_country_flag = attacked_riggans
  13993. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  13994. + }
  13995. + AND = {
  13996. + has_country_flag = attacked_muutagans
  13997. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  13998. + }
  13999. + }
  14000. + }
  14001. + }
  14002. + if = {
  14003. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14004. + add_modifier = {
  14005. + modifier = "enclave_energy_food_trade_1_xur"
  14006. + days = -1
  14007. + }
  14008. + }
  14009. + if = {
  14010. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14011. + add_modifier = {
  14012. + modifier = "enclave_energy_food_trade_1_rig"
  14013. + days = -1
  14014. + }
  14015. + }
  14016. + if = {
  14017. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14018. + add_modifier = {
  14019. + modifier = "enclave_energy_food_trade_1_mut"
  14020. + days = -1
  14021. + }
  14022. + }
  14023. +
  14024. + custom_tooltip = monthly_opinion1
  14025. + hidden_effect = {
  14026. + country_event = { id = guardian.121 }
  14027. + country_event = { id = guardian.122 days = 30 }
  14028. + }
  14029. + }
  14030. +
  14031. + option = {
  14032. + name = guardian.120.food.b
  14033. + custom_gui = "enclave_trader_option"
  14034. + allow = {
  14035. + food > 50
  14036. + hidden_trigger = {
  14037. + NOT = {
  14038. + AND = {
  14039. + has_country_flag = attacked_xuracorp
  14040. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14041. + }
  14042. + AND = {
  14043. + has_country_flag = attacked_riggans
  14044. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14045. + }
  14046. + AND = {
  14047. + has_country_flag = attacked_muutagans
  14048. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14049. + }
  14050. + }
  14051. + }
  14052. + }
  14053. + if = {
  14054. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14055. + add_modifier = {
  14056. + modifier = "enclave_energy_food_trade_2_xur"
  14057. + days = -1
  14058. + }
  14059. + }
  14060. + if = {
  14061. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14062. + add_modifier = {
  14063. + modifier = "enclave_energy_food_trade_2_rig"
  14064. + days = -1
  14065. + }
  14066. + }
  14067. + if = {
  14068. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14069. + add_modifier = {
  14070. + modifier = "enclave_energy_food_trade_2_mut"
  14071. + days = -1
  14072. + }
  14073. + }
  14074. +
  14075. + custom_tooltip = monthly_opinion2
  14076. + hidden_effect = {
  14077. + country_event = { id = guardian.121 }
  14078. + country_event = { id = guardian.122 days = 30 }
  14079. + }
  14080. + }
  14081. +
  14082. + option = {
  14083. + name = guardian.120.food.c
  14084. + custom_gui = "enclave_trader_option"
  14085. + allow = {
  14086. + food > 100
  14087. + hidden_trigger = {
  14088. + NOT = {
  14089. + AND = {
  14090. + has_country_flag = attacked_xuracorp
  14091. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14092. + }
  14093. + AND = {
  14094. + has_country_flag = attacked_riggans
  14095. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14096. + }
  14097. + AND = {
  14098. + has_country_flag = attacked_muutagans
  14099. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14100. + }
  14101. + }
  14102. + }
  14103. + }
  14104. + if = {
  14105. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14106. + add_modifier = {
  14107. + modifier = "enclave_energy_food_trade_3_xur"
  14108. + days = -1
  14109. + }
  14110. + }
  14111. + if = {
  14112. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14113. + add_modifier = {
  14114. + modifier = "enclave_energy_food_trade_3_rig"
  14115. + days = -1
  14116. + }
  14117. + }
  14118. + if = {
  14119. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14120. + add_modifier = {
  14121. + modifier = "enclave_energy_food_trade_3_mut"
  14122. + days = -1
  14123. + }
  14124. + }
  14125. +
  14126. + custom_tooltip = monthly_opinion3
  14127. + hidden_effect = {
  14128. + country_event = { id = guardian.121 }
  14129. + country_event = { id = guardian.122 days = 30 }
  14130. + }
  14131. + }
  14132. +
  14133. + option = {
  14134. + name = guardian.110.d
  14135. + custom_gui = "enclave_trader_option"
  14136. + hidden_effect = {
  14137. + if = {
  14138. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14139. + country_event = { id = guardian.105 }
  14140. + }
  14141. + if = {
  14142. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14143. + country_event = { id = guardian.106 }
  14144. + }
  14145. + if = {
  14146. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14147. + country_event = { id = guardian.107 }
  14148. + }
  14149. + }
  14150. + }
  14151. +
  14152. + option = {
  14153. + name = guardian.110.e
  14154. + custom_gui = "enclave_trader_option"
  14155. + default_hide_option = yes
  14156. + hidden_effect = {
  14157. + remove_country_flag = trader_enclave_diplomacy_engaged
  14158. + }
  14159. + }
  14160. +}
  14161. +
  14162. +# Energy Deal Struck
  14163. +country_event = {
  14164. + id = guardian.121
  14165. + title = guardian.120.name
  14166. + desc = {
  14167. + text = guardian.120.a.reply
  14168. + trigger = {
  14169. + OR = {
  14170. + AND = {
  14171. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14172. + OR = {
  14173. + has_modifier = enclave_energy_trade_1_xur
  14174. + has_modifier = enclave_energy_food_trade_1_xur
  14175. + }
  14176. + }
  14177. + AND = {
  14178. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14179. + OR = {
  14180. + has_modifier = enclave_energy_trade_1_rig
  14181. + has_modifier = enclave_energy_food_trade_1_rig
  14182. + }
  14183. + }
  14184. + AND = {
  14185. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14186. + OR = {
  14187. + has_modifier = enclave_energy_trade_1_mut
  14188. + has_modifier = enclave_energy_food_trade_1_mut
  14189. + }
  14190. + }
  14191. + }
  14192. + }
  14193. + }
  14194. + desc = {
  14195. + text = guardian.120.b.reply
  14196. + trigger = {
  14197. + OR = {
  14198. + AND = {
  14199. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14200. + OR = {
  14201. + has_modifier = enclave_energy_trade_2_xur
  14202. + has_modifier = enclave_energy_food_trade_2_xur
  14203. + }
  14204. + }
  14205. + AND = {
  14206. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14207. + OR = {
  14208. + has_modifier = enclave_energy_trade_2_rig
  14209. + has_modifier = enclave_energy_food_trade_2_rig
  14210. + }
  14211. + }
  14212. + AND = {
  14213. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14214. + OR = {
  14215. + has_modifier = enclave_energy_trade_2_mut
  14216. + has_modifier = enclave_energy_food_trade_2_mut
  14217. + }
  14218. + }
  14219. + }
  14220. + }
  14221. + }
  14222. + desc = {
  14223. + text = guardian.120.c.reply
  14224. + trigger = {
  14225. + OR = {
  14226. + AND = {
  14227. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14228. + OR = {
  14229. + has_modifier = enclave_energy_trade_3_xur
  14230. + has_modifier = enclave_energy_food_trade_3_xur
  14231. + }
  14232. + }
  14233. + AND = {
  14234. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14235. + OR = {
  14236. + has_modifier = enclave_energy_trade_3_rig
  14237. + has_modifier = enclave_energy_food_trade_3_rig
  14238. + }
  14239. + }
  14240. + AND = {
  14241. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14242. + OR = {
  14243. + has_modifier = enclave_energy_trade_3_mut
  14244. + has_modifier = enclave_energy_food_trade_3_mut
  14245. + }
  14246. + }
  14247. + }
  14248. + }
  14249. + }
  14250. +
  14251. + is_triggered_only = yes
  14252. + diplomatic = yes
  14253. + custom_gui = "enclave_trader_window"
  14254. + force_open = yes
  14255. +
  14256. + picture_event_data = {
  14257. + portrait = event_target:traders
  14258. + room = enclave_trader_room
  14259. + }
  14260. +
  14261. + immediate = {
  14262. + set_country_flag = trader_enclave_diplomacy_engaged
  14263. + }
  14264. +
  14265. + after = {
  14266. + hidden_effect = {
  14267. + remove_country_flag = trader_enclave_diplomacy_engaged
  14268. + }
  14269. + }
  14270. +
  14271. + option = {
  14272. + name = guardian.110.d
  14273. + custom_gui = "enclave_trader_option"
  14274. + hidden_effect = {
  14275. + if = {
  14276. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14277. + country_event = { id = guardian.105 }
  14278. + }
  14279. + if = {
  14280. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14281. + country_event = { id = guardian.106 }
  14282. + }
  14283. + if = {
  14284. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14285. + country_event = { id = guardian.107 }
  14286. + }
  14287. + }
  14288. + }
  14289. +
  14290. + option = {
  14291. + name = guardian.111.e
  14292. + custom_gui = "enclave_trader_option"
  14293. + default_hide_option = yes
  14294. + hidden_effect = {
  14295. + remove_country_flag = trader_enclave_diplomacy_engaged
  14296. + }
  14297. + }
  14298. +}
  14299. +
  14300. +# Food
  14301. +country_event = {
  14302. + id = guardian.125
  14303. + title = guardian.125.name
  14304. + desc = guardian.125.desc
  14305. +
  14306. + is_triggered_only = yes
  14307. + diplomatic = yes
  14308. + custom_gui = "enclave_trader_window"
  14309. + force_open = yes
  14310. +
  14311. + picture_event_data = {
  14312. + portrait = event_target:traders
  14313. + room = enclave_trader_room
  14314. + }
  14315. +
  14316. + immediate = {
  14317. + set_country_flag = trader_enclave_diplomacy_engaged
  14318. + }
  14319. +
  14320. + after = {
  14321. + hidden_effect = {
  14322. + remove_country_flag = trader_enclave_diplomacy_engaged
  14323. + }
  14324. + }
  14325. +
  14326. + option = {
  14327. + name = guardian.125.minerals.a
  14328. + custom_gui = "enclave_trader_option"
  14329. + allow = {
  14330. + minerals > 20
  14331. + hidden_trigger = {
  14332. + NOT = {
  14333. + AND = {
  14334. + has_country_flag = attacked_xuracorp
  14335. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14336. + }
  14337. + AND = {
  14338. + has_country_flag = attacked_riggans
  14339. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14340. + }
  14341. + AND = {
  14342. + has_country_flag = attacked_muutagans
  14343. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14344. + }
  14345. + }
  14346. + }
  14347. + }
  14348. + if = {
  14349. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14350. + add_modifier = {
  14351. + modifier = "enclave_food_minerals_trade_1_xur"
  14352. + days = -1
  14353. + }
  14354. + }
  14355. + if = {
  14356. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14357. + add_modifier = {
  14358. + modifier = "enclave_food_minerals_trade_1_rig"
  14359. + days = -1
  14360. + }
  14361. + }
  14362. + if = {
  14363. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14364. + add_modifier = {
  14365. + modifier = "enclave_food_minerals_trade_1_mut"
  14366. + days = -1
  14367. + }
  14368. + }
  14369. +
  14370. + custom_tooltip = monthly_opinion1
  14371. + hidden_effect = {
  14372. + country_event = { id = guardian.126 }
  14373. + country_event = { id = guardian.122 days = 30 }
  14374. + }
  14375. + }
  14376. +
  14377. + option = {
  14378. + name = guardian.125.minerals.b
  14379. + custom_gui = "enclave_trader_option"
  14380. + allow = {
  14381. + minerals > 50
  14382. + hidden_trigger = {
  14383. + NOT = {
  14384. + AND = {
  14385. + has_country_flag = attacked_xuracorp
  14386. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14387. + }
  14388. + AND = {
  14389. + has_country_flag = attacked_riggans
  14390. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14391. + }
  14392. + AND = {
  14393. + has_country_flag = attacked_muutagans
  14394. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14395. + }
  14396. + }
  14397. + }
  14398. + }
  14399. + if = {
  14400. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14401. + add_modifier = {
  14402. + modifier = "enclave_food_minerals_trade_2_xur"
  14403. + days = -1
  14404. + }
  14405. + }
  14406. + if = {
  14407. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14408. + add_modifier = {
  14409. + modifier = "enclave_food_minerals_trade_2_rig"
  14410. + days = -1
  14411. + }
  14412. + }
  14413. + if = {
  14414. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14415. + add_modifier = {
  14416. + modifier = "enclave_food_minerals_trade_2_mut"
  14417. + days = -1
  14418. + }
  14419. + }
  14420. +
  14421. + custom_tooltip = monthly_opinion2
  14422. + hidden_effect = {
  14423. + country_event = { id = guardian.126 }
  14424. + country_event = { id = guardian.122 days = 30 }
  14425. + }
  14426. + }
  14427. +
  14428. + option = {
  14429. + name = guardian.125.minerals.c
  14430. + custom_gui = "enclave_trader_option"
  14431. + allow = {
  14432. + minerals > 100
  14433. + hidden_trigger = {
  14434. + NOT = {
  14435. + AND = {
  14436. + has_country_flag = attacked_xuracorp
  14437. + event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14438. + }
  14439. + AND = {
  14440. + has_country_flag = attacked_riggans
  14441. + event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14442. + }
  14443. + AND = {
  14444. + has_country_flag = attacked_muutagans
  14445. + event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14446. + }
  14447. + }
  14448. + }
  14449. + }
  14450. + if = {
  14451. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14452. + add_modifier = {
  14453. + modifier = "enclave_food_minerals_trade_3_xur"
  14454. + days = -1
  14455. + }
  14456. + }
  14457. + if = {
  14458. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14459. + add_modifier = {
  14460. + modifier = "enclave_food_minerals_trade_3_rig"
  14461. + days = -1
  14462. + }
  14463. + }
  14464. + if = {
  14465. + limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14466. + add_modifier = {
  14467. + modifier = "enclave_food_minerals_trade_3_mut"
  14468. + days = -1
  14469. + }
  14470. }
  14471.  
  14472. - after = {
  14473. + custom_tooltip = monthly_opinion3
  14474. hidden_effect = {
  14475. - remove_country_flag = trader_enclave_diplomacy_engaged
  14476. + country_event = { id = guardian.126 }
  14477. + country_event = { id = guardian.122 days = 30 }
  14478. }
  14479. }
  14480.  
  14481. option = {
  14482. - name = guardian.120.a
  14483. + name = guardian.125.energy.a
  14484. custom_gui = "enclave_trader_option"
  14485. allow = {
  14486. - minerals > 20
  14487. + energy > 20
  14488. hidden_trigger = {
  14489. NOT = {
  14490. AND = {
  14491. @@ -1796,43 +2546,37 @@ country_event = {
  14492. if = {
  14493. limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14494. add_modifier = {
  14495. - modifier = "enclave_energy_trade_1_xur"
  14496. + modifier = "enclave_food_energy_trade_1_xur"
  14497. days = -1
  14498. }
  14499. }
  14500. if = {
  14501. limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14502. add_modifier = {
  14503. - modifier = "enclave_energy_trade_1_rig"
  14504. + modifier = "enclave_food_energy_trade_1_rig"
  14505. days = -1
  14506. }
  14507. }
  14508. if = {
  14509. limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14510. add_modifier = {
  14511. - modifier = "enclave_energy_trade_1_mut"
  14512. + modifier = "enclave_food_energy_trade_1_mut"
  14513. days = -1
  14514. }
  14515. }
  14516.  
  14517. custom_tooltip = monthly_opinion1
  14518. hidden_effect = {
  14519. - event_target:traders = {
  14520. - add_trust = {
  14521. - who = root
  14522. - amount = 1
  14523. - }
  14524. - }
  14525. - country_event = { id = guardian.121 }
  14526. + country_event = { id = guardian.126 }
  14527. country_event = { id = guardian.122 days = 30 }
  14528. }
  14529. }
  14530.  
  14531. option = {
  14532. - name = guardian.120.b
  14533. + name = guardian.125.energy.b
  14534. custom_gui = "enclave_trader_option"
  14535. allow = {
  14536. - minerals > 50
  14537. + energy > 50
  14538. hidden_trigger = {
  14539. NOT = {
  14540. AND = {
  14541. @@ -1853,43 +2597,37 @@ country_event = {
  14542. if = {
  14543. limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14544. add_modifier = {
  14545. - modifier = "enclave_energy_trade_2_xur"
  14546. + modifier = "enclave_food_energy_trade_2_xur"
  14547. days = -1
  14548. }
  14549. }
  14550. if = {
  14551. limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14552. add_modifier = {
  14553. - modifier = "enclave_energy_trade_2_rig"
  14554. + modifier = "enclave_food_energy_trade_2_rig"
  14555. days = -1
  14556. }
  14557. }
  14558. if = {
  14559. limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14560. add_modifier = {
  14561. - modifier = "enclave_energy_trade_2_mut"
  14562. + modifier = "enclave_food_energy_trade_2_mut"
  14563. days = -1
  14564. }
  14565. }
  14566.  
  14567. custom_tooltip = monthly_opinion2
  14568. hidden_effect = {
  14569. - event_target:traders = {
  14570. - add_trust = {
  14571. - who = root
  14572. - amount = 2
  14573. - }
  14574. - }
  14575. - country_event = { id = guardian.121 }
  14576. + country_event = { id = guardian.126 }
  14577. country_event = { id = guardian.122 days = 30 }
  14578. }
  14579. }
  14580.  
  14581. option = {
  14582. - name = guardian.120.c
  14583. + name = guardian.125.energy.c
  14584. custom_gui = "enclave_trader_option"
  14585. allow = {
  14586. - minerals > 100
  14587. + energy > 100
  14588. hidden_trigger = {
  14589. NOT = {
  14590. AND = {
  14591. @@ -1910,34 +2648,28 @@ country_event = {
  14592. if = {
  14593. limit = { event_target:traders = { has_country_flag = trader_enclave_country_1 } }
  14594. add_modifier = {
  14595. - modifier = "enclave_energy_trade_3_xur"
  14596. + modifier = "enclave_food_energy_trade_3_xur"
  14597. days = -1
  14598. }
  14599. }
  14600. if = {
  14601. limit = { event_target:traders = { has_country_flag = trader_enclave_country_2 } }
  14602. add_modifier = {
  14603. - modifier = "enclave_energy_trade_3_rig"
  14604. + modifier = "enclave_food_energy_trade_3_rig"
  14605. days = -1
  14606. }
  14607. }
  14608. if = {
  14609. limit = { event_target:traders = { has_country_flag = trader_enclave_country_3 } }
  14610. add_modifier = {
  14611. - modifier = "enclave_energy_trade_3_mut"
  14612. + modifier = "enclave_food_energy_trade_3_mut"
  14613. days = -1
  14614. }
  14615. }
  14616.  
  14617. custom_tooltip = monthly_opinion3
  14618. hidden_effect = {
  14619. - event_target:traders = {
  14620. - add_trust = {
  14621. - who = root
  14622. - amount = 3
  14623. - }
  14624. - }
  14625. - country_event = { id = guardian.121 }
  14626. + country_event = { id = guardian.126 }
  14627. country_event = { id = guardian.122 days = 30 }
  14628. }
  14629. }
  14630. @@ -1971,63 +2703,90 @@ country_event = {
  14631. }
  14632. }
  14633.  
  14634. -# Energy Deal Struck
  14635. +# Food Deal Struck
  14636. country_event = {
  14637. - id = guardian.121
  14638. - title = guardian.120.name
  14639. + id = guardian.126
  14640. + title = guardian.125.name
  14641. desc = {
  14642. - text = guardian.120.a.reply
  14643. + text = guardian.125.a.reply
  14644. trigger = {
  14645. OR = {
  14646. AND = {
  14647. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14648. - has_modifier = enclave_energy_trade_1_xur
  14649. + OR = {
  14650. + has_modifier = enclave_food_minerals_trade_1_xur
  14651. + has_modifier = enclave_food_energy_trade_1_xur
  14652. + }
  14653. }
  14654. AND = {
  14655. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14656. - has_modifier = enclave_energy_trade_1_rig
  14657. + OR = {
  14658. + has_modifier = enclave_food_minerals_trade_1_rig
  14659. + has_modifier = enclave_food_energy_trade_1_rig
  14660. + }
  14661. }
  14662. AND = {
  14663. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14664. - has_modifier = enclave_energy_trade_1_mut
  14665. + OR = {
  14666. + has_modifier = enclave_food_minerals_trade_1_mut
  14667. + has_modifier = enclave_food_energy_trade_1_mut
  14668. + }
  14669. }
  14670. }
  14671. }
  14672. }
  14673. desc = {
  14674. - text = guardian.120.b.reply
  14675. + text = guardian.125.b.reply
  14676. trigger = {
  14677. OR = {
  14678. AND = {
  14679. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14680. - has_modifier = enclave_energy_trade_2_xur
  14681. + OR = {
  14682. + has_modifier = enclave_food_minerals_trade_2_xur
  14683. + has_modifier = enclave_food_energy_trade_2_xur
  14684. + }
  14685. }
  14686. AND = {
  14687. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14688. - has_modifier = enclave_energy_trade_2_rig
  14689. + OR = {
  14690. + has_modifier = enclave_food_minerals_trade_2_rig
  14691. + has_modifier = enclave_food_energy_trade_2_rig
  14692. + }
  14693. }
  14694. AND = {
  14695. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14696. - has_modifier = enclave_energy_trade_2_mut
  14697. + OR = {
  14698. + has_modifier = enclave_food_minerals_trade_1_mut
  14699. + has_modifier = enclave_food_energy_trade_1_mut
  14700. + }
  14701. }
  14702. }
  14703. }
  14704. }
  14705. desc = {
  14706. - text = guardian.120.c.reply
  14707. + text = guardian.125.c.reply
  14708. trigger = {
  14709. OR = {
  14710. AND = {
  14711. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14712. - has_modifier = enclave_energy_trade_3_xur
  14713. + OR = {
  14714. + has_modifier = enclave_food_minerals_trade_3_xur
  14715. + has_modifier = enclave_food_energy_trade_3_xur
  14716. + }
  14717. }
  14718. AND = {
  14719. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14720. - has_modifier = enclave_energy_trade_3_rig
  14721. + OR = {
  14722. + has_modifier = enclave_food_minerals_trade_3_rig
  14723. + has_modifier = enclave_food_energy_trade_3_rig
  14724. + }
  14725. }
  14726. AND = {
  14727. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14728. - has_modifier = enclave_energy_trade_3_mut
  14729. + OR = {
  14730. + has_modifier = enclave_food_minerals_trade_3_mut
  14731. + has_modifier = enclave_food_energy_trade_3_mut
  14732. + }
  14733. }
  14734. }
  14735. }
  14736. @@ -2094,36 +2853,15 @@ country_event = {
  14737. OR = {
  14738. AND = {
  14739. event_target:traders = { has_country_flag = trader_enclave_country_1 }
  14740. - OR = {
  14741. - has_modifier = enclave_mineral_trade_1_xur
  14742. - has_modifier = enclave_energy_trade_1_xur
  14743. - has_modifier = enclave_mineral_trade_2_xur
  14744. - has_modifier = enclave_energy_trade_2_xur
  14745. - has_modifier = enclave_mineral_trade_3_xur
  14746. - has_modifier = enclave_energy_trade_3_xur
  14747. - }
  14748. + has_active_xuracorp_trade = yes
  14749. }
  14750. AND = {
  14751. event_target:traders = { has_country_flag = trader_enclave_country_2 }
  14752. - OR = {
  14753. - has_modifier = enclave_mineral_trade_1_rig
  14754. - has_modifier = enclave_energy_trade_1_rig
  14755. - has_modifier = enclave_mineral_trade_2_rig
  14756. - has_modifier = enclave_energy_trade_2_rig
  14757. - has_modifier = enclave_mineral_trade_3_rig
  14758. - has_modifier = enclave_energy_trade_3_rig
  14759. - }
  14760. + has_active_riggan_trade = yes
  14761. }
  14762. AND = {
  14763. event_target:traders = { has_country_flag = trader_enclave_country_3 }
  14764. - OR = {
  14765. - has_modifier = enclave_mineral_trade_1_mut
  14766. - has_modifier = enclave_energy_trade_1_mut
  14767. - has_modifier = enclave_mineral_trade_2_mut
  14768. - has_modifier = enclave_energy_trade_2_mut
  14769. - has_modifier = enclave_mineral_trade_3_mut
  14770. - has_modifier = enclave_energy_trade_3_mut
  14771. - }
  14772. + has_active_muutagan_trade = yes
  14773. }
  14774. }
  14775. }
  14776. @@ -2137,6 +2875,10 @@ country_event = {
  14777. OR = {
  14778. has_modifier = enclave_mineral_trade_1_xur
  14779. has_modifier = enclave_energy_trade_1_xur
  14780. + has_modifier = enclave_mineral_food_trade_1_xur
  14781. + has_modifier = enclave_energy_food_trade_1_xur
  14782. + has_modifier = enclave_food_minerals_trade_1_xur
  14783. + has_modifier = enclave_food_energy_trade_1_xur
  14784. }
  14785. }
  14786. AND = {
  14787. @@ -2144,6 +2886,10 @@ country_event = {
  14788. OR = {
  14789. has_modifier = enclave_mineral_trade_1_rig
  14790. has_modifier = enclave_energy_trade_1_rig
  14791. + has_modifier = enclave_mineral_food_trade_1_rig
  14792. + has_modifier = enclave_energy_food_trade_1_rig
  14793. + has_modifier = enclave_food_minerals_trade_1_rig
  14794. + has_modifier = enclave_food_energy_trade_1_rig
  14795. }
  14796. }
  14797. AND = {
  14798. @@ -2151,6 +2897,10 @@ country_event = {
  14799. OR = {
  14800. has_modifier = enclave_mineral_trade_1_mut
  14801. has_modifier = enclave_energy_trade_1_mut
  14802. + has_modifier = enclave_mineral_food_trade_1_mut
  14803. + has_modifier = enclave_energy_food_trade_1_mut
  14804. + has_modifier = enclave_food_minerals_trade_1_mut
  14805. + has_modifier = enclave_food_energy_trade_1_mut
  14806. }
  14807. }
  14808. }
  14809. @@ -2172,6 +2922,10 @@ country_event = {
  14810. OR = {
  14811. has_modifier = enclave_mineral_trade_2_xur
  14812. has_modifier = enclave_energy_trade_2_xur
  14813. + has_modifier = enclave_mineral_food_trade_2_xur
  14814. + has_modifier = enclave_energy_food_trade_2_xur
  14815. + has_modifier = enclave_food_minerals_trade_2_xur
  14816. + has_modifier = enclave_food_energy_trade_2_xur
  14817. }
  14818. }
  14819. AND = {
  14820. @@ -2179,6 +2933,10 @@ country_event = {
  14821. OR = {
  14822. has_modifier = enclave_mineral_trade_2_rig
  14823. has_modifier = enclave_energy_trade_2_rig
  14824. + has_modifier = enclave_mineral_food_trade_2_rig
  14825. + has_modifier = enclave_energy_food_trade_2_rig
  14826. + has_modifier = enclave_food_minerals_trade_2_rig
  14827. + has_modifier = enclave_food_energy_trade_2_rig
  14828. }
  14829. }
  14830. AND = {
  14831. @@ -2186,6 +2944,10 @@ country_event = {
  14832. OR = {
  14833. has_modifier = enclave_mineral_trade_2_mut
  14834. has_modifier = enclave_energy_trade_2_mut
  14835. + has_modifier = enclave_mineral_food_trade_2_mut
  14836. + has_modifier = enclave_energy_food_trade_2_mut
  14837. + has_modifier = enclave_food_minerals_trade_2_mut
  14838. + has_modifier = enclave_food_energy_trade_2_mut
  14839. }
  14840. }
  14841. }
  14842. @@ -2207,6 +2969,10 @@ country_event = {
  14843. OR = {
  14844. has_modifier = enclave_mineral_trade_3_xur
  14845. has_modifier = enclave_energy_trade_3_xur
  14846. + has_modifier = enclave_mineral_food_trade_3_xur
  14847. + has_modifier = enclave_energy_food_trade_3_xur
  14848. + has_modifier = enclave_food_minerals_trade_3_xur
  14849. + has_modifier = enclave_food_energy_trade_3_xur
  14850. }
  14851. }
  14852. AND = {
  14853. @@ -2214,6 +2980,10 @@ country_event = {
  14854. OR = {
  14855. has_modifier = enclave_mineral_trade_3_rig
  14856. has_modifier = enclave_energy_trade_3_rig
  14857. + has_modifier = enclave_mineral_food_trade_3_rig
  14858. + has_modifier = enclave_energy_food_trade_3_rig
  14859. + has_modifier = enclave_food_minerals_trade_3_rig
  14860. + has_modifier = enclave_food_energy_trade_3_rig
  14861. }
  14862. }
  14863. AND = {
  14864. @@ -2221,6 +2991,10 @@ country_event = {
  14865. OR = {
  14866. has_modifier = enclave_mineral_trade_3_mut
  14867. has_modifier = enclave_energy_trade_3_mut
  14868. + has_modifier = enclave_mineral_food_trade_3_mut
  14869. + has_modifier = enclave_energy_food_trade_3_mut
  14870. + has_modifier = enclave_food_minerals_trade_3_mut
  14871. + has_modifier = enclave_food_energy_trade_3_mut
  14872. }
  14873. }
  14874. }
  14875. @@ -2786,12 +3560,7 @@ country_event = {
  14876. if = {
  14877. limit = { FROM = { has_country_flag = trader_enclave_country_1 } }
  14878. remove_modifier = "enclave_traders_sr2"
  14879. - remove_modifier = enclave_mineral_trade_1_xur
  14880. - remove_modifier = enclave_mineral_trade_2_xur
  14881. - remove_modifier = enclave_mineral_trade_3_xur
  14882. - remove_modifier = enclave_energy_trade_1_xur
  14883. - remove_modifier = enclave_energy_trade_2_xur
  14884. - remove_modifier = enclave_energy_trade_3_xur
  14885. + remove_xuracorp_trades = yes
  14886. remove_relation_flag = {
  14887. who = FROM
  14888. flag = xuracorp_trade
  14889. @@ -2801,12 +3570,7 @@ country_event = {
  14890. if = {
  14891. limit = { FROM = { has_country_flag = trader_enclave_country_2 } }
  14892. remove_modifier = "enclave_traders_sr1"
  14893. - remove_modifier = enclave_mineral_trade_1_rig
  14894. - remove_modifier = enclave_mineral_trade_2_rig
  14895. - remove_modifier = enclave_mineral_trade_3_rig
  14896. - remove_modifier = enclave_energy_trade_1_rig
  14897. - remove_modifier = enclave_energy_trade_2_rig
  14898. - remove_modifier = enclave_energy_trade_3_rig
  14899. + remove_riggan_trades = yes
  14900. remove_relation_flag = {
  14901. who = FROM
  14902. flag = riggan_trade
  14903. @@ -2816,12 +3580,7 @@ country_event = {
  14904. if = {
  14905. limit = { FROM = { has_country_flag = trader_enclave_country_3 } }
  14906. remove_modifier = "enclave_traders_sr3"
  14907. - remove_modifier = enclave_mineral_trade_1_mut
  14908. - remove_modifier = enclave_mineral_trade_2_mut
  14909. - remove_modifier = enclave_mineral_trade_3_mut
  14910. - remove_modifier = enclave_energy_trade_1_mut
  14911. - remove_modifier = enclave_energy_trade_2_mut
  14912. - remove_modifier = enclave_energy_trade_3_mut
  14913. + remove_muutagan_trades = yes
  14914. remove_relation_flag = {
  14915. who = FROM
  14916. flag = muutagan_trade
  14917. @@ -2893,12 +3652,7 @@ country_event = {
  14918. immediate = {
  14919. set_global_flag = xuracorp_destroyed
  14920. remove_modifier = "enclave_traders_sr2"
  14921. - remove_modifier = enclave_mineral_trade_1_xur
  14922. - remove_modifier = enclave_mineral_trade_2_xur
  14923. - remove_modifier = enclave_mineral_trade_3_xur
  14924. - remove_modifier = enclave_energy_trade_1_xur
  14925. - remove_modifier = enclave_energy_trade_2_xur
  14926. - remove_modifier = enclave_energy_trade_3_xur
  14927. + remove_xuracorp_trades = yes
  14928. remove_relation_flag = {
  14929. who = FROM
  14930. flag = xuracorp_trade
  14931. @@ -2967,12 +3721,7 @@ country_event = {
  14932. immediate = {
  14933. set_global_flag = riggans_destroyed
  14934. remove_modifier = "enclave_traders_sr1"
  14935. - remove_modifier = enclave_mineral_trade_1_rig
  14936. - remove_modifier = enclave_mineral_trade_2_rig
  14937. - remove_modifier = enclave_mineral_trade_3_rig
  14938. - remove_modifier = enclave_energy_trade_1_rig
  14939. - remove_modifier = enclave_energy_trade_2_rig
  14940. - remove_modifier = enclave_energy_trade_3_rig
  14941. + remove_riggan_trades = yes
  14942. remove_relation_flag = {
  14943. who = FROM
  14944. flag = riggan_trade
  14945. @@ -3041,12 +3790,7 @@ country_event = {
  14946. immediate = {
  14947. set_global_flag = muutagans_destroyed
  14948. remove_modifier = "enclave_traders_sr3"
  14949. - remove_modifier = enclave_mineral_trade_1_mut
  14950. - remove_modifier = enclave_mineral_trade_2_mut
  14951. - remove_modifier = enclave_mineral_trade_3_mut
  14952. - remove_modifier = enclave_energy_trade_1_mut
  14953. - remove_modifier = enclave_energy_trade_2_mut
  14954. - remove_modifier = enclave_energy_trade_3_mut
  14955. + remove_muutagan_trades = yes
  14956. remove_relation_flag = {
  14957. who = FROM
  14958. flag = muutagan_trade
  14959. @@ -3265,21 +4009,11 @@ country_event = {
  14960. limit = {
  14961. OR = {
  14962. has_modifier = enclave_traders_sr2
  14963. - has_modifier = enclave_mineral_trade_1_xur
  14964. - has_modifier = enclave_mineral_trade_2_xur
  14965. - has_modifier = enclave_mineral_trade_3_xur
  14966. - has_modifier = enclave_energy_trade_1_xur
  14967. - has_modifier = enclave_energy_trade_2_xur
  14968. - has_modifier = enclave_energy_trade_3_xur
  14969. + has_active_xuracorp_trade = yes
  14970. }
  14971. }
  14972. remove_modifier = enclave_traders_sr1
  14973. - remove_modifier = enclave_mineral_trade_1_xur
  14974. - remove_modifier = enclave_mineral_trade_2_xur
  14975. - remove_modifier = enclave_mineral_trade_3_xur
  14976. - remove_modifier = enclave_energy_trade_1_xur
  14977. - remove_modifier = enclave_energy_trade_2_xur
  14978. - remove_modifier = enclave_energy_trade_3_xur
  14979. + remove_xuracorp_trades = yes
  14980. remove_relation_flag = {
  14981. who = FROM
  14982. flag = xuracorp_trade
  14983. @@ -3410,21 +4144,11 @@ country_event = {
  14984. limit = {
  14985. OR = {
  14986. has_modifier = enclave_traders_sr1
  14987. - has_modifier = enclave_mineral_trade_1_rig
  14988. - has_modifier = enclave_mineral_trade_2_rig
  14989. - has_modifier = enclave_mineral_trade_3_rig
  14990. - has_modifier = enclave_energy_trade_1_rig
  14991. - has_modifier = enclave_energy_trade_2_rig
  14992. - has_modifier = enclave_energy_trade_3_rig
  14993. + has_active_riggan_trade = yes
  14994. }
  14995. }
  14996. remove_modifier = enclave_traders_sr1
  14997. - remove_modifier = enclave_mineral_trade_1_rig
  14998. - remove_modifier = enclave_mineral_trade_2_rig
  14999. - remove_modifier = enclave_mineral_trade_3_rig
  15000. - remove_modifier = enclave_energy_trade_1_xur
  15001. - remove_modifier = enclave_energy_trade_2_xur
  15002. - remove_modifier = enclave_energy_trade_3_xur
  15003. + remove_riggan_trades = yes
  15004. remove_relation_flag = {
  15005. who = FROM
  15006. flag = riggan_trade
  15007. @@ -3555,21 +4279,11 @@ country_event = {
  15008. limit = {
  15009. OR = {
  15010. has_modifier = enclave_traders_sr3
  15011. - has_modifier = enclave_mineral_trade_1_mut
  15012. - has_modifier = enclave_mineral_trade_2_mut
  15013. - has_modifier = enclave_mineral_trade_3_mut
  15014. - has_modifier = enclave_energy_trade_1_mut
  15015. - has_modifier = enclave_energy_trade_2_mut
  15016. - has_modifier = enclave_energy_trade_3_mut
  15017. + has_active_muutagan_trade = yes
  15018. }
  15019. }
  15020. remove_modifier = enclave_traders_sr3
  15021. - remove_modifier = enclave_mineral_trade_1_mut
  15022. - remove_modifier = enclave_mineral_trade_2_mut
  15023. - remove_modifier = enclave_mineral_trade_3_mut
  15024. - remove_modifier = enclave_energy_trade_1_mut
  15025. - remove_modifier = enclave_energy_trade_2_mut
  15026. - remove_modifier = enclave_energy_trade_3_mut
  15027. + remove_muutagan_trades = yes
  15028. remove_relation_flag = {
  15029. who = FROM
  15030. flag = muutagan_trade
  15031. @@ -3670,7 +4384,7 @@ country_event = {
  15032. }
  15033. }
  15034.  
  15035. -# Mineral Trade Cancelled
  15036. +# No More Energy - Trades Cancelled
  15037. event = {
  15038. id = guardian.170
  15039. hide_window = yes
  15040. @@ -3685,12 +4399,21 @@ event = {
  15041. has_modifier = enclave_mineral_trade_1_xur
  15042. has_modifier = enclave_mineral_trade_2_xur
  15043. has_modifier = enclave_mineral_trade_3_xur
  15044. + has_modifier = enclave_food_energy_trade_1_xur
  15045. + has_modifier = enclave_food_energy_trade_2_xur
  15046. + has_modifier = enclave_food_energy_trade_3_xur
  15047. has_modifier = enclave_mineral_trade_1_rig
  15048. has_modifier = enclave_mineral_trade_2_rig
  15049. has_modifier = enclave_mineral_trade_3_rig
  15050. + has_modifier = enclave_food_energy_trade_1_rig
  15051. + has_modifier = enclave_food_energy_trade_2_rig
  15052. + has_modifier = enclave_food_energy_trade_3_rig
  15053. has_modifier = enclave_mineral_trade_1_mut
  15054. has_modifier = enclave_mineral_trade_2_mut
  15055. has_modifier = enclave_mineral_trade_3_mut
  15056. + has_modifier = enclave_food_energy_trade_1_mut
  15057. + has_modifier = enclave_food_energy_trade_2_mut
  15058. + has_modifier = enclave_food_energy_trade_3_mut
  15059. }
  15060. }
  15061. }
  15062. @@ -3704,12 +4427,21 @@ event = {
  15063. has_modifier = enclave_mineral_trade_1_xur
  15064. has_modifier = enclave_mineral_trade_2_xur
  15065. has_modifier = enclave_mineral_trade_3_xur
  15066. + has_modifier = enclave_food_energy_trade_1_xur
  15067. + has_modifier = enclave_food_energy_trade_2_xur
  15068. + has_modifier = enclave_food_energy_trade_3_xur
  15069. has_modifier = enclave_mineral_trade_1_rig
  15070. has_modifier = enclave_mineral_trade_2_rig
  15071. has_modifier = enclave_mineral_trade_3_rig
  15072. + has_modifier = enclave_food_energy_trade_1_rig
  15073. + has_modifier = enclave_food_energy_trade_2_rig
  15074. + has_modifier = enclave_food_energy_trade_3_rig
  15075. has_modifier = enclave_mineral_trade_1_mut
  15076. has_modifier = enclave_mineral_trade_2_mut
  15077. has_modifier = enclave_mineral_trade_3_mut
  15078. + has_modifier = enclave_food_energy_trade_1_mut
  15079. + has_modifier = enclave_food_energy_trade_2_mut
  15080. + has_modifier = enclave_food_energy_trade_3_mut
  15081. }
  15082. }
  15083. country_event = { id = guardian.171 }
  15084. @@ -3717,7 +4449,7 @@ event = {
  15085. }
  15086. }
  15087.  
  15088. -# Mineral Trade Cancelled Notification
  15089. +# No More Energy - Trades Cancelled Notification
  15090. country_event = {
  15091. id = guardian.171
  15092. title = "guardian.171.name"
  15093. @@ -3737,6 +4469,15 @@ country_event = {
  15094. remove_modifier = enclave_mineral_trade_1_mut
  15095. remove_modifier = enclave_mineral_trade_2_mut
  15096. remove_modifier = enclave_mineral_trade_3_mut
  15097. + remove_modifier = enclave_food_energy_trade_1_xur
  15098. + remove_modifier = enclave_food_energy_trade_2_xur
  15099. + remove_modifier = enclave_food_energy_trade_3_xur
  15100. + remove_modifier = enclave_food_energy_trade_1_rig
  15101. + remove_modifier = enclave_food_energy_trade_2_rig
  15102. + remove_modifier = enclave_food_energy_trade_3_rig
  15103. + remove_modifier = enclave_food_energy_trade_1_mut
  15104. + remove_modifier = enclave_food_energy_trade_2_mut
  15105. + remove_modifier = enclave_food_energy_trade_3_mut
  15106. }
  15107.  
  15108. option = {
  15109. @@ -3745,7 +4486,7 @@ country_event = {
  15110. }
  15111. }
  15112.  
  15113. -# Energy Trade Cancelled
  15114. +# No More Minerals - Trades Cancelled
  15115. event = {
  15116. id = guardian.172
  15117. hide_window = yes
  15118. @@ -3766,6 +4507,15 @@ event = {
  15119. has_modifier = enclave_energy_trade_1_mut
  15120. has_modifier = enclave_energy_trade_2_mut
  15121. has_modifier = enclave_energy_trade_3_mut
  15122. + has_modifier = enclave_food_minerals_trade_1_xur
  15123. + has_modifier = enclave_food_minerals_trade_2_xur
  15124. + has_modifier = enclave_food_minerals_trade_3_xur
  15125. + has_modifier = enclave_food_minerals_trade_1_rig
  15126. + has_modifier = enclave_food_minerals_trade_2_rig
  15127. + has_modifier = enclave_food_minerals_trade_3_rig
  15128. + has_modifier = enclave_food_minerals_trade_1_mut
  15129. + has_modifier = enclave_food_minerals_trade_2_mut
  15130. + has_modifier = enclave_food_minerals_trade_3_mut
  15131. }
  15132. }
  15133. }
  15134. @@ -3785,6 +4535,15 @@ event = {
  15135. has_modifier = enclave_energy_trade_1_mut
  15136. has_modifier = enclave_energy_trade_2_mut
  15137. has_modifier = enclave_energy_trade_3_mut
  15138. + has_modifier = enclave_food_minerals_trade_1_xur
  15139. + has_modifier = enclave_food_minerals_trade_2_xur
  15140. + has_modifier = enclave_food_minerals_trade_3_xur
  15141. + has_modifier = enclave_food_minerals_trade_1_rig
  15142. + has_modifier = enclave_food_minerals_trade_2_rig
  15143. + has_modifier = enclave_food_minerals_trade_3_rig
  15144. + has_modifier = enclave_food_minerals_trade_1_mut
  15145. + has_modifier = enclave_food_minerals_trade_2_mut
  15146. + has_modifier = enclave_food_minerals_trade_3_mut
  15147. }
  15148. }
  15149. country_event = { id = guardian.173 }
  15150. @@ -3792,7 +4551,7 @@ event = {
  15151. }
  15152. }
  15153.  
  15154. -# Energy Trade Cancelled Notification
  15155. +# No More Minerals - Trades Cancelled Notification
  15156. country_event = {
  15157. id = guardian.173
  15158. title = "guardian.173.name"
  15159. @@ -3812,6 +4571,15 @@ country_event = {
  15160. remove_modifier = enclave_energy_trade_1_mut
  15161. remove_modifier = enclave_energy_trade_2_mut
  15162. remove_modifier = enclave_energy_trade_3_mut
  15163. + remove_modifier = enclave_food_minerals_trade_1_xur
  15164. + remove_modifier = enclave_food_minerals_trade_2_xur
  15165. + remove_modifier = enclave_food_minerals_trade_3_xur
  15166. + remove_modifier = enclave_food_minerals_trade_1_rig
  15167. + remove_modifier = enclave_food_minerals_trade_2_rig
  15168. + remove_modifier = enclave_food_minerals_trade_3_rig
  15169. + remove_modifier = enclave_food_minerals_trade_1_mut
  15170. + remove_modifier = enclave_food_minerals_trade_2_mut
  15171. + remove_modifier = enclave_food_minerals_trade_3_mut
  15172. }
  15173.  
  15174. option = {
  15175. @@ -3820,6 +4588,108 @@ country_event = {
  15176. }
  15177. }
  15178.  
  15179. +# No More Food - Trades Cancelled
  15180. +event = {
  15181. + id = guardian.174
  15182. + hide_window = yes
  15183. +
  15184. + is_triggered_only = yes
  15185. +
  15186. + trigger = {
  15187. + any_country = {
  15188. + is_country_type = default
  15189. + food <= 0
  15190. + OR = {
  15191. + has_modifier = enclave_mineral_food_trade_1_xur
  15192. + has_modifier = enclave_mineral_food_trade_2_xur
  15193. + has_modifier = enclave_mineral_food_trade_3_xur
  15194. + has_modifier = enclave_energy_food_trade_1_xur
  15195. + has_modifier = enclave_energy_food_trade_2_xur
  15196. + has_modifier = enclave_energy_food_trade_3_xur
  15197. + has_modifier = enclave_mineral_food_trade_1_rig
  15198. + has_modifier = enclave_mineral_food_trade_2_rig
  15199. + has_modifier = enclave_mineral_food_trade_3_rig
  15200. + has_modifier = enclave_energy_food_trade_1_rig
  15201. + has_modifier = enclave_energy_food_trade_2_rig
  15202. + has_modifier = enclave_energy_food_trade_3_rig
  15203. + has_modifier = enclave_mineral_food_trade_1_mut
  15204. + has_modifier = enclave_mineral_food_trade_2_mut
  15205. + has_modifier = enclave_mineral_food_trade_3_mut
  15206. + has_modifier = enclave_energy_food_trade_1_mut
  15207. + has_modifier = enclave_energy_food_trade_2_mut
  15208. + has_modifier = enclave_energy_food_trade_3_mut
  15209. + }
  15210. + }
  15211. + }
  15212. +
  15213. + immediate = {
  15214. + every_country = {
  15215. + limit = {
  15216. + is_country_type = default
  15217. + food <= 0
  15218. + OR = {
  15219. + has_modifier = enclave_mineral_food_trade_1_xur
  15220. + has_modifier = enclave_mineral_food_trade_2_xur
  15221. + has_modifier = enclave_mineral_food_trade_3_xur
  15222. + has_modifier = enclave_energy_food_trade_1_xur
  15223. + has_modifier = enclave_energy_food_trade_2_xur
  15224. + has_modifier = enclave_energy_food_trade_3_xur
  15225. + has_modifier = enclave_mineral_food_trade_1_rig
  15226. + has_modifier = enclave_mineral_food_trade_2_rig
  15227. + has_modifier = enclave_mineral_food_trade_3_rig
  15228. + has_modifier = enclave_energy_food_trade_1_rig
  15229. + has_modifier = enclave_energy_food_trade_2_rig
  15230. + has_modifier = enclave_energy_food_trade_3_rig
  15231. + has_modifier = enclave_mineral_food_trade_1_mut
  15232. + has_modifier = enclave_mineral_food_trade_2_mut
  15233. + has_modifier = enclave_mineral_food_trade_3_mut
  15234. + has_modifier = enclave_energy_food_trade_1_mut
  15235. + has_modifier = enclave_energy_food_trade_2_mut
  15236. + has_modifier = enclave_energy_food_trade_3_mut
  15237. + }
  15238. + }
  15239. + country_event = { id = guardian.175 }
  15240. + }
  15241. + }
  15242. +}
  15243. +
  15244. +# No More Food - Trades Cancelled Notification
  15245. +country_event = {
  15246. + id = guardian.175
  15247. + title = "guardian.175.name"
  15248. + desc = "guardian.175.desc"
  15249. + picture = GFX_evt_mining_operations
  15250. + show_sound = event_radio_chatter
  15251. +
  15252. + is_triggered_only = yes
  15253. +
  15254. + immediate = {
  15255. + remove_modifier = enclave_mineral_food_trade_1_xur
  15256. + remove_modifier = enclave_mineral_food_trade_2_xur
  15257. + remove_modifier = enclave_mineral_food_trade_3_xur
  15258. + remove_modifier = enclave_energy_food_trade_1_xur
  15259. + remove_modifier = enclave_energy_food_trade_2_xur
  15260. + remove_modifier = enclave_energy_food_trade_3_xur
  15261. + remove_modifier = enclave_mineral_food_trade_1_rig
  15262. + remove_modifier = enclave_mineral_food_trade_2_rig
  15263. + remove_modifier = enclave_mineral_food_trade_3_rig
  15264. + remove_modifier = enclave_energy_food_trade_1_rig
  15265. + remove_modifier = enclave_energy_food_trade_2_rig
  15266. + remove_modifier = enclave_energy_food_trade_3_rig
  15267. + remove_modifier = enclave_mineral_food_trade_1_mut
  15268. + remove_modifier = enclave_mineral_food_trade_2_mut
  15269. + remove_modifier = enclave_mineral_food_trade_3_mut
  15270. + remove_modifier = enclave_energy_food_trade_1_mut
  15271. + remove_modifier = enclave_energy_food_trade_2_mut
  15272. + remove_modifier = enclave_energy_food_trade_3_mut
  15273. + }
  15274. +
  15275. + option = {
  15276. + name = guardian.171.a
  15277. + custom_tooltip = enclave_food_trade_ended
  15278. + }
  15279. +}
  15280. +
  15281. # Artists
  15282. country_event = {
  15283. id = guardian.300
  15284. @@ -8036,7 +8906,7 @@ country_event = {
  15285. }
  15286. option = {
  15287. name = guardian.545.c
  15288. - response_text = guardian.545.b.reply
  15289. + response_text = guardian.545.c.reply
  15290. trigger = {
  15291. NOT = { has_country_flag = bought_wraith_info_2 }
  15292. }
  15293. @@ -9666,7 +10536,13 @@ planet_event = {
  15294. immediate = {
  15295. create_fleet = {
  15296. name = "NAME_Ether_Hatchling"
  15297. - settings = { spawn_debris = no }
  15298. + settings = {
  15299. + can_upgrade = no
  15300. + can_change_composition = no
  15301. + can_change_leader = no
  15302. + uses_naval_capacity = no
  15303. + spawn_debris = no
  15304. + }
  15305. effect = {
  15306. set_owner = root.owner
  15307. create_ship_design = {
  15308. @@ -9678,10 +10554,6 @@ planet_event = {
  15309. prefix = no
  15310. upgradable = no
  15311. }
  15312. - #add_modifier = {
  15313. - # modifier = immature_dragon
  15314. - # days = -1
  15315. - #}
  15316. set_location = root
  15317. }
  15318. }
  15319. @@ -12232,6 +13104,25 @@ country_event = {
  15320.  
  15321. #############################################################
  15322.  
  15323. +# wraith won't be discovered past the midgame
  15324. +event = {
  15325. + id = guardian.20101
  15326. + hide_window = yes
  15327. +
  15328. + is_triggered_only = yes
  15329. +
  15330. + trigger = {
  15331. + any_planet = { has_planet_flag = guardians_wraith_pulsar }
  15332. + }
  15333. +
  15334. + immediate = {
  15335. + random_planet = {
  15336. + limit = { has_planet_flag = guardians_wraith_pulsar }
  15337. + remove_planet_flag = guardians_wraith_pulsar
  15338. + }
  15339. + }
  15340. +}
  15341. +
  15342. ### WRAITH ###
  15343. # First scan of the neutron star, sets Wraith spawn timer
  15344. ship_event = {
  15345. @@ -12271,22 +13162,24 @@ ship_event = {
  15346. option = {
  15347. name = guardian.2010.a
  15348. custom_tooltip = guardian.2010.c
  15349. - hidden_effect = {
  15350. - from = {
  15351. - planet_event = { id = guardian.2011 days = 14400 } # 40 Years
  15352. - }
  15353. - }
  15354. }
  15355. }
  15356.  
  15357. # Wraith is born
  15358. -planet_event = {
  15359. +event = {
  15360. id = guardian.2011
  15361. hide_window = yes
  15362.  
  15363. is_triggered_only = yes
  15364.  
  15365. + trigger = {
  15366. + any_planet = { has_modifier = germinating_wraith }
  15367. + }
  15368. +
  15369. immediate = {
  15370. + random_planet = {
  15371. + limit = { has_modifier = germinating_wraith }
  15372. + save_event_target_as = wraith_star
  15373. remove_modifier = germinating_wraith
  15374. create_country = {
  15375. name = "NAME_Wraith"
  15376. @@ -12353,7 +13246,7 @@ planet_event = {
  15377. }
  15378. }
  15379. save_global_event_target_as = wraith_fleet
  15380. - set_location = root
  15381. + set_location = event_target:wraith_star
  15382. set_fleet_stance = aggressive
  15383. set_aggro_range_measure_from = self
  15384. set_aggro_range = 20
  15385. @@ -12400,6 +13293,7 @@ planet_event = {
  15386. }
  15387. }
  15388. }
  15389. +}
  15390.  
  15391. # Wraith Spawned in Territory
  15392. country_event = {
  15393. @@ -12787,6 +13681,7 @@ country_event = {
  15394. NOT = { has_communications = event_target:fortress_country }
  15395. }
  15396. establish_communications_no_message = event_target:fortress_country
  15397. + }
  15398. event_target:fortress_country = {
  15399. random_owned_ship = {
  15400. limit = { has_ship_flag = fortress_vault }
  15401. @@ -12794,7 +13689,6 @@ country_event = {
  15402. }
  15403. }
  15404. }
  15405. - }
  15406.  
  15407. option = {
  15408. name = "guardian.2101.a"
  15409. @@ -14283,6 +15177,9 @@ country_event = {
  15410. save_global_event_target_as = hive_country
  15411. set_country_flag = hive_country
  15412. }
  15413. + every_playable_country = {
  15414. + establish_communications_no_message = event_target:hive_country
  15415. + }
  15416. create_fleet = {
  15417. name = "NAME_Hiver_Nest"
  15418. settings = { spawn_debris = no }
  15419. diff --git a/2.0.0/events/horizonsignal_events.txt b/2.0.2/events/horizonsignal_events.txt
  15420. index a77443e..1cadf44 100755
  15421. --- a/2.0.0/events/horizonsignal_events.txt
  15422. +++ b/2.0.2/events/horizonsignal_events.txt
  15423. @@ -2657,7 +2657,7 @@ planet_event = {
  15424. limit = {
  15425. has_building = no
  15426. has_blocker = no
  15427. - has_deposit = no
  15428. + #has_deposit = no
  15429. }
  15430. set_building = building_worm_farm
  15431. set_ruined = yes
  15432. @@ -2666,7 +2666,7 @@ planet_event = {
  15433. limit = {
  15434. has_building = no
  15435. has_blocker = no
  15436. - has_deposit = no
  15437. + #has_deposit = no
  15438. }
  15439. set_building = building_worm_mine
  15440. set_ruined = yes
  15441. diff --git a/2.0.0/events/marauder_events.txt b/2.0.2/events/marauder_events.txt
  15442. index 9d93b5f..364b759 100755
  15443. --- a/2.0.0/events/marauder_events.txt
  15444. +++ b/2.0.2/events/marauder_events.txt
  15445. @@ -88,6 +88,8 @@ namespace = marauder
  15446.  
  15447. @raidcooldown = 600
  15448.  
  15449. +# Mercenary Costs
  15450. +
  15451. @largemercallow = 9000
  15452. @largemerccost = -9000
  15453.  
  15454. @@ -97,20 +99,10 @@ namespace = marauder
  15455. @smallmercallow = 4000
  15456. @smallmerccost = -4000
  15457.  
  15458. -@tributeallow = 500
  15459. -@tributecost = -500
  15460. -
  15461. -@tributefoodallow = 500
  15462. -@tributefoodcost = -500
  15463. -
  15464. -@tributeallowraided = 1000
  15465. -@tributecostraided = -1000
  15466. -
  15467. -@tributefoodallowraided = 1000
  15468. -@tributefoodcostraided = -1000
  15469. +# Tribute Allow and Costs found in 01_scripted_triggers_marauder_tribute and marauder_tribute_effects
  15470.  
  15471. -@leaderallow = 5000
  15472. -@leadercost = -5000
  15473. +@leaderallow = 2000
  15474. +@leadercost = -2000
  15475.  
  15476. @raidallow = 3000
  15477. @raidcost = -3000
  15478. @@ -301,14 +293,14 @@ country_event = {
  15479. owner_species = { save_event_target_as = marauder_species }
  15480. every_country = {
  15481. limit = { is_ai = no }
  15482. - country_event = { id = marauder.5 days = 10 }
  15483. + country_event = { id = marauder.5 }
  15484. }
  15485. random_relation = {
  15486. limit = {
  15487. is_country_type = default
  15488. has_policy_flag = refugees_allowed
  15489. }
  15490. - country_event = { id = marauder.9 days = 30 random = 10 }
  15491. + country_event = { id = marauder.9 days = 10 random = 10 }
  15492. }
  15493.  
  15494. # Mercenary Desertions (Marauder 1)
  15495. @@ -1224,6 +1216,28 @@ country_event = {
  15496. has_valid_civic = civic_fanatic_purifiers
  15497. has_valid_civic = civic_machine_terminator
  15498. }
  15499. + NOT = {
  15500. + AND = {
  15501. + has_relation_flag = {
  15502. + who = from
  15503. + flag = current_target
  15504. + }
  15505. + from = { is_country_type = dormant_marauders }
  15506. + }
  15507. + AND = {
  15508. + from = { is_country_type = marauder_raiders }
  15509. + any_country = {
  15510. + is_country_type = dormant_marauders
  15511. + has_country_flag = parent_of@from
  15512. + root = {
  15513. + has_relation_flag = {
  15514. + who = prev
  15515. + flag = current_target
  15516. + }
  15517. + }
  15518. + }
  15519. + }
  15520. + }
  15521. NOT = { has_country_flag = marauder_diplomacy_engaged }
  15522. }
  15523.  
  15524. @@ -2202,14 +2216,6 @@ country_event = {
  15525.  
  15526. immediate = {
  15527. from = { set_country_flag = hired@event_target:raiding_marauder }
  15528. - event_target:raiding_marauder = {
  15529. - set_faction_hostility = {
  15530. - target = from
  15531. - set_hostile = no
  15532. - set_neutral = no
  15533. - set_friendly = yes
  15534. - }
  15535. - }
  15536. if = {
  15537. limit = {
  15538. event_target:raiding_marauder = { has_country_flag = marauder_1 }
  15539. @@ -2263,9 +2269,42 @@ country_event = {
  15540. }
  15541. event_target:raiding_marauder = {
  15542. set_country_flag = raid_ongoing
  15543. + }
  15544. + create_country = {
  15545. + name = event_target:raiding_marauder
  15546. + type = "marauder_raiders"
  15547. + flag = event_target:raiding_marauder
  15548. + effect = {
  15549. + save_event_target_as = marauder_raiding_country
  15550. + if = {
  15551. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_1 } }
  15552. + set_country_flag = marauder_1
  15553. + }
  15554. + if = {
  15555. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_2 } }
  15556. + set_country_flag = marauder_2
  15557. + }
  15558. + if = {
  15559. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_3 } }
  15560. + set_country_flag = marauder_3
  15561. + }
  15562. + set_country_flag = raid_ongoing
  15563. + }
  15564. + }
  15565. + event_target:marauder_raiding_country = {
  15566. + every_country = { establish_communications_no_message = event_target:marauder_raiding_country }
  15567. + event_target:raiding_marauder = {
  15568. + set_country_flag = parent_of@event_target:marauder_raiding_country
  15569. + set_faction_hostility = {
  15570. + target = event_target:marauder_raiding_country
  15571. + set_hostile = no
  15572. + set_neutral = no
  15573. + set_friendly = yes
  15574. + }
  15575. + }
  15576. create_leader = {
  15577. type = admiral
  15578. - species = owner_main_species
  15579. + species = event_target:marauder_species
  15580. name = random
  15581. skill = 3
  15582. leader_age_min = 25
  15583. @@ -2278,9 +2317,8 @@ country_event = {
  15584. create_fleet = {
  15585. name = "NAME_Raiding_Fleet"
  15586. effect = {
  15587. - set_owner = event_target:raiding_marauder
  15588. + set_owner = event_target:raiding_marauder # For ship names
  15589. create_marauder_raiders = yes
  15590. - assign_leader = last_created_leader
  15591. set_location = event_target:raid_source
  15592. set_fleet_stance = aggressive
  15593. set_fleet_bombardment_stance = indiscriminate
  15594. @@ -2288,6 +2326,8 @@ country_event = {
  15595. set_aggro_range = 150
  15596. set_fleet_flag = hired_raiding_fleet
  15597. set_fleet_flag = raiding_fleet
  15598. + set_owner = event_target:marauder_raiding_country # Real owner
  15599. + assign_leader = last_created_leader
  15600.  
  15601. closest_system = {
  15602. limit = {
  15603. @@ -2315,6 +2355,12 @@ country_event = {
  15604. }
  15605. }
  15606. }
  15607. + set_faction_hostility = {
  15608. + target = event_target:marauder_target
  15609. + set_hostile = yes
  15610. + set_neutral = no
  15611. + set_friendly = no
  15612. + }
  15613. }
  15614. country_event = { id = marauder.120 }
  15615. if = {
  15616. @@ -4316,11 +4362,7 @@ event = {
  15617. years_passed >= 25
  15618. any_country = {
  15619. is_country_type = default
  15620. - NOR = {
  15621. - has_valid_civic = "civic_fanatic_purifiers"
  15622. - has_valid_civic = "civic_hive_devouring_swarm"
  15623. - has_valid_civic = "civic_machine_terminator"
  15624. - }
  15625. + NOT = { has_country_flag = under_marauder_attack }
  15626. any_relation = {
  15627. AND = {
  15628. is_country_type = dormant_marauders
  15629. @@ -4340,11 +4382,7 @@ event = {
  15630. random_country = {
  15631. limit = {
  15632. is_country_type = default
  15633. - NOR = {
  15634. - has_valid_civic = "civic_fanatic_purifiers"
  15635. - has_valid_civic = "civic_hive_devouring_swarm"
  15636. - has_valid_civic = "civic_machine_terminator"
  15637. - }
  15638. + NOT = { has_country_flag = under_marauder_attack }
  15639. any_relation = {
  15640. AND = {
  15641. is_country_type = dormant_marauders
  15642. @@ -4368,7 +4406,7 @@ event = {
  15643. save_event_target_as = raiding_marauder
  15644. species = { save_event_target_as = marauder_species }
  15645. }
  15646. - country_event = { id = marauder.101 days = 10 random = 200 }
  15647. + country_event = { id = marauder.101 days = 1 random = 10 }
  15648. }
  15649. }
  15650. 60 = {}
  15651. @@ -4417,10 +4455,59 @@ country_event = {
  15652. any_owned_fleet = { has_fleet_flag = raiding_fleet }
  15653. }
  15654. }
  15655. + NOT = { has_country_flag = recently_raided_or_threatened }
  15656. }
  15657.  
  15658. immediate = {
  15659. + # Determine tribute level
  15660. + if = {
  15661. + limit = {
  15662. + has_monthly_income = { resource = minerals value < 50 }
  15663. + }
  15664. + set_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15665. + }
  15666. + if = {
  15667. + limit = {
  15668. + has_monthly_income = { resource = minerals value > 49 }
  15669. + has_monthly_income = { resource = minerals value < 100 }
  15670. + }
  15671. + set_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15672. + }
  15673. + if = {
  15674. + limit = {
  15675. + has_monthly_income = { resource = minerals value > 99 }
  15676. + has_monthly_income = { resource = minerals value < 150 }
  15677. + }
  15678. + set_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15679. + }
  15680. + if = {
  15681. + limit = {
  15682. + has_monthly_income = { resource = minerals value > 149 }
  15683. + has_monthly_income = { resource = minerals value < 200 }
  15684. + }
  15685. + set_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15686. + }
  15687. + if = {
  15688. + limit = {
  15689. + has_monthly_income = { resource = minerals value > 199 }
  15690. + has_monthly_income = { resource = minerals value < 250 }
  15691. + }
  15692. + set_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15693. + }
  15694. + if = {
  15695. + limit = {
  15696. + has_monthly_income = { resource = minerals value > 249 }
  15697. + has_monthly_income = { resource = minerals value < 300 }
  15698. + }
  15699. + set_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15700. + }
  15701. +
  15702. + set_timed_country_flag = {
  15703. + flag = recently_raided_or_threatened
  15704. + days = 1800 # 5 years
  15705. + }
  15706. set_country_flag = raid_target_of@event_target:raiding_marauder
  15707. + set_country_flag = under_marauder_attack
  15708. if = {
  15709. limit = {
  15710. event_target:raiding_marauder = { has_country_flag = marauder_1 }
  15711. @@ -4467,9 +4554,44 @@ country_event = {
  15712. save_event_target_as = marauder_target
  15713. event_target:raiding_marauder = {
  15714. set_country_flag = raid_ongoing
  15715. + owner_species = { save_event_target_as = marauder_species }
  15716. + }
  15717. + create_country = {
  15718. + name = event_target:raiding_marauder
  15719. + type = "marauder_raiders"
  15720. + species = event_target:marauder_species
  15721. + flag = event_target:raiding_marauder
  15722. + effect = {
  15723. + save_event_target_as = marauder_raiding_country
  15724. + if = {
  15725. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_1 } }
  15726. + set_country_flag = marauder_1
  15727. + }
  15728. + if = {
  15729. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_2 } }
  15730. + set_country_flag = marauder_2
  15731. + }
  15732. + if = {
  15733. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_3 } }
  15734. + set_country_flag = marauder_3
  15735. + }
  15736. + set_country_flag = raid_ongoing
  15737. + }
  15738. + }
  15739. + event_target:marauder_raiding_country = {
  15740. + every_country = { establish_communications_no_message = event_target:marauder_raiding_country }
  15741. + event_target:raiding_marauder = {
  15742. + set_country_flag = parent_of@event_target:marauder_raiding_country
  15743. + set_faction_hostility = {
  15744. + target = event_target:marauder_raiding_country
  15745. + set_hostile = no
  15746. + set_neutral = no
  15747. + set_friendly = yes
  15748. + }
  15749. + }
  15750. create_leader = {
  15751. type = admiral
  15752. - species = owner_main_species
  15753. + species = event_target:marauder_species
  15754. name = random
  15755. skill = 3
  15756. leader_age_min = 25
  15757. @@ -4482,15 +4604,16 @@ country_event = {
  15758. create_fleet = {
  15759. name = "NAME_Raiding_Fleet"
  15760. effect = {
  15761. - set_owner = event_target:raiding_marauder
  15762. + set_owner = event_target:raiding_marauder # For ship names
  15763. create_marauder_raiders = yes
  15764. - assign_leader = last_created_leader
  15765. set_location = event_target:raid_source
  15766. set_fleet_stance = aggressive
  15767. set_fleet_bombardment_stance = indiscriminate
  15768. set_aggro_range_measure_from = self
  15769. set_aggro_range = 150
  15770. set_fleet_flag = raiding_fleet
  15771. + set_owner = event_target:marauder_raiding_country # Real owner
  15772. + assign_leader = last_created_leader
  15773.  
  15774. closest_system = {
  15775. limit = {
  15776. @@ -4518,6 +4641,12 @@ country_event = {
  15777. }
  15778. }
  15779. }
  15780. + set_faction_hostility = {
  15781. + target = event_target:marauder_target
  15782. + set_hostile = yes
  15783. + set_neutral = no
  15784. + set_friendly = no
  15785. + }
  15786. }
  15787. }
  15788.  
  15789. @@ -4529,21 +4658,32 @@ country_event = {
  15790. }
  15791. response_text = marauder.101.1.a.response
  15792. allow = {
  15793. - energy >= @tributeallow
  15794. + determine_energy_tribute = yes
  15795. }
  15796. - add_energy = @tributecost
  15797. + tribute_cost_energy = yes
  15798. hidden_effect = {
  15799. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15800. + remove_country_flag = under_marauder_attack
  15801. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15802. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15803. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15804. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15805. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15806. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15807. remove_relation_flag = {
  15808. who = event_target:raiding_marauder
  15809. flag = current_target
  15810. }
  15811. event_target:raiding_marauder = {
  15812. + remove_country_flag = raid_ongoing
  15813. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15814. + }
  15815. + event_target:marauder_raiding_country = {
  15816. random_owned_fleet = {
  15817. limit = { has_fleet_flag = raiding_fleet }
  15818. delete_fleet = this
  15819. }
  15820. - remove_country_flag = raid_ongoing
  15821. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15822. + destroy_country = yes
  15823. }
  15824. }
  15825. }
  15826. @@ -4554,21 +4694,32 @@ country_event = {
  15827. }
  15828. response_text = marauder.101.1.a.response
  15829. allow = {
  15830. - minerals >= @tributeallow
  15831. + determine_mineral_tribute = yes
  15832. }
  15833. - add_minerals = @tributecost
  15834. + tribute_cost_minerals = yes
  15835. hidden_effect = {
  15836. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15837. + remove_country_flag = under_marauder_attack
  15838. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15839. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15840. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15841. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15842. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15843. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15844. remove_relation_flag = {
  15845. who = event_target:raiding_marauder
  15846. flag = current_target
  15847. }
  15848. event_target:raiding_marauder = {
  15849. + remove_country_flag = raid_ongoing
  15850. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15851. + }
  15852. + event_target:marauder_raiding_country = {
  15853. random_owned_fleet = {
  15854. limit = { has_fleet_flag = raiding_fleet }
  15855. delete_fleet = this
  15856. }
  15857. - remove_country_flag = raid_ongoing
  15858. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15859. + destroy_country = yes
  15860. }
  15861. }
  15862. }
  15863. @@ -4579,21 +4730,32 @@ country_event = {
  15864. }
  15865. response_text = marauder.101.1.a.response
  15866. allow = {
  15867. - food >= @tributefoodallow
  15868. + determine_food_tribute = yes
  15869. }
  15870. - add_food = @tributefoodcost
  15871. + tribute_cost_food = yes
  15872. hidden_effect = {
  15873. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15874. + remove_country_flag = under_marauder_attack
  15875. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15876. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15877. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15878. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15879. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15880. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15881. remove_relation_flag = {
  15882. who = event_target:raiding_marauder
  15883. flag = current_target
  15884. }
  15885. event_target:raiding_marauder = {
  15886. + remove_country_flag = raid_ongoing
  15887. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15888. + }
  15889. + event_target:marauder_raiding_country = {
  15890. random_owned_fleet = {
  15891. limit = { has_fleet_flag = raiding_fleet }
  15892. delete_fleet = this
  15893. }
  15894. - remove_country_flag = raid_ongoing
  15895. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15896. + destroy_country = yes
  15897. }
  15898. }
  15899. }
  15900. @@ -4613,21 +4775,32 @@ country_event = {
  15901. }
  15902. response_text = marauder.101.2.a.response
  15903. allow = {
  15904. - energy >= @tributeallow
  15905. + determine_energy_tribute = yes
  15906. }
  15907. - add_energy = @tributecost
  15908. + tribute_cost_energy = yes
  15909. hidden_effect = {
  15910. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15911. + remove_country_flag = under_marauder_attack
  15912. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15913. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15914. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15915. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15916. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15917. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15918. remove_relation_flag = {
  15919. who = event_target:raiding_marauder
  15920. flag = current_target
  15921. }
  15922. event_target:raiding_marauder = {
  15923. + remove_country_flag = raid_ongoing
  15924. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15925. + }
  15926. + event_target:marauder_raiding_country = {
  15927. random_owned_fleet = {
  15928. limit = { has_fleet_flag = raiding_fleet }
  15929. delete_fleet = this
  15930. }
  15931. - remove_country_flag = raid_ongoing
  15932. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15933. + destroy_country = yes
  15934. }
  15935. }
  15936. }
  15937. @@ -4638,21 +4811,32 @@ country_event = {
  15938. }
  15939. response_text = marauder.101.2.a.response
  15940. allow = {
  15941. - minerals >= @tributeallow
  15942. + determine_mineral_tribute = yes
  15943. }
  15944. - add_minerals = @tributecost
  15945. + tribute_cost_minerals = yes
  15946. hidden_effect = {
  15947. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15948. + remove_country_flag = under_marauder_attack
  15949. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15950. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15951. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15952. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15953. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15954. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15955. remove_relation_flag = {
  15956. who = event_target:raiding_marauder
  15957. flag = current_target
  15958. }
  15959. event_target:raiding_marauder = {
  15960. + remove_country_flag = raid_ongoing
  15961. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15962. + }
  15963. + event_target:marauder_raiding_country = {
  15964. random_owned_fleet = {
  15965. limit = { has_fleet_flag = raiding_fleet }
  15966. delete_fleet = this
  15967. }
  15968. - remove_country_flag = raid_ongoing
  15969. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15970. + destroy_country = yes
  15971. }
  15972. }
  15973. }
  15974. @@ -4663,21 +4847,32 @@ country_event = {
  15975. }
  15976. response_text = marauder.101.2.a.response
  15977. allow = {
  15978. - food >= @tributefoodallow
  15979. + determine_food_tribute = yes
  15980. }
  15981. - add_food = @tributefoodcost
  15982. + tribute_cost_food = yes
  15983. hidden_effect = {
  15984. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  15985. + remove_country_flag = under_marauder_attack
  15986. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  15987. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  15988. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  15989. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  15990. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  15991. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  15992. remove_relation_flag = {
  15993. who = event_target:raiding_marauder
  15994. flag = current_target
  15995. }
  15996. event_target:raiding_marauder = {
  15997. + remove_country_flag = raid_ongoing
  15998. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  15999. + }
  16000. + event_target:marauder_raiding_country = {
  16001. random_owned_fleet = {
  16002. limit = { has_fleet_flag = raiding_fleet }
  16003. delete_fleet = this
  16004. }
  16005. - remove_country_flag = raid_ongoing
  16006. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16007. + destroy_country = yes
  16008. }
  16009. }
  16010. }
  16011. @@ -4698,21 +4893,32 @@ country_event = {
  16012. }
  16013. response_text = marauder.101.3.a.response
  16014. allow = {
  16015. - energy >= @tributeallow
  16016. + determine_energy_tribute = yes
  16017. }
  16018. - add_energy = @tributecost
  16019. + tribute_cost_energy = yes
  16020. hidden_effect = {
  16021. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  16022. + remove_country_flag = under_marauder_attack
  16023. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  16024. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  16025. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  16026. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  16027. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  16028. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  16029. remove_relation_flag = {
  16030. who = event_target:raiding_marauder
  16031. flag = current_target
  16032. }
  16033. event_target:raiding_marauder = {
  16034. + remove_country_flag = raid_ongoing
  16035. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16036. + }
  16037. + event_target:marauder_raiding_country = {
  16038. random_owned_fleet = {
  16039. limit = { has_fleet_flag = raiding_fleet }
  16040. delete_fleet = this
  16041. }
  16042. - remove_country_flag = raid_ongoing
  16043. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16044. + destroy_country = yes
  16045. }
  16046. }
  16047. }
  16048. @@ -4723,21 +4929,32 @@ country_event = {
  16049. }
  16050. response_text = marauder.101.3.a.response
  16051. allow = {
  16052. - minerals >= @tributeallow
  16053. + determine_mineral_tribute = yes
  16054. }
  16055. - add_minerals = @tributecost
  16056. + tribute_cost_minerals = yes
  16057. hidden_effect = {
  16058. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  16059. + remove_country_flag = under_marauder_attack
  16060. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  16061. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  16062. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  16063. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  16064. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  16065. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  16066. remove_relation_flag = {
  16067. who = event_target:raiding_marauder
  16068. flag = current_target
  16069. }
  16070. event_target:raiding_marauder = {
  16071. + remove_country_flag = raid_ongoing
  16072. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16073. + }
  16074. + event_target:marauder_raiding_country = {
  16075. random_owned_fleet = {
  16076. limit = { has_fleet_flag = raiding_fleet }
  16077. delete_fleet = this
  16078. }
  16079. - remove_country_flag = raid_ongoing
  16080. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16081. + destroy_country = yes
  16082. }
  16083. }
  16084. }
  16085. @@ -4748,21 +4965,32 @@ country_event = {
  16086. }
  16087. response_text = marauder.101.3.a.response
  16088. allow = {
  16089. - food >= @tributefoodallow
  16090. + determine_food_tribute = yes
  16091. }
  16092. - add_food = @tributefoodcost
  16093. + tribute_cost_food = yes
  16094. hidden_effect = {
  16095. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  16096. + remove_country_flag = under_marauder_attack
  16097. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  16098. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  16099. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  16100. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  16101. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  16102. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  16103. remove_relation_flag = {
  16104. who = event_target:raiding_marauder
  16105. flag = current_target
  16106. }
  16107. event_target:raiding_marauder = {
  16108. + remove_country_flag = raid_ongoing
  16109. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16110. + }
  16111. + event_target:marauder_raiding_country = {
  16112. random_owned_fleet = {
  16113. limit = { has_fleet_flag = raiding_fleet }
  16114. delete_fleet = this
  16115. }
  16116. - remove_country_flag = raid_ongoing
  16117. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16118. + destroy_country = yes
  16119. }
  16120. }
  16121. }
  16122. @@ -4809,11 +5037,29 @@ country_event = {
  16123. is_triggered_only = yes
  16124.  
  16125. trigger = {
  16126. + OR = {
  16127. + AND = {
  16128. has_relation_flag = {
  16129. who = from
  16130. flag = current_target
  16131. }
  16132. from = { is_country_type = dormant_marauders }
  16133. + }
  16134. + AND = {
  16135. + from = { is_country_type = marauder_raiders }
  16136. + any_country = {
  16137. + is_country_type = dormant_marauders
  16138. + has_country_flag = parent_of@from
  16139. + root = {
  16140. + has_relation_flag = {
  16141. + who = prev
  16142. + flag = current_target
  16143. + }
  16144. + }
  16145. +
  16146. + }
  16147. + }
  16148. + }
  16149. NOT = { has_country_flag = marauder_diplomacy_engaged }
  16150. }
  16151.  
  16152. @@ -4822,6 +5068,29 @@ country_event = {
  16153. owner_species = { save_event_target_as = marauder_species }
  16154. }
  16155. set_country_flag = marauder_diplomacy_engaged
  16156. + if = {
  16157. + limit = {
  16158. + from = { is_country_type = marauder_raiders }
  16159. + }
  16160. + random_country = {
  16161. + limit = {
  16162. + is_country_type = dormant_marauders
  16163. + has_country_flag = parent_of@from
  16164. + }
  16165. + save_event_target_as = marauder_country
  16166. + }
  16167. + from = { save_event_target_as = marauder_raiding_country }
  16168. + else = {
  16169. + from = { save_event_target_as = marauder_country }
  16170. + random_country = {
  16171. + limit = {
  16172. + is_country_type = marauder_raiders
  16173. + from = { has_country_flag = parent_of@prev }
  16174. + }
  16175. + save_event_target_as = marauder_raiding_country
  16176. + }
  16177. + }
  16178. + }
  16179. }
  16180.  
  16181. after = {
  16182. @@ -4838,21 +5107,32 @@ country_event = {
  16183. from = { has_country_flag = marauder_1 }
  16184. }
  16185. allow = {
  16186. - energy >= @tributeallowraided
  16187. + determine_energy_tribute_raided = yes
  16188. }
  16189. - add_energy = @tributecostraided
  16190. + tribute_cost_energy_raided = yes
  16191. hidden_effect = {
  16192. + remove_country_flag = raid_target_of@event_target:marauder_country
  16193. + remove_country_flag = under_marauder_attack
  16194. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16195. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16196. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16197. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16198. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16199. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16200. remove_relation_flag = {
  16201. - who = from
  16202. + who = event_target:marauder_country
  16203. flag = current_target
  16204. }
  16205. - from = {
  16206. + event_target:marauder_country = {
  16207. + remove_country_flag = raid_ongoing
  16208. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16209. + }
  16210. + event_target:marauder_raiding_country = {
  16211. random_owned_fleet = {
  16212. limit = { has_fleet_flag = raiding_fleet }
  16213. delete_fleet = this
  16214. }
  16215. - remove_country_flag = raid_ongoing
  16216. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16217. + destroy_country = yes
  16218. }
  16219. }
  16220. }
  16221. @@ -4863,21 +5143,32 @@ country_event = {
  16222. from = { has_country_flag = marauder_1 }
  16223. }
  16224. allow = {
  16225. - minerals >= @tributeallowraided
  16226. + determine_mineral_tribute_raided = yes
  16227. }
  16228. - add_minerals = @tributecostraided
  16229. + tribute_cost_minerals_raided = yes
  16230. hidden_effect = {
  16231. + remove_country_flag = raid_target_of@event_target:marauder_country
  16232. + remove_country_flag = under_marauder_attack
  16233. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16234. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16235. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16236. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16237. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16238. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16239. remove_relation_flag = {
  16240. - who = from
  16241. + who = event_target:marauder_country
  16242. flag = current_target
  16243. }
  16244. - from = {
  16245. + event_target:marauder_country = {
  16246. + remove_country_flag = raid_ongoing
  16247. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16248. + }
  16249. + event_target:marauder_raiding_country = {
  16250. random_owned_fleet = {
  16251. limit = { has_fleet_flag = raiding_fleet }
  16252. delete_fleet = this
  16253. }
  16254. - remove_country_flag = raid_ongoing
  16255. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16256. + destroy_country = yes
  16257. }
  16258. }
  16259. }
  16260. @@ -4888,21 +5179,32 @@ country_event = {
  16261. from = { has_country_flag = marauder_1 }
  16262. }
  16263. allow = {
  16264. - food >= @tributefoodallowraided
  16265. + determine_food_tribute_raided = yes
  16266. }
  16267. - add_food = @tributefoodcostraided
  16268. + tribute_cost_food_raided = yes
  16269. hidden_effect = {
  16270. + remove_country_flag = raid_target_of@event_target:marauder_country
  16271. + remove_country_flag = under_marauder_attack
  16272. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16273. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16274. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16275. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16276. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16277. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16278. remove_relation_flag = {
  16279. - who = from
  16280. + who = event_target:marauder_country
  16281. flag = current_target
  16282. }
  16283. - from = {
  16284. + event_target:marauder_country = {
  16285. + remove_country_flag = raid_ongoing
  16286. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16287. + }
  16288. + event_target:marauder_raiding_country = {
  16289. random_owned_fleet = {
  16290. limit = { has_fleet_flag = raiding_fleet }
  16291. delete_fleet = this
  16292. }
  16293. - remove_country_flag = raid_ongoing
  16294. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16295. + destroy_country = yes
  16296. }
  16297. }
  16298. }
  16299. @@ -4913,6 +5215,11 @@ country_event = {
  16300. trigger = {
  16301. from = { has_country_flag = marauder_1 }
  16302. NOT = { has_country_flag = marauder_ugly }
  16303. + NOR = {
  16304. + has_valid_civic = "civic_fanatic_purifiers"
  16305. + has_valid_civic = "civic_hive_devouring_swarm"
  16306. + has_valid_civic = "civic_machine_terminator"
  16307. + }
  16308. }
  16309. set_country_flag = marauder_ugly
  16310. }
  16311. @@ -4925,22 +5232,33 @@ country_event = {
  16312. from = { has_country_flag = marauder_2 }
  16313. }
  16314. allow = {
  16315. - energy >= @tributeallowraided
  16316. + determine_energy_tribute_raided = yes
  16317. }
  16318. - add_energy = @tributecostraided
  16319. + tribute_cost_energy_raided = yes
  16320. hidden_effect = {
  16321. + remove_country_flag = raid_target_of@event_target:marauder_country
  16322. + remove_country_flag = under_marauder_attack
  16323. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16324. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16325. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16326. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16327. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16328. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16329. remove_relation_flag = {
  16330. - who = from
  16331. + who = event_target:marauder_country
  16332. flag = current_target
  16333. }
  16334. - from = {
  16335. - random_owned_fleet = {
  16336. - limit = { has_fleet_flag = raiding_fleet }
  16337. - delete_fleet = this
  16338. - }
  16339. + event_target:marauder_country = {
  16340. remove_country_flag = raid_ongoing
  16341. set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16342. }
  16343. + event_target:marauder_raiding_country = {
  16344. + random_owned_fleet = {
  16345. + limit = { has_fleet_flag = raiding_fleet }
  16346. + delete_fleet = this
  16347. + }
  16348. + destroy_country = yes
  16349. + }
  16350. }
  16351. }
  16352. option = { # Offer Mineral tribute
  16353. @@ -4950,21 +5268,32 @@ country_event = {
  16354. from = { has_country_flag = marauder_2 }
  16355. }
  16356. allow = {
  16357. - minerals >= @tributeallowraided
  16358. + determine_mineral_tribute_raided = yes
  16359. }
  16360. - add_minerals = @tributecostraided
  16361. + tribute_cost_minerals_raided = yes
  16362. hidden_effect = {
  16363. + remove_country_flag = raid_target_of@event_target:marauder_country
  16364. + remove_country_flag = under_marauder_attack
  16365. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16366. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16367. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16368. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16369. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16370. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16371. remove_relation_flag = {
  16372. - who = from
  16373. + who = event_target:marauder_country
  16374. flag = current_target
  16375. }
  16376. - from = {
  16377. + event_target:marauder_country = {
  16378. + remove_country_flag = raid_ongoing
  16379. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16380. + }
  16381. + event_target:marauder_raiding_country = {
  16382. random_owned_fleet = {
  16383. limit = { has_fleet_flag = raiding_fleet }
  16384. delete_fleet = this
  16385. }
  16386. - remove_country_flag = raid_ongoing
  16387. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16388. + destroy_country = yes
  16389. }
  16390. }
  16391. }
  16392. @@ -4975,21 +5304,32 @@ country_event = {
  16393. from = { has_country_flag = marauder_2 }
  16394. }
  16395. allow = {
  16396. - food >= @tributefoodallowraided
  16397. + determine_food_tribute_raided = yes
  16398. }
  16399. - add_food = @tributefoodcostraided
  16400. + tribute_cost_food_raided = yes
  16401. hidden_effect = {
  16402. + remove_country_flag = raid_target_of@event_target:marauder_country
  16403. + remove_country_flag = under_marauder_attack
  16404. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16405. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16406. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16407. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16408. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16409. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16410. remove_relation_flag = {
  16411. - who = from
  16412. + who = event_target:marauder_country
  16413. flag = current_target
  16414. }
  16415. - from = {
  16416. + event_target:marauder_country = {
  16417. + remove_country_flag = raid_ongoing
  16418. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16419. + }
  16420. + event_target:marauder_raiding_country = {
  16421. random_owned_fleet = {
  16422. limit = { has_fleet_flag = raiding_fleet }
  16423. delete_fleet = this
  16424. }
  16425. - remove_country_flag = raid_ongoing
  16426. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16427. + destroy_country = yes
  16428. }
  16429. }
  16430. }
  16431. @@ -5002,21 +5342,32 @@ country_event = {
  16432. from = { has_country_flag = marauder_3 }
  16433. }
  16434. allow = {
  16435. - energy >= @tributeallowraided
  16436. + determine_energy_tribute_raided = yes
  16437. }
  16438. - add_energy = @tributecostraided
  16439. + tribute_cost_energy_raided = yes
  16440. hidden_effect = {
  16441. + remove_country_flag = raid_target_of@event_target:marauder_country
  16442. + remove_country_flag = under_marauder_attack
  16443. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16444. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16445. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16446. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16447. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16448. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16449. remove_relation_flag = {
  16450. - who = from
  16451. + who = event_target:marauder_country
  16452. flag = current_target
  16453. }
  16454. - from = {
  16455. + event_target:marauder_country = {
  16456. + remove_country_flag = raid_ongoing
  16457. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16458. + }
  16459. + event_target:marauder_raiding_country = {
  16460. random_owned_fleet = {
  16461. limit = { has_fleet_flag = raiding_fleet }
  16462. delete_fleet = this
  16463. }
  16464. - remove_country_flag = raid_ongoing
  16465. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16466. + destroy_country = yes
  16467. }
  16468. }
  16469. }
  16470. @@ -5027,21 +5378,32 @@ country_event = {
  16471. from = { has_country_flag = marauder_3 }
  16472. }
  16473. allow = {
  16474. - minerals >= @tributeallowraided
  16475. + determine_mineral_tribute_raided = yes
  16476. }
  16477. - add_minerals = @tributecostraided
  16478. + tribute_cost_minerals_raided = yes
  16479. hidden_effect = {
  16480. + remove_country_flag = raid_target_of@event_target:marauder_country
  16481. + remove_country_flag = under_marauder_attack
  16482. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16483. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16484. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16485. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16486. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16487. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16488. remove_relation_flag = {
  16489. - who = from
  16490. + who = event_target:marauder_country
  16491. flag = current_target
  16492. }
  16493. - from = {
  16494. + event_target:marauder_country = {
  16495. + remove_country_flag = raid_ongoing
  16496. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16497. + }
  16498. + event_target:marauder_raiding_country = {
  16499. random_owned_fleet = {
  16500. limit = { has_fleet_flag = raiding_fleet }
  16501. delete_fleet = this
  16502. }
  16503. - remove_country_flag = raid_ongoing
  16504. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16505. + destroy_country = yes
  16506. }
  16507. }
  16508. }
  16509. @@ -5052,21 +5414,32 @@ country_event = {
  16510. from = { has_country_flag = marauder_3 }
  16511. }
  16512. allow = {
  16513. - food >= @tributefoodallowraided
  16514. + determine_food_tribute_raided = yes
  16515. }
  16516. - add_food = @tributefoodcostraided
  16517. + tribute_cost_food_raided = yes
  16518. hidden_effect = {
  16519. + remove_country_flag = raid_target_of@event_target:marauder_country
  16520. + remove_country_flag = under_marauder_attack
  16521. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  16522. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  16523. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  16524. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  16525. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  16526. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  16527. remove_relation_flag = {
  16528. - who = from
  16529. + who = event_target:marauder_country
  16530. flag = current_target
  16531. }
  16532. - from = {
  16533. + event_target:marauder_country = {
  16534. + remove_country_flag = raid_ongoing
  16535. + set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16536. + }
  16537. + event_target:marauder_raiding_country = {
  16538. random_owned_fleet = {
  16539. limit = { has_fleet_flag = raiding_fleet }
  16540. delete_fleet = this
  16541. }
  16542. - remove_country_flag = raid_ongoing
  16543. - set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16544. + destroy_country = yes
  16545. }
  16546. }
  16547. }
  16548. @@ -5085,8 +5458,7 @@ planet_event = {
  16549. is_triggered_only = yes
  16550.  
  16551. trigger = {
  16552. - from = { is_country_type = dormant_marauders }
  16553. - this = {
  16554. + from = { is_country_type = marauder_raiders }
  16555. owner = {
  16556. OR = {
  16557. is_country_type = default
  16558. @@ -5094,11 +5466,18 @@ planet_event = {
  16559. is_country_type = fallen_empire
  16560. }
  16561. }
  16562. - }
  16563. NOT = { has_planet_flag = planet_raided }
  16564. }
  16565.  
  16566. immediate = {
  16567. + owner = { save_event_target_as = raid_victim }
  16568. + random_country = {
  16569. + limit = {
  16570. + is_country_type = dormant_marauders
  16571. + has_country_flag = parent_of@from
  16572. + }
  16573. + save_event_target_as = marauder_country
  16574. + }
  16575. set_timed_planet_flag = {
  16576. flag = planet_raided
  16577. days = 600
  16578. @@ -5162,9 +5541,47 @@ planet_event = {
  16579. option = {
  16580. name = marauder.104.a
  16581. owner = {
  16582. + if = {
  16583. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  16584. + add_energy = -200
  16585. + add_minerals = -200
  16586. + add_food = -50
  16587. + break = yes
  16588. + }
  16589. + if = {
  16590. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  16591. + add_energy = -300
  16592. + add_minerals = -300
  16593. + add_food = -100
  16594. + break = yes
  16595. + }
  16596. + if = {
  16597. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  16598. add_energy = -500
  16599. add_minerals = -500
  16600. - add_food = -50
  16601. + add_food = -150
  16602. + break = yes
  16603. + }
  16604. + if = {
  16605. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  16606. + add_energy = -700
  16607. + add_minerals = -700
  16608. + add_food = -200
  16609. + break = yes
  16610. + }
  16611. + if = {
  16612. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  16613. + add_energy = -900
  16614. + add_minerals = -900
  16615. + add_food = -250
  16616. + break = yes
  16617. + }
  16618. + if = {
  16619. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  16620. + add_energy = -1100
  16621. + add_minerals = -1100
  16622. + add_food = -300
  16623. + }
  16624. }
  16625. }
  16626. }
  16627. @@ -5182,17 +5599,32 @@ planet_event = {
  16628.  
  16629. option = {
  16630. name = marauder.105.a
  16631. + if = {
  16632. + limit = { num_pops > 1 }
  16633. + random_pop = {
  16634. + kill_pop = yes
  16635. + }
  16636. + }
  16637. + if = {
  16638. + limit = { num_pops > 1 }
  16639. random_pop = {
  16640. kill_pop = yes
  16641. }
  16642. + }
  16643. + if = {
  16644. + limit = { num_pops > 1 }
  16645. random_pop = {
  16646. kill_pop = yes
  16647. }
  16648. + }
  16649. + if = {
  16650. + limit = { num_pops > 1 }
  16651. random_pop = {
  16652. kill_pop = yes
  16653. }
  16654. }
  16655. }
  16656. +}
  16657.  
  16658. # Raiders Hit Planet (Machine Empire)
  16659. planet_event = {
  16660. @@ -5208,9 +5640,47 @@ planet_event = {
  16661. option = {
  16662. name = marauder.106.a
  16663. owner = {
  16664. + if = {
  16665. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  16666. + add_energy = -200
  16667. + add_minerals = -200
  16668. + add_food = -50
  16669. + break = yes
  16670. + }
  16671. + if = {
  16672. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  16673. + add_energy = -300
  16674. + add_minerals = -300
  16675. + add_food = -100
  16676. + break = yes
  16677. + }
  16678. + if = {
  16679. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  16680. add_energy = -500
  16681. add_minerals = -500
  16682. - add_food = -50
  16683. + add_food = -150
  16684. + break = yes
  16685. + }
  16686. + if = {
  16687. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  16688. + add_energy = -700
  16689. + add_minerals = -700
  16690. + add_food = -200
  16691. + break = yes
  16692. + }
  16693. + if = {
  16694. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  16695. + add_energy = -900
  16696. + add_minerals = -900
  16697. + add_food = -250
  16698. + break = yes
  16699. + }
  16700. + if = {
  16701. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  16702. + add_energy = -1100
  16703. + add_minerals = -1100
  16704. + add_food = -300
  16705. + }
  16706. }
  16707. }
  16708. }
  16709. @@ -5252,6 +5722,14 @@ planet_event = {
  16710. }
  16711. kill_pop = yes
  16712. }
  16713. + random_pop = {
  16714. + limit = {
  16715. + is_robot_pop = no
  16716. + is_sapient = yes
  16717. + is_growing = no
  16718. + }
  16719. + kill_pop = yes
  16720. + }
  16721. }
  16722. }
  16723.  
  16724. @@ -5269,9 +5747,47 @@ planet_event = {
  16725. option = {
  16726. name = marauder.108.a
  16727. owner = {
  16728. + if = {
  16729. + limit = { has_country_flag = marauder_tribute_1@event_target:marauder_country }
  16730. + add_energy = -200
  16731. + add_minerals = -200
  16732. + add_food = -50
  16733. + break = yes
  16734. + }
  16735. + if = {
  16736. + limit = { has_country_flag = marauder_tribute_2@event_target:marauder_country }
  16737. + add_energy = -300
  16738. + add_minerals = -300
  16739. + add_food = -100
  16740. + break = yes
  16741. + }
  16742. + if = {
  16743. + limit = { has_country_flag = marauder_tribute_3@event_target:marauder_country }
  16744. add_energy = -500
  16745. add_minerals = -500
  16746. - add_food = -50
  16747. + add_food = -150
  16748. + break = yes
  16749. + }
  16750. + if = {
  16751. + limit = { has_country_flag = marauder_tribute_4@event_target:marauder_country }
  16752. + add_energy = -700
  16753. + add_minerals = -700
  16754. + add_food = -200
  16755. + break = yes
  16756. + }
  16757. + if = {
  16758. + limit = { has_country_flag = marauder_tribute_5@event_target:marauder_country }
  16759. + add_energy = -900
  16760. + add_minerals = -900
  16761. + add_food = -250
  16762. + break = yes
  16763. + }
  16764. + if = {
  16765. + limit = { has_country_flag = marauder_tribute_6@event_target:marauder_country }
  16766. + add_energy = -1100
  16767. + add_minerals = -1100
  16768. + add_food = -300
  16769. + }
  16770. }
  16771. }
  16772. }
  16773. @@ -5328,24 +5844,43 @@ fleet_event = {
  16774. destroy_on_arrival = yes
  16775. clear_auto_move_on_arrival = yes
  16776. }
  16777. - owner = {
  16778. + random_country = {
  16779. + limit = {
  16780. + is_country_type = dormant_marauders
  16781. + has_country_flag = parent_of@root.owner
  16782. + }
  16783. + save_event_target_as = raid_parent
  16784. remove_country_flag = raid_ongoing
  16785. set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  16786. }
  16787. - random_country = {
  16788. - limit = { has_country_flag = raid_target_of@root.owner }
  16789. - save_event_target_as = marauder_target
  16790. + owner = { remove_country_flag = raid_ongoing }
  16791. + event_target:raid_victim = {
  16792. country_event = { id = marauder.111 }
  16793. - remove_country_flag = raid_target_of@root.owner
  16794. + remove_country_flag = raid_target_of@event_target:raid_parent
  16795. + remove_country_flag = under_marauder_attack
  16796. + remove_country_flag = marauder_tribute_1@event_target:raid_parent
  16797. + remove_country_flag = marauder_tribute_2@event_target:raid_parent
  16798. + remove_country_flag = marauder_tribute_3@event_target:raid_parent
  16799. + remove_country_flag = marauder_tribute_4@event_target:raid_parent
  16800. + remove_country_flag = marauder_tribute_5@event_target:raid_parent
  16801. + remove_country_flag = marauder_tribute_6@event_target:raid_parent
  16802. + remove_relation_flag = {
  16803. + who = event_target:raid_parent
  16804. + flag = current_target
  16805. + }
  16806. + remove_relation_flag = {
  16807. + who = event_target:raid_parent
  16808. + flag = current_hired_target
  16809. + }
  16810. }
  16811. if = {
  16812. limit = {
  16813. - any_country = { has_country_flag = hired@root.owner }
  16814. + any_country = { has_country_flag = hired@event_target:raid_parent }
  16815. }
  16816. random_country = {
  16817. - limit = { has_country_flag = hired@root.owner }
  16818. + limit = { has_country_flag = hired@event_target:raid_parent }
  16819. country_event = { id = marauder.122 }
  16820. - remove_country_flag = hired@root.owner
  16821. + remove_country_flag = hired@event_target:raid_parent
  16822. }
  16823. }
  16824. }
  16825. @@ -5358,26 +5893,26 @@ country_event = {
  16826. desc = {
  16827. text = marauder.111.1.desc
  16828. trigger = {
  16829. - event_target:raiding_marauder = { has_country_flag = marauder_1 }
  16830. + event_target:raid_parent = { has_country_flag = marauder_1 }
  16831. }
  16832. }
  16833. desc = {
  16834. text = marauder.111.2.desc
  16835. trigger = {
  16836. - event_target:raiding_marauder = { has_country_flag = marauder_2 }
  16837. + event_target:raid_parent = { has_country_flag = marauder_2 }
  16838. }
  16839. }
  16840. desc = {
  16841. text = marauder.111.3.desc
  16842. trigger = {
  16843. - event_target:raiding_marauder = { has_country_flag = marauder_3 }
  16844. + event_target:raid_parent = { has_country_flag = marauder_3 }
  16845. }
  16846. }
  16847.  
  16848. diplomatic = yes
  16849.  
  16850. picture_event_data = {
  16851. - portrait = from.owner
  16852. + portrait = event_target:raid_parent
  16853. room = "ethic_spaceship_room"
  16854. }
  16855.  
  16856. @@ -5421,11 +5956,29 @@ country_event = {
  16857. is_triggered_only = yes
  16858.  
  16859. trigger = {
  16860. + OR = {
  16861. + AND = {
  16862. has_relation_flag = {
  16863. who = from
  16864. flag = current_hired_target
  16865. }
  16866. from = { is_country_type = dormant_marauders }
  16867. + }
  16868. + AND = {
  16869. + from = { is_country_type = marauder_raiders }
  16870. + any_country = {
  16871. + is_country_type = dormant_marauders
  16872. + has_country_flag = parent_of@from
  16873. + root = {
  16874. + has_relation_flag = {
  16875. + who = prev
  16876. + flag = current_hired_target
  16877. + }
  16878. + }
  16879. +
  16880. + }
  16881. + }
  16882. + }
  16883. NOT = { has_country_flag = marauder_diplomacy_engaged }
  16884. }
  16885.  
  16886. @@ -5505,7 +6058,7 @@ event = {
  16887.  
  16888. trigger = {
  16889. any_country = {
  16890. - is_country_type = dormant_marauders
  16891. + is_country_type = marauder_raiders
  16892. has_country_flag = raid_ongoing
  16893. any_owned_fleet = {
  16894. OR = {
  16895. @@ -5541,7 +6094,7 @@ event = {
  16896. immediate = {
  16897. random_country = {
  16898. limit = {
  16899. - is_country_type = dormant_marauders
  16900. + is_country_type = marauder_raiders
  16901. has_country_flag = raid_ongoing
  16902. any_owned_fleet = {
  16903. OR = {
  16904. @@ -5568,74 +6121,13 @@ event = {
  16905. }
  16906. }
  16907. }
  16908. - save_event_target_as = marauder_country
  16909. - if = {
  16910. - limit = {
  16911. - any_owned_fleet = {
  16912. - has_fleet_flag = marauder_raider_fleet_1
  16913. - is_in_combat = no
  16914. - fleet_power < 1500
  16915. - }
  16916. - }
  16917. - random_owned_fleet = {
  16918. - limit = {
  16919. - has_fleet_flag = marauder_raider_fleet_1
  16920. - is_in_combat = no
  16921. - fleet_power < 1500
  16922. - }
  16923. - save_event_target_as = raiding_fleet
  16924. - }
  16925. - }
  16926. - if = {
  16927. - limit = {
  16928. - any_owned_fleet = {
  16929. - has_fleet_flag = marauder_raider_fleet_2
  16930. - is_in_combat = no
  16931. - fleet_power < 2500
  16932. - }
  16933. - }
  16934. - random_owned_fleet = {
  16935. - limit = {
  16936. - has_fleet_flag = marauder_raider_fleet_2
  16937. - is_in_combat = no
  16938. - fleet_power < 2500
  16939. - }
  16940. - save_event_target_as = raiding_fleet
  16941. - }
  16942. - }
  16943. - if = {
  16944. - limit = {
  16945. - any_owned_fleet = {
  16946. - has_fleet_flag = marauder_raider_fleet_3
  16947. - is_in_combat = no
  16948. - fleet_power < 3500
  16949. - }
  16950. - }
  16951. - random_owned_fleet = {
  16952. - limit = {
  16953. - has_fleet_flag = marauder_raider_fleet_3
  16954. - is_in_combat = no
  16955. - fleet_power < 3500
  16956. - }
  16957. - save_event_target_as = raiding_fleet
  16958. - }
  16959. - }
  16960. - if = {
  16961. - limit = {
  16962. - any_owned_fleet = {
  16963. - has_fleet_flag = marauder_raider_fleet_4
  16964. - is_in_combat = no
  16965. - fleet_power < 6500
  16966. - }
  16967. - }
  16968. - random_owned_fleet = {
  16969. + save_event_target_as = marauder_raiding_country
  16970. + random_country = {
  16971. limit = {
  16972. - has_fleet_flag = marauder_raider_fleet_4
  16973. - is_in_combat = no
  16974. - fleet_power < 6500
  16975. - }
  16976. - save_event_target_as = raiding_fleet
  16977. + is_country_type = dormant_marauders
  16978. + has_country_flag = parent_of@event_target:marauder_raiding_country
  16979. }
  16980. + save_event_target_as = marauder_country
  16981. }
  16982. }
  16983. event_target:marauder_country = {
  16984. @@ -5671,8 +6163,10 @@ event = {
  16985. }
  16986. }
  16987. }
  16988. - event_target:raiding_fleet = {
  16989. - clear_fleet_actions = this
  16990. + event_target:marauder_raiding_country = {
  16991. + remove_country_flag = raid_ongoing
  16992. + every_owned_fleet = {
  16993. + remove_auto_move_target = yes
  16994. solar_system = { save_event_target_as = retreating_fleet_system }
  16995. auto_move_to_planet = {
  16996. target = event_target:raid_source
  16997. @@ -5680,11 +6174,27 @@ event = {
  16998. clear_auto_move_on_arrival = yes
  16999. }
  17000. }
  17001. + }
  17002. random_country = {
  17003. limit = { has_country_flag = raid_target_of@event_target:marauder_country }
  17004. save_event_target_as = marauder_target
  17005. country_event = { id = marauder.114 }
  17006. remove_country_flag = raid_target_of@event_target:marauder_country
  17007. + remove_country_flag = under_marauder_attack
  17008. + remove_country_flag = marauder_tribute_1@event_target:marauder_country
  17009. + remove_country_flag = marauder_tribute_2@event_target:marauder_country
  17010. + remove_country_flag = marauder_tribute_3@event_target:marauder_country
  17011. + remove_country_flag = marauder_tribute_4@event_target:marauder_country
  17012. + remove_country_flag = marauder_tribute_5@event_target:marauder_country
  17013. + remove_country_flag = marauder_tribute_6@event_target:marauder_country
  17014. + remove_relation_flag = {
  17015. + who = event_target:marauder_country
  17016. + flag = current_target
  17017. + }
  17018. + remove_relation_flag = {
  17019. + who = event_target:marauder_country
  17020. + flag = current_hired_target
  17021. + }
  17022. }
  17023. if = {
  17024. limit = {
  17025. @@ -5727,7 +6237,7 @@ country_event = {
  17026. is_triggered_only = yes
  17027.  
  17028. trigger = {
  17029. - is_country_type = dormant_marauders
  17030. + is_country_type = marauder_raiders
  17031. has_country_flag = raid_ongoing
  17032. fromfrom = {
  17033. has_fleet_flag = raiding_fleet
  17034. @@ -5735,15 +6245,38 @@ country_event = {
  17035. }
  17036.  
  17037. immediate = {
  17038. + random_country = {
  17039. + limit = {
  17040. + is_country_type = dormant_marauders
  17041. + has_country_flag = parent_of@root
  17042. + }
  17043. save_event_target_as = raiding_marauder
  17044. + }
  17045. fromfrom = {
  17046. solar_system = { save_event_target_as = destroyed_fleet_system }
  17047. }
  17048. random_country = {
  17049. - limit = { has_country_flag = raid_target_of@root }
  17050. + limit = { has_country_flag = raid_target_of@event_target:raiding_marauder }
  17051. country_event = { id = marauder.116 }
  17052. - remove_country_flag = raid_target_of@root
  17053. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  17054. + remove_country_flag = under_marauder_attack
  17055. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  17056. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  17057. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  17058. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  17059. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  17060. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  17061. + remove_relation_flag = {
  17062. + who = event_target:raiding_marauder
  17063. + flag = current_target
  17064. + }
  17065. + remove_relation_flag = {
  17066. + who = event_target:raiding_marauder
  17067. + flag = current_hired_target
  17068. + }
  17069. }
  17070. + remove_country_flag = raid_ongoing
  17071. + event_target:raiding_marauder = {
  17072. remove_country_flag = raid_ongoing
  17073. set_timed_country_flag = { flag = raid_cooldown days = @raidcooldown }
  17074. from = { save_event_target_as = fleet_destroyer }
  17075. @@ -5751,13 +6284,14 @@ country_event = {
  17076. limit = {
  17077. any_country = {
  17078. is_country_type = default
  17079. - has_country_flag = hired@root
  17080. + has_country_flag = hired@event_target:raiding_marauder
  17081. }
  17082. }
  17083. random_country = {
  17084. - limit = { has_country_flag = hired@root }
  17085. + limit = { has_country_flag = hired@event_target:raiding_marauder }
  17086. country_event = { id = marauder.124 }
  17087. - remove_country_flag = hired@root
  17088. + remove_country_flag = hired@event_target:raiding_marauder
  17089. + }
  17090. }
  17091. }
  17092. }
  17093. @@ -5790,11 +6324,6 @@ country_event = {
  17094.  
  17095. is_triggered_only = yes
  17096.  
  17097. - immediate = {
  17098. - event_target:marauder_country = { save_event_target_as = raiding_marauder } # to make marauder.161 work
  17099. - country_event = { id = marauder.161 days = 480 }
  17100. - }
  17101. -
  17102. option = {
  17103. name = marauder.117.a
  17104. }
  17105. @@ -5888,10 +6417,6 @@ country_event = {
  17106.  
  17107. is_triggered_only = yes
  17108.  
  17109. - immediate = {
  17110. - country_event = { id = marauder.161 days = 480 }
  17111. - }
  17112. -
  17113. option = {
  17114. name = marauder.122.a
  17115. }
  17116. @@ -5908,17 +6433,6 @@ country_event = {
  17117.  
  17118. is_triggered_only = yes
  17119.  
  17120. - immediate = {
  17121. - event_target:raiding_marauder = {
  17122. - set_faction_hostility = {
  17123. - target = root
  17124. - set_hostile = yes
  17125. - set_neutral = no
  17126. - set_friendly = no
  17127. - }
  17128. - }
  17129. - }
  17130. -
  17131. option = {
  17132. name = marauder.124.a
  17133. }
  17134. @@ -5943,6 +6457,10 @@ event = {
  17135. }
  17136. any_relation = {
  17137. prev = { is_rival = prev }
  17138. + NOR = {
  17139. + has_country_flag = under_marauder_attack
  17140. + has_country_flag = target_of_hired_ai_raid
  17141. + }
  17142. }
  17143. energy > 5000
  17144. any_relation = {
  17145. @@ -5968,13 +6486,25 @@ event = {
  17146. }
  17147. any_relation = {
  17148. prev = { is_rival = prev }
  17149. + NOR = {
  17150. + has_country_flag = under_marauder_attack
  17151. + has_country_flag = target_of_hired_ai_raid
  17152. + }
  17153. }
  17154. energy > 5000
  17155. + any_relation = {
  17156. + is_country_type = dormant_marauders
  17157. + has_communications = prev
  17158. + NOR = {
  17159. + has_country_flag = raid_ongoing
  17160. + has_country_flag = raid_cooldown
  17161. + }
  17162. + }
  17163. }
  17164. save_event_target_as = hired_marauders
  17165. }
  17166. random_list = {
  17167. - 5 = {
  17168. + 3 = {
  17169. modifier = {
  17170. factor = 0
  17171. event_target:hired_marauders = {
  17172. @@ -6007,12 +6537,17 @@ event = {
  17173. # }
  17174. # save_event_target_as = hired_marauders
  17175. event_target:hired_marauders = {
  17176. - add_energy = -5000
  17177. + add_energy = @raidcost
  17178. random_relation = {
  17179. limit = {
  17180. prev = { is_rival = prev }
  17181. + NOR = {
  17182. + has_country_flag = under_marauder_attack
  17183. + has_country_flag = target_of_hired_ai_raid
  17184. + }
  17185. }
  17186. save_event_target_as = marauder_target
  17187. + set_timed_country_flag = { flag = target_of_hired_ai_raid days = 7200 }
  17188. }
  17189. random_relation = {
  17190. limit = {
  17191. @@ -6066,9 +6601,44 @@ event = {
  17192. }
  17193. event_target:raiding_marauder = {
  17194. set_country_flag = raid_ongoing
  17195. + owner_species = { save_event_target_as = marauder_species }
  17196. + }
  17197. + create_country = {
  17198. + name = event_target:raiding_marauder
  17199. + type = "marauder_raiders"
  17200. + species = event_target:marauder_species
  17201. + flag = event_target:raiding_marauder
  17202. + effect = {
  17203. + save_event_target_as = marauder_raiding_country
  17204. + if = {
  17205. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_1 } }
  17206. + set_country_flag = marauder_1
  17207. + }
  17208. + if = {
  17209. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_2 } }
  17210. + set_country_flag = marauder_2
  17211. + }
  17212. + if = {
  17213. + limit = { event_target:raiding_marauder = { has_country_flag = marauder_3 } }
  17214. + set_country_flag = marauder_3
  17215. + }
  17216. + set_country_flag = raid_ongoing
  17217. + }
  17218. + }
  17219. + event_target:marauder_raiding_country = {
  17220. + every_country = { establish_communications_no_message = event_target:marauder_raiding_country }
  17221. + event_target:raiding_marauder = {
  17222. + set_country_flag = parent_of@event_target:marauder_raiding_country
  17223. + set_faction_hostility = {
  17224. + target = event_target:marauder_raiding_country
  17225. + set_hostile = no
  17226. + set_neutral = no
  17227. + set_friendly = yes
  17228. + }
  17229. + }
  17230. create_leader = {
  17231. type = admiral
  17232. - species = owner_main_species
  17233. + species = event_target:marauder_species
  17234. name = random
  17235. skill = 3
  17236. leader_age_min = 25
  17237. @@ -6081,16 +6651,17 @@ event = {
  17238. create_fleet = {
  17239. name = "NAME_Raiding_Fleet"
  17240. effect = {
  17241. - set_owner = event_target:raiding_marauder
  17242. + set_owner = event_target:raiding_marauder # For ship names
  17243. create_marauder_raiders = yes
  17244. - assign_leader = last_created_leader
  17245. set_location = event_target:raid_source
  17246. set_fleet_stance = aggressive
  17247. + set_fleet_bombardment_stance = indiscriminate
  17248. set_aggro_range_measure_from = self
  17249. set_aggro_range = 150
  17250. - set_fleet_bombardment_stance = indiscriminate
  17251. set_fleet_flag = hired_raiding_fleet
  17252. set_fleet_flag = raiding_fleet
  17253. + set_owner = event_target:marauder_raiding_country # Real owner
  17254. + assign_leader = last_created_leader
  17255.  
  17256. closest_system = {
  17257. limit = {
  17258. @@ -6118,9 +6689,20 @@ event = {
  17259. }
  17260. }
  17261. }
  17262. + set_faction_hostility = {
  17263. + target = event_target:marauder_target
  17264. + set_hostile = yes
  17265. + set_neutral = no
  17266. + set_friendly = no
  17267. + }
  17268. }
  17269. event_target:marauder_target = {
  17270. set_country_flag = raid_target_of@event_target:raiding_marauder
  17271. + set_country_flag = under_marauder_attack
  17272. + set_relation_flag = {
  17273. + who = event_target:raiding_marauder
  17274. + flag = current_hired_target
  17275. + }
  17276. if = {
  17277. limit = { has_communications = event_target:raiding_marauder }
  17278. country_event = { id = marauder.120 days = 1 random = 30 }
  17279. @@ -6130,7 +6712,7 @@ event = {
  17280. }
  17281. }
  17282. }
  17283. - 100 = {}
  17284. + 110 = {}
  17285. }
  17286. }
  17287. }
  17288. @@ -6175,14 +6757,35 @@ event = {
  17289. AND = {
  17290. has_country_flag = marauder_1
  17291. has_country_flag = mercenaries_available_1
  17292. + NOR = {
  17293. + AND = {
  17294. + has_country_flag = merc_fleet_1_hired
  17295. + has_country_flag = merc_fleet_2_hired
  17296. + has_country_flag = merc_fleet_3_hired
  17297. + }
  17298. + }
  17299. }
  17300. AND = {
  17301. has_country_flag = marauder_2
  17302. has_country_flag = mercenaries_available_2
  17303. + NOR = {
  17304. + AND = {
  17305. + has_country_flag = merc_fleet_1_hired
  17306. + has_country_flag = merc_fleet_2_hired
  17307. + has_country_flag = merc_fleet_3_hired
  17308. + }
  17309. + }
  17310. }
  17311. AND = {
  17312. has_country_flag = marauder_3
  17313. has_country_flag = mercenaries_available_3
  17314. + NOR = {
  17315. + AND = {
  17316. + has_country_flag = merc_fleet_1_hired
  17317. + has_country_flag = merc_fleet_2_hired
  17318. + has_country_flag = merc_fleet_3_hired
  17319. + }
  17320. + }
  17321. }
  17322. }
  17323. }
  17324. @@ -6222,14 +6825,35 @@ event = {
  17325. AND = {
  17326. has_country_flag = marauder_1
  17327. has_country_flag = mercenaries_available_1
  17328. + NOR = {
  17329. + AND = {
  17330. + has_country_flag = merc_fleet_1_hired
  17331. + has_country_flag = merc_fleet_2_hired
  17332. + has_country_flag = merc_fleet_3_hired
  17333. + }
  17334. + }
  17335. }
  17336. AND = {
  17337. has_country_flag = marauder_2
  17338. has_country_flag = mercenaries_available_2
  17339. + NOR = {
  17340. + AND = {
  17341. + has_country_flag = merc_fleet_1_hired
  17342. + has_country_flag = merc_fleet_2_hired
  17343. + has_country_flag = merc_fleet_3_hired
  17344. + }
  17345. + }
  17346. }
  17347. AND = {
  17348. has_country_flag = marauder_3
  17349. has_country_flag = mercenaries_available_3
  17350. + NOR = {
  17351. + AND = {
  17352. + has_country_flag = merc_fleet_1_hired
  17353. + has_country_flag = merc_fleet_2_hired
  17354. + has_country_flag = merc_fleet_3_hired
  17355. + }
  17356. + }
  17357. }
  17358. }
  17359. }
  17360. @@ -6563,49 +7187,55 @@ event = {
  17361. is_country_type = dormant_marauders
  17362. has_country_flag = raid_ongoing
  17363. NOT = {
  17364. - any_owned_fleet = {
  17365. - OR = {
  17366. - has_fleet_flag = hired_raiding_fleet
  17367. - has_fleet_flag = raiding_fleet
  17368. - }
  17369. + any_country = {
  17370. + is_country_type = marauder_raiders
  17371. + prev = { has_country_flag = parent_of@prev }
  17372. }
  17373. }
  17374. }
  17375. }
  17376.  
  17377. immediate = {
  17378. - every_country = {
  17379. + random_country = {
  17380. limit = {
  17381. is_country_type = dormant_marauders
  17382. has_country_flag = raid_ongoing
  17383. NOT = {
  17384. - any_owned_fleet = {
  17385. - OR = {
  17386. - has_fleet_flag = hired_raiding_fleet
  17387. - has_fleet_flag = raiding_fleet
  17388. - }
  17389. + any_country = {
  17390. + is_country_type = marauder_raiders
  17391. + prev = { has_country_flag = parent_of@prev }
  17392. }
  17393. }
  17394. }
  17395. + save_event_target_as = raiding_marauder
  17396. remove_country_flag = raid_ongoing
  17397. }
  17398. + random_playable_country = {
  17399. + limit = { has_country_flag = raid_target_of@event_target:raiding_marauder }
  17400. + remove_country_flag = raid_target_of@event_target:raiding_marauder
  17401. + remove_country_flag = under_marauder_attack
  17402. + remove_country_flag = marauder_tribute_1@event_target:raiding_marauder
  17403. + remove_country_flag = marauder_tribute_2@event_target:raiding_marauder
  17404. + remove_country_flag = marauder_tribute_3@event_target:raiding_marauder
  17405. + remove_country_flag = marauder_tribute_4@event_target:raiding_marauder
  17406. + remove_country_flag = marauder_tribute_5@event_target:raiding_marauder
  17407. + remove_country_flag = marauder_tribute_6@event_target:raiding_marauder
  17408. + remove_relation_flag = {
  17409. + who = event_target:raiding_marauder
  17410. + flag = current_target
  17411. }
  17412. + remove_relation_flag = {
  17413. + who = event_target:raiding_marauder
  17414. + flag = current_hired_target
  17415. }
  17416. -
  17417. -# Clear Friendly state after raid
  17418. -country_event = {
  17419. - id = marauder.161
  17420. - hide_window = yes
  17421. -
  17422. - is_triggered_only = yes
  17423. -
  17424. - immediate = {
  17425. - event_target:raiding_marauder = {
  17426. - set_faction_hostility = {
  17427. - target = root
  17428. - set_hostile = yes
  17429. - set_neutral = no
  17430. - set_friendly = no
  17431. + }
  17432. + if = {
  17433. + limit = {
  17434. + any_playable_country = { has_country_flag = hired@event_target:raiding_marauder }
  17435. + }
  17436. + random_playable_country = {
  17437. + limit = { has_country_flag = hired@event_target:raiding_marauder }
  17438. + remove_country_flag = hired@event_target:raiding_marauder
  17439. }
  17440. }
  17441. }
  17442. @@ -7493,7 +8123,7 @@ country_event = {
  17443. }
  17444. }
  17445. option = { # Return to former owner
  17446. - name = marauder.518.a
  17447. + name = marauder.517.b
  17448. custom_tooltip = marauder.517.b.tooltip
  17449. event_target:liberated_planet = {
  17450. set_owner = event_target:planet_former_owner
  17451. @@ -7612,7 +8242,7 @@ country_event = {
  17452. immediate = {
  17453. from = { save_event_target_as = awakened_horde }
  17454. random_list = {
  17455. - 5 = {
  17456. + 2 = {
  17457. set_global_flag = horde_triggered
  17458. country_event = { id = marauder.500 }
  17459. }
  17460. @@ -8202,6 +8832,7 @@ country_event = {
  17461. exists = event_target:raider_khanate
  17462. is_country_type = default
  17463. is_subject = no
  17464. + is_ai = yes
  17465. NOR = {
  17466. has_valid_civic = "civic_fanatic_purifiers"
  17467. has_valid_civic = "civic_hive_devouring_swarm"
  17468. @@ -8440,7 +9071,10 @@ country_event = {
  17469. every_country = {
  17470. limit = { has_modifier = satrapy_of_horde }
  17471. remove_modifier = "satrapy_of_horde"
  17472. - country_event = { id = marauder.670 days = 10 }
  17473. + set_subject_of = {
  17474. + who = none
  17475. + }
  17476. + country_event = { id = marauder.670 days = 4 }
  17477. }
  17478.  
  17479. # Two Diadochi (Marauder small)
  17480. @@ -9000,7 +9634,6 @@ country_event = {
  17481. id = marauder.670
  17482. title = "marauder.670.name"
  17483. desc = "marauder.670.desc"
  17484. -
  17485. picture = GFX_evt_arguing_senate
  17486. show_sound = event_conversation
  17487.  
  17488. @@ -9016,7 +9649,6 @@ country_event = {
  17489. id = marauder.671
  17490. title = "marauder.671.name"
  17491. desc = "marauder.671.desc"
  17492. -
  17493. picture = GFX_evt_large_explosion
  17494. show_sound = event_ship_explosion
  17495.  
  17496. @@ -9026,3 +9658,417 @@ country_event = {
  17497. name = marauder.671.a
  17498. }
  17499. }
  17500. +
  17501. +### Neighbor Events
  17502. +
  17503. +event = {
  17504. + id = marauder.699
  17505. + hide_window = yes
  17506. +
  17507. + is_triggered_only = yes
  17508. +
  17509. + trigger = {
  17510. + any_country = {
  17511. + is_country_type = default
  17512. + any_system_within_border = {
  17513. + any_neighbor_system = {
  17514. + exists = space_owner
  17515. + space_owner = { is_country_type = dormant_marauders }
  17516. + }
  17517. + }
  17518. + }
  17519. + }
  17520. +
  17521. + immediate = {
  17522. + random_playable_country = {
  17523. + limit = {
  17524. + any_system_within_border = {
  17525. + any_neighbor_system = {
  17526. + exists = space_owner
  17527. + space_owner = { is_country_type = dormant_marauders }
  17528. + }
  17529. + }
  17530. + }
  17531. + random_list = {
  17532. + 20 = {
  17533. + country_event = { id = marauder.700 }
  17534. + }
  17535. + 80 = {}
  17536. + }
  17537. + }
  17538. + }
  17539. +}
  17540. +
  17541. +country_event = {
  17542. + id = marauder.700
  17543. + hide_window = yes
  17544. +
  17545. + is_triggered_only = yes
  17546. +
  17547. + immediate = {
  17548. + random_system_within_border = {
  17549. + limit = {
  17550. + any_neighbor_system = {
  17551. + exists = space_owner
  17552. + space_owner = { is_country_type = dormant_marauders }
  17553. + }
  17554. + }
  17555. + save_event_target_as = border_system
  17556. + random_system_planet = {
  17557. + limit = {
  17558. + is_star = no
  17559. + is_asteroid = no
  17560. + is_moon = no
  17561. + }
  17562. + save_event_target_as = border_planet
  17563. + }
  17564. + random_neighbor_system = {
  17565. + limit = {
  17566. + exists = space_owner
  17567. + space_owner = { is_country_type = dormant_marauders }
  17568. + }
  17569. + space_owner = {
  17570. + save_event_target_as = marauder_neighbor
  17571. + owner_species = { save_event_target_as = marauder_neighbor_species }
  17572. + }
  17573. + }
  17574. + }
  17575. +
  17576. + random_list = {
  17577. + 10 = {
  17578. + if = {
  17579. + limit = {
  17580. + has_policy_flag = refugees_allowed
  17581. + any_owned_planet = {
  17582. + habitability = { who = event_target:marauder_neighbor_species value > 0.4 }
  17583. + any_tile = {
  17584. + has_blocker = no
  17585. + has_pop = no
  17586. + }
  17587. + }
  17588. + }
  17589. + random_owned_planet = {
  17590. + limit = {
  17591. + habitability = { who = event_target:marauder_neighbor_species value > 0.4 }
  17592. + any_tile = {
  17593. + has_blocker = no
  17594. + has_pop = no
  17595. + }
  17596. + }
  17597. + create_pop = {
  17598. + species = event_target:marauder_neighbor_species
  17599. + ethos = {
  17600. + ethic = "ethic_militarist"
  17601. + }
  17602. + }
  17603. + planet_event = { id = marauder.701 }
  17604. + }
  17605. + }
  17606. + }
  17607. + 10 = {
  17608. + country_event = { id = marauder.702 }
  17609. + }
  17610. + 10 = {
  17611. + country_event = { id = marauder.703 }
  17612. + }
  17613. + 10 = {
  17614. + country_event = { id = marauder.704 }
  17615. + }
  17616. + 10 = {
  17617. + country_event = { id = marauder.705 }
  17618. + }
  17619. + 10 = {
  17620. + country_event = { id = marauder.706 }
  17621. + }
  17622. + 10 = {
  17623. + country_event = { id = marauder.707 }
  17624. + }
  17625. + }
  17626. + }
  17627. +}
  17628. +
  17629. +# Refugees
  17630. +planet_event = {
  17631. + id = marauder.701
  17632. + title = "marauder.701.name"
  17633. + desc = "marauder.701.desc"
  17634. + picture = GFX_evt_colony_settlement
  17635. + show_sound = event_radio_chatter
  17636. + location = root
  17637. +
  17638. + is_triggered_only = yes
  17639. +
  17640. + trigger = {
  17641. + owner = {
  17642. + NOT = { has_country_flag = marauder_neighbor_event_1 }
  17643. + }
  17644. + }
  17645. +
  17646. + immediate = {
  17647. + owner = {
  17648. + set_country_flag = marauder_neighbor_event_1
  17649. + }
  17650. + }
  17651. +
  17652. + option = {
  17653. + name = marauder.701.a
  17654. + }
  17655. +}
  17656. +
  17657. +# Battle Tactics
  17658. +country_event = {
  17659. + id = marauder.702
  17660. + title = "marauder.702.name"
  17661. + desc = {
  17662. + text = marauder.702.a.desc
  17663. + trigger = {
  17664. + NOR = {
  17665. + has_authority = auth_hive_mind
  17666. + has_authority = auth_machine_intelligence
  17667. + }
  17668. + }
  17669. + }
  17670. + desc = {
  17671. + text = marauder.702.b.desc
  17672. + trigger = {
  17673. + has_authority = auth_hive_mind
  17674. + }
  17675. + }
  17676. + desc = {
  17677. + text = marauder.702.c.desc
  17678. + trigger = {
  17679. + has_authority = auth_machine_intelligence
  17680. + }
  17681. + }
  17682. + picture = GFX_evt_machine_space_battle
  17683. + show_sound = event_space_battle
  17684. +
  17685. + is_triggered_only = yes
  17686. +
  17687. + trigger = {
  17688. + NOT = { has_country_flag = marauder_neighbor_event_2 }
  17689. + }
  17690. +
  17691. + immediate = {
  17692. + set_country_flag = marauder_neighbor_event_2
  17693. + }
  17694. +
  17695. + option = {
  17696. + name = EXCELLENT
  17697. + add_modifier = {
  17698. + modifier = "marauder_skirmishing"
  17699. + days = 3600
  17700. + }
  17701. + }
  17702. +}
  17703. +
  17704. +# New Admiral
  17705. +country_event = {
  17706. + id = marauder.703
  17707. + title = "marauder.703.name"
  17708. + desc = "marauder.703.desc"
  17709. + picture = GFX_evt_hangar_bay
  17710. + show_sound = event_radio_chatter
  17711. +
  17712. + is_triggered_only = yes
  17713. +
  17714. + trigger = {
  17715. + NOT = { has_country_flag = marauder_neighbor_event_3 }
  17716. + }
  17717. +
  17718. + immediate = {
  17719. + set_country_flag = marauder_neighbor_event_3
  17720. + }
  17721. +
  17722. + option = {
  17723. + name = marauder.703.a
  17724. + trigger = {
  17725. + NOR = {
  17726. + has_valid_civic = civic_machine_terminator
  17727. + has_valid_civic = civic_hive_devouring_swarm
  17728. + has_valid_civic = civic_fanatic_purifiers
  17729. + }
  17730. + }
  17731. + create_leader = {
  17732. + type = admiral
  17733. + species = event_target:marauder_neighbor_species
  17734. + name = random
  17735. + skill = 4
  17736. + leader_age_min = 25
  17737. + leader_age_max = 45
  17738. + traits = {
  17739. + trait = leader_trait_mercenary_warrior
  17740. + trait = random_trait
  17741. + }
  17742. + }
  17743. + custom_tooltip = gain_marauder_admiral
  17744. + }
  17745. + option = {
  17746. + name = marauder.703.b
  17747. + trigger = {
  17748. + NOR = {
  17749. + has_valid_civic = civic_machine_terminator
  17750. + has_valid_civic = civic_hive_devouring_swarm
  17751. + has_valid_civic = civic_fanatic_purifiers
  17752. + }
  17753. + }
  17754. + }
  17755. + option = {
  17756. + name = marauder.703.c
  17757. + trigger = {
  17758. + has_valid_civic = civic_machine_terminator
  17759. + }
  17760. + add_influence = 50
  17761. + }
  17762. + option = {
  17763. + name = marauder.703.d
  17764. + trigger = {
  17765. + has_valid_civic = civic_hive_devouring_swarm
  17766. + }
  17767. + add_food = 1
  17768. + add_influence = 50
  17769. + }
  17770. + option = {
  17771. + name = marauder.703.e
  17772. + trigger = {
  17773. + has_valid_civic = civic_fanatic_purifiers
  17774. + }
  17775. + add_influence = 50
  17776. + }
  17777. +}
  17778. +
  17779. +# New Fleet
  17780. +country_event = {
  17781. + id = marauder.704
  17782. + title = "marauder.704.name"
  17783. + desc = "marauder.704.desc"
  17784. + picture = GFX_evt_pirate_armada
  17785. + show_sound = event_radio_chatter
  17786. +
  17787. + is_triggered_only = yes
  17788. +
  17789. + trigger = {
  17790. + NOT = { has_country_flag = marauder_neighbor_event_4 }
  17791. + years_passed >= 30
  17792. + }
  17793. +
  17794. + immediate = {
  17795. + set_country_flag = marauder_neighbor_event_4
  17796. + }
  17797. +
  17798. + option = {
  17799. + name = marauder.704.a
  17800. + create_fleet = {
  17801. + name = "NAME_Salvaged_Fleet"
  17802. + effect = {
  17803. + set_owner = root
  17804. + while = {
  17805. + count = 4
  17806. + create_ship = {
  17807. + name = random
  17808. + prefix = no
  17809. + design = "NAME_Outrider"
  17810. + graphical_culture = "pirate_01"
  17811. + }
  17812. + }
  17813. + while = {
  17814. + count = 2
  17815. + create_ship = {
  17816. + name = random
  17817. + prefix = no
  17818. + design = "NAME_Lancer"
  17819. + graphical_culture = "pirate_01"
  17820. + }
  17821. + }
  17822. + while = {
  17823. + count = 1
  17824. + create_ship = {
  17825. + name = random
  17826. + prefix = no
  17827. + design = "NAME_Void_Champion"
  17828. + graphical_culture = "pirate_01"
  17829. + }
  17830. + }
  17831. + set_location = root.capital_scope
  17832. + }
  17833. + }
  17834. + custom_tooltip = gain_marauder_fleet
  17835. + }
  17836. + option = {
  17837. + name = marauder.704.b
  17838. + add_minerals = 200
  17839. + }
  17840. +}
  17841. +
  17842. +# Resource Cache
  17843. +country_event = {
  17844. + id = marauder.705
  17845. + title = "marauder.705.name"
  17846. + desc = "marauder.705.desc"
  17847. + picture = GFX_evt_space_debris
  17848. + show_sound = event_scanner
  17849. +
  17850. + is_triggered_only = yes
  17851. +
  17852. + trigger = {
  17853. + NOT = { has_country_flag = marauder_neighbor_event_5 }
  17854. + }
  17855. +
  17856. + immediate = {
  17857. + set_country_flag = marauder_neighbor_event_5
  17858. + }
  17859. +
  17860. + option = {
  17861. + name = EXCELLENT
  17862. + add_minerals = 300
  17863. + add_energy = 300
  17864. + }
  17865. +}
  17866. +
  17867. +# Abandoned Habitat
  17868. +country_event = {
  17869. + id = marauder.706
  17870. + title = "marauder.706.name"
  17871. + desc = "marauder.706.desc"
  17872. + picture = GFX_evt_space_debris
  17873. + show_sound = event_scanner
  17874. +
  17875. + is_triggered_only = yes
  17876. +
  17877. + trigger = {
  17878. + NOT = { has_country_flag = marauder_neighbor_event_6 }
  17879. + }
  17880. +
  17881. + immediate = {
  17882. + set_country_flag = marauder_neighbor_event_6
  17883. + }
  17884. +
  17885. + option = {
  17886. + name = marauder.706.a
  17887. + add_minerals = 400
  17888. + }
  17889. +}
  17890. +
  17891. +# Shuttle
  17892. +country_event = {
  17893. + id = marauder.707
  17894. + title = "marauder.707.name"
  17895. + desc = "marauder.707.desc"
  17896. + picture = GFX_evt_machine_space_battle
  17897. + show_sound = event_ship_thrusters
  17898. +
  17899. + is_triggered_only = yes
  17900. +
  17901. + trigger = {
  17902. + NOT = { has_country_flag = marauder_neighbor_event_7 }
  17903. + }
  17904. +
  17905. + immediate = {
  17906. + set_country_flag = marauder_neighbor_event_7
  17907. + }
  17908. +
  17909. + option = {
  17910. + name = marauder.707.a
  17911. + add_energy = 400
  17912. + }
  17913. +}
  17914. \ No newline at end of file
  17915. diff --git a/2.0.0/events/observation_events.txt b/2.0.2/events/observation_events.txt
  17916. index 263e1e3..822dccd 100755
  17917. --- a/2.0.0/events/observation_events.txt
  17918. +++ b/2.0.2/events/observation_events.txt
  17919. @@ -5362,11 +5362,15 @@ planet_event = {
  17920. }
  17921.  
  17922. mean_time_to_happen = {
  17923. - months = 5000
  17924. + years = 400
  17925. modifier = {
  17926. factor = 0.75
  17927. observation_outpost = { has_mission = specimen_collection }
  17928. }
  17929. + modifier = {
  17930. + factor = 0.5
  17931. + observation_outpost = { has_mission = native_indoctrination }
  17932. + }
  17933. }
  17934.  
  17935. immediate = {
  17936. diff --git a/2.0.0/events/on_action_events.txt b/2.0.2/events/on_action_events.txt
  17937. index d15693c..6fec4f2 100755
  17938. --- a/2.0.0/events/on_action_events.txt
  17939. +++ b/2.0.2/events/on_action_events.txt
  17940. @@ -4280,25 +4280,6 @@ ship_event = {
  17941. }
  17942. }
  17943.  
  17944. -# Primitive planet found by trading Star Charts
  17945. -planet_event = {
  17946. - id = action.33
  17947. - is_triggered_only = yes
  17948. - hide_window = yes
  17949. -
  17950. - trigger = {
  17951. - exists = owner
  17952. - NOT = { exists = fromfrom }
  17953. - owner = { is_country_type = primitive }
  17954. - }
  17955. -
  17956. - immediate = {
  17957. - from = {
  17958. - establish_communications_no_message = root.owner
  17959. - }
  17960. - }
  17961. -}
  17962. -
  17963. # Aliens Establish Communications
  17964. country_event = {
  17965. id = action.13
  17966. @@ -6449,93 +6430,20 @@ country_event = {
  17967. }
  17968. }
  17969.  
  17970. -# Megastructure built
  17971. -#country_event = {
  17972. -# id = action.52
  17973. -# hide_window = yes
  17974. -# is_triggered_only = yes
  17975. -#
  17976. -# immediate = {
  17977. -# create_message = {
  17978. -# target = fromfromfrom
  17979. -# type = "MEGASTRUCTURE_BUILT"
  17980. -# localization = "MESSAGE_MEGASTRUCTURE_BUILT"
  17981. -# variable = {
  17982. -# type = name
  17983. -# scope = fromfromfrom
  17984. -# localization = "FLEET"
  17985. -# }
  17986. -# variable = {
  17987. -# type = name
  17988. -# scope = from
  17989. -# localization = "MEGASTRUCTURE"
  17990. -# }
  17991. -# variable = {
  17992. -# type = name
  17993. -# scope = fromfrom
  17994. -# localization = "SYSTEM"
  17995. -# }
  17996. -# }
  17997. -# }
  17998. -#}
  17999. -
  18000. -# Megastructure upgraded
  18001. -#country_event = {
  18002. -# id = action.53
  18003. -# hide_window = yes
  18004. -# is_triggered_only = yes
  18005. -#
  18006. -# immediate = {
  18007. -# create_message = {
  18008. -# target = from
  18009. -# type = "MEGASTRUCTURE_UPGRADED"
  18010. -# localization = "MESSAGE_MEGASTRUCTURE_UPGRADED"
  18011. -# variable = {
  18012. -# type = name
  18013. -# scope = from
  18014. -# localization = "MEGASTRUCTURE"
  18015. -# }
  18016. -# variable = {
  18017. -# type = name
  18018. -# scope = fromfrom
  18019. -# localization = "SYSTEM"
  18020. -# }
  18021. -# }
  18022. -# }
  18023. -#}
  18024. -
  18025. -# Tradition Discovery - Exploration Journals gain research points.
  18026. -ship_event = {
  18027. - id = action.54
  18028. +# Tradition Discovery - gain unity on tech unlock
  18029. +country_event = {
  18030. + id = action.55
  18031. hide_window = yes
  18032. is_triggered_only = yes
  18033.  
  18034. immediate = {
  18035. if = {
  18036. limit = {
  18037. - owner = {
  18038. - OR = {
  18039. - has_non_swapped_tradition = tr_discovery_planetary_survey_corps
  18040. - has_swapped_tradition = tr_discovery_planetary_survey_corps_machine
  18041. - }
  18042. - }
  18043. - }
  18044. - owner = {
  18045. - add_monthly_resource_mult = {
  18046. - resource = physics_research
  18047. - value = 0.1
  18048. - min = 3
  18049. + has_tradition = tr_discovery_faith_in_science
  18050. }
  18051. add_monthly_resource_mult = {
  18052. - resource = society_research
  18053. - value = 0.1
  18054. - min = 3
  18055. - }
  18056. - add_monthly_resource_mult = {
  18057. - resource = engineering_research
  18058. - value = 0.1
  18059. - min = 3
  18060. - }
  18061. + resource = unity
  18062. + value = 3
  18063. }
  18064. }
  18065. }
  18066. @@ -6689,32 +6597,6 @@ ship_event = {
  18067. # }
  18068. #}
  18069.  
  18070. -#planet_event = {
  18071. -# id = action.55
  18072. -# hide_window = yes
  18073. -# is_triggered_only = yes
  18074. -#
  18075. -# immediate = {
  18076. -# owner = {
  18077. -# if = {
  18078. -# limit = {
  18079. -# has_country_flag = has_colonization_fever
  18080. -# NOT = { has_modifier = colonization_fever}
  18081. -# }
  18082. -# add_modifier = { modifier = colonization_fever days = 3600 }
  18083. -# }
  18084. -# if = {
  18085. -# limit = {
  18086. -# has_modifier = colonization_fever
  18087. -# }
  18088. -# remove_modifier = "colonization_fever"
  18089. -# add_modifier = { modifier = colonization_fever days = 3600 }
  18090. -# }
  18091. -# }
  18092. -# }
  18093. -#}
  18094. -
  18095. -
  18096. pop_event = {
  18097. id = action.58
  18098. hide_window = yes
  18099. @@ -7667,6 +7549,12 @@ planet_event = {
  18100. }
  18101.  
  18102. immediate = {
  18103. + every_owned_pop = {
  18104. + limit = {
  18105. + is_growing = yes
  18106. + }
  18107. + kill_pop = yes
  18108. + }
  18109. owner = {
  18110. add_static_war_exhaustion = {
  18111. attacker = from
  18112. @@ -7774,6 +7662,11 @@ event = {
  18113. starbase = {
  18114. exists = owner
  18115. owner = {
  18116. + OR = {
  18117. + is_country_type = default
  18118. + is_country_type = fallen_empire
  18119. + is_country_type = awakened_fallen_empire
  18120. + }
  18121. NOR = {
  18122. is_same_value = prevprev.owner
  18123. is_at_war_with = prevprev.owner
  18124. @@ -7866,7 +7759,7 @@ ship_event = {
  18125. immediate = {
  18126. add_modifier = {
  18127. modifier = jump_drive_cooldown
  18128. - days = 120
  18129. + days = 200
  18130. }
  18131. }
  18132. }
  18133. @@ -7962,3 +7855,35 @@ planet_event = {
  18134. }
  18135. }
  18136. }
  18137. +
  18138. +# Make sure Swarm-owned planets are Infested and megastructures wiped
  18139. +event = {
  18140. + id = action.92
  18141. + hide_window = yes
  18142. +
  18143. + is_triggered_only = yes
  18144. +
  18145. + trigger = {
  18146. + any_country = { is_country_type = swarm }
  18147. + }
  18148. +
  18149. + immediate = {
  18150. + every_planet = {
  18151. + limit = {
  18152. + exists = owner
  18153. + owner = { is_country_type = swarm }
  18154. + NOT = { is_planet_class = pc_infested }
  18155. + }
  18156. + if = {
  18157. + limit = {
  18158. + OR = {
  18159. + is_planet_class = pc_habitat
  18160. + is_planet_class = pc_ringworld_habitable
  18161. + }
  18162. + }
  18163. + destroy_colony = yes
  18164. + else = { change_pc = pc_infested }
  18165. + }
  18166. + }
  18167. + }
  18168. +}
  18169. diff --git a/2.0.0/events/pirate_events.txt b/2.0.2/events/pirate_events.txt
  18170. index 915e258..b142f1c 100755
  18171. --- a/2.0.0/events/pirate_events.txt
  18172. +++ b/2.0.2/events/pirate_events.txt
  18173. @@ -14,6 +14,7 @@ country_event = {
  18174. title = "pirate.1.name"
  18175. picture = GFX_evt_pirate_armada
  18176. show_sound = event_space_battle
  18177. + location = event_target:pirate_system
  18178.  
  18179. desc = { # Spiritual
  18180. text = pirate.1.desc_01
  18181. @@ -119,6 +120,7 @@ country_event = {
  18182. }
  18183. }
  18184. }
  18185. + save_event_target_as = pirate_system
  18186. random_system_planet = {
  18187. limit = { is_star = no }
  18188. save_event_target_as = pirate_home
  18189. @@ -343,6 +345,16 @@ country_event = {
  18190. any_country = {
  18191. is_country_type = default
  18192. has_country_flag = spawner_of@root
  18193. + exists = capital_scope
  18194. + any_controlled_planet = {
  18195. + OR = {
  18196. + has_mining_station = yes
  18197. + has_research_station = yes
  18198. + }
  18199. + solar_system = {
  18200. + NOT = { is_same_value = prev.prev.capital_scope.solar_system }
  18201. + }
  18202. + }
  18203. }
  18204. }
  18205.  
  18206. @@ -364,7 +376,9 @@ country_event = {
  18207. save_event_target_as = pirate_band
  18208. random_owned_ship = {
  18209. limit = { is_ship_size = pirate_station }
  18210. - save_event_target_as = pirate_home
  18211. + fleet = {
  18212. + orbit = { save_event_target_as = pirate_home } # save actual planet as home
  18213. + }
  18214. }
  18215. create_pirate_fleet = yes
  18216. }
  18217. @@ -438,7 +452,6 @@ event = {
  18218. immediate = {
  18219. every_country = {
  18220. limit = {
  18221. - is_ai = no
  18222. NOT = { has_country_flag = birth_of_piracy }
  18223. }
  18224. country_event = { id = pirate.5 }
  18225. @@ -499,6 +512,7 @@ country_event = {
  18226. picture = GFX_evt_pirate_armada
  18227. show_sound = event_space_battle
  18228. desc = pirate.6.desc
  18229. + location = event_target:pirate_system
  18230.  
  18231. trigger = {
  18232. years_passed > 10
  18233. @@ -543,6 +557,7 @@ country_event = {
  18234. }
  18235. }
  18236. }
  18237. + save_event_target_as = pirate_system
  18238. random_system_planet = {
  18239. limit = { is_star = no }
  18240. save_event_target_as = pirate_home
  18241. @@ -710,6 +725,7 @@ country_event = {
  18242. picture = GFX_evt_machine_space_battle
  18243. show_sound = event_space_battle
  18244. desc = pirate.7.desc
  18245. + location = event_target:pirate_system
  18246.  
  18247. trigger = {
  18248. years_passed > 10
  18249. @@ -754,6 +770,7 @@ country_event = {
  18250. }
  18251. }
  18252. }
  18253. + save_event_target_as = pirate_system
  18254. random_system_planet = {
  18255. limit = { is_star = no }
  18256. save_event_target_as = pirate_home
  18257. @@ -1203,54 +1220,55 @@ country_event = {
  18258. id = pirate.49
  18259. hide_window = yes
  18260.  
  18261. - mean_time_to_happen = {
  18262. - months = 280
  18263. - modifier = {
  18264. - factor = 0.2
  18265. - has_isolated_system = yes
  18266. - }
  18267. - modifier = {
  18268. - factor = 0.9
  18269. - num_starbases > 9
  18270. - }
  18271. - modifier = {
  18272. - factor = 0.9
  18273. - num_starbases > 19
  18274. - }
  18275. - modifier = {
  18276. - factor = 1.4
  18277. - check_variable = {
  18278. - which = "pirates_active"
  18279. - value > 0
  18280. - }
  18281. - }
  18282. - modifier = {
  18283. - factor = 1.6
  18284. - check_variable = {
  18285. - which = "pirates_active"
  18286. - value > 1
  18287. - }
  18288. - }
  18289. - modifier = {
  18290. - factor = 2
  18291. - check_variable = {
  18292. - which = "pirates_active"
  18293. - value > 2
  18294. - }
  18295. - }
  18296. - modifier = {
  18297. - factor = 3
  18298. - check_variable = {
  18299. - which = "pirates_active"
  18300. - value > 3
  18301. - }
  18302. - }
  18303. - }
  18304. + is_triggered_only = yes
  18305. +
  18306. + #mean_time_to_happen = {
  18307. + # months = 280
  18308. + # modifier = {
  18309. + # factor = 0.2
  18310. + # has_isolated_system = yes
  18311. + # }
  18312. + # modifier = {
  18313. + # factor = 0.9
  18314. + # num_starbases > 9
  18315. + # }
  18316. + # modifier = {
  18317. + # factor = 0.9
  18318. + # num_starbases > 19
  18319. + # }
  18320. + # modifier = {
  18321. + # factor = 1.4
  18322. + # check_variable = {
  18323. + # which = "pirates_active"
  18324. + # value > 0
  18325. + # }
  18326. + # }
  18327. + # modifier = {
  18328. + # factor = 1.6
  18329. + # check_variable = {
  18330. + # which = "pirates_active"
  18331. + # value > 1
  18332. + # }
  18333. + # }
  18334. + # modifier = {
  18335. + # factor = 2
  18336. + # check_variable = {
  18337. + # which = "pirates_active"
  18338. + # value > 2
  18339. + # }
  18340. + # }
  18341. + # modifier = {
  18342. + # factor = 3
  18343. + # check_variable = {
  18344. + # which = "pirates_active"
  18345. + # value > 3
  18346. + # }
  18347. + # }
  18348. + #}
  18349.  
  18350. trigger = {
  18351. is_country_type = default
  18352. has_country_flag = birth_of_piracy
  18353. - NOT = { has_country_flag = had_pirates_spawn }
  18354. OR = {
  18355. has_isolated_system = yes
  18356. has_bordering_system = yes
  18357. @@ -1264,7 +1282,6 @@ country_event = {
  18358. }
  18359.  
  18360. immediate = {
  18361. - set_timed_country_flag = { flag = had_pirates_spawn days = 1800 }
  18362. if = {
  18363. limit = { has_isolated_system = yes }
  18364. random_system_within_border = {
  18365. diff --git a/2.0.0/events/planet_destruction_events.txt b/2.0.2/events/planet_destruction_events.txt
  18366. index abe19b3..a02a309 100755
  18367. --- a/2.0.0/events/planet_destruction_events.txt
  18368. +++ b/2.0.2/events/planet_destruction_events.txt
  18369. @@ -30,9 +30,56 @@ planet_event = {
  18370. }
  18371. from.owner = { country_event = { id = planet_destruction.102 } }
  18372. else = {
  18373. + if = {
  18374. + limit = {
  18375. + NOT = { is_planet_class = pc_ai }
  18376. + }
  18377. from.owner = { country_event = { id = planet_destruction.101 } }
  18378. }
  18379. }
  18380. + }
  18381. +
  18382. + # Contingency Machine World
  18383. + if = {
  18384. + limit = {
  18385. + is_planet_class = pc_ai
  18386. + NOT = { has_planet_flag = machine_lair }
  18387. + }
  18388. + set_planet_flag = destroyed_by_colossus
  18389. + set_planet_flag = planet_cracked
  18390. + planet_event = { id = crisis.2040 }
  18391. + }
  18392. +
  18393. + # Contingency Final Machine World
  18394. + if = {
  18395. + limit = {
  18396. + is_planet_class = pc_ai
  18397. + has_planet_flag = machine_lair
  18398. + }
  18399. + set_planet_flag = destroyed_by_colossus
  18400. + set_planet_flag = planet_cracked
  18401. + planet_event = { id = crisis.2043 }
  18402. + }
  18403. +
  18404. + # Swarm Situation Log counter
  18405. + if = {
  18406. + limit = {
  18407. + owner = { is_country_type = swarm }
  18408. + }
  18409. + every_country = {
  18410. + limit = { has_event_chain = "prethoryn_scourge_chain" }
  18411. + add_event_chain_counter = {
  18412. + event_chain = "prethoryn_scourge_chain"
  18413. + counter = "infested_worlds"
  18414. + amount = -1
  18415. + }
  18416. + add_event_chain_counter = {
  18417. + event_chain = "prethoryn_scourge_chain"
  18418. + counter = "infested_worlds_cleansed"
  18419. + amount = 1
  18420. + }
  18421. + }
  18422. + }
  18423.  
  18424. # Exterminatus Achievement
  18425. if = {
  18426. @@ -441,11 +488,55 @@ planet_event = {
  18427. limit = {
  18428. exists = owner
  18429. owner = { NOT = { is_same_value = from.owner } }
  18430. + NOT = { is_planet_class = pc_ai }
  18431. }
  18432. from.owner = {
  18433. country_event = { id = planet_destruction.210 }
  18434. }
  18435. }
  18436. +
  18437. + # Contingency Machine World
  18438. + if = {
  18439. + limit = {
  18440. + is_planet_class = pc_ai
  18441. + NOT = { has_planet_flag = machine_lair }
  18442. + }
  18443. + set_planet_flag = destroyed_by_colossus
  18444. + set_planet_flag = planet_shielded
  18445. + planet_event = { id = crisis.2040 }
  18446. + }
  18447. +
  18448. + # Contingency Final Machine World
  18449. + if = {
  18450. + limit = {
  18451. + is_planet_class = pc_ai
  18452. + has_planet_flag = machine_lair
  18453. + }
  18454. + set_planet_flag = destroyed_by_colossus
  18455. + set_planet_flag = planet_shielded
  18456. + planet_event = { id = crisis.2043 }
  18457. + }
  18458. +
  18459. + # Swarm Situation Log counter
  18460. + if = {
  18461. + limit = {
  18462. + owner = { is_country_type = swarm }
  18463. + }
  18464. + every_country = {
  18465. + limit = { has_event_chain = "prethoryn_scourge_chain" }
  18466. + add_event_chain_counter = {
  18467. + event_chain = "prethoryn_scourge_chain"
  18468. + counter = "infested_worlds"
  18469. + amount = -1
  18470. + }
  18471. + add_event_chain_counter = {
  18472. + event_chain = "prethoryn_scourge_chain"
  18473. + counter = "infested_worlds_cleansed"
  18474. + amount = 1
  18475. + }
  18476. + }
  18477. + }
  18478. +
  18479. if = {
  18480. limit = {
  18481. exists = owner
  18482. @@ -636,6 +727,27 @@ planet_event = {
  18483. country_event = { id = planet_destruction.301 }
  18484. }
  18485. }
  18486. +
  18487. + # Swarm Situation Log counter
  18488. + if = {
  18489. + limit = {
  18490. + owner = { is_country_type = swarm }
  18491. + }
  18492. + every_country = {
  18493. + limit = { has_event_chain = "prethoryn_scourge_chain" }
  18494. + add_event_chain_counter = {
  18495. + event_chain = "prethoryn_scourge_chain"
  18496. + counter = "infested_worlds"
  18497. + amount = -1
  18498. + }
  18499. + add_event_chain_counter = {
  18500. + event_chain = "prethoryn_scourge_chain"
  18501. + counter = "infested_worlds_cleansed"
  18502. + amount = 1
  18503. + }
  18504. + }
  18505. + }
  18506. +
  18507. if = {
  18508. limit = {
  18509. exists = owner
  18510. @@ -758,6 +870,10 @@ planet_event = {
  18511. }
  18512. }
  18513. destroy_colony = yes
  18514. + add_modifier = {
  18515. + modifier = neutron_bombarded
  18516. + days = 3600
  18517. + }
  18518. # Special graphics for Habitats and Ring Worlds
  18519. if = {
  18520. limit = {
  18521. @@ -796,6 +912,15 @@ planet_event = {
  18522. }
  18523. }
  18524. }
  18525. + # For Infested worlds
  18526. + if = {
  18527. + limit = { is_planet_class = pc_infested }
  18528. + random_list = {
  18529. + 50 = { change_pc = pc_barren }
  18530. + 50 = { change_pc = pc_barren_cold }
  18531. + }
  18532. + add_modifier = { modifier = "terraforming_candidate" days = -1 }
  18533. + }
  18534. }
  18535. }
  18536.  
  18537. @@ -806,6 +931,13 @@ country_event = {
  18538. text = planet_destruction.301.nobots.desc
  18539. trigger = {
  18540. from = {
  18541. + NOT = {
  18542. + OR = {
  18543. + is_planet_class = pc_infested
  18544. + is_planet_class = pc_barren
  18545. + is_planet_class = pc_barren_cold
  18546. + }
  18547. + }
  18548. count_pops = {
  18549. count < 1
  18550. }
  18551. @@ -822,6 +954,18 @@ country_event = {
  18552. }
  18553. }
  18554. }
  18555. + desc = {
  18556. + text = planet_destruction.301.infested.desc
  18557. + trigger = {
  18558. + from = {
  18559. + OR = {
  18560. + is_planet_class = pc_infested
  18561. + is_planet_class = pc_barren
  18562. + is_planet_class = pc_barren_cold
  18563. + }
  18564. + }
  18565. + }
  18566. + }
  18567. picture = GFX_evt_planet_beam
  18568. show_sound = event_solar_fusion
  18569. location = from
  18570. diff --git a/2.0.0/events/precursor_events.txt b/2.0.2/events/precursor_events.txt
  18571. index b0e400c..385ac6f 100755
  18572. --- a/2.0.0/events/precursor_events.txt
  18573. +++ b/2.0.2/events/precursor_events.txt
  18574. @@ -784,6 +784,19 @@ country_event = {
  18575. immediate = {
  18576. set_global_flag = vultaum_system_discovered
  18577. set_country_flag = vultaum_system
  18578. + if = {
  18579. + limit = {
  18580. + any_system_within_border = { has_star_flag = precursor_1 }
  18581. + }
  18582. + random_system_within_border = {
  18583. + limit = { has_star_flag = precursor_1 }
  18584. + spawn_system = {
  18585. + min_distance = 20
  18586. + max_distance = 50
  18587. + initializer = "vultaumar_system"
  18588. + }
  18589. + }
  18590. + else = {
  18591. random_system = {
  18592. limit = { has_star_flag = precursor_1 }
  18593. spawn_system = {
  18594. @@ -792,6 +805,8 @@ country_event = {
  18595. initializer = "vultaumar_system"
  18596. }
  18597. }
  18598. + }
  18599. + }
  18600. country_event = { id = precursor.100 days = 2 }
  18601. }
  18602. }
  18603. @@ -1572,6 +1587,19 @@ country_event = {
  18604. immediate = {
  18605. set_global_flag = yuht_system_discovered
  18606. set_country_flag = yuht_system
  18607. + if = {
  18608. + limit = {
  18609. + any_system_within_border = { has_star_flag = precursor_2 }
  18610. + }
  18611. + random_system_within_border = {
  18612. + limit = { has_star_flag = precursor_2 }
  18613. + spawn_system = {
  18614. + min_distance = 20
  18615. + max_distance = 50
  18616. + initializer = "yuhtaan_system"
  18617. + }
  18618. + }
  18619. + else = {
  18620. random_system = {
  18621. limit = { has_star_flag = precursor_2 }
  18622. spawn_system = {
  18623. @@ -1580,6 +1608,8 @@ country_event = {
  18624. initializer = "yuhtaan_system"
  18625. }
  18626. }
  18627. + }
  18628. + }
  18629. country_event = { id = precursor.600 days = 2 }
  18630. }
  18631. }
  18632. @@ -2637,6 +2667,19 @@ country_event = {
  18633. immediate = {
  18634. set_global_flag = first_league_discovered
  18635. set_country_flag = first_league_system
  18636. + if = {
  18637. + limit = {
  18638. + any_system_within_border = { has_star_flag = precursor_3 }
  18639. + }
  18640. + random_system_within_border = {
  18641. + limit = { has_star_flag = precursor_3 }
  18642. + spawn_system = {
  18643. + min_distance = 20
  18644. + max_distance = 50
  18645. + initializer = "fen_habbanis_system"
  18646. + }
  18647. + }
  18648. + else = {
  18649. random_system = {
  18650. limit = { has_star_flag = precursor_3 }
  18651. spawn_system = {
  18652. @@ -2645,6 +2688,8 @@ country_event = {
  18653. initializer = "fen_habbanis_system"
  18654. }
  18655. }
  18656. + }
  18657. + }
  18658. country_event = { id = precursor.1100 days = 2 }
  18659. }
  18660. }
  18661. @@ -3550,6 +3595,19 @@ country_event = {
  18662. immediate = {
  18663. set_global_flag = irassia_discovered
  18664. set_country_flag = irassian_system
  18665. + if = {
  18666. + limit = {
  18667. + any_system_within_border = { has_star_flag = precursor_4 }
  18668. + }
  18669. + random_system_within_border = {
  18670. + limit = { has_star_flag = precursor_4 }
  18671. + spawn_system = {
  18672. + min_distance = 20
  18673. + max_distance = 50
  18674. + initializer = "irass_system"
  18675. + }
  18676. + }
  18677. + else = {
  18678. random_system = {
  18679. limit = { has_star_flag = precursor_4 }
  18680. spawn_system = {
  18681. @@ -3558,6 +3616,8 @@ country_event = {
  18682. initializer = "irass_system"
  18683. }
  18684. }
  18685. + }
  18686. + }
  18687. country_event = { id = precursor.1600 days = 2 }
  18688. }
  18689. }
  18690. @@ -4451,6 +4511,19 @@ country_event = {
  18691. immediate = {
  18692. set_global_flag = cybrex_discovered
  18693. set_country_flag = cybrex_system
  18694. + if = {
  18695. + limit = {
  18696. + any_system_within_border = { has_star_flag = precursor_5 }
  18697. + }
  18698. + random_system_within_border = {
  18699. + limit = { has_star_flag = precursor_5 }
  18700. + spawn_system = {
  18701. + min_distance = 20
  18702. + max_distance = 50
  18703. + initializer = "cybrex_system"
  18704. + }
  18705. + }
  18706. + else = {
  18707. random_system = {
  18708. limit = { has_star_flag = precursor_5 }
  18709. spawn_system = {
  18710. @@ -4459,6 +4532,8 @@ country_event = {
  18711. initializer = "cybrex_system"
  18712. }
  18713. }
  18714. + }
  18715. + }
  18716. country_event = { id = precursor.2100 days = 2 }
  18717. }
  18718. }
  18719. @@ -4755,7 +4830,7 @@ country_event = {
  18720.  
  18721. trigger = {
  18722. is_ai = no
  18723. - mid_game_years_passed > 0
  18724. + years_passed > 50
  18725. NOR = {
  18726. has_country_flag = new_precursor
  18727. has_country_flag = ongoing_precursor_artifact
  18728. @@ -4880,6 +4955,10 @@ country_event = {
  18729. factor = 0.66
  18730. has_ethic = ethic_gestalt_consciousness # Won't get the other events
  18731. }
  18732. + modifier = {
  18733. + factor = 0.75
  18734. + years_passed > 100
  18735. + }
  18736. }
  18737.  
  18738. immediate = {
  18739. @@ -5262,7 +5341,7 @@ country_event = {
  18740.  
  18741. trigger = {
  18742. is_ai = no
  18743. - mid_game_years_passed > 0
  18744. + years_passed > 50
  18745. NOR = {
  18746. has_country_flag = new_precursor
  18747. has_country_flag = ongoing_precursor_artifact
  18748. @@ -5320,6 +5399,10 @@ country_event = {
  18749.  
  18750. mean_time_to_happen = {
  18751. months = 240
  18752. + modifier = {
  18753. + factor = 0.75
  18754. + years_passed > 100
  18755. + }
  18756. }
  18757.  
  18758. immediate = {
  18759. @@ -5400,7 +5483,7 @@ country_event = {
  18760.  
  18761. trigger = {
  18762. is_ai = no
  18763. - mid_game_years_passed > 0
  18764. + years_passed > 50
  18765. NOR = {
  18766. has_country_flag = new_precursor
  18767. has_country_flag = ongoing_precursor_artifact
  18768. @@ -5547,6 +5630,10 @@ country_event = {
  18769.  
  18770. mean_time_to_happen = {
  18771. months = 240
  18772. + modifier = {
  18773. + factor = 0.75
  18774. + years_passed > 100
  18775. + }
  18776. }
  18777.  
  18778. immediate = {
  18779. @@ -5834,7 +5921,7 @@ country_event = {
  18780.  
  18781. trigger = {
  18782. is_ai = no
  18783. - mid_game_years_passed > 0
  18784. + years_passed > 50
  18785. NOR = {
  18786. has_country_flag = new_precursor
  18787. has_country_flag = ongoing_precursor_artifact
  18788. @@ -5976,6 +6063,10 @@ country_event = {
  18789.  
  18790. mean_time_to_happen = {
  18791. months = 240
  18792. + modifier = {
  18793. + factor = 0.75
  18794. + years_passed > 100
  18795. + }
  18796. }
  18797.  
  18798. immediate = {
  18799. diff --git a/2.0.0/events/primitive_events.txt b/2.0.2/events/primitive_events.txt
  18800. index d323107..984baa0 100755
  18801. --- a/2.0.0/events/primitive_events.txt
  18802. +++ b/2.0.2/events/primitive_events.txt
  18803. @@ -1338,6 +1338,10 @@ planet_event = {
  18804.  
  18805. mean_time_to_happen = {
  18806. years = 100
  18807. + modifier = {
  18808. + factor = 10
  18809. + owner = { has_country_flag = early_space_age }
  18810. + }
  18811. modifier = {
  18812. factor = 0.75
  18813. has_observation_outpost = yes
  18814. diff --git a/2.0.0/events/test_events.txt b/2.0.2/events/test_events.txt
  18815. index 1d6610a..a08d462 100755
  18816. --- a/2.0.0/events/test_events.txt
  18817. +++ b/2.0.2/events/test_events.txt
  18818. @@ -21,7 +21,7 @@ fleet_event = {
  18819. traits = random
  18820. }
  18821. create_country = {
  18822. - name = "NAME_Unbidden"
  18823. + name = root.owner
  18824. type = "extradimensional"
  18825. species = last_created
  18826. name_list = "Extradimensional"
  18827. @@ -390,3 +390,21 @@ planet_event = {
  18828. #spawn_megastructure_destruction_effect = yes
  18829. }
  18830. }
  18831. +
  18832. +planet_event = {
  18833. + id = henrik.134
  18834. + hide_window = yes
  18835. +
  18836. + trigger = { always = no }
  18837. +
  18838. + immediate = {
  18839. + create_message = {
  18840. + type = BYPASS_EXPLORED
  18841. + localization = BYPASS_EXPLORED_MESSAGE
  18842. + days = 30
  18843. + target = root
  18844. + variable = { type = name localization = SYSTEM1 scope = root }
  18845. + variable = { type = name localization = SYSTEM2 scope = root }
  18846. + }
  18847. + }
  18848. +}
  18849. \ No newline at end of file
  18850. diff --git a/2.0.0/events/tutorial_events.txt b/2.0.2/events/tutorial_events.txt
  18851. index e83388d..61772cd 100755
  18852. --- a/2.0.0/events/tutorial_events.txt
  18853. +++ b/2.0.2/events/tutorial_events.txt
  18854. @@ -21,6 +21,7 @@ country_event = {
  18855. is_triggered_only = yes
  18856.  
  18857. trigger = {
  18858. + is_ai = no
  18859. is_tutorial_level = 2
  18860. NOT = {
  18861. has_event_chain = tutorial_1_chain
  18862. @@ -94,8 +95,8 @@ ship_event = {
  18863.  
  18864. trigger = {
  18865. owner = {
  18866. - is_tutorial_level = 2
  18867. is_ai = no
  18868. + is_tutorial_level = 2
  18869. has_country_flag = tutorial_1
  18870. }
  18871. }
  18872. @@ -128,6 +129,7 @@ country_event = {
  18873. is_triggered_only = yes
  18874.  
  18875. trigger = {
  18876. + is_ai = no
  18877. any_owned_ship = {
  18878. has_fleet_order = survey_planet_order
  18879. }
  18880. @@ -154,6 +156,7 @@ ship_event = {
  18881. trigger = {
  18882. has_fleet_order = survey_planet_order
  18883. owner = {
  18884. + is_ai = no
  18885. is_tutorial_level = 2
  18886. has_country_flag = tutorial_1
  18887. NOT = { has_country_flag = tutorial_2 }
  18888. @@ -181,6 +184,7 @@ country_event = {
  18889. is_triggered_only = yes
  18890.  
  18891. trigger = {
  18892. + is_ai = no
  18893. is_tutorial_level = 2
  18894. NOT = {
  18895. has_event_chain = tutorial_2_chain
  18896. @@ -218,9 +222,10 @@ country_event = {
  18897. is_triggered_only = yes
  18898.  
  18899. trigger = {
  18900. + is_ai = no
  18901. has_technology = tech_colonization_1
  18902. is_tutorial_level = 2
  18903. - not = {
  18904. + NOT = {
  18905. has_country_flag = tutorial_2
  18906. }
  18907. }
  18908. @@ -239,6 +244,7 @@ country_event = {
  18909. # is_triggered_only = yes
  18910. #
  18911. # trigger = {
  18912. +# is_ai = no
  18913. # is_tutorial_level = 2
  18914. # has_technology = tech_colonization_1
  18915. # has_event_chain = "tutorial_2_chain"
  18916. @@ -264,6 +270,7 @@ country_event = {
  18917. # is_triggered_only = yes
  18918. #
  18919. # trigger = {
  18920. +# is_ai = no
  18921. # last_increased_tech = "tech_space_construction"
  18922. # has_event_chain = "tutorial_2_chain"
  18923. # NOT = { has_country_flag = tech_2_researched }
  18924. @@ -300,6 +307,7 @@ country_event = {
  18925. is_triggered_only = yes
  18926.  
  18927. trigger = {
  18928. + is_ai = no
  18929. is_tutorial_level = 2
  18930. has_technology = tech_colonization_1
  18931. has_event_chain = "tutorial_2_chain"
  18932. @@ -335,6 +343,7 @@ country_event = {
  18933. is_triggered_only = yes
  18934.  
  18935. trigger = {
  18936. + is_ai = no
  18937. is_tutorial_level = 2
  18938. count_owned_ships = {
  18939. limit = { is_ship_class = shipclass_constructor }
  18940. @@ -365,6 +374,7 @@ country_event = {
  18941. is_triggered_only = yes
  18942.  
  18943. trigger = {
  18944. + is_ai = no
  18945. is_tutorial_level = 2
  18946. count_owned_ships = {
  18947. limit = { is_ship_class = shipclass_constructor }
  18948. @@ -390,6 +400,7 @@ ship_event = {
  18949. trigger = {
  18950. is_ship_size = constructor
  18951. owner = {
  18952. + is_ai = no
  18953. is_tutorial_level = 2
  18954. has_event_chain = "tutorial_3_chain"
  18955. }
  18956. @@ -480,6 +491,7 @@ ship_event = {
  18957.  
  18958. trigger = {
  18959. owner = {
  18960. + is_ai = no
  18961. is_tutorial_level = 2
  18962. NOT = {
  18963. has_event_chain = "tutorial_4_chain"
  18964. @@ -509,6 +521,7 @@ ship_event = {
  18965.  
  18966. trigger = {
  18967. owner = {
  18968. + is_ai = no
  18969. is_tutorial_level = 2
  18970. has_event_chain = "tutorial_4_chain"
  18971. #any_owned_ship = { is_ship_size = mining_station }
  18972. @@ -603,6 +616,7 @@ ship_event = {
  18973.  
  18974. trigger = {
  18975. owner = {
  18976. + is_ai = no
  18977. is_tutorial_level = 2
  18978. NOT = {
  18979. has_event_chain = "tutorial_5_chain"
  18980. @@ -631,6 +645,7 @@ ship_event = {
  18981.  
  18982. trigger = {
  18983. owner = {
  18984. + is_ai = no
  18985. is_tutorial_level = 2
  18986. has_event_chain = "tutorial_5_chain"
  18987. #any_owned_ship = { is_ship_size = research_station } #removed cause otherwise you need to build 2 before this is triggered
  18988. @@ -662,6 +677,7 @@ country_event = {
  18989. is_triggered_only = yes
  18990.  
  18991. trigger = {
  18992. + is_ai = no
  18993. is_tutorial_level = 2
  18994. NOT = {
  18995. has_event_chain = tutorial_6_chain
  18996. @@ -693,6 +709,7 @@ planet_event = {
  18997.  
  18998. trigger = {
  18999. owner = {
  19000. + is_ai = no
  19001. is_tutorial_level = 2
  19002. NOT = { has_country_flag = tutorial_cleared_early_14 }
  19003. }
  19004. @@ -718,6 +735,7 @@ planet_event = {
  19005.  
  19006. trigger = {
  19007. owner = {
  19008. + is_ai = no
  19009. is_tutorial_level = 2
  19010. has_event_chain = "tutorial_6_chain"
  19011. }
  19012. @@ -750,6 +768,7 @@ country_event = {
  19013. is_triggered_only = yes
  19014.  
  19015. trigger = {
  19016. + is_ai = no
  19017. is_tutorial_level = 2
  19018. NOT = {
  19019. has_country_flag = tutorial_cleared_early_16
  19020. @@ -778,6 +797,7 @@ planet_event = {
  19021.  
  19022. trigger = {
  19023. owner = {
  19024. + is_ai = no
  19025. is_tutorial_level = 2
  19026. NOT = { has_country_flag = tutorial_cleared_early_16 }
  19027. }
  19028. @@ -800,6 +820,7 @@ planet_event = {
  19029.  
  19030. trigger = {
  19031. owner = {
  19032. + is_ai = no
  19033. is_tutorial_level = 2
  19034. has_event_chain = "tutorial_7_chain"
  19035. }
  19036. @@ -828,6 +849,7 @@ country_event = {
  19037. is_triggered_only = yes
  19038.  
  19039. trigger = {
  19040. + is_ai = no
  19041. is_tutorial_level = 2
  19042. NOT = {
  19043. has_event_chain = tutorial_8_chain
  19044. @@ -920,6 +942,7 @@ ship_event = {
  19045.  
  19046. trigger = {
  19047. owner = {
  19048. + is_ai = no
  19049. is_tutorial_level = 2
  19050. NOT = {
  19051. has_country_flag = tutorial_cleared_early_17
  19052. @@ -984,6 +1007,7 @@ country_event = {
  19053. is_triggered_only = yes
  19054.  
  19055. trigger = {
  19056. + is_ai = no
  19057. is_tutorial_level = 2
  19058. has_event_chain = "tutorial_8_chain"
  19059. FROM = {
  19060. @@ -1037,6 +1061,7 @@ country_event = {
  19061. is_advisor_event = yes
  19062.  
  19063. trigger = {
  19064. + is_ai = no
  19065. is_tutorial_level = 2
  19066. has_event_chain = "tutorial_8_chain"
  19067. has_completed_event_chain_counter = {
  19068. @@ -1077,6 +1102,7 @@ country_event = {
  19069. is_triggered_only = yes
  19070.  
  19071. trigger = {
  19072. + is_ai = no
  19073. is_tutorial_level = 2
  19074. NOT = {
  19075. has_event_chain = tutorial_9_chain
  19076. @@ -1107,6 +1133,7 @@ country_event = {
  19077. is_triggered_only = yes
  19078.  
  19079. trigger = {
  19080. + is_ai = no
  19081. is_tutorial_level = 2
  19082. count_owned_ships = {
  19083. limit = { is_ship_class = shipclass_science_ship }
  19084. @@ -1132,6 +1159,7 @@ ship_event = {
  19085. trigger = {
  19086. is_ship_class = shipclass_science_ship
  19087. owner = {
  19088. + is_ai = no
  19089. is_tutorial_level = 2
  19090. has_event_chain = "tutorial_9_chain"
  19091. count_owned_ships = {
  19092. @@ -1166,6 +1194,7 @@ country_event = {
  19093. is_triggered_only = yes
  19094.  
  19095. trigger = {
  19096. + is_ai = no
  19097. is_tutorial_level = 2
  19098. any_owned_ship = {
  19099. is_ship_class = shipclass_science_ship
  19100. @@ -1202,6 +1231,7 @@ country_event = {
  19101. is_advisor_event = yes
  19102.  
  19103. trigger = {
  19104. + is_ai = no
  19105. is_tutorial_level = 2
  19106. has_event_chain = "tutorial_10_chain"
  19107. count_owned_ships = {
  19108. @@ -1286,6 +1316,7 @@ country_event = {
  19109. is_triggered_only = yes
  19110.  
  19111. trigger = {
  19112. + is_ai = no
  19113. is_tutorial_level = 2
  19114. OR = {
  19115. count_owned_ships = {
  19116. @@ -1317,6 +1348,7 @@ ship_event = {
  19117. trigger = {
  19118. is_ship_class = shipclass_colonizer
  19119. owner = {
  19120. + is_ai = no
  19121. is_tutorial_level = 2
  19122. has_event_chain = "tutorial_11_chain"
  19123. }
  19124. @@ -1350,6 +1382,7 @@ country_event = {
  19125. is_triggered_only = yes
  19126.  
  19127. trigger = {
  19128. + is_ai = no
  19129. is_tutorial_level = 2
  19130. has_technology = tech_colonization_1
  19131. NOT = {
  19132. @@ -1384,6 +1417,7 @@ country_event = {
  19133. is_triggered_only = yes
  19134.  
  19135. trigger = {
  19136. + is_ai = no
  19137. is_tutorial_level = 2
  19138. any_owned_planet = {
  19139. is_capital = no
  19140. @@ -1408,6 +1442,7 @@ planet_event = {
  19141. trigger = {
  19142. exists = owner
  19143. owner = {
  19144. + is_ai = no
  19145. is_tutorial_level = 2
  19146. has_event_chain = "tutorial_12_chain"
  19147. }
  19148. @@ -1442,6 +1477,7 @@ country_event = {
  19149. is_triggered_only = yes
  19150.  
  19151. trigger = {
  19152. + is_ai = no
  19153. is_tutorial_level = 2
  19154. any_owned_planet = {
  19155. is_capital = no
  19156. @@ -1473,6 +1509,7 @@ country_event = {
  19157. is_advisor_event = yes
  19158.  
  19159. trigger = {
  19160. + is_ai = no
  19161. is_tutorial_level = 2
  19162. has_event_chain = "tutorial_13_chain"
  19163. any_owned_planet = {
  19164. @@ -1595,6 +1632,7 @@ country_event = {
  19165. is_triggered_only = yes
  19166.  
  19167. trigger = {
  19168. + is_ai = no
  19169. is_tutorial_level = 2
  19170. NOT = {
  19171. has_event_chain = tutorial_15_chain
  19172. @@ -1615,6 +1653,7 @@ country_event = {
  19173. custom_tooltip = tutorial_15_tooltip
  19174. }
  19175. }
  19176. +
  19177. # Cleared Early
  19178. country_event = {
  19179. id = tutorial.330
  19180. @@ -1622,6 +1661,7 @@ country_event = {
  19181. is_triggered_only = yes
  19182.  
  19183. trigger = {
  19184. + is_ai = no
  19185. is_tutorial_level = 2
  19186. has_monthly_income = { resource = energy value > 9 }
  19187. has_monthly_income = { resource = minerals value > 29 }
  19188. @@ -1638,6 +1678,7 @@ country_event = {
  19189. hide_window = yes
  19190.  
  19191. trigger = {
  19192. + is_ai = no
  19193. is_tutorial_level = 2
  19194. has_event_chain = "tutorial_15_chain"
  19195. NOT = { has_country_flag = tutorial_15_minerals_achieved }
  19196. @@ -1668,6 +1709,7 @@ country_event = {
  19197. hide_window = yes
  19198.  
  19199. trigger = {
  19200. + is_ai = no
  19201. is_tutorial_level = 2
  19202. has_event_chain = "tutorial_15_chain"
  19203. has_country_flag = tutorial_15_minerals_achieved
  19204. @@ -1694,6 +1736,7 @@ country_event = {
  19205. hide_window = yes
  19206.  
  19207. trigger = {
  19208. + is_ai = no
  19209. is_tutorial_level = 2
  19210. has_event_chain = "tutorial_15_chain"
  19211. NOT = { has_country_flag = tutorial_15_credits_achieved }
  19212. @@ -1724,6 +1767,7 @@ country_event = {
  19213. hide_window = yes
  19214.  
  19215. trigger = {
  19216. + is_ai = no
  19217. is_tutorial_level = 2
  19218. has_event_chain = "tutorial_15_chain"
  19219. has_country_flag = tutorial_15_credits_achieved
  19220. @@ -1755,6 +1799,7 @@ country_event = {
  19221. is_advisor_event = yes
  19222.  
  19223. trigger = {
  19224. + is_ai = no
  19225. is_tutorial_level = 2
  19226. has_event_chain = "tutorial_15_chain"
  19227. has_completed_event_chain_counter = {
  19228. @@ -1792,6 +1837,7 @@ country_event = {
  19229. is_triggered_only = yes
  19230.  
  19231. trigger = {
  19232. + is_ai = no
  19233. is_tutorial_level = 2
  19234. count_owned_ships = {
  19235. limit = { is_ship_size = corvette }
  19236. @@ -1826,6 +1872,7 @@ ship_event = {
  19237.  
  19238. trigger = {
  19239. owner = {
  19240. + is_ai = no
  19241. is_tutorial_level = 2
  19242. has_event_chain = "tutorial_16_chain"
  19243. NOT = { has_country_flag = tutorial_16_corvettes_built }
  19244. @@ -1853,6 +1900,7 @@ country_event = {
  19245. is_triggered_only = yes
  19246.  
  19247. trigger = {
  19248. + is_ai = no
  19249. is_tutorial_level = 2
  19250. has_event_chain = "tutorial_16_chain"
  19251. NOT = { has_country_flag = tutorial_16_corvettes_built }
  19252. @@ -1873,6 +1921,7 @@ country_event = {
  19253. hide_window = yes
  19254.  
  19255. trigger = {
  19256. + is_ai = no
  19257. is_tutorial_level = 2
  19258. has_event_chain = "tutorial_16_chain"
  19259. NOT = { has_country_flag = tutorial_16_admiral_assigned }
  19260. @@ -1910,6 +1959,7 @@ country_event = {
  19261. is_advisor_event = yes
  19262.  
  19263. trigger = {
  19264. + is_ai = no
  19265. is_tutorial_level = 2
  19266. has_event_chain = "tutorial_16_chain"
  19267. has_completed_event_chain_counter = {
  19268. @@ -1948,6 +1998,7 @@ planet_event = {
  19269. trigger = {
  19270. exists = owner
  19271. owner = {
  19272. + is_ai = no
  19273. is_tutorial_level = 2
  19274. check_variable = {
  19275. which = "num_colonies"
  19276. @@ -2000,6 +2051,7 @@ country_event = {
  19277. is_triggered_only = yes
  19278.  
  19279. trigger = {
  19280. + is_ai = no
  19281. is_tutorial_level = 2
  19282. sectors < 1
  19283. check_variable = {
  19284. @@ -2032,6 +2084,7 @@ country_event = {
  19285. is_advisor_event = yes
  19286.  
  19287. trigger = {
  19288. + is_ai = no
  19289. is_tutorial_level = 2
  19290. has_event_chain = "tutorial_17_chain"
  19291. sectors > 0
  19292. @@ -2066,6 +2119,7 @@ country_event = {
  19293. is_triggered_only = yes
  19294.  
  19295. trigger = {
  19296. + is_ai = no
  19297. is_tutorial_level = 2
  19298. any_sector = {
  19299. NOT = { exists = leader }
  19300. @@ -2098,6 +2152,7 @@ country_event = {
  19301. is_advisor_event = yes
  19302.  
  19303. trigger = {
  19304. + is_ai = no
  19305. is_tutorial_level = 2
  19306. has_event_chain = "tutorial_18_chain"
  19307. any_sector = { exists = leader }
  19308. @@ -2129,6 +2184,7 @@ country_event = {
  19309. is_triggered_only = yes
  19310.  
  19311. trigger = {
  19312. + is_ai = no
  19313. is_tutorial_level = 2
  19314. NOT = {
  19315. has_event_chain = tutorial_19_chain
  19316. @@ -2156,6 +2212,7 @@ country_event = {
  19317. is_triggered_only = yes
  19318.  
  19319. trigger = {
  19320. + is_ai = no
  19321. is_tutorial_level = 2
  19322. NOT = {
  19323. has_event_chain = "tutorial_19_chain"
  19324. @@ -2179,6 +2236,7 @@ country_event = {
  19325. is_triggered_only = yes
  19326.  
  19327. trigger = {
  19328. + is_ai = no
  19329. is_tutorial_level = 2
  19330. has_event_chain = "tutorial_19_chain"
  19331. }
  19332. @@ -2209,6 +2267,7 @@ ship_event = {
  19333.  
  19334. trigger = {
  19335. owner = {
  19336. + is_ai = no
  19337. is_tutorial_level = 2
  19338. NOT = {
  19339. has_event_chain = tutorial_20_chain
  19340. @@ -2245,6 +2304,7 @@ country_event = {
  19341. is_advisor_event = yes
  19342.  
  19343. trigger = {
  19344. + is_ai = no
  19345. is_tutorial_level = 2
  19346. has_event_chain = "tutorial_20_chain"
  19347. any_owned_ship = { is_ship_size = observation_station }
  19348. @@ -2287,7 +2347,10 @@ ship_event = {
  19349. is_triggered_only = yes
  19350.  
  19351. trigger = {
  19352. - owner = { is_tutorial_level = 2 }
  19353. + owner = {
  19354. + is_ai = no
  19355. + is_tutorial_level = 2
  19356. + }
  19357. }
  19358.  
  19359. option = {
  19360. @@ -2313,6 +2376,7 @@ ship_event = {
  19361. }
  19362. }
  19363. }
  19364. +
  19365. ship_event = {
  19366. #Story5
  19367. id = tutorial.53
  19368. @@ -2337,7 +2401,10 @@ ship_event = {
  19369. is_triggered_only = yes
  19370.  
  19371. trigger = {
  19372. - owner = { is_tutorial_level = 2 }
  19373. + owner = {
  19374. + is_ai = no
  19375. + is_tutorial_level = 2
  19376. + }
  19377. }
  19378.  
  19379. immediate = { hidden_effect = { owner = { country_event = { id = story.5 days = 30 } } } }
  19380. @@ -2378,6 +2445,7 @@ ship_event = {
  19381. }
  19382. }
  19383. }
  19384. +
  19385. ship_event = {
  19386. id = tutorial.54
  19387. title = tutorial.52.name
  19388. @@ -2388,7 +2456,10 @@ ship_event = {
  19389. is_triggered_only = yes
  19390.  
  19391. trigger = {
  19392. - owner = { is_tutorial_level = 2 }
  19393. + owner = {
  19394. + is_ai = no
  19395. + is_tutorial_level = 2
  19396. + }
  19397. }
  19398.  
  19399. option = {
  19400. @@ -2441,6 +2512,7 @@ ship_event = {
  19401.  
  19402. trigger = {
  19403. owner = {
  19404. + is_ai = no
  19405. is_tutorial_level = 2
  19406. NOT = {
  19407. has_event_chain = tutorial_21_chain
  19408. @@ -2524,6 +2596,7 @@ ship_event = {
  19409. custom_tooltip = tutorial_21_tooltip
  19410. }
  19411. }
  19412. +
  19413. # Start with meantime
  19414. country_event = {
  19415. id = tutorial.555
  19416. @@ -2534,6 +2607,7 @@ country_event = {
  19417. is_advisor_event = yes
  19418.  
  19419. trigger = {
  19420. + is_ai = no
  19421. is_tutorial_level = 2
  19422. NOT = {
  19423. has_event_chain = tutorial_21_chain
  19424. @@ -2630,6 +2704,7 @@ ship_event = {
  19425.  
  19426. trigger = {
  19427. owner = {
  19428. + is_ai = no
  19429. is_tutorial_level = 2
  19430. has_event_chain = "tutorial_21_chain"
  19431. NOT = { has_country_flag = finished_tutorial_21 }
  19432. @@ -2663,6 +2738,7 @@ ship_event = {
  19433. name = OK
  19434. }
  19435. }
  19436. +
  19437. # Finished by having a mining station on a resource before researching the required tech
  19438. country_event = {
  19439. id = tutorial.560
  19440. @@ -2673,6 +2749,7 @@ country_event = {
  19441. is_advisor_event = yes
  19442.  
  19443. trigger = {
  19444. + is_ai = no
  19445. is_tutorial_level = 2
  19446. NOT = { has_country_flag = finished_tutorial_21 }
  19447. capital_scope = {
  19448. @@ -2829,6 +2906,10 @@ country_event = {
  19449. hide_window = yes
  19450. is_triggered_only = yes
  19451.  
  19452. + trigger = {
  19453. + is_ai = no
  19454. + }
  19455. +
  19456. immediate = {
  19457. end_event_chain = "tutorial_21b_chain"
  19458. }
  19459. @@ -2854,6 +2935,7 @@ country_event = {
  19460. is_advisor_event = yes
  19461.  
  19462. trigger = {
  19463. + is_ai = no
  19464. is_tutorial_level = 2
  19465. NOT = {
  19466. has_event_chain = tutorial_22_chain
  19467. @@ -2885,6 +2967,7 @@ country_event = {
  19468. is_advisor_event = yes
  19469.  
  19470. trigger = {
  19471. + is_ai = no
  19472. is_tutorial_level = 2
  19473. has_event_chain = tutorial_22_chain
  19474. }
  19475. @@ -2911,6 +2994,7 @@ country_event = {
  19476. is_advisor_event = yes
  19477.  
  19478. trigger = {
  19479. + is_ai = no
  19480. is_tutorial_level = 2
  19481. NOT = {
  19482. has_event_chain = tutorial_23_chain
  19483. @@ -2942,6 +3026,7 @@ country_event = {
  19484. is_advisor_event = yes
  19485.  
  19486. trigger = {
  19487. + is_ai = no
  19488. is_tutorial_level = 2
  19489. has_event_chain = tutorial_23_chain
  19490. }
  19491. @@ -2967,6 +3052,7 @@ country_event = {
  19492. is_advisor_event = yes
  19493.  
  19494. trigger = {
  19495. + is_ai = no
  19496. is_tutorial_level = 2
  19497. has_event_chain = tutorial_23_chain
  19498. }
  19499. @@ -2989,8 +3075,8 @@ country_event = {
  19500. is_triggered_only = yes
  19501.  
  19502. trigger = {
  19503. - is_tutorial_level = 2
  19504. is_country_type = default
  19505. + from = { is_tutorial_level = 2 }
  19506. }
  19507.  
  19508. immediate = {
  19509. @@ -3011,6 +3097,7 @@ country_event = {
  19510. is_advisor_event = yes
  19511.  
  19512. trigger = {
  19513. + is_ai = no
  19514. is_tutorial_level = 2
  19515. is_country_type = default
  19516. has_event_chain = tutorial_23_chain
  19517. @@ -3025,7 +3112,6 @@ country_event = {
  19518. }
  19519. }
  19520. }
  19521. - break = yes
  19522. else = { end_event_chain = tutorial_23_chain }
  19523. }
  19524. }
  19525. @@ -3047,6 +3133,7 @@ country_event = {
  19526. is_advisor_event = yes
  19527.  
  19528. trigger = {
  19529. + is_ai = no
  19530. is_tutorial_level = 2
  19531. OR = {
  19532. last_increased_tech = "tech_gene_tailoring"
  19533. @@ -3083,6 +3170,7 @@ country_event = {
  19534. is_advisor_event = yes
  19535.  
  19536. trigger = {
  19537. + is_ai = no
  19538. is_tutorial_level = 2
  19539. has_event_chain = tutorial_24_chain
  19540. }
  19541. @@ -3128,6 +3216,7 @@ country_event = {
  19542. is_advisor_event = yes
  19543.  
  19544. trigger = {
  19545. + is_ai = no
  19546. is_tutorial_level > 0
  19547. }
  19548.  
  19549. @@ -3166,6 +3255,7 @@ country_event = {
  19550. is_advisor_event = yes
  19551.  
  19552. trigger = {
  19553. + is_ai = no
  19554. is_tutorial_level = 2
  19555. OR = {
  19556. last_increased_tech = tech_epigenetic_triggers
  19557. @@ -3219,6 +3309,7 @@ country_event = {
  19558. is_triggered_only = yes
  19559.  
  19560. trigger = {
  19561. + is_ai = no
  19562. is_tutorial_level = 2
  19563. NOT = {
  19564. has_event_chain = tutorial_25_chain
  19565. @@ -3247,6 +3338,7 @@ ship_event = {
  19566.  
  19567. trigger = {
  19568. owner = {
  19569. + is_ai = no
  19570. is_tutorial_level = 2
  19571. NOT = { has_country_flag = tutorial_cleared_early_75 }
  19572. }
  19573. @@ -3269,6 +3361,7 @@ ship_event = {
  19574.  
  19575. trigger = {
  19576. owner = {
  19577. + is_ai = no
  19578. is_tutorial_level = 2
  19579. has_event_chain = "tutorial_25_chain"
  19580. }
  19581. @@ -3294,6 +3387,7 @@ country_event = {
  19582. is_advisor_event = yes
  19583.  
  19584. trigger = {
  19585. + is_ai = no
  19586. is_tutorial_level = 0
  19587. has_country_flag = tutorial_level_picked
  19588. }
  19589. @@ -3318,6 +3412,7 @@ country_event = {
  19590. is_advisor_event = yes
  19591.  
  19592. trigger = {
  19593. + is_ai = no
  19594. is_tutorial_level = 1
  19595. has_country_flag = tutorial_level_picked
  19596. NOT = { has_ethic = ethic_gestalt_consciousness }
  19597. @@ -3343,6 +3438,7 @@ country_event = {
  19598. is_advisor_event = yes
  19599.  
  19600. trigger = {
  19601. + is_ai = no
  19602. is_tutorial_level = 2
  19603. has_country_flag = tutorial_level_picked
  19604. NOT = { has_ethic = ethic_gestalt_consciousness }
  19605. @@ -3373,6 +3469,7 @@ country_event = {
  19606. is_triggered_only = yes
  19607.  
  19608. trigger = {
  19609. + is_ai = no
  19610. OR = {
  19611. is_tutorial_level = 0
  19612. is_tutorial_level = 1
  19613. @@ -3549,6 +3646,7 @@ country_event = {
  19614. is_triggered_only = yes
  19615.  
  19616. trigger = {
  19617. + is_ai = no
  19618. is_tutorial_level < 1
  19619. NOT = { has_country_flag = tutorial_level_picked }
  19620. }
  19621. diff --git a/2.0.0/events/unrest_events.txt b/2.0.2/events/unrest_events.txt
  19622. index 4da4fd1..8974886 100755
  19623. --- a/2.0.0/events/unrest_events.txt
  19624. +++ b/2.0.2/events/unrest_events.txt
  19625. @@ -1375,7 +1375,7 @@ country_event = {
  19626. From = { save_event_target_as = rebel_country }
  19627. remove_country_flag = slave_revolt_chain_active
  19628. save_event_target_as = old_owner
  19629. - solar_system = {
  19630. + fromfrom.solar_system = {
  19631. starbase = {
  19632. set_owner = event_target:rebel_country
  19633. }
  19634. diff --git a/2.0.0/events/utopia_megastructure_events.txt b/2.0.2/events/utopia_megastructure_events.txt
  19635. index 1f9f24e..29abb03 100755
  19636. --- a/2.0.0/events/utopia_megastructure_events.txt
  19637. +++ b/2.0.2/events/utopia_megastructure_events.txt
  19638. @@ -3562,10 +3562,10 @@ country_event = {
  19639. show_sound = event_mystic_reveal
  19640. picture = GFX_evt_colony_settlement
  19641. is_triggered_only = yes
  19642. - location = FromFromFrom
  19643. + location = FromFromFrom.Planet
  19644.  
  19645. option = {
  19646. name = EXCELLENT
  19647. - set_country_flag = already_built_habitat
  19648. + hidden_effect = { set_country_flag = already_built_habitat }
  19649. }
  19650. }
  19651. \ No newline at end of file
  19652. diff --git a/2.0.0/events/utopia_on_action_events.txt b/2.0.2/events/utopia_on_action_events.txt
  19653. index 4b58363..32bd954 100755
  19654. --- a/2.0.0/events/utopia_on_action_events.txt
  19655. +++ b/2.0.2/events/utopia_on_action_events.txt
  19656. @@ -427,6 +427,7 @@ country_event = {
  19657. if = {
  19658. limit = { leader_class = ruler }
  19659. add_trait = leader_trait_ruler_cyborg
  19660. + add_ruler_trait = leader_trait_ruler_cyborg
  19661. }
  19662. }
  19663.  
  19664. @@ -464,6 +465,7 @@ country_event = {
  19665. if = {
  19666. limit = { leader_class = ruler }
  19667. add_trait = leader_trait_ruler_cyborg
  19668. + add_ruler_trait = leader_trait_ruler_cyborg
  19669. }
  19670. }
  19671.  
  19672. @@ -530,6 +532,80 @@ country_event = {
  19673. }
  19674. }
  19675.  
  19676. +# Handle leader traits after species modification
  19677. +country_event = {
  19678. + id = utopia.2508
  19679. + is_triggered_only = yes
  19680. + hide_window = yes
  19681. +
  19682. + immediate = {
  19683. + every_owned_leader = {
  19684. + add_leader_traits_after_modification = yes
  19685. + remove_leader_traits_after_modification = yes
  19686. + }
  19687. +
  19688. + every_pool_leader = {
  19689. + add_leader_traits_after_modification = yes
  19690. + remove_leader_traits_after_modification = yes
  19691. + }
  19692. + }
  19693. +}
  19694. +
  19695. +# New Leaders Get Erudite Trait
  19696. +country_event = {
  19697. + id = utopia.2509
  19698. + is_triggered_only = yes
  19699. + hide_window = yes
  19700. +
  19701. + trigger = {
  19702. + from = {
  19703. + species = {
  19704. + has_trait = trait_erudite
  19705. + NOR = {
  19706. + has_trait = trait_cybernetic
  19707. + has_trait = trait_psionic
  19708. + has_trait = trait_latent_psionic
  19709. + }
  19710. + }
  19711. + }
  19712. + }
  19713. +
  19714. + immediate = {
  19715. + from = {
  19716. + if = {
  19717. + limit = { leader_class = admiral }
  19718. + add_trait = leader_trait_admiral_erudite
  19719. + add_ruler_trait = leader_trait_ruler_erudite
  19720. + break = yes
  19721. + }
  19722. + if = {
  19723. + limit = { leader_class = general }
  19724. + add_trait = leader_trait_general_erudite
  19725. + add_ruler_trait = leader_trait_ruler_erudite
  19726. + break = yes
  19727. + }
  19728. + if = {
  19729. + limit = { leader_class = governor }
  19730. + add_trait = leader_trait_governor_erudite
  19731. + add_ruler_trait = leader_trait_ruler_erudite
  19732. + break = yes
  19733. + }
  19734. + if = {
  19735. + limit = { leader_class = scientist }
  19736. + add_trait = leader_trait_scientist_erudite
  19737. + add_ruler_trait = leader_trait_ruler_erudite
  19738. + break = yes
  19739. + }
  19740. + if = {
  19741. + limit = { leader_class = ruler }
  19742. + add_trait = leader_trait_ruler_erudite
  19743. + add_ruler_trait = leader_trait_ruler_erudite
  19744. + break = yes
  19745. + }
  19746. + }
  19747. + }
  19748. +}
  19749. +
  19750. # New Leaders Get Cyborg Trait
  19751. country_event = {
  19752. id = utopia.2510
  19753. @@ -847,6 +923,7 @@ country_event = {
  19754. if = {
  19755. limit = { leader_class = ruler }
  19756. add_trait = leader_trait_ruler_synthetic
  19757. + add_ruler_trait = leader_trait_ruler_synthetic
  19758. remove_trait = leader_trait_ruler_cyborg
  19759. }
  19760. }
  19761. @@ -892,6 +969,7 @@ country_event = {
  19762. if = {
  19763. limit = { leader_class = ruler }
  19764. add_trait = leader_trait_ruler_synthetic
  19765. + add_ruler_trait = leader_trait_ruler_synthetic
  19766. remove_trait = leader_trait_ruler_cyborg
  19767. }
  19768. }
  19769. @@ -1130,6 +1208,7 @@ country_event = {
  19770. if = {
  19771. limit = { leader_class = ruler }
  19772. add_trait = leader_trait_ruler_synthetic
  19773. + add_ruler_trait = leader_trait_ruler_synthetic
  19774. break = yes
  19775. }
  19776. }
  19777. @@ -1213,7 +1292,7 @@ country_event = {
  19778. }
  19779. country_event = { id = utopia.2602 }
  19780. }
  19781. - change_dominant_species = { species = last_created change_all = yes }
  19782. + #change_dominant_species = { species = last_created change_all = yes }
  19783. }
  19784.  
  19785. option = {
  19786. @@ -1270,6 +1349,7 @@ country_event = {
  19787. if = {
  19788. limit = { leader_class = ruler }
  19789. add_trait = leader_trait_ruler_psionic
  19790. + add_ruler_trait = leader_trait_ruler_psionic
  19791. break = yes
  19792. }
  19793. }
  19794. @@ -1433,6 +1513,7 @@ country_event = {
  19795. if = {
  19796. limit = { leader_class = ruler }
  19797. add_trait = leader_trait_ruler_psionic
  19798. + add_ruler_trait = leader_trait_ruler_psionic
  19799. break = yes
  19800. }
  19801. }
  19802. @@ -1514,6 +1595,7 @@ country_event = {
  19803. if = {
  19804. limit = { leader_class = ruler }
  19805. add_trait = leader_trait_ruler_psionic
  19806. + add_ruler_trait = leader_trait_ruler_psionic
  19807. }
  19808. }
  19809. every_pool_leader = {
  19810. @@ -1554,6 +1636,7 @@ country_event = {
  19811. if = {
  19812. limit = { leader_class = ruler }
  19813. add_trait = leader_trait_ruler_psionic
  19814. + add_ruler_trait = leader_trait_ruler_psionic
  19815. }
  19816. }
  19817. }
  19818. @@ -1611,6 +1694,7 @@ country_event = {
  19819. if = {
  19820. limit = { leader_class = ruler }
  19821. add_trait = leader_trait_ruler_psionic
  19822. + add_ruler_trait = leader_trait_ruler_psionic
  19823. break = yes
  19824. }
  19825. }
  19826. diff --git a/2.0.0/events/utopia_shroud_events.txt b/2.0.2/events/utopia_shroud_events.txt
  19827. index bf90dd5..7b49d39 100755
  19828. --- a/2.0.0/events/utopia_shroud_events.txt
  19829. +++ b/2.0.2/events/utopia_shroud_events.txt
  19830. @@ -439,8 +439,11 @@ country_event = {
  19831. create_fleet = {
  19832. name = "NAME_Psionic_Avatar"
  19833. settings = {
  19834. + can_upgrade = no
  19835. + can_change_composition = no
  19836. + can_change_leader = no
  19837. + uses_naval_capacity = no
  19838. spawn_debris = no
  19839. - is_boss = yes
  19840. }
  19841. effect = {
  19842. set_owner = root
  19843. @@ -6047,3 +6050,167 @@ country_event = {
  19844. }
  19845. }
  19846. }
  19847. +
  19848. +# Chosen One becomes ruler
  19849. +country_event = {
  19850. + id = utopia.3400
  19851. + title = "utopia.3400.name"
  19852. + desc = "utopia.3400.desc"
  19853. + picture = GFX_evt_psionics
  19854. + show_sound = event_mystic_reveal
  19855. +
  19856. + trigger = {
  19857. + is_country_type = default
  19858. + NOT = { has_country_flag = chosen_one_ruler_event }
  19859. + OR = {
  19860. + has_authority = auth_democratic
  19861. + has_authority = auth_oligarchic
  19862. + has_authority = auth_dictatorial
  19863. + }
  19864. + any_owned_leader = {
  19865. + OR = {
  19866. + has_trait = leader_trait_admiral_chosen
  19867. + has_trait = leader_trait_general_chosen
  19868. + has_trait = leader_trait_governor_chosen
  19869. + has_trait = leader_trait_scientist_chosen
  19870. + has_trait = leader_trait_ruler_chosen
  19871. + }
  19872. + }
  19873. + }
  19874. +
  19875. + mean_time_to_happen = {
  19876. + months = 120
  19877. + }
  19878. +
  19879. + immediate = {
  19880. + set_country_flag = chosen_one_ruler_event
  19881. + random_owned_leader = {
  19882. + limit = {
  19883. + OR = {
  19884. + has_trait = leader_trait_admiral_chosen
  19885. + has_trait = leader_trait_general_chosen
  19886. + has_trait = leader_trait_governor_chosen
  19887. + has_trait = leader_trait_scientist_chosen
  19888. + has_trait = leader_trait_ruler_chosen
  19889. + }
  19890. + }
  19891. + save_event_target_as = chosen_one
  19892. + species = { save_event_target_as = chosen_one_species }
  19893. + }
  19894. + }
  19895. +
  19896. + option = {
  19897. + name = "utopia.3400.a"
  19898. + ai_chance = {
  19899. + factor = 100
  19900. + modifier = {
  19901. + factor = 40
  19902. + has_ethic = ethic_egalitarian
  19903. + }
  19904. + modifier = {
  19905. + factor = 80
  19906. + has_ethic = ethic_fanatic_egalitarian
  19907. + }
  19908. + }
  19909. + custom_tooltip = reject_god_emperor
  19910. + }
  19911. + option = {
  19912. + name = "utopia.3400.b"
  19913. + ai_chance = {
  19914. + factor = 150
  19915. + modifier = {
  19916. + factor = 40
  19917. + has_ethic = ethic_authoritarian
  19918. + }
  19919. + modifier = {
  19920. + factor = 80
  19921. + has_ethic = ethic_fanatic_authoritarian
  19922. + }
  19923. + }
  19924. + shift_ethic = "ethic_fanatic_authoritarian"
  19925. + shift_ethic = "ethic_spiritualist"
  19926. + change_government = {
  19927. + authority = auth_imperial
  19928. + civics = {
  19929. + civic = civic_imperial_cult
  19930. + civic = civic_aristocratic_elite
  19931. + civic = civic_philosopher_king
  19932. + }
  19933. + }
  19934. + set_leader = event_target:chosen_one
  19935. + hidden_effect = {
  19936. + every_country = {
  19937. + limit = {
  19938. + is_ai = no
  19939. + NOT = { is_same_value = root }
  19940. + has_communications = root
  19941. + }
  19942. + country_event = { id = utopia.3401 days = 4 }
  19943. + }
  19944. + country_event = { id = utopia.3402 days = 5 }
  19945. + }
  19946. + }
  19947. +}
  19948. +
  19949. +# Empire accepts Chosen One as ruler
  19950. +country_event = {
  19951. + id = utopia.3401
  19952. + title = "utopia.3401.name"
  19953. + desc = "utopia.3401.desc"
  19954. + picture = GFX_evt_psionics
  19955. + show_sound = event_mystic_reveal
  19956. +
  19957. + is_triggered_only = yes
  19958. +
  19959. + option = {
  19960. + name = "utopia.3401.a"
  19961. + trigger = {
  19962. + any_relation = {
  19963. + AND = {
  19964. + is_country_type = shroud
  19965. + has_communications = root
  19966. + }
  19967. + }
  19968. + }
  19969. + }
  19970. + option = {
  19971. + name = "utopia.3401.b"
  19972. + trigger = {
  19973. + OR = {
  19974. + has_ethic = ethic_fanatic_materialist
  19975. + has_ethic = ethic_materialist
  19976. + }
  19977. + }
  19978. + }
  19979. + option = {
  19980. + name = "utopia.3401.c"
  19981. + trigger = {
  19982. + NOR = {
  19983. + has_ethic = ethic_fanatic_materialist
  19984. + has_ethic = ethic_materialist
  19985. + any_relation = {
  19986. + AND = {
  19987. + is_country_type = shroud
  19988. + has_communications = root
  19989. + }
  19990. + }
  19991. + }
  19992. + }
  19993. + }
  19994. +}
  19995. +
  19996. +# Change empire name
  19997. +country_event = {
  19998. + id = utopia.3402
  19999. + hide_window = yes
  20000. +
  20001. + is_triggered_only = yes
  20002. +
  20003. + trigger = {
  20004. + is_ai = yes
  20005. + }
  20006. +
  20007. + immediate = {
  20008. + set_name = random
  20009. + }
  20010. +}
  20011. \ No newline at end of file
  20012. diff --git a/2.0.0/events/war_in_heaven_events.txt b/2.0.2/events/war_in_heaven_events.txt
  20013. index 292fc88..44f0ada 100755
  20014. --- a/2.0.0/events/war_in_heaven_events.txt
  20015. +++ b/2.0.2/events/war_in_heaven_events.txt
  20016. @@ -609,115 +609,41 @@ country_event = {
  20017. }
  20018. }
  20019.  
  20020. -# TODO [HL] [AUG-14707]: Rework for new war system
  20021. -# Victory for one side, neutral observer
  20022. -#country_event = {
  20023. -# id = war_in_heaven.5
  20024. -# title = war_in_heaven.5.name
  20025. -# desc = war_in_heaven.5.desc
  20026. -# picture = GFX_evt_fallen_empire_awakes
  20027. -# show_sound = event_alien_signal
  20028. -# location = from
  20029. -#
  20030. -# is_triggered_only = yes
  20031. -#
  20032. -# trigger = {
  20033. -# NOT = { has_country_flag = war_in_heaven_winner }
  20034. -# NOT = { has_country_flag = war_in_heaven_loser }
  20035. -# }
  20036. -#
  20037. -# option = {
  20038. -# name = war_in_heaven.5.a
  20039. -# }
  20040. -#}
  20041. -
  20042. -# TODO [HL] [AUG-14707]: Rework for new war system
  20043. -# Victory for your side, no planets awarded
  20044. -#country_event = {
  20045. -# id = war_in_heaven.6
  20046. -# title = war_in_heaven.6.name
  20047. -# desc = war_in_heaven.6.desc
  20048. -# picture = GFX_evt_fallen_empire_awakes
  20049. -# show_sound = event_alien_signal
  20050. -# location = from
  20051. -#
  20052. -# is_triggered_only = yes
  20053. -#
  20054. -# trigger = {
  20055. -# has_country_flag = war_in_heaven_winner
  20056. -# NOT = { has_country_flag = war_in_heaven_planet_was_given }
  20057. -# }
  20058. -#
  20059. -# option = {
  20060. -# name = war_in_heaven.6.a
  20061. -# }
  20062. -#}
  20063. -
  20064. -# TODO [HL] [AUG-14707]: Rework for new war system
  20065. -# Victory for your side, planets awarded
  20066. -#country_event = {
  20067. -# id = war_in_heaven.7
  20068. -# title = war_in_heaven.7.name
  20069. -# desc = war_in_heaven.7.desc
  20070. -# picture = GFX_evt_fallen_empire_awakes
  20071. -# show_sound = event_alien_signal
  20072. -# location = from
  20073. -#
  20074. -# is_triggered_only = yes
  20075. -#
  20076. -# trigger = {
  20077. -# has_country_flag = war_in_heaven_winner
  20078. -# has_country_flag = war_in_heaven_planet_was_given
  20079. -# }
  20080. -#
  20081. -# option = {
  20082. -# name = war_in_heaven.7.a
  20083. -# }
  20084. -#}
  20085. -
  20086. -# TODO [HL] [AUG-14707]: Rework for new war system
  20087. -# Victory for your side, no planets awarded
  20088. -#country_event = {
  20089. -# id = war_in_heaven.8
  20090. -# title = war_in_heaven.8.name
  20091. -# desc = war_in_heaven.8.desc
  20092. -# picture = GFX_evt_fallen_empire_awakes
  20093. -# show_sound = event_alien_signal
  20094. -# location = from
  20095. -#
  20096. -# is_triggered_only = yes
  20097. -#
  20098. -# trigger = {
  20099. -# has_country_flag = war_in_heaven_loser
  20100. -# NOT = { has_country_flag = war_in_heaven_planet_was_lost }
  20101. -# }
  20102. -#
  20103. -# option = {
  20104. -# name = war_in_heaven.8.a
  20105. -# }
  20106. -#}
  20107. -
  20108. -# TODO [HL] [AUG-14707]: Rework for new war system
  20109. -# Defeat for your side, planets lost
  20110. -#country_event = {
  20111. -# id = war_in_heaven.9
  20112. -# title = war_in_heaven.9.name
  20113. -# desc = war_in_heaven.9.desc
  20114. -# picture = GFX_evt_fallen_empire_awakes
  20115. -# show_sound = event_alien_signal
  20116. -# location = from
  20117. -#
  20118. -# is_triggered_only = yes
  20119. -#
  20120. -# trigger = {
  20121. -# has_country_flag = war_in_heaven_loser
  20122. -# has_country_flag = war_in_heaven_planet_was_lost
  20123. -# }
  20124. -#
  20125. -# option = {
  20126. -# name = war_in_heaven.9.a
  20127. -# }
  20128. -#}
  20129. +# Victory for one side
  20130. +country_event = {
  20131. + id = war_in_heaven.5
  20132. + title = war_in_heaven.5.name
  20133. + desc = war_in_heaven.5.desc
  20134. + picture = GFX_evt_fallen_empire_awakes
  20135. + show_sound = event_alien_signal
  20136. + location = from
  20137. +
  20138. + is_triggered_only = yes
  20139. +
  20140. + trigger = {
  20141. + is_subject = no
  20142. + }
  20143. +
  20144. + option = {
  20145. + name = war_in_heaven.5.a
  20146. + }
  20147. +}
  20148. +
  20149. +# Ends in Status Quo
  20150. +country_event = {
  20151. + id = war_in_heaven.6
  20152. + title = war_in_heaven.6.name
  20153. + desc = war_in_heaven.6.desc
  20154. + picture = GFX_evt_fallen_empire_awakes
  20155. + show_sound = event_alien_signal
  20156. + location = from
  20157. +
  20158. + is_triggered_only = yes
  20159. +
  20160. + option = {
  20161. + name = war_in_heaven.6.a
  20162. + }
  20163. +}
  20164.  
  20165. # War in Heaven combatant defeated by nonaligned league
  20166. country_event = {
  20167. diff --git a/2.0.0/interface/alerts.gfx b/2.0.2/interface/alerts.gfx
  20168. index cb6816b..df82bbe 100755
  20169. --- a/2.0.0/interface/alerts.gfx
  20170. +++ b/2.0.2/interface/alerts.gfx
  20171. @@ -3,7 +3,7 @@ spriteTypes = {
  20172. spriteType = {
  20173. name = "GFX_alerticons"
  20174. texturefile = "gfx/interface/icons/alerticons.dds"
  20175. - noOfFrames = 30
  20176. + noOfFrames = 31
  20177. alwaystransparent = yes
  20178. }
  20179.  
  20180. diff --git a/2.0.0/interface/ascension_perks.gfx b/2.0.2/interface/ascension_perks.gfx
  20181. index 651ddf3..1c85e9d 100755
  20182. --- a/2.0.0/interface/ascension_perks.gfx
  20183. +++ b/2.0.2/interface/ascension_perks.gfx
  20184. @@ -99,8 +99,8 @@ spriteTypes = {
  20185. }
  20186.  
  20187. spriteType = {
  20188. - name = "GFX_ap_reach_for_the_stars"
  20189. - texturefile = "gfx/interface/icons/ascension_perks/ap_reach_for_the_stars.dds"
  20190. + name = "GFX_ap_grasp_the_void"
  20191. + texturefile = "gfx/interface/icons/ascension_perks/ap_grasp_the_void.dds"
  20192. alwaystransparent = yes
  20193. }
  20194.  
  20195. @@ -193,4 +193,10 @@ spriteTypes = {
  20196. texturefile = "gfx/interface/icons/ascension_perks/ap_nihilistic_acquisition.dds"
  20197. alwaystransparent = yes
  20198. }
  20199. +
  20200. + spriteType = {
  20201. + name = "GFX_ap_transcendent_learning"
  20202. + texturefile = "gfx/interface/icons/ascension_perks/ap_transcendent_learning.dds"
  20203. + alwaystransparent = yes
  20204. + }
  20205. }
  20206. diff --git a/2.0.0/interface/credits_l_simp_chinese.txt b/2.0.0/interface/credits_l_simp_chinese.txt
  20207. deleted file mode 100755
  20208. index e5e62c5..0000000
  20209. --- a/2.0.0/interface/credits_l_simp_chinese.txt
  20210. +++ /dev/null
  20211. @@ -1,608 +0,0 @@
  20212. -# 《群星：利维坦》 / 《视界信号》开发小组
  20213. ---------
  20214. -##游戏总监
  20215. -Martin Anward
  20216. -
  20217. -##项目组长
  20218. -Rikard Åslund
  20219. -
  20220. -##设计
  20221. -Martin Anward
  20222. -Daniel Moregård
  20223. -
  20224. -##附加设计
  20225. -Henrik Fåhraeus
  20226. -
  20227. -##客座作家
  20228. -Alexis Kennedy (视界信号)
  20229. -
  20230. -##程序
  20231. -Daniel Eriksson
  20232. -Alexander Ivannikov
  20233. -Mehrnaz Amanat Bari
  20234. -Joakim Bennedich
  20235. -Hampus Liljekvist
  20236. -
  20237. -##内容设计
  20238. -Maximilian Olbers
  20239. -Niclas Karlsson
  20240. -Rufus Tronde
  20241. -Henrik Eklund
  20242. -Miranda van den Brink
  20243. -
  20244. -##本地化经理
  20245. -Sara Wendel-Örtqvist
  20246. -
  20247. -##用户模组调度
  20248. -Joel Hansson
  20249. -Niklas Strid
  20250. -
  20251. -##艺术调度
  20252. -Pernilla Sparrhult
  20253. -
  20254. -##艺术总监
  20255. -Fredrik Toll
  20256. -
  20257. -##2D美工
  20258. -Simon Gunnarsson
  20259. -Jonas Jakobsson
  20260. -Frida Eriksson
  20261. -
  20262. -##3D美工
  20263. -Helena Kasper
  20264. -Joacim Carlberg
  20265. -Johan Lundqvist
  20266. -
  20267. -##动画&特效
  20268. -Niklas Tammpere
  20269. -
  20270. -##艺术原画
  20271. -Ylva Ljungqvist
  20272. -
  20273. -##质保经理
  20274. -Mario Lasan
  20275. -
  20276. -##内部质保
  20277. -Aziz Faghihinejad
  20278. -Leo Larsson
  20279. -
  20280. -##社区质保
  20281. -Carsten 't Mannetje
  20282. -
  20283. -##质保测试
  20284. -Albin Wallin
  20285. -Arthur Bialecki
  20286. -Carmille Gidfors
  20287. -Daniel Sjöberg
  20288. -Jesper Norberg
  20289. -Malin Jakobsson
  20290. -Markus Grebe
  20291. -Olga Koter
  20292. -Patric Lindbergh
  20293. -Peter Skager
  20294. -Sebastian Borg
  20295. -
  20296. -##音效总监
  20297. -Björn Iversen
  20298. -
  20299. -##作曲
  20300. -Andreas Waldetoft
  20301. -
  20302. -##附加音效总监
  20303. -David Schlein-Andersen
  20304. -
  20305. -## Beta测试者
  20306. -Mark Charters
  20307. -Lukasz Damentko
  20308. -Dylan Anthony Skoda
  20309. -Cathrine Zangerl
  20310. -Michael Aaron Hoselton
  20311. -Jeroen Elfrink
  20312. -Christopher Kenneth O'Keefe
  20313. -Kamil Kowalczyk
  20314. -Erik Brian Olmstead
  20315. -Them Bo Bojesen Jensen
  20316. -Peter Deadman
  20317. -Richard Williams
  20318. -David Lockwood
  20319. -Edward Earl Chaney II
  20320. -Pablo Agustín Eralio
  20321. -Mitchell Alexander Cumming
  20322. -
  20323. -
  20324. -#派拉多克斯群星开发组
  20325. ---------
  20326. -##执行副总经理 创意策划
  20327. -Johan Andersson
  20328. -
  20329. -##游戏总监
  20330. -Henrik Fåhraeus
  20331. -
  20332. -##项目组长
  20333. -Rikard Åslund
  20334. -
  20335. -##制作人
  20336. -Anna Norrevik
  20337. -
  20338. -##设计师
  20339. -Henrik Fåhraeus
  20340. -Joakim Andreasson
  20341. -Daniel Moregård
  20342. -
  20343. -##附加设计
  20344. -Johan Andersson
  20345. -
  20346. -##程序
  20347. -Daniel Eriksson
  20348. -Alexander Ivannikov
  20349. -Mehrnaz Amanat Bari
  20350. -Rikard Åslund
  20351. -Joakim Bennedich
  20352. -
  20353. -##附加程序
  20354. -Johan Lerström
  20355. -Jonas Wickerström
  20356. -Martin Anward
  20357. -Mohammed Al-Sader
  20358. -Niklas Strid
  20359. -
  20360. -##首席内容设计
  20361. -Henrik Eklund
  20362. -
  20363. -##内容设计
  20364. -Maximilian Olbers
  20365. -Niclas Karlsson
  20366. -David Ballantyne
  20367. -Rufus Tronde
  20368. -
  20369. -##艺术总监
  20370. -Fredrik Toll
  20371. -
  20372. -##2D美工
  20373. -Aline Gladh
  20374. -Simon Gunnarsson
  20375. -Jonas Jakobsson
  20376. -Jenny Holmer
  20377. -
  20378. -##艺术原画
  20379. -Erik Nilsson
  20380. -
  20381. -##封面设计
  20382. -Aline Gladh
  20383. -
  20384. -##附加2D美工
  20385. -Frida Eriksson
  20386. -Anton Hultdin
  20387. -Johan Lundqvist
  20388. -Pontus Olofsson
  20389. -Timor Khanagov
  20390. -Carlos Lundhall
  20391. -
  20392. -##3D美工
  20393. -Joakim Larsen
  20394. -Markus Krantz
  20395. -Viktor Nyström
  20396. -Magnus Nyström
  20397. -Maxemilian Roberts
  20398. -Robin Skog
  20399. -Helena Kasper
  20400. -Staffan Norling
  20401. -Marcus Persson
  20402. -Fredrik Toll
  20403. -
  20404. -##动画师
  20405. -Niklas Tammpere
  20406. -Nancy Lai
  20407. -
  20408. -##附加动画师
  20409. -Patrick Kling
  20410. -
  20411. -##内部质保
  20412. -Olga Koter
  20413. -Aziz Faghihinejad
  20414. -Leo Larsson
  20415. -Karim Muammar
  20416. -
  20417. -##质保
  20418. -Peter Skager
  20419. -Daniel Sjöberg
  20420. -Daniel Olsson
  20421. -Patric Lindbergh
  20422. -Malin Jakobsson
  20423. -Rufus Magnusson
  20424. -Carsten t'Mannetje
  20425. -
  20426. -##附加质保
  20427. -Alexander Lundström
  20428. -
  20429. -##音效总监
  20430. -Björn Iversen
  20431. -
  20432. -##编曲
  20433. -Andreas Waldetoft
  20434. -
  20435. -##配音演员
  20436. -Kola Krauze
  20437. -
  20438. -##附加音效设计
  20439. -Martin Skogehall
  20440. -
  20441. -##界面设计
  20442. -Daniel Moregård
  20443. -
  20444. -##手册
  20445. -Troy Goodfellow
  20446. -
  20447. -
  20448. -#派拉多克斯开发工作室
  20449. ---------
  20450. -##执行副总经理 工作室
  20451. -Mattias Lilja
  20452. -
  20453. -##副总开发
  20454. -Thomas Johansson
  20455. -
  20456. -##执行总监
  20457. -Linda Kiby
  20458. -
  20459. -##制作人
  20460. -Anna Norrevik
  20461. -
  20462. -##总监助理/编辑/本地化经理
  20463. -Sara Wendel-Örtqvist
  20464. -
  20465. -##DLC管理
  20466. -Pernilla Sparrhult
  20467. -
  20468. -##百科创建与维护
  20469. -Magne Skjæran
  20470. -
  20471. -##技术脚本
  20472. -Niklas Strid
  20473. -Joel Hansson
  20474. -
  20475. -##技术总监
  20476. -Fredrik Zetterman
  20477. -
  20478. -##执行引擎总监
  20479. -John Wordsworth
  20480. -
  20481. -##程序管理
  20482. -Olof Björk
  20483. -
  20484. -##引擎编程
  20485. -Marcus Beausang
  20486. -John Wordsworth
  20487. -Rickard Nyberg
  20488. -
  20489. -##版本工程师
  20490. -Per Hasselström
  20491. -
  20492. -##工具编程
  20493. -Johan Yngman
  20494. -
  20495. -##3D美工管理
  20496. -Fredrik Toll
  20497. -
  20498. -##2D美工管理
  20499. -Pontus Olofsson
  20500. -
  20501. -##脚本管理
  20502. -Tobias Bodlund
  20503. -
  20504. -##质保管理
  20505. -Mario Lasan
  20506. -
  20507. -##质保
  20508. -Filippa Gannholm
  20509. -Zeke Lugmair
  20510. -Jake Leiper-Ritchie
  20511. -Jesper Norberg
  20512. -Alexander Oltner
  20513. -Emil Tisander
  20514. -
  20515. -##社区管理
  20516. -Björn Blomberg
  20517. -
  20518. -##引擎组
  20519. -John Wordsworth
  20520. -Marcus Beausang
  20521. -Per Hasselström
  20522. -Johan Yngman
  20523. -Richard Nyberg
  20524. -
  20525. -##内容设计
  20526. -Jakob Have
  20527. -Marcus Olsen
  20528. -Henrik Lohmander
  20529. -Mathilda Bjarnehed
  20530. -Camilla Isaksson
  20531. -Petter Vilberg
  20532. -
  20533. -##程序
  20534. -Henrik Hansson
  20535. -Jimmy Rönn
  20536. -Ilya Nikitin
  20537. -Igor Aleksandrowicz
  20538. -Gwenael Tranvouez
  20539. -Gustav Palmqvist
  20540. -Tomasz Kowalczyk
  20541. -Carl Carenvall
  20542. -Martin Hesselborn
  20543. -Rickard Lagerbäck
  20544. -Petter Hansson
  20545. -
  20546. -##美工
  20547. -Staffan Norling
  20548. -Mats Virtanen
  20549. -Bjarne Hallberg
  20550. -
  20551. -##设计
  20552. -Chris King
  20553. -Dan Lind
  20554. -
  20555. -##项目组长
  20556. -Anna Norrevik
  20557. -Martin Anward
  20558. -
  20559. -
  20560. -#派拉多克斯《群星》团队
  20561. ---------
  20562. -##品牌管理
  20563. -Tomas Härenstam
  20564. -
  20565. -##市场
  20566. -Steven K Wells
  20567. -
  20568. -##社区
  20569. -Graham Murphy
  20570. -Björn Blomberg
  20571. -
  20572. -##销售
  20573. -Daniel Lagergren
  20574. -Fang Chen
  20575. -
  20576. -质保项目调度
  20577. -Niklas Ivarsson
  20578. -Malin Furöstam
  20579. -
  20580. -
  20581. -#派拉多克斯互动
  20582. ---------
  20583. -#管理层
  20584. -
  20585. -##首席执行官
  20586. -Fredrik Wester
  20587. -
  20588. -##财务总监
  20589. -Andras Vajlok
  20590. -
  20591. -##首席运营官
  20592. -Susana Meza Graham
  20593. -
  20594. -##首席产品官
  20595. -Johan Sjöberg
  20596. -
  20597. -##首席信息官
  20598. -John Hargelid
  20599. -
  20600. -##派拉多克斯工作室经理
  20601. -Mattias Lilja
  20602. -
  20603. -##产品副总裁
  20604. -Shams Jorjani
  20605. -
  20606. -##首席市场官
  20607. -Daniela Sjunnesson
  20608. -Production Team
  20609. -
  20610. -##产品经理
  20611. -Jörgen Björklund
  20612. -
  20613. -##高级制作人
  20614. -Andreas Renström
  20615. -Florian Schwarzer
  20616. -Joe Fricano
  20617. -
  20618. -##制作人
  20619. -Staffan Berglén
  20620. -Patrick Berglind
  20621. -Kandra Dahlgren
  20622. -Robin Cederholm
  20623. -
  20624. -##制作人助理
  20625. -Angelica Uhlan
  20626. -Peter Cornelius
  20627. -Niklas Lundström
  20628. -
  20629. -
  20630. -#用户调研组
  20631. ---------
  20632. -##用户调研经理
  20633. -Karl Leino
  20634. -
  20635. -##用户调研
  20636. -Tobias Viklund
  20637. -Jean-Luc Potte
  20638. -Henrik Edlund
  20639. -Johan Dorell
  20640. -
  20641. -##用户调研助理
  20642. -Anna Ström
  20643. -
  20644. -#质保团队
  20645. -
  20646. -##高级质保管理
  20647. -Artur Foxander
  20648. -
  20649. -##质保管理
  20650. -Loke Norman
  20651. -
  20652. -##质保专员
  20653. -Felix Gladitz
  20654. -Niklas Ivarsson
  20655. -Andrei Zainea
  20656. -
  20657. -##质保测试
  20658. -Pontus Anehäll
  20659. -Emil Andersson
  20660. -Bengin Bayrak
  20661. -Erik Elgerot
  20662. -Malin Furöstam
  20663. -Victor Järnberg
  20664. -Kimberly Stinson
  20665. -Daniel Teige
  20666. -
  20667. -
  20668. -#品牌管理组
  20669. ---------
  20670. -##品牌经理
  20671. -Marco Behrmann
  20672. -Stefan Eld
  20673. -Tomas Härenstam
  20674. -Jakob Munthe
  20675. -
  20676. -##进度管理
  20677. -Martin Park
  20678. -
  20679. -##采编助理
  20680. -Nils Brolin
  20681. -
  20682. -#市场&销售
  20683. -
  20684. -##首席市场管理
  20685. -Daniela Sjunnesson
  20686. -
  20687. -##副市场管理
  20688. -Petra Takeva
  20689. -
  20690. -##营销创意总监
  20691. -Steven K Wells
  20692. -
  20693. -##预告&视频制作
  20694. -Marcus Herbertsson
  20695. -
  20696. -##直播制作
  20697. -Anders Carlsson
  20698. -
  20699. -##活动制作
  20700. -Veronica Gunlycke
  20701. -
  20702. -##高级社区经理
  20703. -Malin Söderberg
  20704. -
  20705. -##社区开发
  20706. -Zeke Lugmair
  20707. -
  20708. -##论坛与论坛维护管理
  20709. -Christian Arvidsson
  20710. -
  20711. -##线上营销经理
  20712. -Mats Wall
  20713. -
  20714. -##前端开发
  20715. -Alberto Blázquez
  20716. -
  20717. -##邮件营销经理
  20718. -Andreas Nyberg
  20719. -
  20720. -##用户获取经理
  20721. -Mi Ahnhem Thomsen
  20722. -
  20723. -##图像制作
  20724. -Max Collin
  20725. -Adam Skarin
  20726. -
  20727. -##销售经理
  20728. -Filip Sirc
  20729. -Fang Chen
  20730. -
  20731. -##直销开发
  20732. -Daniel Lagergren
  20733. -
  20734. -
  20735. -#技术，分析与开发
  20736. ---------
  20737. -##技术总监
  20738. -Christian Westman
  20739. -
  20740. -##高级后端开发
  20741. -Anders Törlind
  20742. -
  20743. -##后端开发
  20744. -Alexander Altanis
  20745. -Mikael Berg
  20746. -
  20747. -##网络开发
  20748. -Johan Li
  20749. -
  20750. -##分析团队
  20751. -Magnus Eriksson
  20752. -Niklas Nordansjö
  20753. -
  20754. -##IT经理
  20755. -Henrik Hjelm
  20756. -
  20757. -##IT技术
  20758. -Johannes Ek
  20759. -Richard Lindkvist
  20760. -
  20761. -
  20762. -#法律
  20763. ---------
  20764. -##高级法律顾问
  20765. -Juliette Auverny-Bennetot
  20766. -
  20767. -##法律顾问
  20768. -Andreas Ruthberg-Sällquist
  20769. -
  20770. -##律师助理
  20771. -Emilia Oscarsson
  20772. -
  20773. -
  20774. -#特别鸣谢
  20775. ---------
  20776. -Matthijs Hoving
  20777. -
  20778. -
  20779. -#外部合作
  20780. ---------
  20781. -##本地化
  20782. -西班牙语 - QLOC
  20783. -法语 - S&H Entertainment Localization
  20784. -德语 - S&H Entertainment Localization
  20785. -波兰语 - QLOC
  20786. -俄语 - The Most Games
  20787. -巴西葡萄语 - S&H Entertainment Localization
  20788. -
  20789. -##Beta测试者
  20790. -Markus Grebe
  20791. -Lukasz Damentko
  20792. -Magne Skjæran
  20793. -Kamil Kowalczyk
  20794. -Michael Aaron Hoselton
  20795. -Peter Deadman
  20796. -Dylan Anthony Skoda
  20797. -Christopher Kenneth O'Keefe
  20798. -Cathrine Zangerl
  20799. -Jeroen Elfrink
  20800. -Erik Brian Olmstead
  20801. -Them Bo Bojesen Jensen
  20802. -Tomasz Wieczorek
  20803. -Mark Charters
  20804. -Samuel Frederick Allessandro Marrello
  20805. -Isaac Lamb
  20806. -Christian Borrelli
  20807. -Fabian Schneider
  20808. -
  20809. -##配音录制工作室:
  20810. -Cineast Dub AB
  20811. -
  20812. -
  20813. ---------
  20814. -
  20815. -在此特别感谢我们的论坛，粉丝们与合作伙伴们。
  20816. -没有你们就没有我们今天的成功。
  20817. -
  20818. -
  20819. -FORZA DJURGÅR'N!
  20820. diff --git a/2.0.0/interface/customize_species_editors.gui b/2.0.2/interface/customize_species_editors.gui
  20821. index 3e0a535..5433428 100755
  20822. --- a/2.0.0/interface/customize_species_editors.gui
  20823. +++ b/2.0.2/interface/customize_species_editors.gui
  20824. @@ -772,7 +772,7 @@ guiTypes = {
  20825. instantTextBoxType = {
  20826. name = "trait_points_lables"
  20827. font = "malgun_goth_24"
  20828. - position = { x = 20 y = 90 }
  20829. + position = { x = 20 y = 70 }
  20830. maxWidth = 330
  20831. text = "POINTS_LEFT"
  20832. format = left
  20833. @@ -783,7 +783,7 @@ guiTypes = {
  20834. instantTextBoxType = {
  20835. name = "trait_points"
  20836. font = "malgun_goth_24"
  20837. - position = { x = 340 y = 90 }
  20838. + position = { x = 340 y = 70 }
  20839. maxWidth = 30
  20840. text = "12"
  20841. format = left
  20842. @@ -794,7 +794,7 @@ guiTypes = {
  20843. instantTextBoxType = {
  20844. name = "trait_picks_lables"
  20845. font = "malgun_goth_24"
  20846. - position = { x = 20 y = 115 }
  20847. + position = { x = 20 y = 95 }
  20848. maxWidth = 330
  20849. text = "PICKS_LEFT"
  20850. format = left
  20851. @@ -805,7 +805,7 @@ guiTypes = {
  20852. instantTextBoxType = {
  20853. name = "trait_picks"
  20854. font = "malgun_goth_24"
  20855. - position = { x = 340 y = 115 }
  20856. + position = { x = 340 y = 95 }
  20857. maxWidth = 30
  20858. text = "12"
  20859. format = left
  20860. @@ -816,8 +816,8 @@ guiTypes = {
  20861.  
  20862. containerWindowType = {
  20863. name = "details"
  20864. - size = { width = 410 height = 160 }
  20865. - position = { x = 12 y = 150 }
  20866. + size = { width = 410 height = 220 }
  20867. + position = { x = 12 y = 130 }
  20868.  
  20869. background = {
  20870. name = "leader_frame"
  20871. @@ -839,7 +839,7 @@ guiTypes = {
  20872. instantTextBoxType = {
  20873. name = "trait_description"
  20874. font = "cg_16b"
  20875. - position = { x = 10 y = 40 }
  20876. + position = { x = 10 y = 30 }
  20877. maxWidth = 395
  20878. text = ""
  20879. format = left
  20880. diff --git a/2.0.0/interface/diplomacy_artist_event_view.gui b/2.0.2/interface/diplomacy_artist_event_view.gui
  20881. index 8861cb0..8689096 100755
  20882. --- a/2.0.0/interface/diplomacy_artist_event_view.gui
  20883. +++ b/2.0.2/interface/diplomacy_artist_event_view.gui
  20884. @@ -316,7 +316,7 @@ guiTypes = {
  20885. containerWindowType = {
  20886. name = "EVENT_DIPLO"
  20887. position = { x = 0 y = 400 }
  20888. - size = { width=563 height=220 }
  20889. + size = { width=563 height=280 }
  20890. moveable = no
  20891.  
  20892. instantTextBoxType={
  20893. @@ -341,9 +341,9 @@ guiTypes = {
  20894.  
  20895. listboxType = {
  20896. name = "option_list"
  20897. - position = { x = 500 y = 30 }
  20898. + position = { x = 500 y = 20 }
  20899. backGround=""
  20900. - size = { x=450 y=175 }
  20901. + size = { x=450 y=240 }
  20902. spacing = 1
  20903. scrollbartype = "standardlistbox_slider"
  20904. borderSize = { x = 0 y = 0 }
  20905. diff --git a/2.0.0/interface/diplomacy_curator_event_view.gui b/2.0.2/interface/diplomacy_curator_event_view.gui
  20906. index aacce6b..5e7706f 100755
  20907. --- a/2.0.0/interface/diplomacy_curator_event_view.gui
  20908. +++ b/2.0.2/interface/diplomacy_curator_event_view.gui
  20909. @@ -314,7 +314,7 @@ guiTypes = {
  20910. containerWindowType = {
  20911. name = "EVENT_DIPLO"
  20912. position = { x = 0 y = 400 }
  20913. - size = { width=563 height=220 }
  20914. + size = { width=563 height=280 }
  20915. moveable = no
  20916.  
  20917. instantTextBoxType={
  20918. @@ -339,9 +339,9 @@ guiTypes = {
  20919.  
  20920. listboxType = {
  20921. name = "option_list"
  20922. - position = { x = 500 y = 30 }
  20923. + position = { x = 500 y = 20 }
  20924. backGround=""
  20925. - size = { x=450 y=175 }
  20926. + size = { x=450 y=240 }
  20927. spacing = 1
  20928. scrollbartype = "standardlistbox_slider"
  20929. borderSize = { x = 0 y = 0 }
  20930. diff --git a/2.0.0/interface/diplomacy_trader_event_view.gui b/2.0.2/interface/diplomacy_trader_event_view.gui
  20931. index 1097ce6..f7f4536 100755
  20932. --- a/2.0.0/interface/diplomacy_trader_event_view.gui
  20933. +++ b/2.0.2/interface/diplomacy_trader_event_view.gui
  20934. @@ -313,7 +313,7 @@ guiTypes = {
  20935. containerWindowType = {
  20936. name = "EVENT_DIPLO"
  20937. position = { x = 0 y = 400 }
  20938. - size = { width=563 height=220 }
  20939. + size = { width=563 height=280 }
  20940. moveable = no
  20941.  
  20942. instantTextBoxType={
  20943. @@ -338,9 +338,9 @@ guiTypes = {
  20944.  
  20945. listboxType = {
  20946. name = "option_list"
  20947. - position = { x = 500 y = 30 }
  20948. + position = { x = 500 y = 20 }
  20949. backGround=""
  20950. - size = { x=450 y=175 }
  20951. + size = { x = 460 y = 240 }
  20952. spacing = 1
  20953. scrollbartype = "standardlistbox_slider"
  20954. borderSize = { x = 0 y = 0 }
  20955. diff --git a/2.0.0/interface/federation_view.gui b/2.0.2/interface/federation_view.gui
  20956. index 4630ec9..0563495 100755
  20957. --- a/2.0.0/interface/federation_view.gui
  20958. +++ b/2.0.2/interface/federation_view.gui
  20959. @@ -41,7 +41,7 @@ guiTypes = {
  20960. buttonType = {
  20961. name = "federation_rename_button"
  20962. spriteType = "GFX_invisible"
  20963. - position = { x = -390 y = 5 }
  20964. + position = { x = -320 y = 5 }
  20965. size = { x = 300 y = 25 }
  20966. orientation = center_up
  20967. }
  20968. @@ -74,7 +74,7 @@ guiTypes = {
  20969. name = "leader_desc"
  20970. font = "cg_16b"
  20971. position = { x = 140 y = 65 }
  20972. - maxwidth = 330
  20973. + maxwidth = 450
  20974. }
  20975.  
  20976. containerWindowType = {
  20977. @@ -479,8 +479,10 @@ guiTypes = {
  20978. name = "name"
  20979. font = "cg_16b"
  20980. maxWidth = 250
  20981. + maxHeight = 25
  20982. position = { x = 50 y = @entry_info_height }
  20983. alwaysTransparent = yes
  20984. + fixedSize = yes
  20985. }
  20986.  
  20987. instantTextBoxType={
  20988. @@ -560,7 +562,7 @@ guiTypes = {
  20989. position = { x = 305 y = @entry_info_height }
  20990. font = "cg_16b"
  20991. text = "10/10"
  20992. - maxWidth = 60
  20993. + maxWidth = 70
  20994. maxHeight = 15
  20995. fixedSize = yes
  20996. }
  20997. diff --git a/2.0.0/interface/fleet_view.gfx b/2.0.2/interface/fleet_view.gfx
  20998. index 2ebf1d6..dfcbeba 100755
  20999. --- a/2.0.0/interface/fleet_view.gfx
  21000. +++ b/2.0.2/interface/fleet_view.gfx
  21001. @@ -1219,7 +1219,7 @@ spriteTypes = {
  21002.  
  21003. spriteType = {
  21004. name = "GFX_delete_template_button"
  21005. - texturefile = "gfx/interface/fleet_view/delete_template_button.dds"
  21006. + texturefile = "gfx/interface/fleet_view/fleet_action_button_destroy_fleet_2.dds"
  21007. effectFile = "gfx/FX/buttonstate_onlydisable.lua"
  21008. noOfFrames = 3
  21009. animation = {
  21010. diff --git a/2.0.0/interface/fleet_view.gui b/2.0.2/interface/fleet_view.gui
  21011. index fcc6547..8e746b6 100755
  21012. --- a/2.0.0/interface/fleet_view.gui
  21013. +++ b/2.0.2/interface/fleet_view.gui
  21014. @@ -130,6 +130,7 @@ guiTypes = {
  21015. buttonType = {
  21016. name = "disband"
  21017. quadTextureSprite = "GFX_fleetview_destroy_fleet"
  21018. +# quadTextureSprite = "GFX_delete_template_button"
  21019. position = { x= -39 y = 2 }
  21020. Orientation = "UPPER_RIGHT"
  21021. buttonFont = "cg_16b"
  21022. @@ -346,11 +347,11 @@ guiTypes = {
  21023.  
  21024. buttonType = {
  21025. name = "disband"
  21026. - quadTextureSprite = "GFX_fleetview_destroy_fleet"
  21027. + quadTextureSprite = "GFX_delete_template_button"
  21028. position = { x= -73 y = 10 }
  21029. Orientation = "UPPER_RIGHT"
  21030. buttonFont = "cg_16b"
  21031. - pdx_tooltip = "DISBAND"
  21032. + pdx_tooltip = "FLEET_MANAGER_DELETE_TEMPLATE"
  21033. }
  21034.  
  21035. buttonType = {
  21036. diff --git a/2.0.0/interface/frontend.gfx b/2.0.2/interface/frontend.gfx
  21037. index a3778f3..2b14e6b 100755
  21038. --- a/2.0.0/interface/frontend.gfx
  21039. +++ b/2.0.2/interface/frontend.gfx
  21040. @@ -25,11 +25,6 @@ spriteTypes = {
  21041. texturefile = "gfx/interface/main/game_logo.dds"
  21042. }
  21043.  
  21044. - spriteType = {
  21045. - name = "gfx_game_logo_chinese"
  21046. - texturefile = "gfx/interface/main/game_logo_chinese.dds"
  21047. - }
  21048. -
  21049. spriteType = {
  21050. name = "GFX_white_stripe_button"
  21051. texturefile = "gfx/interface/buttons/white_stripe.dds"
  21052. diff --git a/2.0.0/interface/galaxy_view.gfx b/2.0.2/interface/galaxy_view.gfx
  21053. index f221eba..e739d24 100755
  21054. --- a/2.0.0/interface/galaxy_view.gfx
  21055. +++ b/2.0.2/interface/galaxy_view.gfx
  21056. @@ -108,6 +108,7 @@ spriteTypes = {
  21057. spriteType = {
  21058. name = "GFX_diplomacy_status_war"
  21059. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  21060. + noOfFrames = 2
  21061. }
  21062.  
  21063. spriteType = {
  21064. diff --git a/2.0.0/interface/galaxy_view.gui b/2.0.2/interface/galaxy_view.gui
  21065. index 949bdc2..7b7d9fd 100755
  21066. --- a/2.0.0/interface/galaxy_view.gui
  21067. +++ b/2.0.2/interface/galaxy_view.gui
  21068. @@ -302,21 +302,21 @@ guiTypes = {
  21069.  
  21070. containerWindowType = {
  21071. name = "detailed_diplomacy_window"
  21072. - size = { width = 285 height = 188}
  21073. - position = { x = 25 y = 360 }
  21074. + size = { width = 285 height = 218}
  21075. + position = { x = 25 y = 340 }
  21076. clipping = yes
  21077.  
  21078. iconType = {
  21079. name = "value_slot_2"
  21080. spriteType = "GFX_value_slot_2"
  21081. - position = { x = -4 y = 33 }
  21082. + position = { x = -4 y = 32 }
  21083. alwaystransparent = yes
  21084. }
  21085.  
  21086. iconType = {
  21087. name = "value_slot_3"
  21088. spriteType = "GFX_value_slot_2"
  21089. - position = { x = -4 y = 150 }
  21090. + position = { x = -4 y = 144 }
  21091. alwaystransparent = yes
  21092. }
  21093.  
  21094. @@ -324,7 +324,7 @@ guiTypes = {
  21095. name = "diplomatic_status"
  21096. font = "malgun_goth_24"
  21097. text = "DIPLO_STATUS"
  21098. - position = { x = 0 y = 0 }
  21099. + position = { x = 0 y = 3 }
  21100. maxWidth = 250
  21101. maxHeight = 32
  21102. format = LEFT
  21103. @@ -332,8 +332,8 @@ guiTypes = {
  21104.  
  21105. smoothListboxType = {
  21106. name = "detailed_diplomacy_list"
  21107. - position = { x = 5 y = 31 }
  21108. - size = { x = 280 y = 156 }
  21109. + position = { x = 5 y = 32 }
  21110. + size = { x = 280 y = 184 }
  21111. scrollbarType = "standardlistbox_slider"
  21112. }
  21113. }
  21114. @@ -343,7 +343,7 @@ guiTypes = {
  21115. font = "cg_16b"
  21116. spriteType = "GFX_standard_button_142_34_button"
  21117. buttonText = "GALAXY_VIEW_EMPIRE_DIPLOMACY"
  21118. - position = { x = 155 y = 550 }
  21119. + position = { x = 155 y = 556 }
  21120. }
  21121. }
  21122.  
  21123. @@ -388,8 +388,6 @@ guiTypes = {
  21124. }
  21125. }
  21126.  
  21127. -
  21128. -
  21129. containerWindowType = {
  21130. name = "empire_list"
  21131. position = { x=335 y=75 }
  21132. @@ -515,10 +513,10 @@ guiTypes = {
  21133. buttonType={
  21134. name = "status"
  21135. font = "cg_16b"
  21136. - spriteType = "GFX_galactic_object_button"
  21137. - #spriteType = "GFX_button_150_24"
  21138. + #spriteType = "GFX_galactic_object_button"
  21139. + spriteType = "GFX_button_164_24"
  21140. buttonText = "GALAXY_VIEW_EMPIRE_STATUS"
  21141. - position = { x = 656 y = 40 }
  21142. + position = { x = 656 y = 33 }
  21143. pdx_tooltip = "GALAXY_VIEW_SORT_DIPLOMACY"
  21144. }
  21145.  
  21146. @@ -527,7 +525,7 @@ guiTypes = {
  21147. font = "cg_16b"
  21148. spriteType = "GFX_button_150_24"
  21149. buttonText = "RELATIVE_POWER"
  21150. - position = { x = 927 y = @sort_button_height }
  21151. + position = { x = 823 y = @sort_button_height }
  21152. pdx_tooltip = "GALAXY_VIEW_SORT_POWER"
  21153. }
  21154.  
  21155. @@ -536,10 +534,19 @@ guiTypes = {
  21156. font = "cg_16b"
  21157. spriteType = "GFX_button_150_24"
  21158. buttonText = "GALAXY_VIEW_EMPIRE_ALLIANCE_FEDERATION"
  21159. - position = { x = 1080 y = @sort_button_height }
  21160. + position = { x = 976 y = @sort_button_height }
  21161. pdx_tooltip = "GALAXY_VIEW_SORT_ALLIANCE_OR_FEDERATION"
  21162. }
  21163.  
  21164. + buttonType={
  21165. + name = "war_status"
  21166. + font = "cg_16b"
  21167. + spriteType = "GFX_button_95_24"
  21168. + buttonText = "GALAXY_VIEW_EMPIRE_WAR_STATUS"
  21169. + position = { x = 1128 y = @sort_button_height }
  21170. + pdx_tooltip = "GALAXY_VIEW_SORT_WAR_STATUS"
  21171. + }
  21172. +
  21173.  
  21174. containerWindowType = {
  21175. name = "empires_window"
  21176. @@ -627,7 +634,7 @@ guiTypes = {
  21177. OverlappingElementsBoxType = {
  21178. name = "diplomacy_icons"
  21179. position = { x = 330 y = 9 }
  21180. - size = { x = 250 y = 40 }
  21181. + size = { x = 150 y = 40 }
  21182. format = left
  21183. spacing = 12.0
  21184. }
  21185. @@ -637,13 +644,13 @@ guiTypes = {
  21186. iconType = {
  21187. name = "power_background"
  21188. quadTextureSprite = "GFX_info_background_125"
  21189. - position = { x = 630 y = 8 }
  21190. + position = { x = 520 y = 8 }
  21191. }
  21192.  
  21193. iconType = {
  21194. name = "power_icon"
  21195. quadTextureSprite = "GFX_relative_power_icon"
  21196. - position = { x = 605 y = 11 }
  21197. + position = { x = 495 y = 11 }
  21198. }
  21199.  
  21200. instantTextBoxType={
  21201. @@ -651,9 +658,9 @@ guiTypes = {
  21202. font = "cg_16b"
  21203. maxWidth = 110
  21204. maxHeight = 16
  21205. - position = { x = 625 y = 15 }
  21206. + position = { x = 526 y = 15 }
  21207. text = "Relative Power"
  21208. - format = RIGHT
  21209. + format = center
  21210. }
  21211.  
  21212. # FEDERATION
  21213. @@ -661,12 +668,22 @@ guiTypes = {
  21214. instantTextBoxType={
  21215. name = "alliance_federation"
  21216. font = "cg_16b"
  21217. - position = { x = 748 y = 7 }
  21218. + position = { x = 645 y = 7 }
  21219. maxWidth = 150
  21220. maxHeight = 30
  21221. format = center
  21222. vertical_alignment = center
  21223. }
  21224. +
  21225. + # WAR STATUS
  21226. +
  21227. + iconType ={
  21228. + name ="war_status_icon"
  21229. + quadTextureSprite = "GFX_diplomacy_status_war"
  21230. + position = { x = 832 y = 7 }
  21231. + scale = 0.9
  21232. + }
  21233. +
  21234. }
  21235.  
  21236. containerWindowType = {
  21237. @@ -695,7 +712,7 @@ guiTypes = {
  21238.  
  21239. containerWindowType = {
  21240. name = "selected_empire_detailed_diplomacy_entry"
  21241. - size = { width=210 height=38 }
  21242. + size = { width=210 height=34 }
  21243.  
  21244. iconType ={
  21245. name ="diplomacy_type_icon"
  21246. diff --git a/2.0.0/interface/game_setup/setup.gui b/2.0.2/interface/game_setup/setup.gui
  21247. index 305f846..da540d6 100755
  21248. --- a/2.0.0/interface/game_setup/setup.gui
  21249. +++ b/2.0.2/interface/game_setup/setup.gui
  21250. @@ -1367,27 +1367,29 @@ guiTypes = {
  21251. }
  21252. }
  21253.  
  21254. - # Aggressiveness
  21255. +
  21256. + # Difficulty
  21257. containerWindowType = {
  21258. - name = "aggressiveness"
  21259. + id = "difficulty"
  21260. + name = "difficulty"
  21261. position = { x = 72 y = 485 }
  21262.  
  21263. instantTextBoxType = {
  21264. - name = "aggressiveness_label"
  21265. + name = "difficulty_label"
  21266. position = { x = -20 y = 0 }
  21267. font = "malgun_goth_24"
  21268. maxWidth = 204
  21269. maxHeight = 52
  21270. orientation = "UPPER_LEFT"
  21271. - text = "FE_AGGRESSIVENESS"
  21272. - pdx_tooltip = "FE_AGGRESSIVENESS_TOOLTIP"
  21273. + text = "FE_DIFFICULTY"
  21274. + pdx_tooltip = "FE_DIFFICULTY_TOOLTIP"
  21275. tooltip_mode_enabled = yes
  21276. }
  21277.  
  21278. instantTextBoxType={
  21279. name = "value"
  21280. font = "malgun_goth_24"
  21281. - text = "AGGRESSIVENESS_NORMAL"
  21282. + text = "DIFFICULTY_NORMAL"
  21283. position = { x = 790 y = 0 }
  21284. maxWidth = 220
  21285. maxHeight = 35
  21286. @@ -1396,8 +1398,8 @@ guiTypes = {
  21287. }
  21288.  
  21289. spinnerType = {
  21290. - id = "aggressiveness_spinner"
  21291. - name = "aggressiveness_spinner"
  21292. + id = "galaxy_difficulty_spinner"
  21293. + name = "galaxy_difficulty_spinner"
  21294. leftbutton = "spinner_upButton"
  21295. rightbutton = "spinner_downButton"
  21296. size = {x = 307 y = 30 }
  21297. @@ -1427,33 +1429,32 @@ guiTypes = {
  21298. size = { x = @spinnerOverlaySizeX y = @spinnerOverlaySizeY }
  21299. }
  21300.  
  21301. - navUp = "num_habitable_worlds_slider"
  21302. - navDown = "galaxy_difficulty_spinner"
  21303. + navUp = "aggressiveness_spinner"
  21304. + navDown = "galaxy_ftl_spinner"
  21305. }
  21306. }
  21307.  
  21308. - # Difficulty
  21309. + # Aggressiveness
  21310. containerWindowType = {
  21311. - id = "difficulty"
  21312. - name = "difficulty"
  21313. + name = "aggressiveness"
  21314. position = { x = 72 y = 525 }
  21315.  
  21316. instantTextBoxType = {
  21317. - name = "difficulty_label"
  21318. + name = "aggressiveness_label"
  21319. position = { x = -20 y = 0 }
  21320. font = "malgun_goth_24"
  21321. maxWidth = 204
  21322. maxHeight = 52
  21323. orientation = "UPPER_LEFT"
  21324. - text = "FE_DIFFICULTY"
  21325. - pdx_tooltip = "FE_DIFFICULTY_TOOLTIP"
  21326. + text = "FE_AGGRESSIVENESS"
  21327. + pdx_tooltip = "FE_AGGRESSIVENESS_TOOLTIP"
  21328. tooltip_mode_enabled = yes
  21329. }
  21330.  
  21331. instantTextBoxType={
  21332. name = "value"
  21333. font = "malgun_goth_24"
  21334. - text = "DIFFICULTY_NORMAL"
  21335. + text = "AGGRESSIVENESS_NORMAL"
  21336. position = { x = 790 y = 0 }
  21337. maxWidth = 220
  21338. maxHeight = 35
  21339. @@ -1462,8 +1463,8 @@ guiTypes = {
  21340. }
  21341.  
  21342. spinnerType = {
  21343. - id = "galaxy_difficulty_spinner"
  21344. - name = "galaxy_difficulty_spinner"
  21345. + id = "aggressiveness_spinner"
  21346. + name = "aggressiveness_spinner"
  21347. leftbutton = "spinner_upButton"
  21348. rightbutton = "spinner_downButton"
  21349. size = {x = 307 y = 30 }
  21350. @@ -1493,8 +1494,8 @@ guiTypes = {
  21351. size = { x = @spinnerOverlaySizeX y = @spinnerOverlaySizeY }
  21352. }
  21353.  
  21354. - navUp = "aggressiveness_spinner"
  21355. - navDown = "galaxy_ftl_spinner"
  21356. + navUp = "num_habitable_worlds_slider"
  21357. + navDown = "galaxy_difficulty_spinner"
  21358. }
  21359. }
  21360.  
  21361. diff --git a/2.0.0/interface/government_view.gfx b/2.0.2/interface/government_view.gfx
  21362. index 9392e7a..253759f 100755
  21363. --- a/2.0.0/interface/government_view.gfx
  21364. +++ b/2.0.2/interface/government_view.gfx
  21365. @@ -32,6 +32,11 @@ spriteTypes = {
  21366. noOfFrames = 3
  21367. }
  21368.  
  21369. + spriteType = {
  21370. + name = "GFX_piracy_risk"
  21371. + texturefile = "gfx/interface/icons/piracy_risk.dds"
  21372. + }
  21373. +
  21374. spriteType = {
  21375. name = "GFX_pie_chart_overlay"
  21376. texturefile = "gfx/interface/pie_chart_overlay.dds"
  21377. diff --git a/2.0.0/interface/government_view.gui b/2.0.2/interface/government_view.gui
  21378. index e49d70d..37cdd62 100755
  21379. --- a/2.0.0/interface/government_view.gui
  21380. +++ b/2.0.2/interface/government_view.gui
  21381. @@ -272,6 +272,22 @@ guiTypes = {
  21382. text_color_code = "E"
  21383. }
  21384.  
  21385. + iconType = {
  21386. + name = "ruler_skill"
  21387. + spriteType = "GFX_leader_skill"
  21388. + position = { x = -3 y = 71 }
  21389. + scale = 0.90
  21390. + frame = 5
  21391. + }
  21392. +
  21393. + buttonType = {
  21394. + name = "rename_ruler"
  21395. + spriteType = "GFX_invisible"
  21396. + position = { x = -5 y = 35 }
  21397. + size = { x = 335 y = 25 }
  21398. + orientation = left
  21399. + }
  21400. +
  21401. instantTextBoxType = {
  21402. name = "species"
  21403. position = { x = 0 y = 55 }
  21404. @@ -379,6 +395,47 @@ guiTypes = {
  21405. }
  21406. }
  21407.  
  21408. + containerWindowType = {
  21409. + name = "piracy_window"
  21410. + size = { width = 100 height = 45 }
  21411. + position = { x = 3 y = 495 }
  21412. +
  21413. + background = {
  21414. + name = "leader_frame"
  21415. + spriteType = "GFX_tiles_dark_area_cut_8"
  21416. + alwaysTransparent = yes
  21417. + }
  21418. +
  21419. + instantTextBoxType = {
  21420. + name = "piracy_label"
  21421. + position = { x = 5 y = 2 }
  21422. + font = "cg_16b"
  21423. + text = "PIRACY_LABEL"
  21424. + maxWidth = 100
  21425. + maxHeight = 22
  21426. + fixedSize = yes
  21427. + format = left
  21428. + }
  21429. +
  21430. + iconType = {
  21431. + name = "piracy_icon"
  21432. + quadTextureSprite = "GFX_piracy_risk"
  21433. + position = { x = 10 y = 23 }
  21434. + orientation = "UPPER_LEFT"
  21435. + }
  21436. +
  21437. + instantTextBoxType = {
  21438. + name = "piracy_risk"
  21439. + position = { x = 35 y = 23 }
  21440. + font = "cg_16b"
  21441. + text = "12%"
  21442. + maxWidth = 50
  21443. + maxHeight = 22
  21444. + fixedSize = yes
  21445. + format = left
  21446. + }
  21447. + }
  21448. +
  21449. containerWindowType = {
  21450. name = "government_spec_window"
  21451. size = { width = 250 height = 155 }
  21452. @@ -483,17 +540,33 @@ guiTypes = {
  21453. font = "cg_16b"
  21454. text = ""
  21455. maxWidth = 220
  21456. - maxHeight = 60
  21457. + maxHeight = 20
  21458. #fixedSize = yes
  21459. format = left
  21460. #alwaysTransparent = yes
  21461. #text_color_code = "E"
  21462. }
  21463.  
  21464. + buttonType = {
  21465. + name = "rename_heir"
  21466. + spriteType = "GFX_invisible"
  21467. + position = { x = -5 y = 31 }
  21468. + size = { x = 225 y = 25 }
  21469. + orientation = left
  21470. + }
  21471. +
  21472. + iconType = {
  21473. + name = "heir_skill"
  21474. + spriteType = "GFX_leader_skill"
  21475. + position = { x = -3 y = 51 }
  21476. + scale = 0.90
  21477. + frame = 5
  21478. + }
  21479. +
  21480. overlappingElementsBoxType = {
  21481. name = "traits"
  21482. position = { x = 70 y = 0 }
  21483. - size = { x = 100 y = 32 }
  21484. + size = { x = 150 y = 32 }
  21485. spacing = 5
  21486. format = right
  21487. }
  21488. @@ -531,7 +604,7 @@ guiTypes = {
  21489. smoothListboxType = {
  21490. name = "modifiers_list"
  21491. position = { x = -10 y = 5 }
  21492. - size = { x=248 y=220 }
  21493. + size = { x=248 y=260 }
  21494. scrollbartype = "standardlistbox_slider"
  21495. orientation = "UPPER_LEFT"
  21496. }
  21497. diff --git a/2.0.0/interface/icons.gfx b/2.0.2/interface/icons.gfx
  21498. index f6f3ee3..73b5443 100755
  21499. --- a/2.0.0/interface/icons.gfx
  21500. +++ b/2.0.2/interface/icons.gfx
  21501. @@ -1176,6 +1176,11 @@ spriteTypes = {
  21502. texturefile = "gfx/interface/icons/ship_parts/ship_part_thruster_4.dds"
  21503. }
  21504.  
  21505. + spriteType = {
  21506. + name = "GFX_ship_part_thruster_5"
  21507. + texturefile = "gfx/interface/icons/ship_parts/ship_part_thruster_5.dds"
  21508. + }
  21509. +
  21510. spriteType = {
  21511. name = "GFX_ship_part_reactor_booster_1"
  21512. texturefile = "gfx/interface/icons/ship_parts/ship_part_reactor_booster_1.dds"
  21513. diff --git a/2.0.0/interface/main.gui b/2.0.2/interface/main.gui
  21514. index 48a9844..d9b1816 100755
  21515. --- a/2.0.0/interface/main.gui
  21516. +++ b/2.0.2/interface/main.gui
  21517. @@ -42,14 +42,14 @@ guiTypes = {
  21518. positionType = {
  21519. name = "maingui_lower_topbar_size"
  21520. # width less than x increase size with y
  21521. - position = { x = 1365 y = 220 }
  21522. + position = { x = 1399 y = 220 }
  21523. }
  21524.  
  21525. ### TOPBAR FOR MUSICPLAYER
  21526. containerWindowType = {
  21527. name = "maingui_lower_topbar"
  21528. - position = { x=-120 y=34 }
  21529. - size = { width=120 height=36 }
  21530. + position = { x=-170 y=34 }
  21531. + size = { width=170 height=36 }
  21532. orientation = upper_right
  21533.  
  21534. background = {
  21535. @@ -58,6 +58,18 @@ guiTypes = {
  21536. position = { x= 0 y = 0 }
  21537. }
  21538.  
  21539. + containerWindowType = {
  21540. + name = "topbar_bar_res"
  21541. + size = { width = 260 height = 25 }
  21542. + position = { x = 26 y = 6 }
  21543. +
  21544. + background = {
  21545. + name = "topbar_bar_03"
  21546. + spriteType = "GFX_topbar_bar_03"
  21547. + alwaysTransparent = yes
  21548. + }
  21549. + }
  21550. +
  21551. ####################
  21552. # Music
  21553. ####################
  21554. @@ -68,6 +80,18 @@ guiTypes = {
  21555. position = { x= -96 y = 0 }
  21556. clipping = no
  21557.  
  21558. + containerWindowType = {
  21559. + name = "topbar_bar_04"
  21560. + size = { width = 102 height = 25 }
  21561. + position = { x = -10 y = 6 }
  21562. +
  21563. + background = {
  21564. + name = "topbar_bar_03"
  21565. + spriteType = "GFX_topbar_bar_03"
  21566. + alwaysTransparent = yes
  21567. + }
  21568. + }
  21569. +
  21570. #background = {
  21571. # name = "Background"
  21572. # quadTextureSprite ="GFX_tiles_frame_light"
  21573. @@ -113,7 +137,7 @@ guiTypes = {
  21574. containerWindowType = {
  21575. name = "strategic_resources"
  21576. size = { width = 60 height = 20 }
  21577. - position = { x = 220 y = 0 }
  21578. + position = { x = 190 y = 0 }
  21579.  
  21580. buttonType = {
  21581. name = "strategic_resources_hitbox"
  21582. @@ -144,7 +168,7 @@ guiTypes = {
  21583. containerWindowType = {
  21584. name = "system_cap"
  21585. size = { width = 60 height = 20 }
  21586. - position = { x = 10 y = 0 }
  21587. + position = { x = 0 y = 0 }
  21588.  
  21589. buttonType = {
  21590. name = "system_cap_hitbox"
  21591. @@ -175,7 +199,7 @@ guiTypes = {
  21592. containerWindowType = {
  21593. name = "navy_size"
  21594. size = { width = 60 height = 20 }
  21595. - position = { x = 65 y = 0 }
  21596. + position = { x = 60 y = 0 }
  21597.  
  21598. buttonType = {
  21599. name = "navy_size_hitbox"
  21600. @@ -206,7 +230,7 @@ guiTypes = {
  21601. containerWindowType = {
  21602. name = "starbase_capacity"
  21603. size = { width = 65 height = 20 }
  21604. - position = { x = 135 y = 0 }
  21605. + position = { x = 130 y = 0 }
  21606.  
  21607. buttonType = {
  21608. name = "starbase_capacity_hitbox"
  21609. @@ -302,17 +326,6 @@ guiTypes = {
  21610. }
  21611. }
  21612.  
  21613. - containerWindowType = {
  21614. - name = "topbar_bar_05"
  21615. - size = { width = 212 height = 25 }
  21616. - position = { x = 941 y = 13 }
  21617. -
  21618. - background = {
  21619. - name = "topbar_bar_05"
  21620. - spriteType = "GFX_topbar_bar_03"
  21621. - }
  21622. - }
  21623. -
  21624. containerWindowType = {
  21625. name = "topbar_buttons"
  21626. size = { width = 20 height = 0 }
  21627. @@ -336,6 +349,18 @@ guiTypes = {
  21628. size = { width=200 height=200 }
  21629. Orientation = UPPER_LEFT
  21630.  
  21631. + containerWindowType = {
  21632. + name = "topbar_bar_05"
  21633. + size = { width = 260 height = 25 }
  21634. + position = { x = 651 y = 13 }
  21635. +
  21636. + background = {
  21637. + name = "topbar_bar_03"
  21638. + spriteType = "GFX_topbar_bar_03"
  21639. + alwaysTransparent = yes
  21640. + }
  21641. + }
  21642. +
  21643. iconType = {
  21644. name = "energy_icon"
  21645. spriteType = "GFX_resource_energy"
  21646. diff --git a/2.0.0/interface/mapicons.gfx b/2.0.2/interface/mapicons.gfx
  21647. index f4269f9..b172b2d 100755
  21648. --- a/2.0.0/interface/mapicons.gfx
  21649. +++ b/2.0.2/interface/mapicons.gfx
  21650. @@ -127,6 +127,7 @@ spriteTypes = {
  21651. spriteType = {
  21652. name = "GFX_has_ftl_magnet"
  21653. textureFile = "gfx/interface/icons/has_ftl_magnet.dds"
  21654. + noOfFrames = 3
  21655. }
  21656.  
  21657. progressbartype = {
  21658. diff --git a/2.0.0/interface/megastructure_view.gui b/2.0.2/interface/megastructure_view.gui
  21659. index 424f771..8d14d91 100755
  21660. --- a/2.0.0/interface/megastructure_view.gui
  21661. +++ b/2.0.2/interface/megastructure_view.gui
  21662. @@ -137,19 +137,20 @@ guiTypes = {
  21663. instantTextBoxType = {
  21664. name = "production_header"
  21665. font = "cg_16b"
  21666. - position = { x = 150 y = 310 }
  21667. - maxWidth = 280
  21668. + position = { x = 128 y = 300 }
  21669. + maxWidth = 316
  21670. maxHeight = 30
  21671. fixedSize = yes
  21672. #alwaysTransparent = yes
  21673. text = "PRODUCTION"
  21674. - format = center
  21675. + format = centre
  21676. }
  21677. +
  21678. gridBoxType = {
  21679. name = "production"
  21680. - position = { x = 150 y = 327 }
  21681. - size = { width = 50% height = 60 }
  21682. - slotSize = { width = 50 height = 20 }
  21683. + position = { x = 128 y = 321 }
  21684. + size = { width = 316 height = 30 }
  21685. + slotSize = { width = 77 height = 20 }
  21686. max_slots_horizontal = 3
  21687. format = CENTERED_UP
  21688. }
  21689. @@ -157,18 +158,18 @@ guiTypes = {
  21690. instantTextBoxType = {
  21691. name = "maintenance_header"
  21692. font = "cg_16b"
  21693. - position = { x = -70 y = 410 }
  21694. - maxWidth = 280
  21695. + position = { x = 380 y = 300 }
  21696. + maxWidth = 166
  21697. maxHeight = 30
  21698. fixedSize = yes
  21699. #alwaysTransparent = yes
  21700. text = "MAINTENANCE"
  21701. - format = center
  21702. + format = centre
  21703. }
  21704. gridBoxType = {
  21705. name = "maintenance"
  21706. - position = { x = -70 y = 427 }
  21707. - size = { width = 50% height = 60 }
  21708. + position = { x = 390 y = 321 }
  21709. + size = { width = 120 height = 30 }
  21710. slotSize = { width = 50 height = 20 }
  21711. max_slots_horizontal = 3
  21712. format = CENTERED_UP
  21713. @@ -182,7 +183,7 @@ guiTypes = {
  21714. instantTextBoxType = {
  21715. name = "title"
  21716. font = "malgun_goth_24"
  21717. - position = { x = 25 y = 5 }
  21718. + position = { x = 25 y = 12 }
  21719. maxWidth = 520
  21720. maxHeight = 20
  21721. format = centre
  21722. @@ -255,18 +256,20 @@ guiTypes = {
  21723. }
  21724. containerWindowType = {
  21725. name = "megastructure_production_entry"
  21726. - #background = {
  21727. - #}
  21728. - size = { width = 50 height = 20 }
  21729. + background = {
  21730. + name = "planet_view_module_spaceport_orbital_entry_background"
  21731. + spriteType = "GFX_interface_list_light"
  21732. + }
  21733. + size = { width = 75 height = 30 }
  21734. instantTextBoxType = {
  21735. name = "text"
  21736. font = "cg_16b"
  21737. - position = { x = -50 y = 0 }
  21738. - maxWidth = 150
  21739. - maxHeight = 20
  21740. + position = { x = 0 y = 5 }
  21741. + maxWidth = 75
  21742. + maxHeight = 30
  21743. format = center
  21744. fixedSize = yes
  21745. - alwaysTransparent = no
  21746. + alwaysTransparent = yes
  21747. text = ""
  21748. }
  21749. }
  21750. diff --git a/2.0.0/interface/mp_gamesetup.gui b/2.0.2/interface/mp_gamesetup.gui
  21751. index 3309763..e576541 100755
  21752. --- a/2.0.0/interface/mp_gamesetup.gui
  21753. +++ b/2.0.2/interface/mp_gamesetup.gui
  21754. @@ -1042,22 +1042,22 @@ guiTypes = {
  21755. }
  21756. }
  21757.  
  21758. - # Aggressiveness
  21759. + # Difficulty
  21760. containerWindowType = {
  21761. - name = "aggressiveness"
  21762. + name = "difficulty"
  21763. position = { x = 0 y = 480 }
  21764. size={ width=@SettingEntrySizeX height=@SettingEntrySizeY }
  21765.  
  21766. instantTextBoxType = {
  21767. - name = "aggressiveness_label"
  21768. + name = "difficulty_label"
  21769. position = { x = 10 y = 4 }
  21770. font = "cg_16b"
  21771. maxWidth = 204
  21772. maxHeight = 52
  21773. alwaysTransparent = yes
  21774. orientation = "UPPER_LEFT"
  21775. - text = "FE_AGGRESSIVENESS"
  21776. - pdx_tooltip = "FE_AGGRESSIVENESS_TOOLTIP"
  21777. + text = "FE_DIFFICULTY"
  21778. + pdx_tooltip = "FE_DIFFICULTY_TOOLTIP"
  21779. }
  21780.  
  21781. instantTextBoxType={
  21782. @@ -1072,8 +1072,8 @@ guiTypes = {
  21783. }
  21784.  
  21785. spinnerType = {
  21786. - id = "aggressiveness_spinner"
  21787. - name = "aggressiveness_spinner"
  21788. + id = "galaxy_difficulty_spinner"
  21789. + name = "galaxy_difficulty_spinner"
  21790. leftbutton = "spinner_upButton"
  21791. rightbutton = "spinner_downButton"
  21792. size = { x = 204 y = 30 }
  21793. @@ -1097,22 +1097,22 @@ guiTypes = {
  21794. }
  21795. }
  21796.  
  21797. - # Difficulty
  21798. + # Aggressiveness
  21799. containerWindowType = {
  21800. - name = "difficulty"
  21801. + name = "aggressiveness"
  21802. position = { x = 0 y = 520 }
  21803. size={ width=@SettingEntrySizeX height=@SettingEntrySizeY }
  21804.  
  21805. instantTextBoxType = {
  21806. - name = "difficulty_label"
  21807. + name = "aggressiveness_label"
  21808. position = { x = 10 y = 4 }
  21809. font = "cg_16b"
  21810. maxWidth = 204
  21811. maxHeight = 52
  21812. alwaysTransparent = yes
  21813. orientation = "UPPER_LEFT"
  21814. - text = "FE_DIFFICULTY"
  21815. - pdx_tooltip = "FE_DIFFICULTY_TOOLTIP"
  21816. + text = "FE_AGGRESSIVENESS"
  21817. + pdx_tooltip = "FE_AGGRESSIVENESS_TOOLTIP"
  21818. }
  21819.  
  21820. instantTextBoxType={
  21821. @@ -1127,8 +1127,8 @@ guiTypes = {
  21822. }
  21823.  
  21824. spinnerType = {
  21825. - id = "galaxy_difficulty_spinner"
  21826. - name = "galaxy_difficulty_spinner"
  21827. + id = "aggressiveness_spinner"
  21828. + name = "aggressiveness_spinner"
  21829. leftbutton = "spinner_upButton"
  21830. rightbutton = "spinner_downButton"
  21831. size = { x = 204 y = 30 }
  21832. diff --git a/2.0.0/interface/rename_dialog.gui b/2.0.2/interface/rename_dialog.gui
  21833. index c5dc299..f9d435f 100755
  21834. --- a/2.0.0/interface/rename_dialog.gui
  21835. +++ b/2.0.2/interface/rename_dialog.gui
  21836. @@ -1,5 +1,5 @@
  21837. guiTypes = {
  21838. - ### Rename Colony Window
  21839. + ### Generic Rename Window
  21840. containerWindowType = {
  21841. name = "rename_dialog"
  21842. orientation = center
  21843. @@ -331,4 +331,163 @@ guiTypes = {
  21844. text = "DIALOG_AGREE_GAMEPAD_INDICATOR"
  21845. }
  21846. }
  21847. +
  21848. + ### Rename for Ruler & Heir
  21849. + containerWindowType = {
  21850. + name = "rename_ruler_dialog"
  21851. + orientation = center
  21852. + origo = center
  21853. + moveable = yes
  21854. + size = { width=400 height=222 }
  21855. + position = { x=0 y=-10 }
  21856. +
  21857. + background = {
  21858. + name = "background"
  21859. + quadTextureSprite = "GFX_tile_outliner_bg"
  21860. + position = { x = 0 y = 0 }
  21861. + size = { x = 400 y = 200 }
  21862. + }
  21863. +
  21864. + iconType = {
  21865. + name = "hex_bg"
  21866. + spriteType = "GFX_hex_bg"
  21867. + position = { x = -10 y = -14 }
  21868. + alwaysTransparent = yes
  21869. + }
  21870. +
  21871. + iconType = {
  21872. + name = "empire_header_line"
  21873. + quadTextureSprite = "GFX_line"
  21874. + position = { x = 6 y = 22 }
  21875. + alwaysTransparent = yes
  21876. + }
  21877. +
  21878. + instantTextBoxType = {
  21879. + name = "title"
  21880. + font = "malgun_goth_24"
  21881. + text = "RENAME_RULER_TITLE"
  21882. + position = { x = 12 y = 7 }
  21883. + maxWidth = 300
  21884. + maxHeight = 40
  21885. + fixedSize = yes
  21886. + alwaysTransparent = yes
  21887. + }
  21888. +
  21889. + editBoxType = {
  21890. + position = { x = 17 y = 45 }
  21891. + name = "editbox"
  21892. + instantTextBoxType = no
  21893. + textureFile = "gfx/interface/tiles/small_tiles_dialog.dds"
  21894. + font = "malgun_goth_24"
  21895. + borderSize = { x=4 y=4 }
  21896. + size = { x=370 y=40 }
  21897. + text = " "
  21898. + orientation = "UPPER_LEFT"
  21899. + cursor = { x=0 y= 3}
  21900. + }
  21901. +
  21902. + instantTextBoxType = {
  21903. + name = "title_male_label"
  21904. + font = "malgun_goth_24"
  21905. + text = "RULER_TITLE_MALE"
  21906. + position = { x = 222 y = 90 }
  21907. + maxWidth = 150
  21908. + maxHeight = 20
  21909. + fixedSize = yes
  21910. + alwaysTransparent = yes
  21911. + }
  21912. +
  21913. + editBoxType = {
  21914. + position = { x = 17 y = 85 }
  21915. + name = "editbox_title_male"
  21916. + instantTextBoxType = no
  21917. + textureFile = "gfx/interface/tiles/small_tiles_dialog.dds"
  21918. + font = "malgun_goth_24"
  21919. + borderSize = { x=4 y=4 }
  21920. + size = { x=200 y=40 }
  21921. + text = ""
  21922. + orientation = "UPPER_LEFT"
  21923. + cursor = { x=0 y= 3}
  21924. + }
  21925. +
  21926. + instantTextBoxType = {
  21927. + name = "title_female_label"
  21928. + font = "malgun_goth_24"
  21929. + text = "RULER_TITLE_FEMALE"
  21930. + position = { x = 222 y = 130 }
  21931. + maxWidth = 150
  21932. + maxHeight = 20
  21933. + fixedSize = yes
  21934. + alwaysTransparent = yes
  21935. + }
  21936. +
  21937. + editBoxType = {
  21938. + position = { x = 17 y = 125 }
  21939. + name = "editbox_title_female"
  21940. + instantTextBoxType = no
  21941. + textureFile = "gfx/interface/tiles/small_tiles_dialog.dds"
  21942. + font = "malgun_goth_24"
  21943. + borderSize = { x=4 y=4 }
  21944. + size = { x=200 y=40 }
  21945. + text = " "
  21946. + orientation = "UPPER_LEFT"
  21947. + cursor = { x=0 y= 3}
  21948. + }
  21949. +
  21950. + buttonType = {
  21951. + name = "RandomizeButton"
  21952. + quadTextureSprite = "GFX_button_randomize"
  21953. + position = { x = 340 y = 20 }
  21954. + Orientation = "UPPER_LEFT"
  21955. + no_clicksound = yes
  21956. + }
  21957. +
  21958. + buttonType =
  21959. + {
  21960. + name = "DeclineButton"
  21961. + quadTextureSprite = "GFX_standard_button_142_34_button"
  21962. + position = { x= 5 y = 160 }
  21963. + Orientation = "UPPER_LEFT"
  21964. + buttonText = "CANCEL"
  21965. + buttonFont = "cg_16b"
  21966. + clicksound = "back_click"
  21967. + shortcut = "ESCAPE"
  21968. + actionShortCut = "cancel"
  21969. + }
  21970. +
  21971. + buttonType =
  21972. + {
  21973. + name = "AgreeButton"
  21974. + quadTextureSprite = "GFX_standard_button_142_34_button"
  21975. + position = { x= 225 y = 160 }
  21976. + Orientation = "UPPER_LEFT"
  21977. + buttonText = "OK"
  21978. + buttonFont = "cg_16b"
  21979. + clicksound = "confirmation"
  21980. + shortcut = "RETURN"
  21981. + actionShortCut = "accept"
  21982. + }
  21983. +
  21984. + instantTextBoxType = {
  21985. + name = "decline_text"
  21986. + orientation = center_down
  21987. + format = center
  21988. + position = { x = -175 y = 0 }
  21989. + maxWidth = 180
  21990. + maxHeight = 20
  21991. + font = "malgun_goth_24"
  21992. + text = "DIALOG_DECLINE_GAMEPAD_INDICATOR"
  21993. + }
  21994. +
  21995. + instantTextBoxType = {
  21996. + name = "agree_text"
  21997. + orientation = center_down
  21998. + format = center
  21999. + position = { x = 9 y = 0 }
  22000. + maxWidth = 180
  22001. + maxHeight = 20
  22002. + font = "malgun_goth_24"
  22003. + text = "DIALOG_AGREE_GAMEPAD_INDICATOR"
  22004. + }
  22005. + }
  22006. }
  22007. \ No newline at end of file
  22008. diff --git a/2.0.0/interface/ship_designer.gui b/2.0.2/interface/ship_designer.gui
  22009. index 492ad35..6c11836 100755
  22010. --- a/2.0.0/interface/ship_designer.gui
  22011. +++ b/2.0.2/interface/ship_designer.gui
  22012. @@ -1349,7 +1349,7 @@ guiTypes = {
  22013. containerWindowType = {
  22014. name = "section_select_window"
  22015. position = { x = 353 y = 80 }
  22016. - size = { width = 528 height = 615 }
  22017. + size = { width = 528 height = 630 }
  22018. moveable = yes
  22019. # Orientation = "CENTER_UP"
  22020.  
  22021. @@ -1389,7 +1389,7 @@ guiTypes = {
  22022. smoothListBoxType = {
  22023. name = "list"
  22024. position = { x = 12 y = 53 }
  22025. - size = { x = 840 y = 550 }
  22026. + size = { x = 500 y = 560 }
  22027. scrollbartype = "standardlistbox_slider"
  22028. }
  22029.  
  22030. diff --git a/2.0.0/interface/startup_info.txt b/2.0.2/interface/startup_info.txt
  22031. index 92d0036..583dde8 100755
  22032. --- a/2.0.0/interface/startup_info.txt
  22033. +++ b/2.0.2/interface/startup_info.txt
  22034. @@ -1,4 +1,4 @@
  22035. -Stellaris has changed quite dramatically in 2.0, including a complete overhaul of the way FTL travel works. Overall, you can expect the pace of expansion to be more measured and deliberate, and you now have much greater choice over which star systems you want to control.
  22036. +Stellaris has changed quite dramatically in version 2.0, including a complete overhaul of the way FTL travel works. Overall, you can expect the pace of expansion to be more measured and deliberate, and you now have much greater choice over which star systems you want to control.
  22037.  
  22038. You will need to use your construction ships to build Starbases that control systems and defend your borders. Starbases can be upgraded with shipyards to construct military fleets, or turned into mighty fortresses able to defend vital choke points and strategically important systems.
  22039.  
  22040. @@ -12,4 +12,4 @@ We hope you are ready for the Apocalypse!
  22041.  
  22042. ---
  22043.  
  22044. -Due to the size and scope of the changes, saved games from before version 2.0 will not be compatible with version 2.0. If you wish to continue your old save in version 1.9, follow the forum link below and read the thread 'How to revert Stellaris to a previous version'.
  22045. \ No newline at end of file
  22046. +Due to the size and scope of the changes, saved games from previous versions will not be compatible with version 2.0. If you wish to continue your old save in version 1.9, follow the forum link below and read the thread 'How to revert Stellaris to a previous version'.
  22047. \ No newline at end of file
  22048. diff --git a/2.0.0/interface/texticons.gfx b/2.0.2/interface/texticons.gfx
  22049. index d857a17..eb5e688 100755
  22050. --- a/2.0.0/interface/texticons.gfx
  22051. +++ b/2.0.2/interface/texticons.gfx
  22052. @@ -298,4 +298,10 @@ spriteTypes = {
  22053. name = "GFX_text_ship_stats_special"
  22054. texturefile = "gfx/interface/icons/ship_stats/special.dds"
  22055. }
  22056. +
  22057. + spriteType = {
  22058. + name = "GFX_text_fleet_status"
  22059. + texturefile = "gfx/interface/outliner/outliner_upgradable_design.dds"
  22060. + noOfFrames = 2
  22061. + }
  22062. }
  22063. diff --git a/2.0.0/interface/topbar_traditions_view.gui b/2.0.2/interface/topbar_traditions_view.gui
  22064. index 74afccc..49aab6c 100755
  22065. --- a/2.0.0/interface/topbar_traditions_view.gui
  22066. +++ b/2.0.2/interface/topbar_traditions_view.gui
  22067. @@ -24,7 +24,7 @@ guiTypes = {
  22068. positionType = { name = "tr_expansion_courier_network" position = { x = 61 y = 125 } }
  22069. positionType = { name = "tr_expansion_reach_for_the_stars" position = { x = 201 y = 55 } }
  22070. positionType = { name = "tr_discovery_to_boldly_go" position = { x = 96 y = 55 } }
  22071. - positionType = { name = "tr_discovery_planetary_survey_corps" position = { x = 96 y = 125 } }
  22072. + positionType = { name = "tr_discovery_databank_uplinks" position = { x = 96 y = 125 } }
  22073. positionType = { name = "tr_discovery_science_division" position = { x = 166 y = 55 } }
  22074. positionType = { name = "tr_discovery_polytechnic_education" position = { x = 166 y = 125 } }
  22075. positionType = { name = "tr_discovery_faith_in_science" position = { x = 166 y = 195 } }
  22076. diff --git a/2.0.0/interface/traditions.gfx b/2.0.2/interface/traditions.gfx
  22077. index 9f5066a..a1daa45 100755
  22078. --- a/2.0.0/interface/traditions.gfx
  22079. +++ b/2.0.2/interface/traditions.gfx
  22080. @@ -264,7 +264,7 @@ spriteTypes = {
  22081. }
  22082.  
  22083. spriteType = {
  22084. - name = "GFX_tr_discovery_planetary_survey_corps"
  22085. + name = "GFX_tr_discovery_databank_uplinks"
  22086. textureFile = "gfx/interface/icons/traditions/tradition_discovery_planetary_survey_corps.dds"
  22087. }
  22088.  
  22089. diff --git a/2.0.0/interface/war_goals_view.gfx b/2.0.2/interface/war_goals_view.gfx
  22090. index a5cb4fa..709b30f 100755
  22091. --- a/2.0.0/interface/war_goals_view.gfx
  22092. +++ b/2.0.2/interface/war_goals_view.gfx
  22093. @@ -2,46 +2,67 @@ spriteTypes = {
  22094. spriteType = {
  22095. name = "GFX_wg_conquest"
  22096. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22097. + noOfFrames = 2
  22098. }
  22099.  
  22100. spriteType = {
  22101. name = "GFX_wg_war_in_heaven"
  22102. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22103. + noOfFrames = 2
  22104. }
  22105.  
  22106. spriteType = {
  22107. name = "GFX_wg_machine_uprising"
  22108. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22109. + noOfFrames = 2
  22110. }
  22111.  
  22112. spriteType = {
  22113. name = "GFX_wg_end_threat"
  22114. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22115. + noOfFrames = 2
  22116. + }
  22117. +
  22118. + spriteType = {
  22119. + name = "GFX_wg_end_threat_assimilators"
  22120. + texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22121. + noOfFrames = 2
  22122. }
  22123.  
  22124. spriteType = {
  22125. name = "GFX_wg_end_threat_ae"
  22126. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22127. + noOfFrames = 2
  22128. }
  22129.  
  22130. spriteType = {
  22131. name = "GFX_wg_end_threat_swarm"
  22132. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22133. + noOfFrames = 2
  22134. }
  22135.  
  22136. spriteType = {
  22137. name = "GFX_wg_plunder"
  22138. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22139. + noOfFrames = 2
  22140. + }
  22141. +
  22142. + spriteType = {
  22143. + name = "GFX_wg_assimilation"
  22144. + texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22145. + noOfFrames = 2
  22146. }
  22147.  
  22148. spriteType = {
  22149. name = "GFX_wg_cleansing"
  22150. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22151. + noOfFrames = 2
  22152. }
  22153.  
  22154. spriteType = {
  22155. name = "GFX_wg_absorption"
  22156. texturefile = "gfx/interface/icons/diplomacy/diplomacy_war.dds"
  22157. + noOfFrames = 2
  22158. }
  22159.  
  22160. spriteType = {
  22161. diff --git a/2.0.0/interface/waroverview.gfx b/2.0.2/interface/waroverview.gfx
  22162. index 2873a65..572f80f 100755
  22163. --- a/2.0.0/interface/waroverview.gfx
  22164. +++ b/2.0.2/interface/waroverview.gfx
  22165. @@ -52,6 +52,7 @@ spriteTypes = {
  22166. noOfFrames = 6
  22167. effectFile = "gfx/FX/buttonstate_onlydisable.lua"
  22168. }
  22169. +
  22170. spriteType = {
  22171. name = "GFX_waroverview_icon_progress_allies"
  22172. textureFile = "gfx/interface/waroverview/waroverview_icon_progress_allies.dds"
  22173. @@ -59,6 +60,13 @@ spriteTypes = {
  22174. effectFile = "gfx/FX/buttonstate_onlydisable.lua"
  22175. }
  22176.  
  22177. + spriteType = {
  22178. + name = "GFX_waroverview_icon_enemy_surrender_progress"
  22179. + textureFile = "gfx/interface/waroverview/waroverview_icon_enemy_surrender_progress.dds"
  22180. + noOfFrames = 5
  22181. + effectFile = "gfx/FX/buttonstate_onlydisable.lua"
  22182. + }
  22183. +
  22184. progressbartype = {
  22185. name = "GFX_waroverview_war_exhaustion_stats_progressbar"
  22186. color = { 1.0 1.0 1.0 }
  22187. diff --git a/2.0.0/interface/waroverview.gui b/2.0.2/interface/waroverview.gui
  22188. index 14039d0..5e1125a 100755
  22189. --- a/2.0.0/interface/waroverview.gui
  22190. +++ b/2.0.2/interface/waroverview.gui
  22191. @@ -33,48 +33,52 @@ guiTypes = {
  22192. }
  22193.  
  22194. iconType ={
  22195. - name = "their_war_exhaustion_progress"
  22196. - spriteType = "GFX_waroverview_icon_progress_enemies"
  22197. - frame = 6
  22198. - centerPosition = yes
  22199. - position = { x = 18 y = -1 }
  22200. + name ="war_status_icon"
  22201. + quadTextureSprite = "GFX_diplomacy_status_war"
  22202. + position = { x = 2 y = -15 }
  22203. + scale = 0.9
  22204. alwaysTransparent = yes
  22205. }
  22206. +
  22207. iconType = {
  22208. - name = "our_war_exhaustion_progress"
  22209. - spriteType = "GFX_waroverview_icon_progress_allies"
  22210. - frame = 6
  22211. - centerPosition = yes
  22212. - position = { x = 16 y = -1 }
  22213. + name = "enemy_flag"
  22214. + quadTextureSprite = "GFX_empire_flag_32"
  22215. + position = { x = 28 y = -18 }
  22216. alwaysTransparent = yes
  22217. }
  22218.  
  22219. iconType = {
  22220. - name = "enemy_flag"
  22221. + name = "our_flag"
  22222. quadTextureSprite = "GFX_empire_flag_32"
  22223. - position = { x = 0 y = -18 }
  22224. + position = { x = -28 y = -18 }
  22225. alwaysTransparent = yes
  22226. }
  22227.  
  22228. + iconType = {
  22229. + name = "their_surrender_progress"
  22230. + spriteType = "GFX_waroverview_icon_enemy_surrender_progress"
  22231. + frame = 3
  22232. + centerPosition = yes
  22233. + position = { x = 15 y = 23 }
  22234. + }
  22235. +
  22236. instantTextBoxType = {
  22237. name = "their_war_exhaustion"
  22238. - position = { x = 18 y = 19 }
  22239. + position = { x = 25 y = 15 }
  22240. font = "cg_16b"
  22241. maxWidth = 40
  22242. maxHeight = 20
  22243. format = center
  22244. fixedSize = yes
  22245. - alwaysTransparent = yes
  22246. }
  22247. instantTextBoxType = {
  22248. name = "our_war_exhaustion"
  22249. - position = { x = -24 y = -38 }
  22250. + position = { x = -31 y = 15 }
  22251. font = "cg_16b"
  22252. maxWidth = 40
  22253. maxHeight = 20
  22254. format = center
  22255. fixedSize = yes
  22256. - alwaysTransparent = yes
  22257. }
  22258. }
  22259.  
  22260. @@ -216,7 +220,7 @@ guiTypes = {
  22261.  
  22262. containerWindowType = {
  22263. name = "war_exhaustion_stats"
  22264. - size = { width = 155 height = 218 }
  22265. + size = { width = 155 height = 168 }
  22266. position = { x = 0 y = 250 }
  22267.  
  22268. background = {
  22269. @@ -276,7 +280,7 @@ guiTypes = {
  22270.  
  22271. instantTextBoxType = {
  22272. name = "war_exhaustion_details_label"
  22273. - position = { x = 7 y = 85 }
  22274. + position = { x = 7 y = 65 }
  22275. font = "cg_16b"
  22276. maxWidth = 143
  22277. maxHeight = 30
  22278. @@ -288,7 +292,7 @@ guiTypes = {
  22279.  
  22280. instantTextBoxType = {
  22281. name = "passive_label"
  22282. - position = { x = 7 y = 105 }
  22283. + position = { x = 7 y = 85 }
  22284. font = "cg_16b"
  22285. maxWidth = 143
  22286. maxHeight = 30
  22287. @@ -299,7 +303,7 @@ guiTypes = {
  22288. }
  22289. instantTextBoxType = {
  22290. name = "passive_value"
  22291. - position = { x = -40 y = 105 }
  22292. + position = { x = -40 y = 85 }
  22293. orientation = upper_right
  22294. font = "cg_16b"
  22295. maxWidth = 35
  22296. @@ -312,7 +316,7 @@ guiTypes = {
  22297.  
  22298. instantTextBoxType = {
  22299. name = "ships_label"
  22300. - position = { x = 7 y = 125 }
  22301. + position = { x = 7 y = 105 }
  22302. font = "cg_16b"
  22303. maxWidth = 143
  22304. maxHeight = 30
  22305. @@ -323,7 +327,7 @@ guiTypes = {
  22306. }
  22307. instantTextBoxType = {
  22308. name = "ships_value"
  22309. - position = { x = -40 y = 125 }
  22310. + position = { x = -40 y = 105 }
  22311. orientation = upper_right
  22312. font = "cg_16b"
  22313. maxWidth = 35
  22314. @@ -336,7 +340,7 @@ guiTypes = {
  22315.  
  22316. instantTextBoxType = {
  22317. name = "armies_label"
  22318. - position = { x = 7 y = 145 }
  22319. + position = { x = 7 y = 125 }
  22320. font = "cg_16b"
  22321. maxWidth = 143
  22322. maxHeight = 30
  22323. @@ -347,7 +351,7 @@ guiTypes = {
  22324. }
  22325. instantTextBoxType = {
  22326. name = "armies_value"
  22327. - position = { x = -40 y = 145 }
  22328. + position = { x = -40 y = 125 }
  22329. orientation = upper_right
  22330. font = "cg_16b"
  22331. maxWidth = 35
  22332. @@ -359,19 +363,19 @@ guiTypes = {
  22333. }
  22334.  
  22335. instantTextBoxType = {
  22336. - name = "occupation_label"
  22337. - position = { x = 7 y = 165 } # { x = 7 y = 65 }
  22338. + name = "static_label"
  22339. + position = { x = 7 y = 145 }
  22340. font = "cg_16b"
  22341. maxWidth = 143
  22342. maxHeight = 30
  22343. fixedSize = yes
  22344. format = left
  22345. - text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_HEADER"
  22346. - pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22347. + text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_HEADER"
  22348. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_TOOLTIP"
  22349. }
  22350. instantTextBoxType = {
  22351. - name = "occupation_value"
  22352. - position = { x = -40 y = 165 }
  22353. + name = "static_value"
  22354. + position = { x = -40 y = 145 }
  22355. orientation = upper_right
  22356. font = "cg_16b"
  22357. maxWidth = 35
  22358. @@ -381,21 +385,46 @@ guiTypes = {
  22359. text_color_code = "H"
  22360. alwaystransparent = yes
  22361. }
  22362. + }
  22363. +
  22364. + containerWindowType = {
  22365. + name = "occupation_stats"
  22366. + size = { width = 155 height = 48 }
  22367. + position = { x = 0 y = 420 }
  22368. +
  22369. + background = {
  22370. + name = "background"
  22371. + spriteType = "GFX_tiles_dark_area_cut_8"
  22372. + }
  22373. +
  22374. + iconType = {
  22375. + name = "progressbar"
  22376. + spriteType = "GFX_waroverview_war_exhaustion_stats_progressbar"
  22377. + position = { x = 7 y = 14 }
  22378. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22379. + }
  22380. + iconType = {
  22381. + name = "progressbar_marker"
  22382. + spriteType = "GFX_waroverview_war_exhaustion_stats_progressbar_glow"
  22383. + centerPosition = yes
  22384. + position = { x = 7 y = 33 }
  22385. + alwaystransparent = yes
  22386. + }
  22387.  
  22388. instantTextBoxType = {
  22389. - name = "static_label"
  22390. - position = { x = 7 y = 185 }
  22391. + name = "occupation_label"
  22392. + position = { x = 7 y = 5 }
  22393. font = "cg_16b"
  22394. maxWidth = 143
  22395. maxHeight = 30
  22396. fixedSize = yes
  22397. format = left
  22398. - text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_HEADER"
  22399. - pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_TOOLTIP"
  22400. + text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_HEADER"
  22401. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22402. }
  22403. instantTextBoxType = {
  22404. - name = "static_value"
  22405. - position = { x = -40 y = 185 }
  22406. + name = "occupation_value"
  22407. + position = { x = -40 y = 5 }
  22408. orientation = upper_right
  22409. font = "cg_16b"
  22410. maxWidth = 35
  22411. @@ -451,7 +480,7 @@ guiTypes = {
  22412.  
  22413. containerWindowType = {
  22414. name = "war_exhaustion_stats"
  22415. - size = { width = 155 height = 218 }
  22416. + size = { width = 155 height = 168 }
  22417. position = { x = 0 y = 250 }
  22418. origo = upper_right
  22419. orientation = upper_right
  22420. @@ -513,7 +542,7 @@ guiTypes = {
  22421.  
  22422. instantTextBoxType = {
  22423. name = "war_exhaustion_details_label"
  22424. - position = { x = 7 y = 85 }
  22425. + position = { x = 7 y = 65 }
  22426. font = "cg_16b"
  22427. maxWidth = 143
  22428. maxHeight = 30
  22429. @@ -525,7 +554,7 @@ guiTypes = {
  22430.  
  22431. instantTextBoxType = {
  22432. name = "passive_label"
  22433. - position = { x = 7 y = 105 }
  22434. + position = { x = 7 y = 85 }
  22435. font = "cg_16b"
  22436. maxWidth = 143
  22437. maxHeight = 30
  22438. @@ -536,7 +565,7 @@ guiTypes = {
  22439. }
  22440. instantTextBoxType = {
  22441. name = "passive_value"
  22442. - position = { x = -40 y = 105 }
  22443. + position = { x = -40 y = 85 }
  22444. orientation = upper_right
  22445. font = "cg_16b"
  22446. maxWidth = 35
  22447. @@ -549,7 +578,7 @@ guiTypes = {
  22448.  
  22449. instantTextBoxType = {
  22450. name = "ships_label"
  22451. - position = { x = 7 y = 125 }
  22452. + position = { x = 7 y = 105 }
  22453. font = "cg_16b"
  22454. maxWidth = 143
  22455. maxHeight = 30
  22456. @@ -560,7 +589,7 @@ guiTypes = {
  22457. }
  22458. instantTextBoxType = {
  22459. name = "ships_value"
  22460. - position = { x = -40 y = 125 }
  22461. + position = { x = -40 y = 105 }
  22462. orientation = upper_right
  22463. font = "cg_16b"
  22464. maxWidth = 35
  22465. @@ -573,7 +602,7 @@ guiTypes = {
  22466.  
  22467. instantTextBoxType = {
  22468. name = "armies_label"
  22469. - position = { x = 7 y = 145 }
  22470. + position = { x = 7 y = 125 }
  22471. font = "cg_16b"
  22472. maxWidth = 143
  22473. maxHeight = 30
  22474. @@ -584,7 +613,7 @@ guiTypes = {
  22475. }
  22476. instantTextBoxType = {
  22477. name = "armies_value"
  22478. - position = { x = -40 y = 145 }
  22479. + position = { x = -40 y = 125 }
  22480. orientation = upper_right
  22481. font = "cg_16b"
  22482. maxWidth = 35
  22483. @@ -596,19 +625,19 @@ guiTypes = {
  22484. }
  22485.  
  22486. instantTextBoxType = {
  22487. - name = "occupation_label"
  22488. - position = { x = 7 y = 165 } # { x = 7 y = 65 }
  22489. + name = "static_label"
  22490. + position = { x = 7 y = 145 }
  22491. font = "cg_16b"
  22492. maxWidth = 143
  22493. maxHeight = 30
  22494. fixedSize = yes
  22495. format = left
  22496. - text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_HEADER"
  22497. - pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22498. + text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_HEADER"
  22499. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_TOOLTIP"
  22500. }
  22501. instantTextBoxType = {
  22502. - name = "occupation_value"
  22503. - position = { x = -40 y = 165 }
  22504. + name = "static_value"
  22505. + position = { x = -40 y = 145 }
  22506. orientation = upper_right
  22507. font = "cg_16b"
  22508. maxWidth = 35
  22509. @@ -618,21 +647,48 @@ guiTypes = {
  22510. text_color_code = "H"
  22511. alwaystransparent = yes
  22512. }
  22513. + }
  22514. +
  22515. + containerWindowType = {
  22516. + name = "occupation_stats"
  22517. + size = { width = 155 height = 48 }
  22518. + position = { x = 0 y = 420 }
  22519. + origo = upper_right
  22520. + orientation = upper_right
  22521. +
  22522. + background = {
  22523. + name = "background"
  22524. + spriteType = "GFX_tiles_dark_area_cut_8"
  22525. + }
  22526. +
  22527. + iconType = {
  22528. + name = "progressbar"
  22529. + spriteType = "GFX_waroverview_war_exhaustion_stats_progressbar"
  22530. + position = { x = 7 y = 14 }
  22531. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22532. + }
  22533. + iconType = {
  22534. + name = "progressbar_marker"
  22535. + spriteType = "GFX_waroverview_war_exhaustion_stats_progressbar_glow"
  22536. + centerPosition = yes
  22537. + position = { x = 7 y = 33 }
  22538. + alwaystransparent = yes
  22539. + }
  22540.  
  22541. instantTextBoxType = {
  22542. - name = "static_label"
  22543. - position = { x = 7 y = 185 }
  22544. + name = "occupation_label"
  22545. + position = { x = 7 y = 5 }
  22546. font = "cg_16b"
  22547. maxWidth = 143
  22548. maxHeight = 30
  22549. fixedSize = yes
  22550. format = left
  22551. - text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_HEADER"
  22552. - pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_DESTRUCTION_TOOLTIP"
  22553. + text = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_HEADER"
  22554. + pdx_tooltip = "WAROVERVIEW_WAR_EXHAUSTION_STAT_OCCUPATION_TOOLTIP"
  22555. }
  22556. instantTextBoxType = {
  22557. - name = "static_value"
  22558. - position = { x = -40 y = 185 }
  22559. + name = "occupation_value"
  22560. + position = { x = -40 y = 5 }
  22561. orientation = upper_right
  22562. font = "cg_16b"
  22563. maxWidth = 35
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!