OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

1.0.5 hotfix 1:

Browse source 
- Various fixes for the Combiner Patch.
This commit is contained in:
Marisa the Magician 2019-12-03 18:20:54 +01:00
commit 85494e8449
5 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/biorifle.zsc
View file

@ -505,7 +505,7 @@ Class BioGel : Actor
}
b = Spawn("BioHitbox",pos);
b.target = self;
A_PlaySound("ges/hit");
A_PlaySound("bio/hit");
A_SprayDecal("BioSplat",-172);
int numpt = Min(100,int(Scale.x*10))+Random[GES](-5,5);
for ( int i=0; i<numpt; i++ )
@ -538,7 +538,7 @@ Class BioGel : Actor
if ( invoker.atline ) invoker.atline.RemoteActivate(target,invoker.atside,SPAC_Impact,pos);
UTMainHandler.DoBlast(self,Min(175,int(Scale.x*50)),20000*Scale.x);
A_Explode(int(Args[0]*Scale.x),Min(175,int(Scale.x*50)));
A_PlaySound("ges/explode",CHAN_VOICE);
A_PlaySound("bio/explode",CHAN_VOICE);
int numpt = Min(300,int(Scale.x*30))+Random[GES](-10,10);
for ( int i=0; i<numpt; i++ )
{
@ -704,7 +704,7 @@ Class BioRifle : UTWeapon
if ( weap.Ammo1.Amount <= 0 ) return;
if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return;
}
A_PlaySound("ges/fire",CHAN_WEAPON);
A_PlaySound("bio/fire",CHAN_WEAPON);
invoker.FireEffect();
UTMainHandler.DoFlash(self,Color(48,0,255,0),1);
A_AlertMonsters();
@ -749,7 +749,7 @@ Class BioRifle : UTWeapon
if ( !weap ) return;
invoker.charge = 0;
invoker.special1 = 0;
A_PlaySound("ges/charge",CHAN_WEAPON);
A_PlaySound("bio/charge",CHAN_WEAPON);
invoker.bCharging = true;
}
action void A_ChargeUp()
@ -777,7 +777,7 @@ Class BioRifle : UTWeapon
{
Tag "$T_BIORIFLE";
Inventory.PickupMessage "$I_BIORIFLE";
Weapon.UpSound "ges/select";
Weapon.UpSound "bio/select";
Weapon.SlotNumber 3;
Weapon.SelectionOrder 7;
Weapon.AmmoType "BioAmmo";

6
zscript/eightball.zsc
View file

@ -109,7 +109,7 @@ Class UTRocket : Actor
int ticcnt;
Default
{
Obituary "$O_EIGHTBALL";
Obituary "$O_UTROCKET";
DamageType 'RocketDeath';
Radius 2;
Height 2;
@ -477,8 +477,8 @@ Class UTRocketLauncher : UTWeapon
Default
{
Tag "$T_EIGHTBALL";
Inventory.PickupMessage "$I_EIGHTBALL";
Tag "$T_UTROCKET";
Inventory.PickupMessage "$I_UTROCKET";
Weapon.UpSound "utrl/select";
Weapon.SlotNumber 9;
Weapon.SelectionOrder 1;

2
zscript/ripper.zsc
View file

@ -175,7 +175,7 @@ Class Razor2Alt : Razor2
bFORCEXYBILLBOARD = true;
Scale *= 0.65;
A_StopSound(CHAN_VOICE);
A_PlaySound("ripper/althit");
A_PlaySound("ripper/althit",CHAN_VOICE);
Spawn("Razor2AltLight",pos);
A_AlertMonsters();
A_SprayDecal("RazorBlast",20);