Progression expansion & XGT combined key support

Lemon-King · Jun 20, 2024 · 0463dcd · 0463dcd
1 parent 38a5cde
commit 0463dcd
Show file tree

Hide file tree

Showing 11 changed files with 375 additions and 136 deletions.
diff --git a/resources/assets/playersheets/clericplayer.playersheet b/resources/assets/playersheets/clericplayer.playersheet
@@ -28,10 +28,18 @@
         "dexterity": [6,10]
     },
     "xgame": {
-        "GreenArmor": "PlatinumHelm,MeshArmor",
-        "BlueArmor": "AmuletOfWarding,FalconShield",
-        "SilverShield": "PlatinumHelm,MeshArmor",
-        "EnchantedShield": "AmuletOfWarding,FalconShield",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["PlatinumHelm","MeshArmor"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["AmuletOfWarding","FalconShield"],
+            "false": "EnchantedShield"
+        },
 
         "Fist": "Mana1",
         "Chainsaw": "CWeaponPiece3",

diff --git a/resources/assets/playersheets/fighterplayer.playersheet b/resources/assets/playersheets/fighterplayer.playersheet
@@ -28,10 +28,42 @@
         "dexterity": [10,13],
     },
     "xgame": {
-        "GreenArmor": "AmuletOfWarding,PlatinumHelm",
-        "BlueArmor": "FalconShield,MeshArmor",
-        "SilverShield": "AmuletOfWarding,PlatinumHelm",
-        "EnchantedShield": "FalconShield,MeshArmor",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["AmuletOfWarding","PlatinumHelm"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","MeshArmor"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
 
         "Fist": "Mana1",
         "Chainsaw": "FWeaponPiece3",

diff --git a/resources/assets/playersheets/hereticplayer.playersheet b/resources/assets/playersheets/hereticplayer.playersheet
@@ -28,18 +28,43 @@
         "dexterity": [15,18]
     },
     "xgame": {
-        "SilverShield": {
+        "GreenArmor,SilverShield": {
             "cvar": "hxdd_armor_mode",
             "equals": 2,
             "true": ["MeshArmor", "PlatinumHelm"],
             "false": "SilverShield"
         },
-        "EnchantedShield": {
+        "BlueArmor,EnchantedShield": {
             "cvar": "hxdd_armor_mode",
             "equals": 2,
             "true": ["AmuletOfWarding", "FalconShield"],
             "false": "EnchantedShield"
         },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
+
 
         "Fist": "Staff",
         "Chainsaw": "Gauntlets",

diff --git a/resources/assets/playersheets/hx2assassinplayer.playersheet b/resources/assets/playersheets/hx2assassinplayer.playersheet
@@ -28,10 +28,43 @@
         "dexterity": [15,18]
     },
     "xgame": {
-        "GreenArmor": "PlatinumHelm,MeshArmor",
-        "BlueArmor": "AmuletOfWarding,FalconShield",
-        "SilverShield": "PlatinumHelm,MeshArmor",
-        "EnchantedShield": "AmuletOfWarding,FalconShield",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["MeshArmor","PlatinumHelm"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","AmuletOfWarding"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
+
 
         "Fist": "Mana1",
         "Chainsaw": "Mana3",

diff --git a/resources/assets/playersheets/hx2crusaderplayer.playersheet b/resources/assets/playersheets/hx2crusaderplayer.playersheet
@@ -28,10 +28,42 @@
         "dexterity": [6,10]
     },
     "xgame": {
-        "GreenArmor": "FalconShield,AmuletOfWarding",
-        "BlueArmor": "PlatinumHelm,MeshArmor",
-        "SilverShield": "FalconShield,AmuletOfWarding",
-        "EnchantedShield": "PlatinumHelm,MeshArmor",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","AmuletOfWarding"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["PlatinumHelm","MeshArmor"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "FalconShield"
+        },
 
         "GoldWandAmmo": "none",
         "GoldWandHefty": "Mana1",

diff --git a/resources/assets/playersheets/hx2necromancerplayer.playersheet b/resources/assets/playersheets/hx2necromancerplayer.playersheet
@@ -28,6 +28,62 @@
         "dexterity": [8,12]
     },
     "xgame": {
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["MeshArmor","PlatinumHelm"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","AmuletOfWarding"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
+
+        "Fist": "Mana1",
+        "Chainsaw": "none",
+        "Pistol": "Mana1",
+        "Shotgun": "NWeapMagicMissile",
+        "SuperShotgun": "NWeapBoneShards",
+        "Chaingun": "NWeapMagicMissile",
+        "RocketLauncher": "Mana3",
+        "PlasmaRifle": "NWeapBoneShards",
+        "BFG9000": "none",
+
+        "Clip": "none",
+        "ClipBox": "Mana3",
+        "Shell": "Mana1",
+        "ShellBox": "Mana3",
+        "RocketAmmo": "Mana2",
+        "RocketBox": "Mana3",
+        "Cell": "Mana2",
+        "CellPack": "Mana3",
+
         "GoldWandAmmo": "none",
         "GoldWandHefty": "Mana1",
 

diff --git a/resources/assets/playersheets/hx2paladinplayer.playersheet b/resources/assets/playersheets/hx2paladinplayer.playersheet
@@ -28,10 +28,42 @@
         "dexterity": [10,13]
     },
     "xgame": {
-        "GreenArmor": "PlatinumHelm,MeshArmor",
-        "BlueArmor": "AmuletOfWarding,FalconShield",
-        "SilverShield": "PlatinumHelm,MeshArmor",
-        "EnchantedShield": "AmuletOfWarding,FalconShield",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["MeshArmor","PlatinumHelm"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","AmuletOfWarding"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
 
         "Fist": "Mana1",
         "Chainsaw": "PWeapPurifierPiece2",

diff --git a/resources/assets/playersheets/hx2succubusplayer.playersheet b/resources/assets/playersheets/hx2succubusplayer.playersheet
@@ -28,10 +28,42 @@
         "dexterity": [9,13]
     },
     "xgame": {
-        "GreenArmor": "MeshArmor,PlatinumHelm",
-        "BlueArmor": "FalconShield,AmuletOfWarding",
-        "SilverShield": "MeshArmor,PlatinumHelm",
-        "EnchantedShield": "FalconShield,AmuletOfWarding",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["MeshArmor","PlatinumHelm"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["FalconShield","AmuletOfWarding"],
+            "false": "EnchantedShield"
+        },
+        "MeshArmor": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "MeshArmor"
+        },
+        "PlatinumHelm": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "SilverShield",
+            "false": "PlatinumHelm"
+        },
+        "AmuletOfWarding": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "AmuletOfWarding"
+        },
+        "FalconShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 1,
+            "true": "EnchantedShield",
+            "false": "FalconShield"
+        },
 
         "Fist": "Mana1",
         "Chainsaw": "SWeapTempestStaffPiece2",

diff --git a/resources/assets/playersheets/mageplayer.playersheet b/resources/assets/playersheets/mageplayer.playersheet
@@ -28,10 +28,18 @@
         "dexterity": [8,12]
     },
     "xgame": {
-        "GreenArmor": "PlatinumHelm,MeshArmor",
-        "BlueArmor": "AmuletOfWarding,FalconShield",
-        "SilverShield": "PlatinumHelm,MeshArmor",
-        "EnchantedShield": "AmuletOfWarding,FalconShield",
+        "GreenArmor,SilverShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["PlatinumHelm","MeshArmor"],
+            "false": "SilverShield"
+        },
+        "BlueArmor,EnchantedShield": {
+            "cvar": "hxdd_armor_mode",
+            "equals": 2,
+            "true": ["AmuletOfWarding","FalconShield"],
+            "false": "EnchantedShield"
+        },
 
         "Fist": "Mana1",
         "Chainsaw": "MWeaponPiece3",