Skip to content

Commit

Permalink
Merge pull request #2870 from UnscathedAnimal/patch-1
Browse files Browse the repository at this point in the history 
Update Patch_HighRoller_AddonAmmo.xml
  • Loading branch information
@N7Huntsman
N7Huntsman authored Nov 6, 2023
2 parents ae2e7fa + 53d62e2 commit a4dd65a
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions Patches/Vanilla Weapons Expanded - Frontier/Patch_HighRoller_AddonAmmo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_GaussRevolver_HR</defName>
<label>Gauss Revolver</label>
<label>6mm Railgun</label>
<ammoTypes>
<Ammo_6mmRailgun_Sabot>Bullet_GaussRevolver_HR</Ammo_6mmRailgun_Sabot>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_GaussRepeater_HR</defName>
<label>Gauss Repeater</label>
<label>6mm Railgun</label>
<ammoTypes>
<Ammo_6mmRailgun_Sabot>Bullet_GaussRepeater_HR</Ammo_6mmRailgun_Sabot>
</ammoTypes>
Expand All @@ -121,7 +121,7 @@

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
<defName>Bullet_GaussRevolver_HR</defName>
<label>Gauss revolver slug</label>
<label>gauss revolver shot</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<isInstant>true</isInstant>
<damageFalloff>False</damageFalloff>
Expand All @@ -141,7 +141,7 @@

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseLaserBullet">
<defName>Bullet_GaussRepeater_HR</defName>
<label>Gauss repeater slug</label>
<label>gauss repeater shot</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<isInstant>true</isInstant>
<damageFalloff>False</damageFalloff>
Expand Down Expand Up @@ -175,23 +175,23 @@

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SalvagedLaserRevolver_HR</defName>
<label>Salvaged Laser Revolver</label>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRevolver_HR</Ammo_LaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SalvagedLaserRepeater_HR</defName>
<label>Salvaged Laser Repeater</label>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserRepeater_HR</Ammo_LaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SalvagedLaserHuntingRifle_HR</defName>
<label>Salvaged Laser Hunting Rifle</label>
<label>laser charge</label>
<ammoTypes>
<Ammo_LaserChargePack>Bullet_Laser_SalvagedLaserHuntingRifle_HR</Ammo_LaserChargePack>
</ammoTypes>
Expand All @@ -203,6 +203,7 @@

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
<defName>Bullet_Laser_SalvagedLaserRevolver_HR</defName>
<label>laser beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>12</damageAmountBase>
Expand All @@ -220,6 +221,7 @@

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
<defName>Bullet_Laser_SalvagedLaserRepeater_HR</defName>
<label>laser beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>20</damageAmountBase>
Expand All @@ -237,6 +239,7 @@

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletGreen">
<defName>Bullet_Laser_SalvagedLaserHuntingRifle_HR</defName>
<label>laser beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>24</damageAmountBase>
Expand All @@ -259,4 +262,4 @@
</operations>
</match>
</Operation>
</Patch>
</Patch>

0 comments on commit a4dd65a

Please sign in to comment.