PLI - investment je buttons for corruption

Author: MasterOfGrey

Populist Legal Innovation/common/journal_entries/MoG_PLI_investment_je.txt

@@ -6,6 +6,9 @@
 	weight = 9000
 	is_shown_when_inactive = { NOT = { is_country_type = decentralized } }
 	possible = { is_revolutionary = no }
+		
+	scripted_button = mog_pli_fight_corruption_button
+	scripted_button = mog_pli_curry_favour_button
 
 	scripted_progress_bar = mog_pli_investment_tracking_bar
 	scripted_progress_bar = mog_pli_corruption_tracking_bar

Populist Legal Innovation/common/script_values/MoG_PLI_bar_drift_values.txt

@@ -124,6 +124,7 @@ mog_pli_corruption_tracking_bar_weekly_drift = {
 		add = var:mog_pli_corruption_current_value
 		divide = 100
 	}
+	format = DECIMAL_SCRIPT_VALUE_FORMAT_INVERT
 }
 
 mog_pli_innovation_tracking_bar_weekly_drift = {

Populist Legal Innovation/common/script_values/MoG_PLI_investment_values.txt

@@ -56,27 +56,31 @@ mog_pli_investment_increment = {
 			multiply = investment
 		}
 		desc = PLI_POLICE_INSTITUTION		# Max = 0.5
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	add = {
 		owner.institution:institution_schools ?= {
 			add = 0.04
 			multiply = investment
 		}
 		desc = PLI_SCHOOL_INSTITUTION		# Max = 0.2
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	add = {
 		owner.institution:institution_health_system ?= {
 			add = 0.04
 			multiply = investment
 		}
 		desc = PLI_HEALTH_INSTITUTION		# Max = 0.2
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	add = {
 		owner.institution:institution_social_security ?= {
 			add = 0.1
 			multiply = investment
 		}
 		desc = PLI_SOCSEC_INSTITUTION		# Max = 0.5
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	# Decelerators
 	add = {		# New Investment has higher overheads
@@ -85,13 +89,15 @@ mog_pli_investment_increment = {
 			multiply = investment
 		}
 		desc = PLI_OHS_INSTITUTION			# Max = -0.5
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	add = {		# New Investment has either sovereign risk or more noise to filter
 		owner.institution:institution_home_affairs ?= {
 			add = -0.04
 			multiply = investment
 		}
 		desc = PLI_HAFFAIRS_INSTITUTION		# Max = -0.2
+		format = PLI_2DECIMAL_SCRIPT_VALUE_FORMAT
 	}
 	min = 0.1
 }
@@ -433,35 +439,69 @@ mog_pli_corruption_target_loc_value = {
 
 mog_pli_corruption_increment = {
 	value = 0
-	# Accelerators/Decelerators
-	add = {
-		owner.institution:institution_police ?= {
-			add = 0.01
-			multiply = investment
+	if = {
+		limit = { mog_pli_corruption_target > var:mog_pli_corruption_current_value } # Target below current state.
+		add = { 
+			add = 0.275
+			multiply = {
+				add = var:mog_pli_corruption_current_value
+				divide = mog_pli_corruption_target
+			}
+			desc = PLI_BASE_CORRUPTION
+			format = PLI_3DECIMAL_SCRIPT_VALUE_INVERT_FORMAT
 		}
-		desc = PLI_POLICE_INSTITUTION		# Max = 0.05
 	}
 	add = {
-		owner.institution:institution_schools ?= {
-			add = 0.01
-			multiply = investment
+		# Accelerators/Decelerators
+		add = {
+			owner.institution:institution_police ?= {
+				add = 0.01
+				multiply = investment
+			}
+			if = {
+				limit = { mog_pli_corruption_target > var:mog_pli_corruption_current_value }
+				multiply = -1	# Slow the rise instead of speeding the decline.
+			}
+			desc = PLI_POLICE_INSTITUTION		# Max = 0.05
+			format = PLI_3DECIMAL_SCRIPT_VALUE_INVERT_FORMAT
 		}
-		desc = PLI_SCHOOL_INSTITUTION		# Max = 0.05
-	}
-	add = {
-		owner.institution:institution_workplace_safety ?= {
-			add = 0.01
-			multiply = investment
+		add = {
+			owner.institution:institution_schools ?= {
+				add = 0.01
+				multiply = investment
+			}
+			if = {
+				limit = { mog_pli_corruption_target > var:mog_pli_corruption_current_value }
+				multiply = -1	# Slow the rise instead of speeding the decline.
+			}
+			desc = PLI_SCHOOL_INSTITUTION		# Max = 0.05
+			format = PLI_3DECIMAL_SCRIPT_VALUE_INVERT_FORMAT
 		}
-		desc = PLI_OHS_INSTITUTION			# Max = 0.05
-	}
-	add = {		# Depends on the nature of the institution
-		owner.institution:institution_home_affairs ?= {
-			add = owner.mog_pli_cor_internal_security
-			divide = 400	# 10 becomes 0.025
-			multiply = investment
+		add = {
+			owner.institution:institution_workplace_safety ?= {
+				add = 0.01
+				multiply = investment
+			}
+			if = {
+				limit = { mog_pli_corruption_target > var:mog_pli_corruption_current_value }
+				multiply = -1	# Slow the rise instead of speeding the decline.
+			}
+			desc = PLI_OHS_INSTITUTION			# Max = 0.05
+			format = PLI_3DECIMAL_SCRIPT_VALUE_INVERT_FORMAT
+		}
+		add = {		# Depends on the nature of the institution
+			owner.institution:institution_home_affairs ?= {
+				add = owner.mog_pli_cor_internal_security
+				divide = 400	# 10 becomes 0.025
+				multiply = investment
+			}
+			if = {
+				limit = { mog_pli_corruption_target > var:mog_pli_corruption_current_value }
+				multiply = -1	# Slow the rise instead of speeding the decline.
+			}
+			desc = PLI_HAFFAIRS_INSTITUTION		# Max = 0.125
+			format = PLI_3DECIMAL_SCRIPT_VALUE_INVERT_FORMAT
 		}
-		desc = PLI_HAFFAIRS_INSTITUTION		# Max = 0.125
 	}
 }
 

Populist Legal Innovation/common/script_values/MoG_PLI_temp_math_values.txt

@@ -1,5 +1,8 @@
 ## Calculation values used exclusively in maths for effect setting.
 
+####################
+#### INVESTMENT ####
+####################
 # Investment je modifier multipliers
 mog_pli_dummy_contribution_multiplier = {
 	value = {
@@ -171,40 +174,42 @@ je_mog_pli_reaction_multiplier = {	# Value of 1 will result in 100%
 	}
 }
 
-# Innovation je modifier multipliers
-mog_pli_innovation_multiplier = {
-	value = {
-		add = {								# We need to multiply by inverse of the investment % from the JE.
-			add = 100											# innovation_current_value is actually the limiting proportion
-			subtract = var:mog_pli_innovation_current_value		# 100-current gets the proportion for the negative penalty
-			divide = 100										# Convert to %
-		}
+# Investment je button vals
+mog_pli_fought_corruption_val = {
+	add = root.var:mog_pli_corruption_current_value
+	add = {
+		value = root.var:mog_pli_corruption_current_value
+		divide = 80			# Divide by 80, not 100, so that mid-range corruption doesn't feel so bad to fight
+		multiply = -20		# Remove up to 20 corruption scaled based on current corruption
 	}
+	min = 0
 }
 
-mog_pli_proliferation_multiplier = {
-	value = {
-		add = {								# This one does not need inverting.
-			add = var:mog_pli_proliferation_current_value		# gets the proliferation value for the bonus
-			divide = 100										# Convert to %
-		}
+mog_pli_fought_corruption_tt_val = {	# Mimic the calc above
+	add = {
+		value = var:mog_pli_corruption_current_value
+		divide = 80
+		multiply = -20
 	}
 }
 
-mog_pli_proliferation_multiplier_loc = {
-	value = {
-		add = mog_pli_proliferation_multiplier	
-		multiply = 4							# From the default value for je_mog_pli_proliferation_modifier
+mog_pli_curried_favour_val = {
+	add = root.var:mog_pli_corruption_current_value
+	add = {
+		value = 100
+		subtract = root.var:mog_pli_corruption_current_value
+		divide = 80			# Divide by 80, not 100, so there are diminishing impacts at the top end
+		multiply = 20		# Add up to 20 corruption inversely scaled based on current corruption
 	}
+	max = 100
 }
 
-mog_pli_max_innovation_base_sv = {
-	value = {													# Calculate what the default modifier value would be right now - 
-		add = {														# - i.e. the total unadjusted modifier based on previous month:
-			add = var:mog_pli_max_innovation_adjustment					# Cross multiply [ investment_current_prev/100 = adjustment/total ]
-			multiply = 100												# Solve for total -> [ = (adjustment*100)/investment_current_prev ]
-			divide = var:mog_pli_innovation_current_prev
-		}
+mog_pli_curried_favour_tt_val = {		# Mimic the calc above
+	add = {
+		value = 100
+		subtract = var:mog_pli_corruption_current_value
+		divide = 80
+		multiply = 20
 	}
 }
 
@@ -241,3 +246,43 @@ mog_pli_war_confidence_target_hit_val = {
 		}
 	}
 }
+
+####################
+#### INNOVATION ####
+####################
+# Innovation je modifier multipliers
+mog_pli_innovation_multiplier = {
+	value = {
+		add = {								# We need to multiply by inverse of the investment % from the JE.
+			add = 100											# innovation_current_value is actually the limiting proportion
+			subtract = var:mog_pli_innovation_current_value		# 100-current gets the proportion for the negative penalty
+			divide = 100										# Convert to %
+		}
+	}
+}
+
+mog_pli_proliferation_multiplier = {
+	value = {
+		add = {								# This one does not need inverting.
+			add = var:mog_pli_proliferation_current_value		# gets the proliferation value for the bonus
+			divide = 100										# Convert to %
+		}
+	}
+}
+
+mog_pli_proliferation_multiplier_loc = {
+	value = {
+		add = mog_pli_proliferation_multiplier	
+		multiply = 4							# From the default value for je_mog_pli_proliferation_modifier
+	}
+}
+
+mog_pli_max_innovation_base_sv = {
+	value = {													# Calculate what the default modifier value would be right now - 
+		add = {														# - i.e. the total unadjusted modifier based on previous month:
+			add = var:mog_pli_max_innovation_adjustment					# Cross multiply [ investment_current_prev/100 = adjustment/total ]
+			multiply = 100												# Solve for total -> [ = (adjustment*100)/investment_current_prev ]
+			divide = var:mog_pli_innovation_current_prev
+		}
+	}
+}