From 9a5ca48ae1e59e3a1b8d1a0c709a713677a2ad78 Mon Sep 17 00:00:00 2001
From: Son-Guhun <22954418+Son-Guhun@users.noreply.github.com>
Date: Tue, 21 Jan 2020 14:43:44 -0300
Subject: [PATCH] Ran object data scripts, updated decospecialart

- decospecialart.py now uses Section to read default data
---
 builderlib/decospecialart.py                  |   9 +-
 release/table/unit.ini                        | 252 ++++++++----------
 .../10-Decorations/10-UpgradeSystemInit.j     |  76 ++++--
 3 files changed, 181 insertions(+), 156 deletions(-)

diff --git a/builderlib/decospecialart.py b/builderlib/decospecialart.py
index e98dc42..f25c781 100644
--- a/builderlib/decospecialart.py
+++ b/builderlib/decospecialart.py
@@ -1,14 +1,17 @@
 """This script iterates over all decorations in a .ini database and set their Specialart field
 to the format expected by the SpecialEffect system.
 """
-from myconfigparser import MyConfigParser, load_unit_data, get_decorations
+from myconfigparser import MyConfigParser, load_unit_data, get_decorations, Section
 
 
 def configure_decorations(unit_data, decoration_list):
     for decoration in decoration_list:
-        data = unit_data[decoration]
+        data = Section(unit_data[decoration])
         try:
-            data['Specialart'] = '"{}"'.format(',' + data['file'][1:-1])
+            file = data['file'][1:-1]
+            if file[-4] != '.':
+                file = file + '.mdx'
+            data['Specialart'] = '"{}"'.format(',' + file)
         except:
             print("Could not find model data for {}.".format(decoration))
         data['elevPts'] = '0'
diff --git a/release/table/unit.ini b/release/table/unit.ini
index 40b5eab..d122f21 100644
--- a/release/table/unit.ini
+++ b/release/table/unit.ini
@@ -51235,9 +51235,11 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
 -- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Tip = "Flag Human 1 - [|cffffcc00Q|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h08Z,h090"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -51318,9 +51320,11 @@ _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNNightElfCaptureFlag.blp"
 -- Button Position (X)
-Buttonpos_1 = 1
+Buttonpos_1 = 2
+-- Button Position (Y)
+Buttonpos_2 = 0
 -- Hotkey
-Hotkey = "S"
+Hotkey = "E"
 -- Name
 Name = "Flag Night Elf"
 -- Attack 1 - Range Motion Buffer
@@ -51328,7 +51332,7 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",Objects\\InventoryItems\\NightElfCaptureFlag\\NightElfCaptureFlag.mdl"
 -- Tooltip - Basic
-Tip = "Flag Night Elf - [|cffffcc00S|r]"
+Tip = "Flag Night Elf - [|cffffcc00E|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -51411,9 +51415,11 @@ _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNOrcBattleStandard.blp"
 -- Button Position (X)
-Buttonpos_1 = 2
+Buttonpos_1 = 3
+-- Button Position (Y)
+Buttonpos_2 = 0
 -- Hotkey
-Hotkey = "D"
+Hotkey = "R"
 -- Name
 Name = "Flag Orc 1"
 -- Attack 1 - Range Motion Buffer
@@ -51421,9 +51427,11 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",Objects\\InventoryItems\\OrcCaptureFlag\\OrcCaptureFlag.mdl"
 -- Tooltip - Basic
-Tip = "Flag Orc - [|cffffcc00D|r]"
+Tip = "Flag Orc 1 - [|cffffcc00R|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h093,h094"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -51503,12 +51511,8 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNRallyPoint.blp"
--- Button Position (X)
-Buttonpos_1 = 1
--- Button Position (Y)
-Buttonpos_2 = 2
 -- Hotkey
-Hotkey = "X"
+Hotkey = "A"
 -- Name
 Name = "Flag Rally"
 -- Attack 1 - Range Motion Buffer
