Merge pull request #25 from tboby/UpdatingExistingCode

Updating existing code
cwtools · Jul 8, 2019 · 15acabf · 15acabf
2 parents 788a3c9 + 855cc0c
commit 15acabf
Show file tree

Hide file tree

Showing 19 changed files with 147 additions and 301 deletions.
diff --git a/common/council_positions.cwt → ...on/Council_position/council_positions.cwt b/common/council_positions.cwt → ...on/Council_position/council_positions.cwt
@@ -40,19 +40,11 @@ council_position = {
 
         ## cardinality = 0..inf
         ### Adds the percentage of available troops from "ROOT" to "who" multiplied by factor to the score.
-        additive_power_diff_modifier = {
-            who = scope[character]
-            factor = float
-            alias_name[trigger] = alias_match_left[trigger]
-        }
+        additive_power_diff_modifier = single_alias_right[council_power_percentages]
 
         ## cardinality = 0..inf
         ### Adds the percentage of realm size from "ROOT" to "who" multiplied by factor to the score.
-        additive_compared_realm_size_modifier = {
-            who = scope[character]
-            factor = float
-            alias_name[trigger] = alias_match_left[trigger]
-        }
+        additive_compared_realm_size_modifier = single_alias_right[council_power_percentages]
 
         # According to wiki; haven't checked myself
         ## cardinality = 0..inf
@@ -65,11 +57,7 @@ council_position = {
 
         ## cardinality = 0..inf
         ### Adds the opinion from "ROOT" to "who" multiplied by factor to the score.
-        additive_opinion_modifier = {
-            who = scope[character]
-            factor = float
-            alias_name[trigger] = alias_match_left[trigger]
-        }
+        additive_opinion_modifier = single_alias_right[council_power_percentages]
 
         ## cardinality = 0..inf
         alias_name[additive_modifier] = alias_match_left[additive_modifier]

diff --git a/common/Council_position/council_power_single_alias.cwt b/common/Council_position/council_power_single_alias.cwt
@@ -0,0 +1,5 @@
+single_alias[council_power_percentages] = {
+    who = scope[character]
+    factor = float
+    alias_name[trigger] = alias_match_left[trigger]
+}
diff --git a/common/alternate_start/alternate_start.cwt b/common/alternate_start/alternate_start.cwt
@@ -112,17 +112,11 @@ alternate_start_setting = {
 
     ## cardinality = 0..1
     ### Conditions for the setting to appear on the list. Evaluated once, when the window is opened.
-    potential = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    potential  = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Conditions for the setting to be enabled.
-    trigger = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    trigger  = single_alias_right[trigger_clause]
 
     subtype[checkbox] = {
         ## cardinality = 0..1

diff --git a/common/artifact_spawns.cwt → common/artifacts/artifact_spawns.cwt b/common/artifact_spawns.cwt → common/artifacts/artifact_spawns.cwt
diff --git a/common/artifacts.cwt → common/artifacts/artifacts.cwt b/common/artifacts.cwt → common/artifacts/artifacts.cwt
@@ -25,10 +25,7 @@ artifact = {
     ## cardinality = 0..1
     ### Conditions for the artifact to be active. Unowned artifacts are active only if they don't have this block.
     ## replace_scope = { this = character root = character fromfrom = character }
-    active = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    active = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Flags automatically assigned to each created artifact of this type.
@@ -55,10 +52,7 @@ artifact = {
     ## cardinality = 0..1
     ### Conditions for the artifact_can_be_gifted_to trigger.
     ## replace_scope = { this = character root = character }
-    allowed_gift = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    allowed_gift  = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Command modifiers the artifact applies to its owner.

diff --git a/common/bloodlines.cwt b/common/bloodlines.cwt
@@ -56,8 +56,5 @@ bloodline = {
     ## cardinality = 0..1
     ## replace_scope = { this = character root = character }
     ### Conditions for a bloodline holder to get its benefits. Defaults to always active.
-    active = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    active = single_alias_right[trigger_clause]
 }
diff --git a/common/event_modifiers.cwt b/common/event_modifiers.cwt
@@ -27,8 +27,5 @@ event_modifier = {
     }
 
     ## cardinality = 0..1
-    is_visible = {
-        ## cardinality = 1..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    is_visible = single_alias_right[trigger_clause]
 }
diff --git a/common/landed_titles.cwt b/common/landed_titles.cwt
@@ -35,10 +35,7 @@ alias[empire:<title.empire>] = {
     ## cardinality = 0..1
     ## replace_scope = { this = character root = character }
     ### Special conditions to create a title via the create de jure title mechanic. ROOT is the character creating.
-    allow = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    allow  = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Randomly-generated holders will have this religion.
@@ -201,10 +198,7 @@ alias[kingdom:<title.kingdom>] = {
     ## cardinality = 0..1
     ## replace_scope = { this = character root = character }
     ### Special conditions to create a title via the create de jure title mechanic. ROOT is the character creating.
-    allow = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    allow = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Randomly-generated holders will have this religion.
@@ -366,10 +360,7 @@ alias[duchy:<title.duchy>] = {
     ## cardinality = 0..1
     ## replace_scope = { this = character root = character }
     ### Special conditions to create a title via the create de jure title mechanic. ROOT is the character creating.
-    allow = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    allow = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Randomly-generated holders will have this religion.
@@ -524,10 +515,7 @@ alias[duchy_hired:<title.duchy_hired>] = {
     ## cardinality = 0..1
     ## replace_scope = { this = character root = character }
     ### Special conditions to recruit the mercenary company. ROOT is the character hiring.
-    allow = {
-        ## cardinality = 0..inf
-        alias_name[trigger] = alias_match_left[trigger]
-    }
+    allow = single_alias_right[trigger_clause]
 
     ## cardinality = 0..1
     ### Randomly-generated holders will have this religion. For holy orders, employer religion must match to be able to recruit.

diff --git a/common/law/law_alias.cwt b/common/law/law_alias.cwt
@@ -30,7 +30,6 @@ single_alias[law_clause] = {
         ### If yes, this law will be selected by default on game start. Defaults to "no".
         default = bool
 
-
         ## replace_scope = { this = title root = title }
         ## cardinality = 0..1
         ### Effects when the law is enacted. Takes place before effect = {} and is only triggered when the law is passed in-game (not via history or event). ROOT seems to be title.