SIS v1.12.1

Author: MasterOfGrey

Subject Interaction Suite/common/diplomatic_actions/yMoG_S10_offer_convoy_contribution.txt

@@ -27,7 +27,7 @@
 		cost = 0
 		# forced_duration = 6
 
-		# is_two_sided_pact = no
+		is_two_sided_pact = no
 		show_in_outliner = yes
 
 		relations_progress_per_day = 1.5
@@ -51,7 +51,10 @@
 		requirement_to_maintain = {
 			trigger = {
 				ROOT = {
-					excess_convoy_surplus_percent > 0
+					custom_tooltip = {
+						text = "TRIGGER_COUNTRY_EXCESS_CONVOY_SURPLUS_PERCENT_GREATER_THAN"
+						excess_convoy_surplus_percent > 0
+					}
 				}
 			}
 		}

Subject Interaction Suite/common/script_values/MoG_12_convoys.txt

@@ -1,6 +1,15 @@
 # We are using this to identify when a country can afford to give away 30% of its convoy production.
 excess_convoy_surplus_percent = {
-	add = num_convoys_required
-	divide = num_convoys_available	# Result is 0.7 if has enough to give away.
-	add = -1						# If result >0, then has enough to give away.
+	add = {
+		add = num_convoys_required
+		min = 1
+	}
+	divide = { 
+		add = num_convoys_available	# Result is 0.7 or lower if has enough to give away.
+		min = 1
+	}						# We have currently calculated **usage** as a %
+	multiply = -1
+	add = 1					# (1-usage)=[surplus as proportion of total] (which must be >0.3)
+	
+	add = -0.3				# If result >0, then has enough to give away.
 }

…/lens_toolbar_icons/occ_offer_convoy.dds …lens_toolbar_icons/occ_offer_convoys.ddsSubject Interaction Suite/gfx/interface/icons/lens_toolbar_icons/occ_offer_convoy.dds renamed to Subject Interaction Suite/gfx/interface/icons/lens_toolbar_icons/occ_offer_convoys.dds Subject Interaction Suite/gfx/interface/icons/lens_toolbar_icons/occ_offer_convoy.dds renamed to Subject Interaction Suite/gfx/interface/icons/lens_toolbar_icons/occ_offer_convoys.dds

@@ -8,4 +8,6 @@
  occ_offer_convoys_action_break_name: "Cancel Increased Convoy Contributions"
  occ_offer_convoys_pact_desc: "[SCOPE.GetRootScope.GetDiplomaticPact.GetFirstCountry.GetName] offers to increase convoy contributions to [SCOPE.GetRootScope.GetDiplomaticPact.GetSecondCountry.GetName]."
  occ_offer_convoys_action_notification_break_name: "[INITIATOR_COUNTRY.GetName] cancelled increased convoy contributions"
- occ_offer_convoys_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] has restored convoy contributions to their regular level."
+ occ_offer_convoys_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] has restored convoy contributions to their regular level."
+ 
+ TRIGGER_COUNTRY_EXCESS_CONVOY_SURPLUS_PERCENT_GREATER_THAN: "Surplus [concept_convoys] after sharing is #b not#! greater than #BOLD 0%#! (currently: [ROOT.GetCountry.MakeScope.ScriptValue('excess_convoy_surplus_percent')|v%])"