@@ -51516,7 +51520,7 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",UI\\Feedback\\RallyPoint\\RallyPoint.mdl"
 -- Tooltip - Basic
-Tip = "Flag Rally - [|cffffcc00X|r]"
+Tip = "Flag Rally - [|cffffcc00A|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -51599,11 +51603,9 @@ _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNUndeadCaptureFlag.blp"
 -- Button Position (X)
-Buttonpos_1 = 2
--- Button Position (Y)
-Buttonpos_2 = 2
+Buttonpos_1 = 1
 -- Hotkey
-Hotkey = "C"
+Hotkey = "S"
 -- Name
 Name = "Flag Undead"
 -- Attack 1 - Range Motion Buffer
@@ -51611,7 +51613,7 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",Objects\\InventoryItems\\UndeadCaptureFlag\\UndeadCaptureFlag.mdl"
 -- Tooltip - Basic
-Tip = "Flag Undead - [|cffffcc00C|r]"
+Tip = "Flag Undead - [|cffffcc00S|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -51693,22 +51695,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (X)
-Buttonpos_1 = 1
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "W"
 -- Name
 Name = "Flag Human 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\LordaeronSummer\\Props\\BannerHuman\\BannerHuman0.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00W|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h090,h08U"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -51788,22 +51784,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (X)
-Buttonpos_1 = 2
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "E"
 -- Name
 Name = "Flag Human 3"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\LordaeronSummer\\Props\\BannerHuman\\BannerHuman1.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00E|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h08U,h08Z"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -51884,11 +51874,11 @@ _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNGreaterRejuvScroll.blp"
 -- Button Position (X)
-Buttonpos_1 = 3
+Buttonpos_1 = 1
 -- Button Position (Y)
 Buttonpos_2 = 0
 -- Hotkey
-Hotkey = "R"
+Hotkey = "W"
 -- Name
 Name = "Flag Long Human 1"
 -- Attack 1 - Range Motion Buffer
@@ -51896,9 +51886,11 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\Cityscape\\Props\\Banner_Long\\Banner_Long.mdl"
 -- Tooltip - Basic
-Tip = "Flag Long Human - [|cffffcc00R|r]"
+Tip = "Flag Long Human 1 - [|cffffcc00W|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h092"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -51978,18 +51970,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNGreaterRejuvScroll.blp"
--- Hotkey
-Hotkey = "A"
 -- Name
 Name = "Flag Long Human 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\Cityscape\\Props\\Banner_Long2\\Banner_Long2.mdl"
--- Tooltip - Basic
-Tip = "Flag Long Human - [|cffffcc00A|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h091"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -52069,18 +52059,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNOrcBattleStandard.blp"
--- Button Position (X)
-Buttonpos_1 = 3
 -- Name
 Name = "Flag Orc 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\LordaeronSummer\\Props\\BannerOrc\\BannerOrc0.mdl"
--- Tooltip - Basic
-Tip = "Flag Orc - [|cffffcc00F|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h094,h08W"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -52160,20 +52148,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNOrcBattleStandard.blp"
--- Button Position (Y)
-Buttonpos_2 = 2
--- Hotkey
-Hotkey = "Z"
 -- Name
 Name = "Flag Orc 3"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
 Specialart = ",Doodads\\LordaeronSummer\\Props\\TutorialOrcBanner\\TutorialOrcBanner.mdl"
--- Tooltip - Basic
-Tip = "Flag Orc - [|cffffcc00Z|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h08W,h093"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -109225,9 +109209,11 @@ RngBuff1 = 250.
 -- Special
 Specialart = ",_unoptmized\\Decorations\\Tableware\\Cup_Of_ManaV3_FewPolygons_By_Jhotam.mdl"
 -- Tooltip - Basic
