diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt
index 62cd569..9781520 100644
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -33,12 +33,10 @@ rg_gray_govener_init = {
}
if = {
limit = {
- owner = {
OR = {
has_global_flag = has_wsg_mod
has_global_flag = kdc_event_mod_active
}
- }
}
set_leader_flag = "gray_leader"
set_leader_flag = gray_leader
@@ -152,12 +150,10 @@ rg_gray_commander_init = {
}
if = {
limit = {
- owner = {
OR = {
has_global_flag = has_wsg_mod
has_global_flag = kdc_event_mod_active
}
- }
}
set_leader_flag = "gray_leader" # "gray_leader"==rg_gray_leader
set_leader_flag = gray_leader
@@ -497,11 +493,9 @@ rg_gray_scientist_init = {
}
if = {
limit = {
- owner = {
- OR = {
- has_global_flag = has_wsg_mod
- has_global_flag = kdc_event_mod_active
- }
+ OR = {
+ has_global_flag = has_wsg_mod
+ has_global_flag = kdc_event_mod_active
}
}
set_leader_flag = "gray_leader" # "gray_leader"==rg_gray_leader
@@ -522,11 +516,9 @@ rg_gray_scientist_init = {
}
if = {
limit = {
- owner = {
- OR = {
- has_global_flag = has_wsg_mod
- has_global_flag = kdc_event_mod_active
- }
+ OR = {
+ has_global_flag = has_wsg_mod
+ has_global_flag = kdc_event_mod_active
}
}
if = {
@@ -590,11 +582,9 @@ rg_gray_country_leader_init = {
# set_leader_flag = rg_gray_leader
if = {
limit = {
- owner = {
- OR = {
- has_global_flag = has_wsg_mod
- has_global_flag = kdc_event_mod_active
- }
+ OR = {
+ has_global_flag = has_wsg_mod
+ has_global_flag = kdc_event_mod_active
}
}
# 暂时和小灰网络断开连接
diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt
index e9f6f8d..9105ab4 100644
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -1,8 +1,22 @@
@gray_portrait = Gray
rg_set_gray_portrait = {
- change_leader_portrait = @gray_portrait
- event_target:rg_gray_country_leader = {
+ if = {
+ limit = {
+ has_global_flag = ms_species_enabled
+ event_target:gray_owner = {
+ has_country_flag = mss_enable_gray_maid
+ }
+ }
+ ms_update_gray_portrait = yes
+ event_target:rg_gray_country_leader = {
+ ms_update_gray_portrait = yes
+ }
+ }
+ else = {
change_leader_portrait = @gray_portrait
+ event_target:rg_gray_country_leader = {
+ change_leader_portrait = @gray_portrait
+ }
}
}
@@ -2189,6 +2203,7 @@ rg_gray_country_init = {
# 下一阶段的事件再建立通讯
# establish_communications_no_message = root
save_global_event_target_as = rg_gray_country
+ save_global_event_target_as = gray_country
# 创建看板娘用于第一次接触
rg_gray_country_leader_init = yes
set_leader = last_created_leader
diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt
index 023fb27..d3662a5 100644
--- a/events/!_RG_gray_goo_events.txt
+++ b/events/!_RG_gray_goo_events.txt
@@ -314,6 +314,7 @@ country_event = {
rg_gray_country_init = yes #创建国家
}
rg_gray_country_after_init = yes
+ set_country_flag = machine_age_nanites_studied
create_message = {
type = MESSAGE_RECRUITED_LEADER
localization = "rg_event.2.desc"
@@ -621,12 +622,9 @@ event = {
}
}
AND = {
- OR = {
- has_country_flag = gray_official_active
- has_country_flag = gray_governor_active #旧版flag
- }
+ has_country_flag = gray_official_active
NOT = {
- exists = event_target:gray_governor
+ exists = event_target:gray_official
}
}
AND = {
@@ -640,10 +638,8 @@ event = {
}
immediate = {
event_target:gray_owner = {
- OR = {
- has_country_flag = gray_official_active
- has_country_flag = gray_governor_active #旧版flag
- } #总督
+ remove_country_flag = gray_official_active #新版flag
+ remove_country_flag = gray_governor_active #旧版flag #总督
remove_country_flag = gray_warship_active #旗舰
remove_country_flag = gray_army_active #陆军
remove_country_flag = gray_constship_active #科舰
@@ -652,12 +648,8 @@ event = {
modifier = "gray_scattered"
days = 3600
}
- country_event = {
- id = graygoo.511
- }
- country_event = {
- id = rg_event.22
- }
+ country_event = { id = graygoo.511 }
+ country_event = { id = graygoo.512 days = 3600 }
}
}
}
@@ -682,11 +674,20 @@ country_event = {
desc = "graygoo.512.a.desc"
desc = "graygoo.512.b.desc"
desc = "graygoo.512.c.desc"
- diplomatic = yes
+
+ event_window_type = leader_story
+ picture = GFX_evt_gray_gooed_planet
+ picture_event_data = {
+ portrait = event_target:rg_gray_country_leader
+ room = root
+ }
+
is_triggered_only = yes
+
immediate = {
remove_country_flag = gray_reforming
}
+
option = {
name = graygoo.512.a
}
diff --git a/events/!_rg_mss_gray.txt b/events/!_rg_mss_gray.txt
new file mode 100644
index 0000000..a1eb31f
--- /dev/null
+++ b/events/!_rg_mss_gray.txt
@@ -0,0 +1,89 @@
+namespace = mss_gray
+# 2024年5月15日20:14:29
+# chougou 美味女仆：肖像
+country_event = {
+ id = mss_gray.10
+ title = mss_gray.10.t
+ desc = mss_gray.10.d
+ trigger = {
+ exists = event_target:gray_owner
+ is_same_value = event_target:gray_owner
+ }
+ diplomatic = yes
+ is_triggered_only = yes
+ fire_only_once = yes
+ immediate = {
+ event_target:gray_country = {
+ create_leader = {
+ class = official
+ species = event_target:gray_owner
+ effect = {
+ change_leader_portrait = ms_ldr_gray_default
+ save_event_target_as = mss_temp_gray
+ set_leader_flag = ms_temp_gray
+ }
+ }
+ }
+ ms_set_gray_portrait = { P = ms_ldr_gray_default }
+ }
+ picture = GFX_evt_gray_goo_ships
+ picture_event_data = {
+ portrait = event_target:mss_temp_gray
+ room = specialist_bulwark_room
+ planet_background = pc_gray_goo
+ }
+ show_sound = event_faceoff_in_space
+ option = {
+ name = mss_gray.portrait.random
+ is_dialog_only = yes response_text = mss_gray.portrait.response.random
+ ms_set_gray_portrait = { P = ms_ldr_gray_random }
+ }
+ option = {
+ name = mss_gray.portrait.random.wingless
+ is_dialog_only = yes response_text = mss_gray.portrait.response.random
+ ms_set_gray_portrait = { P = ms_ldr_gray_random_wingless }
+ }
+ option = {
+ name = mss_gray.portrait.default
+ is_dialog_only = yes response_text = mss_gray.portrait.response.default
+ ms_set_gray_portrait = { P = ms_ldr_gray_default }
+ }
+ option = {
+ name = mss_gray.portrait.default.wingless
+ is_dialog_only = yes response_text = mss_gray.portrait.response.default
+ ms_set_gray_portrait = { P = ms_ldr_gray_default_wingless }
+ }
+ option = {
+ name = mss_gray.portrait.classic
+ is_dialog_only = yes response_text = mss_gray.portrait.response.classic
+ ms_set_gray_portrait = { P = ms_ldr_gray_classic }
+ }
+ option = {
+ name = mss_gray.portrait.classic.wingless
+ is_dialog_only = yes response_text = mss_gray.portrait.response.classic
+ ms_set_gray_portrait = { P = ms_ldr_gray_classic_wingless }
+ }
+ option = {
+ name = mss_gray.10.yes
+ custom_tooltip = mss_gray.10.yes.tt
+ hidden_effect = {
+ set_country_flag = mss_enable_gray_maid
+ country_event = { id = mss_gray.20 }
+ }
+ }
+ option = {
+ name = mss_gray.10.no
+ custom_tooltip = mss_gray.10.no.tt
+ hidden_effect = {
+ set_global_flag = rg_mss_denied_gray_maid
+ }
+ }
+ after = {
+ custom_tooltip = MS_LABEL_SPECIES
+ hidden_effect = {
+ event_target:mss_temp_gray = {
+ kill_leader = { show_notification = no }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/events/RG_events.txt b/events/RG_events.txt
index 0af18e5..3b36265 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -1041,35 +1041,35 @@ country_event = {
}
}
-# looping check for grayreforming
-country_event = {
- id = rg_event.22
- hide_window = yes
- is_triggered_only = yes
- trigger = {
- is_same_value = event_target:gray_owner
- has_country_flag = gray_reforming
- }
- immediate = {
- if = {
- limit = {
- NOT = {
- has_modifier = "gray_scattered"
- }
- }
- country_event = {
- id = graygoo.512
- }
- }
- else = {
- country_event = {
- id = rg_event.22
- years = 1
- }
- # *THIS* looping check
- }
- }
-}
+# # looping check for grayreforming
+# country_event = {
+# id = rg_event.22
+# hide_window = yes
+# is_triggered_only = yes
+# trigger = {
+# is_same_value = event_target:gray_owner
+# has_country_flag = gray_reforming
+# }
+# immediate = {
+# if = {
+# limit = {
+# NOT = {
+# has_modifier = "gray_scattered"
+# }
+# }
+# country_event = {
+# id = graygoo.512
+# }
+# }
+# else = {
+# country_event = {
+# id = rg_event.22
+# years = 1
+# }
+# # *THIS* looping check
+# }
+# }
+# }
# 拆毁工厂小灰通讯
country_event = {
diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt
index 1af3daf..0cc74d6 100644
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@@ -1156,28 +1156,28 @@ country_event = {
option = {
name = OK
}
- option = {
- name = rg_graygoo.504.a
- allow = {
- has_country_flag = gray_reforming
- resource_stockpile_compare = {
- resource = nanites
- value >= 1000
- }
- resource_stockpile_compare = {
- resource = alloys
- value >= 50000
- }
- }
- add_resource = {
- nanites = -1000
- alloys = -50000
- }
- remove_modifier = "gray_scattered"
- country_event = {
- id = graygoo.512
- }
- }
+ # option = {
+ # name = rg_graygoo.504.a
+ # allow = {
+ # has_country_flag = gray_reforming
+ # resource_stockpile_compare = {
+ # resource = nanites
+ # value >= 1000
+ # }
+ # resource_stockpile_compare = {
+ # resource = alloys
+ # value >= 50000
+ # }
+ # }
+ # add_resource = {
+ # nanites = -1000
+ # alloys = -50000
+ # }
+ # remove_modifier = "gray_scattered"
+ # country_event = {
+ # id = graygoo.512
+ # }
+ # }
}
# Main Menu (const)
diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt
index f3dfe85..4e3ba30 100644
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@@ -1225,28 +1225,28 @@ country_event = {
}
}
}
- option = {
- name = rg_graygoo.504.a
- allow = {
- has_country_flag = gray_reforming
- resource_stockpile_compare = {
- resource = nanites
- value >= 1000
- }
- resource_stockpile_compare = {
- resource = alloys
- value >= 50000
- }
- }
- add_resource = {
- nanites = -1000
- alloys = -50000
- }
- remove_modifier = "gray_scattered"
- country_event = {
- id = graygoo.512
- }
- }
+ # option = {
+ # name = rg_graygoo.504.a
+ # allow = {
+ # has_country_flag = gray_reforming
+ # resource_stockpile_compare = {
+ # resource = nanites
+ # value >= 1000
+ # }
+ # resource_stockpile_compare = {
+ # resource = alloys
+ # value >= 50000
+ # }
+ # }
+ # add_resource = {
+ # nanites = -1000
+ # alloys = -50000
+ # }
+ # remove_modifier = "gray_scattered"
+ # country_event = {
+ # id = graygoo.512
+ # }
+ # }
}
# Main Menu (const)