move loyal overlays to the loyal trait

this in particular fixes #4058 . Also people simply forgetting the IS_LOYAL macro was a not-so-uncommon cause of bugs. In some cases people want to give the LOYAL trait without giving the loyal overlays for those cases i added a optional OVERLAY parameter to the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO} instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are no longer needed in combination with those traits.
wesnoth · May 20, 2019 · 701ecab · 701ecab
1 parent e1e51e6
commit 701ecab
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 47 deletions.
diff --git a/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg b/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
@@ -54,7 +54,7 @@
             y=23
             {IS_HERO}
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_INTELLIGENT}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
@@ -221,7 +221,7 @@
         [unit]
             type=Mermaid Priestess
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_RESILIENT}
             [/modifications]
             id=Cylanna

diff --git a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
@@ -182,7 +182,7 @@
         x={X}
         y={Y}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL OVERLAY=""}
             {TRAIT_FEARLESS}
         [/modifications]
         moves=0

diff --git a/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg b/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
@@ -383,7 +383,7 @@
             name= _ "Caladon"
             unrenamable=yes
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_QUICK}
             [/modifications]
             {IS_HERO}

diff --git a/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg b/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
@@ -40,7 +40,7 @@
         canrecruit=yes
         type=Mermaid Diviner
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL OVERLAY=""}
             {TRAIT_DEXTROUS}
         [/modifications]
         [ai]

diff --git a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
@@ -437,7 +437,7 @@
             {IS_HERO}
             random_traits=no
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
         [/unit]
 

diff --git a/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg b/data/campaigns/Eastern_Invasion/scenarios/16_Weldyn_under_Attack.cfg
@@ -212,7 +212,7 @@
             type=General
             random_traits=no
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
             side=1
             x=21

diff --git a/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg b/data/campaigns/Eastern_Invasion/utils/character-definitions.cfg
@@ -18,7 +18,7 @@
     random_traits=no
     unrenamable=yes
     [modifications]
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL_HERO}
         {TEAM_COLOR_OVERRIDE () teal}
     [/modifications]
 #enddef

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
@@ -404,7 +404,7 @@
             canrecruit=no
             {IS_HERO}
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
         [/modify_unit]
 

diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
@@ -692,7 +692,7 @@ fire:  +10%"
         {PLACEMENT}
         {IS_HERO}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
             {TRAIT_INTELLIGENT}
         [/modifications]
     [/unit]
@@ -709,7 +709,7 @@ fire:  +10%"
         {IS_HERO}
         random_traits=no
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef
@@ -725,7 +725,7 @@ fire:  +10%"
         {IS_HERO}
         random_traits=no
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef

diff --git a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
@@ -36,7 +36,7 @@
     [modifications]
         {TRAIT_QUICK}
         {TRAIT_RESILIENT}
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL OVERLAY=""}
     [/modifications]
 #enddef
 
@@ -90,7 +90,7 @@
     [modifications]
         {TRAIT_DEXTROUS}
         {TRAIT_RESILIENT}
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL OVERLAY=""}
     [/modifications]
 #enddef
 
@@ -126,7 +126,7 @@
     [modifications]
         {TRAIT_QUICK}
         {TRAIT_RESILIENT}
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL OVERLAY=""}
     [/modifications]
 #enddef
 

diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
@@ -238,7 +238,7 @@
                         #textdomain wesnoth-l
                     [/effect]
                 [/object]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
             {IS_HERO}
             unrenamable=yes

diff --git a/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg b/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
@@ -45,7 +45,7 @@
             {IS_HERO}
             x,y=6,23
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_STRONG}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
@@ -965,6 +965,7 @@
         [foreach]
             array=new_companions
             [do]
+				## TODO: does this still work after the overlays= change?
                 {VARIABLE this_item.side 1}
                 {VARIABLE this_item.canrecruit no}
                 # We'll be unstoring these units onto the recall list, which won't heal them automatically, so we do it here.
@@ -998,7 +999,7 @@
                             name=this_item.modifications
                             mode=replace
                             [literal]
-                                {TRAIT_LOYAL}
+                                {TRAIT_LOYAL_HERO}
                                 {TRAIT_UNDEAD}
                             [/literal]
                         [/set_variables]

diff --git a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
@@ -258,7 +258,7 @@
                     x,y=15,2
                     side=1
                     [modifications]
-                        {TRAIT_LOYAL}
+                        {TRAIT_LOYAL_HERO}
                     [/modifications]
                     {IS_HERO}
                 [/unit]