-Tip = "Tableware Mana Mug - [|cffffcc00E|r]"
+Tip = "Tableware Mug 1 - [|cffffcc00E|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NN"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -168048,9 +168034,11 @@ Name = "City Angmar 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",buildings\\naga\\TempleofTides\\TempleofTides.mdl"
+Specialart = ",_unoptmized\\Decorations\\City\\Angmar\\Angmar_Doodad02.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1L7,h1MU"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -174440,9 +174428,11 @@ Name = "City Angmar 3"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",buildings\\nightelf\\TreeofLife\\TreeofLife.mdl"
+Specialart = ",_unoptmized\\Decorations\\City\\Angmar\\Angmar_Doodad03.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1MU,h1IJ"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -179846,14 +179836,22 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNUnholyAura.blp"
+-- Button Position (Y)
+Buttonpos_2 = 2
+-- Hotkey
+Hotkey = "Z"
 -- Name
 Name = "City Angmar 1"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Doodads\\Cityscape\\Structures\\City_ColumnSingle\\City_ColumnSingle.mdl"
+Specialart = ",_unoptmized\\Decorations\\City\\Angmar\\Angmar_Doodad01.mdl"
+-- Tooltip - Basic
+Tip = "City Angmar 1 - [|cffffcc00Z|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1IJ,h1L7"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -181453,12 +181451,16 @@ race = "nightelf"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNTreeOfLife.blp"
+-- Button Position (X)
+Buttonpos_1 = 3
 -- Name
 Name = "Statue Angmar"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",buildings\\nightelf\\TreeofLife\\TreeofLife.mdl"
+Specialart = ",_unoptmized\\Decorations\\Statue\\Angmar_Doodad04.mdl"
+-- Tooltip - Basic
+Tip = "Statue Angmar - [|cffffcc00F|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -181549,11 +181551,13 @@ Name = "Misc Bell 1"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Doodads\\Cityscape\\Structures\\Archway1\\Archway1.mdl"
+Specialart = ",_unoptmized\\Decorations\\Misc\\Bell1.mdl"
 -- Tooltip - Basic
 Tip = "Archway - [|cffffcc00Q|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NJ"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -181633,20 +181637,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNCallToArms.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
 -- Name
 Name = "Misc Bell 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Doodads\\Cityscape\\Structures\\Archway1\\Archway1.mdl"
--- Tooltip - Basic
-Tip = "Archway - [|cffffcc00Q|r]"
+Specialart = ",_unoptmized\\Decorations\\Misc\\Bell2.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NI"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -181728,20 +181728,20 @@ _parent = "hhou"
 Art = "ReplaceableTextures\\CommandButtons\\BTNEntanglingRoots.blp"
 -- Button Position (X)
 Buttonpos_1 = 2
--- Button Position (Y)
-Buttonpos_2 = 0
 -- Hotkey
-Hotkey = "E"
+Hotkey = "D"
 -- Name
 Name = "Tree Root 1"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Tree_HighResBarrens.mdl"
+Specialart = ",_unoptmized\\Decorations\\Tree\\RootsLarge-Variation-A.mdl"
 -- Tooltip - Basic
-Tip = "Tree Barrens - [|cffffcc00E|r]"
+Tip = "Tree Root 1 - [|cffffcc00D|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NL"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -181831,22 +181831,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNEntanglingRoots.blp"
--- Button Position (X)
-Buttonpos_1 = 2
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "E"
 -- Name
 Name = "Tree Root 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Tree_HighResBarrens.mdl"
--- Tooltip - Basic
-Tip = "Tree Barrens - [|cffffcc00E|r]"
+Specialart = ",_unoptmized\\Decorations\\Tree\\RootsLarge-Variation-B.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NK"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -181936,22 +181930,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNStrongDrink.blp"
--- Button Position (X)
-Buttonpos_1 = 2
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "E"
 -- Name
 Name = "Tableware Mug 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",_unoptmized\\Decorations\\Tableware\\Cup_Of_ManaV3_FewPolygons_By_Jhotam.mdl"
