Kalospacer/realgray-stellaris-mod
Kalospacer
/
realgray-stellaris-mod
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes fix merge

This commit is contained in:
ProjectKoi-Kalo\Kalo 2024-09-25 13:04:19 +08:00
parent 8e248545f1
commit 478f6dca99
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/inline_scripts/events/rg_test_gray_skill_varible.txt
View File

@ -8,7 +8,6 @@ set_variable = {
#Country event_target:gray_owner #Country event_target:gray_owner
#存储当前领袖等级 #存储当前领袖等级
rg_save_gray_leader_level_effect = { rg_save_gray_leader_level_effect = {
<<<<<<< HEAD
every_owned_leader = { every_owned_leader = {
if = { if = {
###等级检测 ###等级检测
@ -34,7 +33,6 @@ rg_save_gray_leader_level_effect = {
} }
} }
} }
=======
random_owned_leader = { random_owned_leader = {
#是小灰领袖 #是小灰领袖
limit = { limit = {
@ -58,7 +56,6 @@ check_variable = {
which = rg_gray_level which = rg_gray_level
value >= 10 value >= 10
} }
>>>>>>> RG_AG_TEST
#Country event_target:gray_owner #Country event_target:gray_owner
#等级导入，把存储的领袖等级赋予到领袖身上 #等级导入，把存储的领袖等级赋予到领袖身上

5
common/scripted_triggers/RG_scripted_triggers.txt
View File

@ -70,15 +70,14 @@ rg_is_main_species_with_maid_trait_trigger = {
} }
} }
<<<<<<< HEAD
RG_tradition5_or_gray_owner_trigger = { RG_tradition5_or_gray_owner_trigger = {
OR = { OR = {
RG_gray_harbitat_active_trigger = yes RG_gray_harbitat_active_trigger = yes
has_active_tradition = tr_rg_nanotech_5 has_active_tradition = tr_rg_nanotech_5
======= }
}
rg_has_ag_origin_trigger = { rg_has_ag_origin_trigger = {
any_country = { any_country = {
has_origin = origin_Asgray has_origin = origin_Asgray
>>>>>>> RG_AG_TEST
} }
} }