HTTT: Unit variations don't need an ID

wesnoth · Apr 5, 2018 · 1b1fca2 · 1b1fca2
1 parent 9a87667
commit 1b1fca2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
@@ -99,7 +99,6 @@
     [variation]
         variation_id=sceptre
         hide_help=yes
-        id=Battle Princess
         name= _ "female^Battle Princess"
         race=human
         image="units/human-battleprincess-resting.png"

diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg
@@ -1,7 +1,6 @@
 #textdomain wesnoth-httt
 
 #define HTTT_COMMANDER AFFIX
-    id=Commander
     name= _ "Commander"
     race=human
     num_traits=0
@@ -83,6 +82,7 @@
 #enddef
 
 [unit_type]
+    id=Commander
     {HTTT_COMMANDER ()}
     cost=40
     [leading_anim]

diff --git a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg
@@ -1,7 +1,6 @@
 #textdomain wesnoth-httt
 
 #define HTTT_FIGHTER
-    id=Fighter
     name= _ "Fighter"
     race=human
     num_traits=0
@@ -49,6 +48,7 @@
 #enddef
 
 [unit_type]
+    id=Fighter
     {HTTT_FIGHTER}
     cost=18
     description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However they have the potential to become great warriors one day."

diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg
@@ -1,7 +1,6 @@
 #textdomain wesnoth-httt
 
 #define HTTT_LORD AFFIX
-    id=Lord
     name= _ "Lord"
     race=human
     num_traits=0
@@ -97,6 +96,7 @@
 #enddef
 
 [unit_type]
+    id=Lord
     {HTTT_LORD ()}
     cost=65
     [leading_anim]

diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg
@@ -59,7 +59,6 @@
     [variation]
         variation_id=sceptre
         hide_help=yes
-        id=Princess
         name= _ "female^Princess"
         race=human
         image="units/human-princess.png"