--- Tooltip - Basic
-Tip = "Tableware Mana Mug - [|cffffcc00E|r]"
+Specialart = ",_unoptmized\\Decorations\\Tableware\\Tankard.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h0XD"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182031,18 +182019,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNOrbOfVenom.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
 -- Hotkey
-Hotkey = "Q"
+Hotkey = "A"
 -- Name
 Name = "Tableware Glass"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",_unoptmized\\Decorations\\Tableware\\RPG Bread.mdl"
+Specialart = ",_unoptmized\\Decorations\\Tableware\\Glass of Milk.mdl"
 -- Tooltip - Basic
-Tip = "Tableware Bread - [|cffffcc00Q|r]"
+Tip = "Tableware Glass - [|cffffcc00A|r]"
 -- Tooltip - Extended
 Ubertip = "Animation sets:|nNone: Empty Glass|nAlternate: Milk"
 -- Normal
@@ -182125,19 +182111,21 @@ _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
 -- Button Position (Y)
-Buttonpos_2 = 0
+Buttonpos_2 = 2
 -- Hotkey
-Hotkey = "Q"
+Hotkey = "Z"
 -- Name
 Name = "Flag WoW 1"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag_1.mdl"
 -- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Tip = "Flag WoW 1 - [|cffffcc00Z|r]"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NQ,h1NT"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182217,20 +182205,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
 -- Name
 Name = "Flag WoW 2"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag_2.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NR,h1NP"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182310,20 +182294,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
 -- Name
 Name = "Flag WoW 3"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag_3.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NS,h1NQ"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182403,20 +182383,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
 -- Name
 Name = "Flag WoW 4"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag_4.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NT,h1NR"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182496,20 +182472,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
 -- Name
 Name = "Flag WoW 5"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
--- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag_5.mdl"
 -- Tooltip - Extended
 Ubertip = ""
+-- Upgrades To
+Upgrade = "h1NP,h1NS"
 -- Normal
 abilList = "A012,A011,A00T,A037,UDR4,A02Y,A02Z,A031,A032,A0C6,A0B7"
 -- Acquisition Range
@@ -182589,18 +182561,16 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
--- Hotkey
-Hotkey = "Q"
+-- Button Position (X)
+Buttonpos_1 = 3
 -- Name
 Name = "Flag Rack"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag Rack.mdl"
 -- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Tip = "Flag Rack - [|cffffcc00F|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -182682,18 +182652,18 @@ weapTp1 = "missile"
 _parent = "hhou"
 -- Icon - Game Interface
 Art = "ReplaceableTextures\\CommandButtons\\BTNHumanCaptureFlag.blp"
--- Button Position (Y)
-Buttonpos_2 = 0
+-- Button Position (X)
+Buttonpos_1 = 2
 -- Hotkey
-Hotkey = "Q"
+Hotkey = "D"
 -- Name
 Name = "Flag Triple"
 -- Attack 1 - Range Motion Buffer
 RngBuff1 = 250.
 -- Special
-Specialart = ",Objects\\InventoryItems\\HumanCaptureFlag\\HumanCaptureFlag.mdl"
+Specialart = ",_unoptmized\\Decorations\\Flags\\Flag Triple.mdl"
 -- Tooltip - Basic
-Tip = "Flag Human - [|cffffcc00Q|r]"
+Tip = "Flag Triple - [|cffffcc00D|r]"
 -- Tooltip - Extended
 Ubertip = ""
 -- Normal
@@ -185167,6 +185137,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Villager Spawner 1"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Villager Spawner 1"
 -- Units Trained
@@ -185192,6 +185164,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Villager Spawner 2"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Villager Spawner 2"
 -- Units Trained
@@ -185364,6 +185338,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Animal Spawner 1"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Animal Spawner 1"
 -- Units Trained
@@ -185389,6 +185365,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Animal Spawner 2"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Animal Spawner 2"
 -- Units Trained
