Merge pull request #3086 from SamaelGray/SamaelGray-drawSizeMigration

DrawSize Migration
CombatExtended-Continued · Jun 22, 2024 · d0cebc3 · d0cebc3
2 parents 66c7b88 + 4ce35fa
commit d0cebc3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
@@ -198,7 +198,6 @@
 		</tools>
 		<modExtensions>
 			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>1.0,1.0</DrawSize>
 				<DrawOffset>-0.3,0.0</DrawOffset>
 			</li>
 		</modExtensions>
@@ -480,14 +479,6 @@
 				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
 			</li>
 		</tools>
-		<modExtensions>
-			<!--	
-      <li Class="CombatExtended.GunDrawExtension">
-<DrawSize>0.93,0.93</DrawSize>
-<DrawOffset>0.0,0.0</DrawOffset>
-      </li>
-    -->
-		</modExtensions>
 	</ThingDef>
 
 	<!-- ==================== Minigun (Mechanoid) ==================== -->
@@ -500,6 +491,7 @@
 		<graphicData>
 			<texPath>Things/Weapons/MechanoidMinigun</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(1.4,1.4)</drawSize>
 		</graphicData>
 		<soundInteract>Interact_Rifle</soundInteract>
 		<statBases>
@@ -557,10 +549,6 @@
 			</li>
 		</tools>
 		<modExtensions>
-			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>1.4,1.4</DrawSize>
-				<DrawOffset>0.0,0.0</DrawOffset>
-			</li>
 			<li Class="CombatExtended.ThingDefExtensionCE">
 				<MenuHidden>True</MenuHidden>
 			</li>

diff --git a/Defs/ThingDefs_Misc/Weapons_Spotting.xml b/Defs/ThingDefs_Misc/Weapons_Spotting.xml
@@ -24,6 +24,7 @@
 		<graphicData>
 			<texPath>Things/Weapons/CE_BinocularsRadio</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(0.87,0.87)</drawSize>
 		</graphicData>
 		<generateAllowChance>0</generateAllowChance>
 		<soundInteract>Interact_Rifle</soundInteract>
@@ -70,12 +71,6 @@
 				<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
 			</li>
 		</tools>
-		<modExtensions>
-			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>0.87,0.87</DrawSize>
-				<DrawOffset>0.0,0.0</DrawOffset>
-			</li>
-		</modExtensions>
 	</ThingDef>
 
 </Defs>