OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

1.0.5 hotfix 1:

Browse source 
- Various fixes for the Combined Patch.
 - Some safeguards for force field and sentries so they don't bug the hell out if receiving crushing or ice damage.
This commit is contained in:
Marisa the Magician 2019-12-03 18:21:36 +01:00
commit b8ab28175a
14 changed files with 111 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

26
zscript/ueightball.zsc
View file

@ -128,7 +128,7 @@ Class URocket : Actor
UTMainHandler.DoBlast(self,rad,80000);
A_Explode(dmg,rad);
A_QuakeEx(3,3,3,8,0,rad+50,"",QF_RELATIVE|QF_SCALEDOWN,falloff:rad,rollIntensity:0.2);
A_PlaySound("utrl/explode",CHAN_VOICE);
A_PlaySound("eightball/explode",CHAN_VOICE);
A_AlertMonsters();
Spawn("RocketExplLight",pos);
int numpt = Random[Eightball](15,30);
@ -363,7 +363,7 @@ Class Eightball : UnrealWeapon
LockedOn = false;
if ( Owner.player.ReadyWeapon == self )
{
Owner.A_PlaySound("utrl/seeklost",CHAN_WEAPON,Dampener.Active(Owner)?.1:1.);
Owner.A_PlaySound("eightball/seeklost",CHAN_WEAPON,Dampener.Active(Owner)?.1:1.);
if ( !Dampener.Active(Owner) ) Owner.A_AlertMonsters();
}
}
@ -405,12 +405,12 @@ Class Eightball : UnrealWeapon
invoker.special1 = 0;
if ( weap.bAltFire )
{
A_PlaySound("utrl/altfire",CHAN_WEAPON,Dampener.Active(self)?.3:3.);
A_PlaySound("eightball/altfire",CHAN_WEAPON,Dampener.Active(self)?.3:3.);
if ( !Dampener.Active(self) ) A_AlertMonsters();
}
else
{
A_PlaySound("utrl/fire",CHAN_WEAPON);
A_PlaySound("eightball/fire",CHAN_WEAPON);
A_AlertMonsters();
}
invoker.FireEffect();
@ -481,7 +481,7 @@ Class Eightball : UnrealWeapon
}
}
// lose lock-on
if ( invoker.LockedOn ) A_PlaySound("utrl/seeklost",CHAN_6);
if ( invoker.LockedOn ) A_PlaySound("eightball/seeklost",CHAN_6);
invoker.LockedTarget = null;
invoker.LockedOn = false;
for ( int i=0; i<12; i++ )
@ -518,12 +518,12 @@ Class Eightball : UnrealWeapon
}
if ( invoker.LockedTarget )
{
A_PlaySound("utrl/seeklock",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
A_PlaySound("eightball/seeklock",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
if ( !Dampener.Active(self) ) A_AlertMonsters();
}
else if ( invoker.LockedOn )
{
A_PlaySound("utrl/seeklost",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
A_PlaySound("eightball/seeklost",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
if ( !Dampener.Active(self) ) A_AlertMonsters();
}
if ( invoker.LockedTarget ) invoker.LockedOn = true;
@ -533,7 +533,7 @@ Class Eightball : UnrealWeapon
{
Tag "$T_EIGHTBALL";
Inventory.PickupMessage "$I_EIGHTBALL";
Weapon.UpSound "utrl/select";
Weapon.UpSound "eightball/select";
Weapon.SlotNumber 5;
Weapon.SelectionOrder 1000;
Weapon.SlotPriority 1;
@ -560,9 +560,9 @@ Class Eightball : UnrealWeapon
Goto Idle+1;
Ready2:
EBLS O 0 A_CheckReload();
EBLL A 0 A_PlaySound("utrl/load",CHAN_6,Dampener.Active(self)?.1:1.);
EBLL A 0 A_PlaySound("eightball/load",CHAN_6,Dampener.Active(self)?.1:1.);
EBLL ABCDEFGHIJK 1 A_WeaponReady(WRF_NOFIRE);
EBLL L 0 A_PlaySound("utrl/rotate",CHAN_ITEM,Dampener.Active(self)?.01:.1);
EBLL L 0 A_PlaySound("eightball/rotate",CHAN_ITEM,Dampener.Active(self)?.01:.1);
EBLL LMNOPQRSTUVWXYZ[ 1 A_WeaponReady(WRF_NOFIRE);
EBLL Z 0; // force no tweening
EBLI A 0;
@ -595,7 +595,7 @@ Class Eightball : UnrealWeapon
#### # 5
{
A_Overlay(-9999,"Null");
A_PlaySound("utrl/load",CHAN_WEAPON,Dampener.Active(self)?.03:.3);
A_PlaySound("eightball/load",CHAN_WEAPON,Dampener.Active(self)?.03:.3);
if ( invoker.bSingleRocket = !invoker.bSingleRocket )
A_Print(StringTable.Localize("$M_SINGLEROCKETON"));
else A_Print(StringTable.Localize("$M_SINGLEROCKETOFF"));
@ -621,10 +621,10 @@ Class Eightball : UnrealWeapon
Goto Release;
Loading:
EBLI A 0;
EBLL A 0 A_PlaySound("utrl/load",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
EBLL A 0 A_PlaySound("eightball/load",CHAN_WEAPON,Dampener.Active(self)?.1:1.);
EBLL ABCDEFGHIJK 1;
EBLL L 0 A_LoadRocket();
EBLL L 0 A_PlaySound("utrl/rotate",CHAN_ITEM,Dampener.Active(self)?.01:.1);
EBLL L 0 A_PlaySound("eightball/rotate",CHAN_ITEM,Dampener.Active(self)?.01:.1);
EBLL LMNOPQRSTUVWXYZ[ 1;
EBLL Z 0;
EBLI A 0;