@@ -185653,6 +185631,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Villager Spawner 3"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Villager Spawner 3"
 -- Units Trained
@@ -187138,6 +187118,8 @@ Description = ""
 EditorSuffix = "[spawn]"
 -- Name
 Name = "Misc Animal Spawner 3"
+-- Special
+Specialart = ",buildings\\other\\CircleOfPower\\CircleOfPower.mdx"
 -- Tooltip - Basic
 Tip = "Misc Animal Spawner 3"
 -- Units Trained
diff --git a/release/trigger/10-Decorations/10-UpgradeSystemInit.j b/release/trigger/10-Decorations/10-UpgradeSystemInit.j
index 2fc86a6..8de8708 100644
--- a/release/trigger/10-Decorations/10-UpgradeSystemInit.j
+++ b/release/trigger/10-Decorations/10-UpgradeSystemInit.j
@@ -101,10 +101,51 @@ public module Module
         set UpgradeData('nth0').first = 'nth0'
         set UpgradeData('nth1').next = 'nth0'
         set UpgradeData('nth1').first = 'nth0'
+        set UpgradeData('h08U').prev = 'h090'
+        set UpgradeData('h08U').next = 'h08Z'
+        set UpgradeData('h08U').first = 'h08U'
+        set UpgradeData('h08Z').prev = 'h08U'
+        set UpgradeData('h08Z').next = 'h090'
+        set UpgradeData('h08Z').first = 'h08U'
+        set UpgradeData('h090').prev = 'h08Z'
+        set UpgradeData('h090').next = 'h08U'
+        set UpgradeData('h090').first = 'h08U'
+        set UpgradeData('h091').next = 'h092'
+        set UpgradeData('h091').first = 'h091'
+        set UpgradeData('h092').next = 'h091'
+        set UpgradeData('h092').first = 'h091'
+        set UpgradeData('h08W').prev = 'h094'
+        set UpgradeData('h08W').next = 'h093'
+        set UpgradeData('h08W').first = 'h08W'
+        set UpgradeData('h093').prev = 'h08W'
+        set UpgradeData('h093').next = 'h094'
+        set UpgradeData('h093').first = 'h08W'
+        set UpgradeData('h094').prev = 'h093'
+        set UpgradeData('h094').next = 'h08W'
+        set UpgradeData('h094').first = 'h08W'
+        set UpgradeData('h1NP').prev = 'h1NT'
+        set UpgradeData('h1NP').next = 'h1NQ'
+        set UpgradeData('h1NP').first = 'h1NP'
+        set UpgradeData('h1NQ').prev = 'h1NP'
+        set UpgradeData('h1NQ').next = 'h1NR'
+        set UpgradeData('h1NQ').first = 'h1NP'
+        set UpgradeData('h1NR').prev = 'h1NQ'
+        set UpgradeData('h1NR').next = 'h1NS'
+        set UpgradeData('h1NR').first = 'h1NP'
+        set UpgradeData('h1NS').prev = 'h1NR'
+        set UpgradeData('h1NS').next = 'h1NT'
+        set UpgradeData('h1NS').first = 'h1NP'
+        set UpgradeData('h1NT').prev = 'h1NS'
+        set UpgradeData('h1NT').next = 'h1NP'
+        set UpgradeData('h1NT').first = 'h1NP'
         set UpgradeData('h0XB').next = 'h0XC'
         set UpgradeData('h0XB').first = 'h0XB'
         set UpgradeData('h0XC').next = 'h0XB'
         set UpgradeData('h0XC').first = 'h0XB'
+        set UpgradeData('h0XD').next = 'h1NN'
+        set UpgradeData('h0XD').first = 'h0XD'
+        set UpgradeData('h1NN').next = 'h0XD'
+        set UpgradeData('h1NN').first = 'h0XD'
         set UpgradeData('h0XF').next = 'h0XE'
         set UpgradeData('h0XF').first = 'h0XF'
         set UpgradeData('h0XE').next = 'h0XF'
