fix modify_unit_type macros

wesnoth · Jul 3, 2020 · 6fb3573 · 6fb3573
1 parent 8850862
commit 6fb3573
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/data/campaigns/Dead_Water/units/Kraken.cfg b/data/campaigns/Dead_Water/units/Kraken.cfg
@@ -2,7 +2,7 @@
 
 #define ENABLE_KRAKEN
     [modify_unit_type]
-        id="Cuttle Fish"
+        type="Cuttle Fish"
         add_advancement="Kraken"
         set_experience=80
     [/modify_unit_type]

diff --git a/data/core/macros/optional_unit_advancements.cfg b/data/core/macros/optional_unit_advancements.cfg
@@ -1,89 +1,89 @@
 #define ENABLE_PARAGON
     [modify_unit_type]
-        id="Dune Blademaster"
+        type="Dune Blademaster"
         add_advancement="Dune Paragon"
         set_experience=220
     [/modify_unit_type]
 #enddef
 
 #define DISABLE_GRAND_MARSHAL
     [modify_unit_type]
-        id="General"
+        type="General"
         remove_advancement="Grand Marshal"
         set_experience=150
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_ARMAGEDDON_DRAKE
     [modify_unit_type]
-        id="Inferno Drake"
+        type="Inferno Drake"
         add_advancement="Armageddon Drake"
         set_experience=220
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_DWARVISH_ARCANISTER
     [modify_unit_type]
-        id="Dwarvish Runemaster"
+        type="Dwarvish Runemaster"
         add_advancement="Dwarvish Arcanister"
         set_experience=210
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_DWARVISH_RUNESMITH
     [modify_unit_type]
-        id="Dwarvish Fighter"
+        type="Dwarvish Fighter"
         add_advancement="Dwarvish Runesmith"
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_WOLF_ADVANCEMENT
     [modify_unit_type]
-        id="Wolf"
+        type="Wolf"
         add_advancement="Great Wolf"
         set_experience=30
     [/modify_unit_type]
     [modify_unit_type]
-        id="Great Wolf"
+        type="Great Wolf"
         add_advancement="Direwolf"
         set_experience=65
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_NIGHTBLADE
     [modify_unit_type]
-        id="Orcish Slayer"
+        type="Orcish Slayer"
         add_advancement="Orcish Nightblade"
         set_experience=100
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_TROLL_SHAMAN
     [modify_unit_type]
-        id="Troll Whelp"
+        type="Troll Whelp"
         add_advancement="Troll Shaman"
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_ANCIENT_LICH
     [modify_unit_type]
-        id="Lich"
+        type="Lich"
         add_advancement="Ancient Lich"
         set_experience=250
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_DEATH_KNIGHT
     [modify_unit_type]
-        id="Revenant"
+        type="Revenant"
         add_advancement="Death Knight"
         set_experience=85
     [/modify_unit_type]
 #enddef
 
 #define ENABLE_WOSE_SHAMAN
     [modify_unit_type]
-        id="Wose"
+        type="Wose"
         add_advancement="Wose Shaman"
         set_experience=80
     [/modify_unit_type]

diff --git a/data/schema/core/addons.cfg b/data/schema/core/addons.cfg
@@ -154,7 +154,7 @@
 	[tag]
 		name="modify_unit_type"
 		max=infinite
-		{REQUIRED_KEY id string}
+		{REQUIRED_KEY type string}
 		{SIMPLE_KEY add_advancement string}
 		{SIMPLE_KEY remove_advancement string}
 		{SIMPLE_KEY set_experience int}

diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp
@@ -501,7 +501,7 @@ void game_config_manager::load_addons_cfg()
 					for(const auto& advancefrom : units.child_range("advancefrom")) {
 
 						config modify_unit_type {
-							"id", unit_type["id"],
+							"type", unit_type["id"],
 							"add_advancement", advancefrom["unit"],
 							"set_experience", advancefrom["experience"]
 						};