@@ -284,7 +284,7 @@
                     x,y=15,2
                     side=1
                     [modifications]
-                        {TRAIT_LOYAL}
+                        {TRAIT_LOYAL_HERO}
                     [/modifications]
                     {IS_HERO}
                 [/unit]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
@@ -376,7 +376,7 @@
             {IS_HERO}
             profile=portraits/alanin.png
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
@@ -279,7 +279,7 @@
             profile=portraits/baglur.png
             facing=sw
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -337,7 +337,7 @@
             x,y=5,24
             side=1
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_INTELLIGENT}
             [/modifications]
         [/unit]
@@ -505,7 +505,7 @@
             advances_to=Dwarvish Arcanister
             max_experience=210
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_STRONG}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
@@ -203,7 +203,7 @@
             profile=portraits/durstorn-insane.png
             random_traits=no
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
         [/unit]
         [unit]

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Toward_Mountains_of_Haag.cfg
@@ -263,7 +263,7 @@
             random_traits=no
             {IS_HERO}
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 [object]
                     [effect]
                         apply_to=image_mod

diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
@@ -13,7 +13,7 @@
         random_traits=no
         {IS_HERO}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef
@@ -31,7 +31,7 @@
         random_traits=no
         {IS_HERO}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef
@@ -49,7 +49,7 @@
         random_traits=no
         {IS_HERO}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg
@@ -40,7 +40,7 @@
         x={X}
         y={Y}
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL OVERLAY=""}
         [/modifications]
         ai_special=guardian
         random_traits=yes

diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/characters.cfg
@@ -21,7 +21,7 @@
     unrenamable=yes
     {IS_HERO}
     [modifications]
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL_HERO}
         {TRAIT_QUICK}
     [/modifications]
 #enddef
@@ -34,7 +34,7 @@
     unrenamable=yes
     {IS_HERO}
     [modifications]
-        {TRAIT_LOYAL}
+        {TRAIT_LOYAL_HERO}
         {TRAIT_STRONG}
     [/modifications]
 #enddef

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
@@ -332,7 +332,7 @@
                         random_traits=no
                         profile=portraits/lady_outlaw.png
                         [modifications]
-                            {TRAIT_LOYAL}
+                            {TRAIT_LOYAL_HERO}
                         [/modifications]
                     [/unit]
 

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
@@ -274,7 +274,7 @@
             random_traits=no
             profile=portraits/jessica.png
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
             [/modifications]
         [/unit]
 

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg b/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
@@ -22,7 +22,7 @@
         unrenamable=yes
         random_traits=no
         [modifications]
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL_HERO}
         [/modifications]
     [/unit]
 #enddef

diff --git a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
@@ -260,7 +260,7 @@
             {IS_HERO}
             x,y=10,9
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]
@@ -802,7 +802,7 @@
                     {IS_HERO}
                     x,y=10,9
                     [modifications]
-                        {TRAIT_LOYAL}
+                        {TRAIT_LOYAL_HERO}
                         {TRAIT_RESILIENT}
                     [/modifications]
                 [/unit]

diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
@@ -321,7 +321,7 @@
             side=1
             x,y=21,14
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_INTELLIGENT}
             [/modifications]
         [/unit]

diff --git a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
@@ -550,7 +550,7 @@
             name=EthilielV.modifications
             mode=insert
             [value]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL OVERLAY=""}
                 {TRAIT_QUICK}
             [/value]
         [/set_variables]

diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
@@ -800,7 +800,7 @@
                                 canrecruit=no
                                 {IS_HERO}
                                 [modifications]
-                                    {TRAIT_LOYAL}
+                                    {TRAIT_LOYAL_HERO}
                                 [/modifications]
                             [/modify_unit]
 

diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
@@ -477,7 +477,7 @@ _f, _f, Re, _f
                     x,y=recall,recall
                     random_traits=no
                     [modifications]
-                        {TRAIT_LOYAL}
+                        {TRAIT_LOYAL_HERO}
                     [/modifications]
                 [/unit]
             [/then]

diff --git a/data/campaigns/Two_Brothers/utils/characters.cfg b/data/campaigns/Two_Brothers/utils/characters.cfg
@@ -133,7 +133,7 @@
             {IS_HERO}
             {PLACEMENT}
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL_HERO}
                 {TRAIT_INTELLIGENT}
             [/modifications]
         [/unit]