@@ -585,6 +626,10 @@ public module Module
         set UpgradeData('h15Q').first = 'h15Q'
         set UpgradeData('h15R').next = 'h15Q'
         set UpgradeData('h15R').first = 'h15Q'
+        set UpgradeData('h1NI').next = 'h1NJ'
+        set UpgradeData('h1NI').first = 'h1NI'
+        set UpgradeData('h1NJ').next = 'h1NI'
+        set UpgradeData('h1NJ').first = 'h1NI'
         set UpgradeData('h017').prev = 'h0KU'
         set UpgradeData('h017').next = 'h0KT'
         set UpgradeData('h017').first = 'h017'
@@ -897,6 +942,10 @@ public module Module
         set UpgradeData('h0SI').prev = 'h0SH'
         set UpgradeData('h0SI').next = 'h0SG'
         set UpgradeData('h0SI').first = 'h0SG'
+        set UpgradeData('h1NK').next = 'h1NL'
+        set UpgradeData('h1NK').first = 'h1NK'
+        set UpgradeData('h1NL').next = 'h1NK'
+        set UpgradeData('h1NL').first = 'h1NK'
         set UpgradeData('h054').next = 'h055'
         set UpgradeData('h054').first = 'h054'
         set UpgradeData('h055').next = 'h054'
@@ -1016,6 +1065,15 @@ public module Module
         set UpgradeData('h1BS').prev = 'h1BR'
         set UpgradeData('h1BS').next = 'h1BP'
         set UpgradeData('h1BS').first = 'h1BP'
+        set UpgradeData('h1MU').prev = 'h1L7'
+        set UpgradeData('h1MU').next = 'h1IJ'
+        set UpgradeData('h1MU').first = 'h1MU'
+        set UpgradeData('h1IJ').prev = 'h1MU'
+        set UpgradeData('h1IJ').next = 'h1L7'
+        set UpgradeData('h1IJ').first = 'h1MU'
+        set UpgradeData('h1L7').prev = 'h1IJ'
+        set UpgradeData('h1L7').next = 'h1MU'
+        set UpgradeData('h1L7').first = 'h1MU'
         set UpgradeData('h0V8').prev = 'h0VC'
         set UpgradeData('h0V8').next = 'h0V9'
         set UpgradeData('h0V8').first = 'h0V8'
@@ -2388,24 +2446,6 @@ public module Module
         set UpgradeData('h1IA').prev = 'h1I8'
         set UpgradeData('h1IA').next = 'h18P'
         set UpgradeData('h1IA').first = 'h18P'
-        set UpgradeData('h1KZ').prev = 'h1L9'
-        set UpgradeData('h1KZ').next = 'h1L0'
-        set UpgradeData('h1KZ').first = 'h1KZ'
-        set UpgradeData('h1L0').prev = 'h1KZ'
-        set UpgradeData('h1L0').next = 'h1L1'
-        set UpgradeData('h1L0').first = 'h1KZ'
-        set UpgradeData('h1L1').prev = 'h1L0'
-        set UpgradeData('h1L1').next = 'h1L2'
-        set UpgradeData('h1L1').first = 'h1KZ'
-        set UpgradeData('h1L2').prev = 'h1L1'
-        set UpgradeData('h1L2').next = 'h1L8'
-        set UpgradeData('h1L2').first = 'h1KZ'
-        set UpgradeData('h1L8').prev = 'h1L2'
-        set UpgradeData('h1L8').next = 'h1L9'
-        set UpgradeData('h1L8').first = 'h1KZ'
-        set UpgradeData('h1L9').prev = 'h1L8'
-        set UpgradeData('h1L9').next = 'h1KZ'
-        set UpgradeData('h1L9').first = 'h1KZ'
         set UpgradeData('h1MS').prev = 'h1N6'
         set UpgradeData('h1MS').next = 'h1N5'
         set UpgradeData('h1MS').first = 'h1MS'