暂存

r
暂存
2023-06-11 16:17:01 +08:00 · 2023-06-11 16:00:21 +08:00 · 2023-06-11 15:56:54 +08:00 · 2023-06-11 15:39:42 +08:00 · 2023-06-11 15:12:30 +08:00 · 2023-06-11 14:51:17 +08:00
9 changed files with 116 additions and 85 deletions
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@ -2555,7 +2555,7 @@ RG_gray_mod1_effect_project = {
 	enable_special_project = {
 		name = RG_GRAY_MOD1
 		location = event_target:gray_owner_capital_starbase
-		owner = root
+		owner = event_target:gray_owner
 	}
 	add_resource = {
 		energy = -15000
@ -2567,7 +2567,7 @@ RG_gray_mod2_effect = {
 	enable_special_project = {
 		name = RG_GRAY_MOD2
 		location = event_target:gray_owner_capital_starbase
-		owner = root
+		owner = event_target:gray_owner
 	}
 	add_resource = {
 		energy = -150000
@ -2579,7 +2579,7 @@ RG_gray_mod3_effect = {
 	enable_special_project = {
 		name = RG_GRAY_MOD3
 		location = event_target:gray_owner_capital_starbase
-		owner = root
+		owner = event_target:gray_owner
 	}
 	add_resource = {
 		energy = -40000
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@ -1,7 +1,7 @@
 situation_rg_gray_mod1 = {
 	picture = GFX_evt_planet_beam
-	complete_icon_frame = GFX_situation_outcome_frame_red
-	complete_icon = GFX_situation_exploding_planet
+	complete_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_positive
 	on_progress_complete = {
 		custom_tooltip = situation_rg_gray_mod1_finish_tooltip
 		hidden_effect = {
@ -56,14 +56,6 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_2_booster
-				}
-				modifier = {
-					country_engineering_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_3 = {
 			icon = GFX_situation_stage_3
@ -103,14 +95,6 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_5_booster
-				}
-				modifier = {
-					country_physics_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_6 = {
 			icon = GFX_situation_stage_6
@ -122,7 +106,9 @@ situation_rg_gray_mod1 = {
 					country_event = {
 						id = rg_story.28
 					}
-					RG_gray_mod1_effect_project = yes
+				}
+				event_target:gray_warship = {
+					set_event_locked = no
 				}
 			}
 		}
@ -134,12 +120,36 @@ situation_rg_gray_mod1 = {
 		default = yes
 		on_select = {
 			if = {
-				limit = { has_situation_flag = locked }
+				limit = {
+					NOT = {
+						has_situation_flag = rg_stage6_locked
+					}
+					has_situation_flag = locked
+				}
 				set_situation_locked = no
 				remove_situation_flag = locked
 			}
+			event_target:gray_warship = {
+				set_event_locked = yes
+			}
 			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
 		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
 	}
 	approach = {
 		name = situation_rg_gray_mod1_approach_2
@ -149,17 +159,32 @@ situation_rg_gray_mod1 = {
 			custom_tooltip = situation_rg_gray_mod1_approach_2_tooltip
 			set_situation_locked = yes
 			set_situation_flag = locked
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_3
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_3_tooltip
+			abort_situation = this
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
 		}
 	}
 	monthly_progress = {
 		base = 0.1
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_1_booster
 		}
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_2_booster
 		}
@ -174,17 +199,12 @@ situation_rg_gray_mod1 = {
 			has_situation_flag = situation_rg_gray_mod1_stage_4_booster
 		}
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_5_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_5_booster
 		}
 		modifier = {
-			subtract = 1.5
-			desc = situation_rg_gray_mod1_stage_5_booster_tooltip
-			has_situation_flag = situation_rg_gray_mod1_stage_5_booster
-		}
-		modifier = {
-			subtract = 0
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_6_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_6_booster
 		}
@ -205,5 +225,6 @@ situation_rg_gray_mod1 = {
 				id = rg_event.10
 			}
 		}
+		destroy_situation = this 
 	}	
 }
--- a/common/special_projects/!_RG_projects_distant_stars.txt
+++ b/common/special_projects/!_RG_projects_distant_stars.txt
@ -87,12 +87,6 @@ special_project = {
 			country_event = {
 				id = rg_event.11
 			}
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				remove_situation_flag = situation_rg_gray_mod1_stage_6_booster
-			}
 		}
 	}
 }
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@ -625,6 +625,14 @@ country_event = {
 				assign_leader = event_target:gray_leader_admiral
 			}
 		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			remove_situation_flag = rg_stage6_locked
+			set_situation_locked = no
+			remove_situation_flag = locked
+		}
 	}
 	option = {
 		name = OK
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@ -514,7 +514,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@ -455,7 +455,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
--- a/events/rg_gray_mod_story_event.txt
+++ b/events/rg_gray_mod_story_event.txt
@ -6,6 +6,7 @@ country_event = {
 	title = rg_story.23.title
 	desc = rg_story.23.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -31,7 +32,6 @@ country_event = {
 				value >= 1500
 			}
 		}
-		effect = {
 		add_resource = {
 			energy = -1500
 			alloys = -1500
@ -43,7 +43,6 @@ country_event = {
 			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
 		}
 	}
-	}
 }

 country_event = {
@ -51,6 +50,7 @@ country_event = {
 	title = rg_story.24.title
 	desc = rg_story.24.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -66,7 +66,6 @@ country_event = {
 	}
 	option = {
 		name = rg_story.24.b
-		effect = {
 		random_situation = {
 			limit = {
 				is_situation_type = situation_rg_gray_mod1
@ -74,7 +73,6 @@ country_event = {
 			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
 		}
 	}
-	}
 }

 country_event = {
@ -82,6 +80,7 @@ country_event = {
 	title = rg_story.25.title
 	desc = rg_story.25.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -113,14 +112,12 @@ country_event = {
 				value >= 5000
 			}
 		}
-		effect = {
 		add_resource = {
 			energy = -5000
 			alloys = -5000
 		}
 		rg_create_gray_mod1_testship_1 = yes
 	}
-	}
 }

 country_event = {
@ -128,6 +125,7 @@ country_event = {
 	title = rg_story.26.title
 	desc = rg_story.26.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -149,14 +147,12 @@ country_event = {
 	}
 	option = {
 		name = rg_story.26.b
-		effect = {
 		add_resource = {
 			energy = -5000
 			alloys = -5000
 		}
 		rg_create_gray_planetkiller_testship_1 = yes
 	}
-	}
 }

 country_event = {
@ -164,6 +160,7 @@ country_event = {
 	title = rg_story.27.title
 	desc = rg_story.27.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -180,7 +177,6 @@ country_event = {
 	}
 	option = {
 		name = rg_story.27.b
-		effect = {
 		random_situation = {
 			limit = {
 				is_situation_type = situation_rg_gray_mod1
@ -188,7 +184,6 @@ country_event = {
 			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
 		}
 	}
-	}
 }

 country_event = {
@ -196,6 +191,7 @@ country_event = {
 	title = rg_story.28.title
 	desc = rg_story.28.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -212,8 +208,16 @@ country_event = {
 			limit = {
 				is_situation_type = situation_rg_gray_mod1
 			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
 			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
 		}
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
 	}
 }

@ -222,6 +226,7 @@ country_event = {
 	title = rg_story.29.title
 	desc = rg_story.29.desc
 	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
 	is_triggered_only = yes
 	trigger = {
 		NOR = {
@ -232,7 +237,7 @@ country_event = {
 	immediate = {
 	}
 	option = {
-		name = rg_story.28.a
+		name = rg_story.29.a
 		default_hide_option = yes
 	}
 }
--- a/localisation/simp_chinese/RG_event_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_event_l_simp_chinese.yml
@ -267,12 +267,12 @@
 rg_event.10.a:0 "我们做了一个错误的决定..."

 rg_story.23.title:0 "§Y第一阶段：基本舰体修复§!"
- rg_story.23.desc:0 "我们的$NAME_Gray$改造计划将分为六个子阶段。在第一阶段，我们需要$NAME_Gray$舰体中严重损耗的部分，并修复一部分供能系统，并修复舰体上损坏无法挂载武器的挂载点。\n§Y在这一阶段计划不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.23.desc:0 "我们的$NAME_Gray$改造计划将分为六个子阶段。在第一阶段，我们需要修复$NAME_Gray$舰体中严重损耗的部分，并修复一部分供能系统，并修复舰体上损坏无法挂载武器的挂载点。\n§Y在这一阶段计划不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
 rg_story.23.a:0 "就这么办。"
 rg_story.23.b:0 "§Y买买买，我要这合金有何用？§!"

 rg_story.24.title:0 "§Y第二阶段：武器载点重构§!"
- rg_story.24.desc:0 "我们的计划已经进入第二阶段。在这一阶段，我们将修复$NAME_Gray$舰体上损坏的主武器挂载点，通过给反应堆添加节能认证，整合掉不需要的旅馆房间等措施来添加更多的武器挂载点，通过优化舰载机发射流程以搭载更多的舰载机。\n§Y在这一阶段计划不加干预仍将正常进行。不过指派我们的科研团队加以协助能够加快这一进程。§!"
+ rg_story.24.desc:0 "我们的计划已经进入第二阶段。在这一阶段，我们将修复$NAME_Gray$舰体上损坏的主武器挂载点，通过给反应堆添加节能认证，整合掉不需要的旅馆房间等措施来添加更多的武器挂载点，通过优化舰载机弹射流程中不必要的安全措施以搭载更多的舰载机。\n§Y在这一阶段计划不加干预仍将正常进行。不过指派我们的科研团队加以协助能够加快这一进程。§!"
 rg_story.24.a:0 "那就这样吧。"
 rg_story.24.b:0 "§Y指派工程学团队协助。§!"

--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@ -331,8 +331,8 @@
 MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
 rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案：无害化处理。"

- situation_rg_gray_mod1:0 "$RG_GRAY_MOD1$"
- situation_rg_gray_mod1_desc:0 "由于L星团资源太缺乏，$NAME_Gray$的舰体已经很久没有维护了。通过调集足够的资源$NAME_Gray$能够将母舰状态恢复到完全体。为了执行这项计划，$NAME_Gray$需要我们的工程团队的帮助。"
+ situation_rg_gray_mod1:0 "§Y$NAME_Gray$改造工程§!"
+ situation_rg_gray_mod1_desc:0 "由于L星团资源太缺乏，$NAME_Gray$的舰体已经很久没有维护了。通过调集足够的资源$NAME_Gray$能够将母舰状态恢复到完全体。为了执行这项计划，$NAME_Gray$需要我们的工程团队的帮助。\n§R切换$NAME_Gray$形态将会导致计划失败。§!"

 situation_rg_gray_mod1_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
 situation_rg_gray_mod1_stage_1_tooltip:0 "$rg_story.23.desc$"
@ -351,11 +351,14 @@

 situation_rg_gray_mod1_approach_1:0 "按计划执行"
 situation_rg_gray_mod1_approach_2:0 "暂停执行计划"
- situation_rg_gray_mod1_approach_1_tooltip:0 "§Y我们的项目将会按计划按部就班执行。§!"
- situation_rg_gray_mod2_approach_2_tooltip:0 "§Y迫于外部压力，我们需要暂缓执行改造项目。§!"
+ situation_rg_gray_mod1_approach_3:0 "放弃执行计划"
+ situation_rg_gray_mod1_approach_1_tooltip:0 "§G我们的项目将会按计划按部就班执行。§!"
+ situation_rg_gray_mod1_approach_2_tooltip:0 "§Y迫于外部压力，我们需要暂缓执行改造项目。§!"
+ situation_rg_gray_mod1_approach_3_tooltip:0 "§R我们遇到了使计划难以为继的困难，不得不暂时中止计划等待下一个时机。§!"
+ situation_rg_gray_mod1_monthly_change_tooltip:0 "§Y我们正在稳步推进改造项目。§!"

- situation_rg_gray_mod1_stage_1_booster_tooltip:0 "§Y我们的项目获得了额外预算§!"
- situation_rg_gray_mod1_stage_2_booster_tooltip:0 "§Y我们的工程团队将会被指派帮助改造项目§!"
- situation_rg_gray_mod1_stage_3_booster_tooltip:0 "§Y由于我们的计划缺少预算，项目团队只能用想象力来弥补不足...§!"
- situation_rg_gray_mod1_stage_5_booster_tooltip:0 "§Y我们的物理团队将会被指派帮助改造项目§!"
+ situation_rg_gray_mod1_stage_1_booster_tooltip:0 "§G我们的项目获得了额外预算§!"
+ situation_rg_gray_mod1_stage_2_booster_tooltip:0 "§G我们的工程团队将会被指派帮助改造项目§!"
+ situation_rg_gray_mod1_stage_3_booster_tooltip:0 "§R由于我们的计划缺少预算，项目团队只能用想象力来弥补不足§!"
+ situation_rg_gray_mod1_stage_5_booster_tooltip:0 "§G我们的物理团队将会被指派帮助改造项目§!"
 situation_rg_gray_mod1_stage_6_booster_tooltip:0 "§Y我们需要实际开始执行改造项目§!"
Author	SHA1	Message	Date
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	144b726051	暂存	2023-06-11 16:17:01 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	a708c18df6	r	2023-06-11 16:00:21 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	e48ced2893	暂存	2023-06-11 15:56:54 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	19a8e99a0b	暂存	2023-06-11 15:39:42 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	0a8698882b	暂存	2023-06-11 15:12:30 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c28c858bb3	暂存	2023-06-11 14:51:17 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c54b555f2f	暂存	2023-06-11 14:40:20 +08:00