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

Jump to bottom

Changed EnhancedSplash so that it can be controlled for each weapon. #26

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Changed EnhancedSplash so that it can be controlled for each weapon. #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Classes/ST_FlakSlug.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function NewExplode(vector HitLocation, vector HitNormal, bool bDirect)
local vector start;
local ST_UTChunkInfo CI;

if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashFlakSlug) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.FlakSlugDamage,
Expand Down
2 changes: 1 addition & 1 deletion Classes/ST_Razor2Alt.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ auto state Flying
local float damageScale, dist;
local vector dir;

if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashRipperSecondary) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.RipperSecondaryDamage,
Expand Down
2 changes: 1 addition & 1 deletion Classes/ST_RocketMk2.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ auto state Flying

function BlowUp(vector HitLocation)
{
if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashRockets) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.RocketDamage,
Expand Down
4 changes: 2 additions & 2 deletions Classes/ST_ShockProj.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ simulated function PostBeginPlay() {
}

function SuperExplosion() {
if (STM.WeaponSettings.bEnableEnhancedSplashCombo) {
if (STM.WeaponSettings.bEnableEnhancedSplashShockCombo) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.ShockComboDamage,
Expand All @@ -42,7 +42,7 @@ function SuperExplosion() {

function Explode(vector HitLocation,vector HitNormal) {
PlaySound(ImpactSound, SLOT_Misc, 0.5,,, 0.5+FRand());
if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashShockProjectile) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.ShockProjectileDamage,
Expand Down
2 changes: 1 addition & 1 deletion Classes/ST_UT_Grenade.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function Explosion(vector HitLocation)

function BlowUp(vector HitLocation)
{
if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashRockets) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.GrenadeDamage,
Expand Down
2 changes: 1 addition & 1 deletion Classes/ST_UT_SeekingRocket.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ auto state Flying

function BlowUp(vector HitLocation)
{
if (STM.WeaponSettings.bEnableEnhancedSplash) {
if (STM.WeaponSettings.bEnableEnhancedSplashRockets) {
STM.EnhancedHurtRadius(
self,
STM.WeaponSettings.RocketDamage,
Expand Down
14 changes: 10 additions & 4 deletions Classes/WeaponSettings.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ var config bool bReplaceRocketLauncher;
var config bool bReplaceSniperRifle;
var config bool bReplaceWarheadLauncher;

var config bool bEnableEnhancedSplash;
var config bool bEnableEnhancedSplashBio;
var config bool bEnableEnhancedSplashCombo;
var config bool bEnableEnhancedSplashShockCombo;
var config bool bEnableEnhancedSplashShockProjectile;
var config bool bEnableEnhancedSplashRipperSecondary;
var config bool bEnableEnhancedSplashFlakSlug;
var config bool bEnableEnhancedSplashRockets;
var config bool bEnhancedSplashIgnoreStationaryPawns;
var config float SplashMaxDiffraction;
var config float SplashMinDiffractionDistance;
Expand Down Expand Up @@ -164,9 +167,12 @@ defaultproperties
bReplaceSniperRifle=True
bReplaceWarheadLauncher=True

bEnableEnhancedSplash=True
bEnableEnhancedSplashBio=False
bEnableEnhancedSplashCombo=False
bEnableEnhancedSplashShockCombo=False
bEnableEnhancedSplashShockProjectile=False
bEnableEnhancedSplashRipperSecondary=True
bEnableEnhancedSplashFlakSlug=True
bEnableEnhancedSplashRockets=True
SplashMaxDiffraction=0.5
SplashMinDiffractionDistance=50.0

Expand Down