Thrown Candy Guns shouldn't bounce.
This commit is contained in:
parent
b0b4d6ed67
commit
12afc5c10f
2 changed files with 3 additions and 23 deletions
|
|
@ -1,3 +1,3 @@
|
|||
[default]
|
||||
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r359 \cu(Tue 16 Mar 14:43:25 CET 2021)\c-";
|
||||
SWWM_SHORTVER="\cw0.9.11b-pre r359 \cu(2021-03-16 14:43:25)\c-";
|
||||
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r360 \cu(Tue 16 Mar 14:44:51 CET 2021)\c-";
|
||||
SWWM_SHORTVER="\cw0.9.11b-pre r360 \cu(2021-03-16 14:44:51)\c-";
|
||||
|
|
|
|||
|
|
@ -526,14 +526,7 @@ Class CandyGunProj : Actor
|
|||
+FORCERADIUSDMG;
|
||||
+FORCEXYBILLBOARD;
|
||||
+FOILINVUL;
|
||||
+BOUNCEONFLOORS;
|
||||
+BOUNCEONCEILINGS;
|
||||
+BOUNCEONWALLS;
|
||||
+CANBOUNCEWATER;
|
||||
+DONTBOUNCEONSKY;
|
||||
+USEBOUNCESTATE;
|
||||
BounceFactor 0.3;
|
||||
WallBounceFactor 0.3;
|
||||
+EXPLODEONWATER;
|
||||
}
|
||||
override void PostBeginPlay()
|
||||
{
|
||||
|
|
@ -592,16 +585,6 @@ Class CandyGunProj : Actor
|
|||
Spawn("CandyRing3",pos);
|
||||
if ( swwm_omnibust ) BusterWall.ProjectileBust(self,5000+900*special1,cvel);
|
||||
}
|
||||
void A_CheckBounce()
|
||||
{
|
||||
if ( (vel.length() > 4) && (vel.unit() dot cvel > .5) )
|
||||
{
|
||||
bHITOWNER = true;
|
||||
A_StartSound("explodium/mag");
|
||||
return;
|
||||
}
|
||||
ExplodeMissile();
|
||||
}
|
||||
States
|
||||
{
|
||||
Spawn:
|
||||
|
|
@ -612,9 +595,6 @@ Class CandyGunProj : Actor
|
|||
if ( vel.length() > 0. ) cvel = vel.unit();
|
||||
}
|
||||
Wait;
|
||||
Bounce:
|
||||
XZW1 A 0 A_CheckBounce();
|
||||
Goto Spawn;
|
||||
Death:
|
||||
TNT1 A 0 A_BlowUp();
|
||||
XEX3 AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLLLMMMNNNOOOPPPQQQRRRSSS 1 Bright
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue