Skip to content

Allow Medieval Overhaul handgonne to fire both blunderbuss and ball shot #4215

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

Open
wants to merge 5 commits into
base: Development
Choose a base branch
from
Open

Allow Medieval Overhaul handgonne to fire both blunderbuss and ball shot #4215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0649752
Adjust MO handgonne shotgun to use blunderbuss shot (instead of muske…
BenjaminTzudiker Sep 5, 2025
4c3e6d3
Add non-shotgun ammo option to MO handgonne
BenjaminTzudiker Sep 5, 2025
84c2287
Fix handgonne projectile def parents
BenjaminTzudiker Sep 5, 2025
537bd42
Adjust handgonne base stats to have worse reload and only take one am…
BenjaminTzudiker Sep 5, 2025
8e4145e
Revert range buff but slightly lower warmup time
BenjaminTzudiker Sep 5, 2025
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
55 changes: 46 additions & 9 deletions ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo/MO_Ammo_Medieval.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,31 +700,68 @@
</modExtensions>
</ThingDef>

<!-- ===== Handgonne Ammos (1-Handed Blunderbuss) ===== -->
<!-- ===== Handgonne Ammos ===== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_HandgonneShot</defName>
<label>Handgonne Shot</label>
<ammoTypes>
<Ammo_BlunderbussShot>Bullet_Handgonne_Pellet</Ammo_BlunderbussShot>
<Ammo_MusketBall>Bullet_Handgonne_Ball</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<ThingDef ParentName="Base12GaugeBullet">
<defName>Bullet_Handgonne_Ball</defName>
<ThingDef ParentName="BlunderbussShotBullet">
<defName>Bullet_Handgonne_Pellet</defName>
<label>lead pellet</label>
<graphicData>
<texPath>Things/Projectile/Shotgun_Pellet</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>10</damageAmountBase>
<pelletCount>6</pelletCount>
<armorPenetrationSharp>2.5</armorPenetrationSharp>
<armorPenetrationBlunt>12</armorPenetrationBlunt>
<armorPenetrationSharp>1.5</armorPenetrationSharp>
<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
<spreadMult>22.5</spreadMult>
<speed>64</speed>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_ProjectileFleck">
<FleckDatas>
<li>
<startDelayTick>0</startDelayTick>
<fleck>Fleck_CEBlackpowderSmoke</fleck>
<emissionsPerTick>1</emissionsPerTick>
<flecksPerEmission>1</flecksPerEmission>
<cutoffTickRange>2</cutoffTickRange>
<scale>1.5~1.7</scale>
<originOffset>0.0~2.5</originOffset>
</li>
</FleckDatas>
</li>
</comps>
</ThingDef>

<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_Handgonne_Ball</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>24</damageAmountBase>
<armorPenetrationSharp>4</armorPenetrationSharp>
<armorPenetrationBlunt>14</armorPenetrationBlunt>
<speed>72</speed>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_ProjectileFleck">
<FleckDatas>
<li>
<startDelayTick>0</startDelayTick>
<fleck>Fleck_CEBlackpowderSmokeShort</fleck>
<emissionsPerTick>4</emissionsPerTick>
<flecksPerEmission>1</flecksPerEmission>
<cutoffTickRange>3~3</cutoffTickRange>
<scale>2.0~2.5</scale>
</li>
</FleckDatas>
</li>
</comps>
</ThingDef>

</Defs>
9 changes: 4 additions & 5 deletions .../Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,26 +227,25 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Handgonne_Ball</defaultProjectile>
<warmupTime>1.66</warmupTime>
<warmupTime>2.33</warmupTime>
<range>12</range>
<soundCast>Shot_Shotgun_NoRack</soundCast>
<soundCastTail>GunTail_Heavy</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
</Properties>
<AmmoUser>
<magazineSize>4</magazineSize>
<magazineSize>1</magazineSize>
<reloadTime>5.1</reloadTime>
<ammoSet>AmmoSet_HandgonneShot</ammoSet>
<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
<AmmoGenPerMagOverride>1</AmmoGenPerMagOverride>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
<weaponTags>
<li>NeolithicRangedHeavy</li>
<li>NeolithicRangedChief</li>
<li>CE_OneHandedWeapon</li>
<li>CE_TwoHandedWeapon</li>
</weaponTags>
</Operation>

Expand Down