Skip to content

Commit

Permalink
Merge pull request #3664 from CombatExtended-Continued/Update-RimFantasy
Browse files Browse the repository at this point in the history
Update - RimFantasy Series
  • Loading branch information
N7Huntsman authored Jan 30, 2025
2 parents d6cfe94 + 3c8583d commit c23d362
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Wand_Amethyst</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1</warmupTime>
<range>40</range>
<recoilAmount>1.53</recoilAmount>
<soundCast>Shot_ChargeRifle</soundCast>
Expand All @@ -33,17 +33,17 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Staff_Amethyst</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1.25</warmupTime>
<range>45</range>
<recoilAmount>1.53</recoilAmount>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<burstShotCount>5</burstShotCount>
<burstShotCount>3</burstShotCount>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>7</muzzleFlashScale>
</Properties>
<FireModes>
<aimedBurstShotCount>3</aimedBurstShotCount>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
Expand All @@ -59,7 +59,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Ring_Amethyst</defaultProjectile>
<warmupTime>0.25</warmupTime>
<warmupTime>0.75</warmupTime>
<range>35</range>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Ring_Emerald</defaultProjectile>
<warmupTime>0.25</warmupTime>
<warmupTime>0.75</warmupTime>
<range>35</range>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
Expand All @@ -66,7 +66,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Ring_Sapphire</defaultProjectile>
<warmupTime>0.25</warmupTime>
<warmupTime>0.75</warmupTime>
<range>35</range>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
Expand All @@ -87,7 +87,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Ring_Ruby</defaultProjectile>
<warmupTime>0.25</warmupTime>
<warmupTime>0.75</warmupTime>
<range>35</range>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Staff_Emerald</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1.25</warmupTime>
<range>45</range>
<recoilAmount>1.53</recoilAmount>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<burstShotCount>5</burstShotCount>
<burstShotCount>3</burstShotCount>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>7</muzzleFlashScale>
</Properties>
<FireModes>
<aimedBurstShotCount>3</aimedBurstShotCount>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
Expand All @@ -72,17 +72,17 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Staff_Sapphire</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1.25</warmupTime>
<range>45</range>
<recoilAmount>1.53</recoilAmount>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<burstShotCount>5</burstShotCount>
<burstShotCount>3</burstShotCount>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>7</muzzleFlashScale>
</Properties>
<FireModes>
<aimedBurstShotCount>3</aimedBurstShotCount>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
Expand All @@ -98,17 +98,17 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Staff_Ruby</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1.25</warmupTime>
<range>45</range>
<recoilAmount>1.53</recoilAmount>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<burstShotCount>5</burstShotCount>
<burstShotCount>3</burstShotCount>
<soundCast>Shot_ChargeRifle</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>7</muzzleFlashScale>
</Properties>
<FireModes>
<aimedBurstShotCount>3</aimedBurstShotCount>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Wand_Emerald</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1</warmupTime>
<range>40</range>
<recoilAmount>1.53</recoilAmount>
<soundCast>Shot_ChargeRifle</soundCast>
Expand All @@ -68,7 +68,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Wand_Sapphire</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1</warmupTime>
<range>40</range>
<recoilAmount>1.53</recoilAmount>
<soundCast>Shot_ChargeRifle</soundCast>
Expand All @@ -90,7 +90,7 @@
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>RF_MagicBolt_Wand_Ruby</defaultProjectile>
<warmupTime>0.5</warmupTime>
<warmupTime>1</warmupTime>
<range>40</range>
<recoilAmount>1.53</recoilAmount>
<soundCast>Shot_ChargeRifle</soundCast>
Expand Down

0 comments on commit c23d362

Please sign in to comment.