暂存特质合并

暂存
暂存等级上限改动
2023-11-20 20:39:13 +08:00 · 2023-11-20 20:08:29 +08:00 · 2023-11-20 18:55:29 +08:00
6 changed files with 152 additions and 120 deletions
--- a/common/scripted_effects/RG_combat_skill_effects.txt
+++ b/common/scripted_effects/RG_combat_skill_effects.txt
@@ -5,7 +5,7 @@ RG_leader_trait_tempest_incoming_random_kill_effect = {
 			any_ground_combat_$SIDE_A$ = {
 				exists = leader
 				leader = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 		}
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -211,7 +211,7 @@ rg_gray_commander_init = {
 				set_leader_flag = rg_gray_leader
 				add_trait_no_notify = RG_leader_trait_admiral_gray
 				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
-				add_trait_no_notify = RG_leader_trait_general_gray_skill
+				# add_trait_no_notify = RG_leader_trait_general_gray_skill
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
 				add_trait_no_notify = subclass_commander_councilor
 				add_trait_no_notify = leader_trait_carrier_specialization
--- a/common/traits/!_RG_gray_goo_traits.txt
+++ b/common/traits/!_RG_gray_goo_traits.txt
@@ -33,58 +33,65 @@
 # 	randomized = no
 # }

-RG_leader_trait_offical_gray = {
-	#唯一特质
-	cost = 0
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = leader
-		ICON = "GFX_leader_trait_psionic_chosen_one"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	immortal_leaders = yes
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	councilor_modifier = {
-		all_technology_research_speed = 0.5
-	}
-	planet_modifier = {
-		planet_buildings_cost_mult = -0.4
-		planet_building_build_speed_mult = 0.6
-		planet_jobs_alloys_produces_mult = 0.25
-		planet_jobs_engineering_research_produces_mult = 0.25
-		deposit_blockers_cost_mult = -0.4
-		planet_clear_blocker_time_mult = -0.6
-	}
-	sector_modifier = {
-		planet_buildings_cost_mult = -0.2
-		planet_building_build_speed_mult = 0.2
-		planet_jobs_alloys_produces_mult = 0.1
-		planet_jobs_engineering_research_produces_mult = 0.1
-		deposit_blockers_cost_mult = -0.2
-		planet_clear_blocker_time_mult = -0.2
-		starbase_shipyard_build_cost_mult = -0.25
-		starbase_shipyard_build_speed_mult = -0.3
-	}
-	fleet_modifier = {
-		ship_armor_mult = 3.5
-		ship_hull_mult = 3.5
-		ships_upkeep_mult = -0.4
-		ship_hull_regen_add_perc = 5
-		ship_armor_regen_add_perc = 5
-	}
-	army_modifier = {
-		army_collateral_damage_mult = 0.15
-		army_disengage_chance_mult = 0.5
-		army_health = 0.35
-	}
-	leader_class = { commander official scientist }
-	initial = no
-	randomized = no
-}
+# RG_leader_trait_offical_gray = {
+# 	#唯一特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = leader
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 		triggered_self_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		leader_skill_levels = 1
+# 		mult = trigger:has_skill
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	councilor_modifier = {
+# 		all_technology_research_speed = 0.5
+# 	}
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.6
+# 		planet_jobs_alloys_produces_mult = 0.25
+# 		planet_jobs_engineering_research_produces_mult = 0.25
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_time_mult = -0.6
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_alloys_produces_mult = 0.1
+# 		planet_jobs_engineering_research_produces_mult = 0.1
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_time_mult = -0.2
+# 		starbase_shipyard_build_cost_mult = -0.25
+# 		starbase_shipyard_build_speed_mult = -0.3
+# 	}
+# 	fleet_modifier = {
+# 		ship_armor_mult = 3.5
+# 		ship_hull_mult = 3.5
+# 		ships_upkeep_mult = -0.4
+# 		ship_hull_regen_add_perc = 5
+# 		ship_armor_regen_add_perc = 5
+# 	}
+# 	army_modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	leader_class = all
+# 	initial = no
+# 	randomized = no
+# }

 RG_leader_trait_governor_gray = {
 	#总督特质
@@ -98,6 +105,13 @@ RG_leader_trait_governor_gray = {
 		TIER = none
 	}
 	immortal_leaders = yes
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
@@ -135,7 +149,7 @@ RG_leader_trait_ruler_gray = {
 		COUNCIL = yes
 		TIER = none
 	}
-	# councilor_trait = yes
+	# forced_councilor_trait = yes
 	triggered_self_modifier = {
 		potential = {
 			is_councilor = yes
@@ -146,7 +160,7 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.1
 		mult = trigger:has_skill
 	}
@@ -164,7 +178,7 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.15
 		mult = trigger:has_skill
 	}
@@ -178,13 +192,13 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.2
 		mult = trigger:has_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -198,7 +212,7 @@ RG_leader_trait_ruler_gray = {
 	}
 	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -216,7 +230,7 @@ RG_leader_trait_ruler_gray = {
 	}
 	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -243,9 +257,7 @@ RG_leader_trait_ruler_gray = {
 		country_base_influence_produces_add = 1
 		mult = trigger:has_skill
 	}
-	leader_class = {
-		official
-	}
+	leader_class = { official }
 	initial = no
 	randomized = no
 }
@@ -261,6 +273,13 @@ RG_leader_trait_admiral_gray_1 = {
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
@@ -277,9 +296,7 @@ RG_leader_trait_admiral_gray_1 = {
 		army_disengage_chance_mult = 0.3
 		army_health = 0.15
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -295,6 +312,13 @@ RG_leader_trait_admiral_gray_2 = {
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
@@ -311,9 +335,7 @@ RG_leader_trait_admiral_gray_2 = {
 		army_disengage_chance_mult = 0.4
 		army_health = 0.25
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -329,6 +351,13 @@ RG_leader_trait_admiral_gray = {
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
@@ -345,15 +374,12 @@ RG_leader_trait_admiral_gray = {
 		army_disengage_chance_mult = 0.5
 		army_health = 0.35
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }

 RG_leader_trait_admiral_nanorebuild_gray = {
-	#3级舰长（默认
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
@@ -371,9 +397,15 @@ RG_leader_trait_admiral_nanorebuild_gray = {
 		ship_hull_regen_add_perc = 0.5
 		ship_armor_regen_add_perc = 0.5
 	}
-	leader_class = {
-		commander
+	triggered_army_modifier = {
+		potential = {
+			always = yes
+		}
+		army_damage_mult = 0.05
+		army_health = 0.05
+		mult = owner.rg_general_skill_combat_daypassed_variable
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -389,6 +421,13 @@ RG_leader_trait_scientist_gray = {
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
@@ -403,9 +442,7 @@ RG_leader_trait_scientist_gray = {
 		# ship_speed_mult = 0.5
 		ship_anomaly_generation_chance_mult = -1
 	}
-	leader_class = {
-		scientist
-	}
+	leader_class = { scientist }
 	initial = no
 	randomized = no
 }
@@ -437,32 +474,31 @@ RG_leader_trait_scientist_gray = {
 # 	randomized = no
 # }

-RG_leader_trait_general_gray_skill = {
-	destiny_trait = yes
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = commander
-		ICON = "GFX_leader_trait_supreme_warrior"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
-	triggered_army_modifier = {
-		potential = {
-			always = yes
-		}
-		army_damage_mult = 0.05
-		army_health = 0.05
-		mult = owner.rg_general_skill_combat_daypassed_variable
-	}
-	leader_class = {
-		commander
-	}
-	initial = no
-	randomized = no
-	destiny_background_icon = "GFX_leader_background_destiny_1"
-}
+# 与舰长技能合并，弃用
+# RG_leader_trait_general_gray_skill = {
+# 	destiny_trait = yes
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = commander
+# 		ICON = "GFX_leader_trait_supreme_warrior"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
+# 	triggered_army_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		army_damage_mult = 0.05
+# 		army_health = 0.05
+# 		mult = owner.rg_general_skill_combat_daypassed_variable
+# 	}
+# 	leader_class = { commander }
+# 	initial = no
+# 	randomized = no
+# 	destiny_background_icon = "GFX_leader_background_destiny_1"
+# }

 RG_leader_trait_admiral_fake_dragon = {
 	cost = 0
@@ -483,9 +519,7 @@ RG_leader_trait_admiral_fake_dragon = {
 		ship_hull_mult = 0.2
 		ship_weapon_damage = 0.2
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -528,9 +562,7 @@ RG_leader_trait_admiral_timed_life = {
 		ship_weapon_damage = 10
 		custom_tooltip_with_modifiers = rg_timed_life_millennium
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -574,9 +606,7 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 		ship_weapon_damage = 0.01
 		custom_tooltip_with_modifiers = rg_timed_life_millennium_reborn
 	}
-	leader_class = {
-		commander
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
--- a/events/RG_combat_skill_events.txt
+++ b/events/RG_combat_skill_events.txt
@@ -388,7 +388,7 @@ planet_event = {
 				exists = leader
 				leader = {
 					#leader
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 					owner = {
 						#country
 						save_event_target_as = attacking_general_country
@@ -452,7 +452,7 @@ country_event = {
 						exists = leader
 						leader = {
 							OR = {
-								has_trait = RG_leader_trait_general_gray_skill
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
 							}
 						}
 					}
@@ -547,7 +547,7 @@ country_event = {
 			exists = leader
 			leader = {
 				OR = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 			if = {
--- a/events/z_RG_placeholder_event.txt
+++ b/events/z_RG_placeholder_event.txt
@@ -1,5 +1,7 @@
 namespace = wg_affection

+# 3.9引用空事件崩溃问题占位
+# 3.10已弃用
 country_event = {
 	id = wg_affection.30000
 	title = wg_affection.30000.name
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -19,10 +19,10 @@
 RG_leader_trait_general_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以辅助星域资源调度和研究资源调度。可不要让她做奇怪的事情哦？"
 RG_leader_trait_general_gray_skill:0 "§Y风暴将至§!"
 RG_leader_trait_general_gray_skill_desc:0 "灰色风暴在L星团中席卷无数纪元。倘若风暴再度到来，想必那星球上的人们所看到的景色一定永生难忘吧。"
- RG_leader_trait_tempest_incoming_effect:0 "$ARMY_EFFECTS_TXT$:\n$t$每击杀一支敌对陆军:\n$tt$$MOD_ARMY_DAMAGE_MULT$: §G+5%§!\n$tt$$MOD_ARMY_HEALTH$: §G+5%§!\n$tt$直接击杀一支敌对陆军的概率: §G+1%§!\n当前BUFF层数: §Y[owner.rg_general_skill_combat_daypassed_variable]§!\n当前概率为: §Y[owner.rg_general_skill_combat_killed_variable]%§!"
+ RG_leader_trait_tempest_incoming_effect:0 "$ARMY_EFFECTS_TXT$:\n$t$每击杀一支敌对陆军:\n$tt$$MOD_ARMY_DAMAGE_MULT$: §G+5%§!\n$tt$$MOD_ARMY_HEALTH$: §G+5%§!\n$tt$§Y直接击杀一支敌对陆军的概率§!: §G+1%§!\n$t$当前§YBUFF层数§!: §Y[owner.rg_general_skill_combat_daypassed_variable]§!\n$t$当前§Y直接击杀一支敌对陆军的概率§!为: §Y[owner.rg_general_skill_combat_killed_variable]%§!"
 RG_leader_trait_admiral_nanorebuild_gray:0 "§Y灰质重塑§!"
- RG_leader_trait_admiral_nanorebuild_gray_desc:0 "创造与解构，纳米机器席卷之处我们无所不能。"
- RG_leader_trait_admiral_nanorebuild_effect:0 "$FLEET_EFFECTS_TXT$:\n$t$每摧毁一艘敌军舰船:\n$tt$§Y计数器层数§!: §G+1§!\n$t$这位领袖所在舰队损失舰船时:\n$tt$消耗§Y计数器层数§!立即重建舰船。\n$t$当前§Y计数器层数§!: §Y[owner.rg_nanorebuild_counter]§!\n$t$§Y$NAME_Gray$§!无法被该技能重组。"
+ RG_leader_trait_admiral_nanorebuild_gray_desc:0 "灰色风暴在L星团中席卷无数纪元。\n创造与解构，纳米机器席卷之处我们无所不能。"
+ RG_leader_trait_admiral_nanorebuild_effect:0 "$FLEET_EFFECTS_TXT$:\n$t$每摧毁一艘敌军舰船:\n$tt$§Y重塑计数器层数§!: §G+1§!\n$t$这位领袖所在舰队损失舰船时:\n$tt$消耗§Y重塑计数器层数§!立即重建舰船。\n$t$当前§Y重塑计数器层数§!: §Y[owner.rg_nanorebuild_counter]§!\n$t$§Y$NAME_Gray$§!无法被该技能重建。\n\n$RG_leader_trait_tempest_incoming_effect$"

 RG_leader_trait_ruler_gray_tt:0 "§E随每技能等级提升的效果:§!"
 RG_leader_trait_variable_tt:0 "§E随变量层数提升的效果:§!"
Author	SHA1	Message	Date
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c67315b296	暂存特质合并	2023-11-20 20:39:13 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ff3ed9f4f1	暂存	2023-11-20 20:08:29 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	b3d35699bf	暂存等级上限改动	2023-11-20 18:55:29 +08:00