-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3242 from CombatExtended-Continued/Resolve-Loop
Resolve Vanilla Expanded Dependency Loop
- Loading branch information
Showing
10 changed files
with
122 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,4 +97,5 @@ | |
| <speed>34</speed> | ||
| </projectile> | ||
| </ThingDef> | ||
|
|
||
| </Defs> | ||
107 changes: 107 additions & 0 deletions
107
...ons Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Defs> | ||
|
|
||
| <!-- Roman Shield (Scutum) --> | ||
| <ThingDef ParentName="ShieldBase"> | ||
| <defName>VFEC_Shield_Heavy_CE</defName> | ||
| <label>kite shield</label> | ||
| <description>A heavily fortified square shield that covers one's body from shin to shoulder, heavy enough to slow those wielding it at the benefit of incredible protection.</description> | ||
| <techLevel>Neolithic</techLevel> | ||
| <graphicData> | ||
| <texPath>Things/Item/Equipment/Shield/HeavyShield/HeavyShield</texPath> | ||
| <graphicClass>Graphic_Single</graphicClass> | ||
| <drawSize>0.88</drawSize> | ||
| </graphicData> | ||
| <thingCategories Inherit="False"> | ||
| <li>Shields</li> | ||
| </thingCategories> | ||
| <costStuffCount>25</costStuffCount> | ||
| <costList> | ||
| <WoodLog>60</WoodLog> | ||
| <Steel>35</Steel> | ||
| </costList> | ||
| <stuffCategories> | ||
| <li>Leathery</li> | ||
| </stuffCategories> | ||
| <recipeMaker> | ||
| <researchPrerequisite>VFEC_HeavyShieldMaking</researchPrerequisite> | ||
| <recipeUsers> | ||
| <li>FueledSmithy</li> | ||
| <li>ElectricSmithy</li> | ||
| </recipeUsers> | ||
| </recipeMaker> | ||
| <statBases> | ||
| <WorkToMake>3000</WorkToMake> | ||
| <MaxHitPoints>145</MaxHitPoints> | ||
| <StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor> | ||
| <ArmorRating_Sharp>1.75</ArmorRating_Sharp> | ||
| <ArmorRating_Blunt>6</ArmorRating_Blunt> | ||
| <Mass>8</Mass> | ||
| <Bulk>8</Bulk> | ||
| <WornBulk>6</WornBulk> | ||
| </statBases> | ||
| <equippedStatOffsets> | ||
| <ReloadSpeed>-0.1</ReloadSpeed> | ||
| <MeleeHitChance>-1</MeleeHitChance> | ||
| <ShootingAccuracyPawn>-0.2</ShootingAccuracyPawn> | ||
| <AimingAccuracy>-0.05</AimingAccuracy> | ||
| <Suppressability>-0.25</Suppressability> | ||
| <MeleeCritChance>-0.08</MeleeCritChance> | ||
| <MeleeParryChance>1.0</MeleeParryChance> | ||
| </equippedStatOffsets> | ||
| <comps> | ||
| <li> | ||
| <compClass>CompColorable</compClass> | ||
| </li> | ||
| </comps> | ||
| <apparel> | ||
| <developmentalStageFilter>Child, Adult</developmentalStageFilter> | ||
| <tags> | ||
| <li>TribalShield</li> | ||
| </tags> | ||
| <renderNodeProperties> | ||
| <li> | ||
| <nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass> | ||
| <workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass> | ||
| <texPath>Things/Item/Equipment/Shield/HeavyShield/HeavyShield</texPath> | ||
| <shaderTypeDef>CutoutComplex</shaderTypeDef> | ||
| <parentTagDef>ApparelBody</parentTagDef> | ||
| <drawData> | ||
| <scale>0.65</scale> | ||
| <defaultData> | ||
| <layer>80</layer> | ||
| </defaultData> | ||
| <dataEast> | ||
| <layer>-5</layer> | ||
| <offset>(0, 0, -0.1)</offset> | ||
| <rotationOffset>30</rotationOffset> | ||
| </dataEast> | ||
| <dataWest> | ||
| <rotationOffset>-30</rotationOffset> | ||
| </dataWest> | ||
| <dataNorth> | ||
| <layer>-5</layer> | ||
| <offset>(0.15, 0, -0.1)</offset> | ||
| </dataNorth> | ||
| <dataSouth> | ||
| <offset>(0.3, 0, -0.2)</offset> | ||
| </dataSouth> | ||
| </drawData> | ||
| </li> | ||
| </renderNodeProperties> | ||
| </apparel> | ||
| <modExtensions> | ||
| <li Class="CombatExtended.ShieldDefExtension"> | ||
| <shieldCoverage> | ||
| <li>Hands</li> | ||
| <li>Arms</li> | ||
| <li>Shoulders</li> | ||
| <li>Torso</li> | ||
| <li>Neck</li> | ||
| <li>Legs</li> | ||
| </shieldCoverage> | ||
| </li> | ||
| </modExtensions> | ||
| </ThingDef> | ||
|
|
||
| </Defs> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,4 +67,5 @@ | |
| <li>CE_Apparel_TribalBackpack</li> | ||
| </value> | ||
| </Operation> | ||
|
|
||
| </Patch> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 0 additions & 76 deletions
76
... Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
...nded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsMelee.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters