Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc. Patch Things #2800

Merged
merged 6 commits into from
Oct 19, 2023
Merged

Misc. Patch Things #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b126c19
Add missed Protosword bit.
N7Huntsman Oct 2, 2023
38d66d4
Merge branch 'Development' into Misc-Patch-Stuff
SamaelGray Oct 10, 2023
a343dd1
housekeeping
SamaelGray Oct 10, 2023
53b8a91
Remove turk's guns patch
N7Huntsman Oct 11, 2023
7864eb2
Merge branch 'Development' of https://github.com/CombatExtended-Conti…
N7Huntsman Oct 18, 2023
5870a0a
Update autoloader concept info
N7Huntsman Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Defs/Tutor/Concepts_NotedOpportunistic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@

<ConceptDef>
<defName>CE_AutoLoader</defName>
<label>CE: Ammo container</label>
<label>CE: Autoloaders</label>
<priority>50</priority>
<needsOpportunity>True</needsOpportunity>
<helpText>To Do</helpText>
<helpText>Some specialized structures can use the ammo stored inside of them to reload adjacent compatible turrets. These loaders might be automated or require a colonist to operate.</helpText>
<highlightTags>
<li>CE_AutoLoader</li>
</highlightTags>
Expand Down
11 changes: 10 additions & 1 deletion Patches/Protoswords/Proto_CE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,16 @@
</value>
</li>

<!-- Patch sear damage type -->
<!-- Patch sear tool capacity & damage type -->
<li Class="PatchOperationAddModExtension">
<xpath>Defs/ToolCapacityDef[defName="BON_SearStab"]</xpath>
<value>
<li Class="CombatExtended.ModExtensionMeleeToolPenetration">
<canHitInternal>true</canHitInternal>
</li>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/DamageDef[defName="BON_SearDamage"]</xpath>
<value>
Expand Down
124 changes: 62 additions & 62 deletions Patches/Vehicle Framework Expanded - Classic Mechs/Mech_BattleCannon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,75 +7,75 @@
<match Class="PatchOperationSequence">
<operations>

<!-- Main Guns -->
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/projectile</xpath>
<value>
<projectile>Bullet_120mmCannonShell_HE</projectile>
</value>
</li>
<!-- Main Guns -->
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/projectile</xpath>
<value>
<projectile>Bullet_120mmCannonShell_HE</projectile>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/reloadTimer</xpath>
<value>
<reloadTimer>9.6</reloadTimer>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/reloadTimer</xpath>
<value>
<reloadTimer>9.6</reloadTimer>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/warmUpTimer</xpath>
<value>
<warmUpTimer>3</warmUpTimer>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/magazineCapacity</xpath>
<value>
<magazineCapacity>20</magazineCapacity>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/warmUpTimer</xpath>
<value>
<warmUpTimer>3</warmUpTimer>
</value>
</li>

<li Class="PatchOperationRemove">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/chargePerAmmoCount</xpath>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/magazineCapacity</xpath>
<value>
<magazineCapacity>20</magazineCapacity>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/genericAmmo</xpath>
<value>
<genericAmmo>false</genericAmmo>
</value>
</li>
<li Class="PatchOperationRemove">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/chargePerAmmoCount</xpath>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/maxRange</xpath>
<value>
<maxRange>105</maxRange>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/genericAmmo</xpath>
<value>
<genericAmmo>false</genericAmmo>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/ammunition/thingDefs</xpath>
<value>
<thingDefs>
<li>Ammo_120mmCannonShell_HEAT</li>
<li>Ammo_120mmCannonShell_HE</li>
</thingDefs>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/maxRange</xpath>
<value>
<maxRange>105</maxRange>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]</xpath>
<value>
<li Class="Vehicles.CETurretDataDefModExtension">
<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
<shotHeight>5</shotHeight>
<speed>229</speed>
<sway>0.82</sway>
<spread>0.01</spread>
</li>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]/ammunition/thingDefs</xpath>
<value>
<thingDefs>
<li>Ammo_120mmCannonShell_HEAT</li>
<li>Ammo_120mmCannonShell_HE</li>
</thingDefs>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_BattleCannon"]</xpath>
<value>
<li Class="Vehicles.CETurretDataDefModExtension">
<ammoSet>AmmoSet_120mmCannonShell</ammoSet>
<shotHeight>5</shotHeight>
<speed>229</speed>
<sway>0.82</sway>
<spread>0.01</spread>
</li>
</value>
</li>

</operations>
</match>
Expand Down
172 changes: 86 additions & 86 deletions Patches/Vehicle Framework Expanded - Classic Mechs/Mech_MachineGun.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,103 +7,103 @@
<match Class="PatchOperationSequence">
<operations>

<!-- HMG Sub-->
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/projectile</xpath>
<value>
<projectile>Bullet_50BMG_FMJ</projectile>
</value>
</li>
<!-- HMG Sub-->
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/projectile</xpath>
<value>
<projectile>Bullet_50BMG_FMJ</projectile>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/reloadTimer</xpath>
<value>
<reloadTimer>3</reloadTimer>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/reloadTimer</xpath>
<value>
<reloadTimer>3</reloadTimer>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/warmUpTimer</xpath>
<value>
<warmUpTimer>1</warmUpTimer>
</value>
</li>
<li Class="PatchOperationReplace">
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/warmUpTimer</xpath>
<value>
<warmUpTimer>1</warmUpTimer>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/magazineCapacity</xpath>
<value>
<magazineCapacity>200</magazineCapacity>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/genericAmmo</xpath>
<value>
<genericAmmo>false</genericAmmo>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/genericAmmo</xpath>
<value>
<genericAmmo>false</genericAmmo>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/maxRange</xpath>
<value>
<maxRange>80</maxRange>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/ammunition/thingDefs</xpath>
<value>
<thingDefs>
<li>Ammo_50BMG_FMJ</li>
<li>Ammo_50BMG_AP</li>
<li>Ammo_50BMG_Incendiary</li>
<li>Ammo_50BMG_HE</li>
<li>Ammo_50BMG_Sabot</li>
</thingDefs>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/maxRange</xpath>
<value>
<maxRange>80</maxRange>
</value>
</li>
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/fireModes</xpath>
<value>
<fireModes>
<li>
<shotsPerBurst>1</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Single</label>
<texPath>UI/Gizmos/FireRate_Single</texPath>
</li>
<li>
<shotsPerBurst>5</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Burst</label>
<texPath>UI/Gizmos/FireRate_Burst</texPath>
</li>
<li>
<shotsPerBurst>10</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Auto</label>
<texPath>UI/Gizmos/FireRate_Auto</texPath>
</li>
</fireModes>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/ammunition/thingDefs</xpath>
<value>
<thingDefs>
<li>Ammo_50BMG_FMJ</li>
<li>Ammo_50BMG_AP</li>
<li>Ammo_50BMG_Incendiary</li>
<li>Ammo_50BMG_HE</li>
<li>Ammo_50BMG_Sabot</li>
</thingDefs>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]/fireModes</xpath>
<value>
<fireModes>
<li>
<shotsPerBurst>1</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Single</label>
<texPath>UI/Gizmos/FireRate_Single</texPath>
</li>
<li>
<shotsPerBurst>5</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Burst</label>
<texPath>UI/Gizmos/FireRate_Burst</texPath>
</li>
<li>
<shotsPerBurst>10</shotsPerBurst>
<ticksBetweenShots>6</ticksBetweenShots>
<ticksBetweenBursts>60</ticksBetweenBursts>
<label>Auto</label>
<texPath>UI/Gizmos/FireRate_Auto</texPath>
<li Class="PatchOperationAddModExtension">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]</xpath>
<value>
<li Class="Vehicles.CETurretDataDefModExtension">
<ammoSet>AmmoSet_50BMG</ammoSet>
<shotHeight>2.5</shotHeight>
<speed>163</speed>
<sway>1.5</sway>
<spread>0.1</spread>
</li>
</fireModes>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/Vehicles.VehicleTurretDef[defName="HighMacs_MachineGun"]</xpath>
<value>
<li Class="Vehicles.CETurretDataDefModExtension">
<ammoSet>AmmoSet_50BMG</ammoSet>
<shotHeight>2.5</shotHeight>
<speed>163</speed>
<sway>1.5</sway>
<spread>0.1</spread>
</li>
</value>
</li>
</value>
</li>

</operations>
</match>
Expand Down
Loading
Loading