diff --git a/language.txt b/language.txt index ce07492..e5ace4c 100644 --- a/language.txt +++ b/language.txt @@ -109,6 +109,7 @@ I_HEALTH = "You picked up a Health Pack."; I_BANDAGES = "You got some Bandages."; I_FRUIT = "You ate some Nali Healing Fruit."; I_SHEALTH = "You picked up the Super Health Pack."; +I_SEARCHLIGHT = "You picked up the Searchlight."; I_FLASHLIGHT = "You picked up a Flashlight."; I_DETECTOR = "You got the Motion Detector."; I_SCUBA = "You picked up the SCUBA Gear."; @@ -175,6 +176,7 @@ T_HEALTH = "Health Pack"; T_BANDAGES = "Bandages"; T_FRUIT = "Nali Healing Fruit"; T_SHEALTH = "Super Health Pack"; +T_SEARCHLIGHT = "Searchlight"; T_FLASHLIGHT = "Flashlight"; T_LFLARES = "Light Flare"; T_DFLARES = "Darkness Flare"; @@ -373,6 +375,7 @@ I_HEALTH = "Has recogido un Paquete de Salud."; I_BANDAGES = "Has obtenido unos Vendajes."; I_FRUIT = "Comiste una Fruta de Salud Nali."; I_SHEALTH = "Has recogido el Paquete de Supersalud."; +I_SEARCHLIGHT = "Has recogido el Faro."; I_FLASHLIGHT = "Has recogido una Linterna."; I_DETECTOR = "Has obtenido el Detector de Movimiento."; I_SCUBA = "Has recogido el Kit de Buceo."; @@ -435,6 +438,7 @@ T_HEALTH = "Paquete de salud"; T_BANDAGES = "Vendajes"; T_FRUIT = "Fruta de Salud Nali"; T_SHEALTH = "paquete de Supersalud"; +T_SEARCHLIGHT = "Faro"; T_FLASHLIGHT = "Linterna"; T_LFLARES = "Bengala Luminosa"; T_DFLARES = "Bengala Oscura"; diff --git a/sndinfo.txt b/sndinfo.txt index 117c168..9a189f1 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -178,14 +178,38 @@ stinger/explo3 stingex3 $random stinger/explode { stinger/explo1 stinger/explo2 stinger/explo3 } $limit stinger/explode 16 -flak/click click +uflak/select pdown +uflak/load hidraul2 +uflak/reload load1 +uflak/fire shot1 +uflak/altfire explode1 +uflak/click click -eightball/fly brocket +eightball/select selectin +eightball/rotate barrelmv +eightball/load loading +eightball/fire ignite +eightball/altfire eightalt +eightball/seeklock seeklock +eightball/seeklost seeklost +eightball/fly brocket +asmd/select tazersel +asmd/fire tazefire +asmd/altfire tazealtf +asmd/hit expl03 +asmd/blast specexpl +asmd/ball expla02 asmd/vapour vapour -ges/drip GelDrip +ges/hit gelhit +ges/select gelselec +ges/fire gelshot ges/load GelLoad +ges/drip GelDrip +ges/explode explg02 +$limit ges/hit 64 +$limit ges/explode 64 dampener/on dampsnd dampener/off dampndea @@ -216,7 +240,7 @@ flare/explode explo1 voice/activate voicesnd -univis/toggle invisibl +uinvis/toggle invisibl lite/pickup fshlite1 lite/off fshlite2 @@ -229,11 +253,14 @@ automag/select cocking automag/fire shot automag/click click automag/reload reload +automag/casing shell2 +rifle/select riflesel rifle/fire riflesht rifle/scopeon rifllon rifle/scopeoff riflloff +umini/select minisel umini/wind windu2 umini/fire regf1 umini/altfire altf1 @@ -275,6 +302,7 @@ peace/open peaceopn peace/fly brufly1 telehand/throw peacethr +telehand/spark tdisrupt stun/select stunsel stun/charge stunchrg @@ -359,3 +387,9 @@ sentry/movestop sentmove vfrag/bounce1 glasstk1 vfrag/bounce2 glasstk2 $random vfrag/bounce { vfrag/bounce1 vfrag/bounce2 } + +razorjack/select beam +razorjack/fire stblade +razorjack/hum razorhum +razorjack/hit bladehit +razorjack/flesh bladethk diff --git a/zscript/asmd.zsc b/zscript/asmd.zsc index b37b913..0a5bc14 100644 --- a/zscript/asmd.zsc +++ b/zscript/asmd.zsc @@ -391,8 +391,8 @@ Class ASMDBall : Actor r.angle = atan2(HitNormal.y,HitNormal.x); r.pitch = asin(-HitNormal.z); r.scale *= 1.5; - A_PlaySound("shock/hit",CHAN_VOICE); - A_PlaySound("shock/ball",CHAN_WEAPON,pitch:FRandom[ASMD](0.5,1.5)); + A_PlaySound("asmd/hit",CHAN_VOICE); + A_PlaySound("asmd/ball",CHAN_WEAPON,pitch:FRandom[ASMD](0.5,1.5)); A_QuakeEx(4,4,4,30,0,200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:70,rollIntensity:0.15); A_AlertMonsters(); int numpt = Random[ASMD](50,100); @@ -581,7 +581,7 @@ Class ASMDBeam : Actor let r = Spawn("ASMDBlastRing",b.pos); r.angle = atan2(t.Results.HitVector.y,t.Results.HitVector.x); r.pitch = asin(-t.Results.HitVector.z); - A_PlaySound("shock/blast",CHAN_WEAPON,attenuation:0.5,pitch:0.6); + A_PlaySound("asmd/blast",CHAN_WEAPON,attenuation:0.5,pitch:0.6); int numpt = Random[ASMD](200,300); for ( int i=0; i 0 ) { vel *= 1.+.06+special1; - A_PlaySound("ripper/hum",CHAN_VOICE,1.0,true,3.0,pitch:3.125+special1*.2); + A_PlaySound("razorjack/hum",CHAN_VOICE,1.0,true,3.0,pitch:3.125+special1*.2); } - else A_PlaySound("ripper/hum",CHAN_VOICE,1.0,true,3.0,pitch:3.125); + else A_PlaySound("razorjack/hum",CHAN_VOICE,1.0,true,3.0,pitch:3.125); Vector3 dir = vel.unit(); A_SetAngle(atan2(dir.y,dir.x)); A_SetPitch(asin(-dir.z)); @@ -79,7 +79,7 @@ Class RazorBlade : Actor if ( !target.bNOBLOOD ) { target.SpawnBlood(pos,AngleTo(target),damage); - A_PlaySound("ripper/flesh"); + A_PlaySound("razorjack/flesh"); A_AlertMonsters(); } UTMainHandler.DoKnockback(target,vel.unit(),15000); @@ -120,7 +120,7 @@ Class RazorBlade : Actor } action void A_RazorHit() { - A_PlaySound("ripper/hit"); + A_PlaySound("razorjack/hit"); A_AlertMonsters(); A_SprayDecal("WallCrack",-20); int numpt = Random[Ripper](5,10); @@ -240,7 +240,7 @@ Class Razorjack : UnrealWeapon if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return; if ( self is 'UTPlayer' ) UTPlayer(self).PlayAttacking3(); - A_PlaySound("ripper/fire",CHAN_WEAPON,pitch:bAlt?1.:(1.+invoker.special1*.1)); + A_PlaySound("razorjack/fire",CHAN_WEAPON,pitch:bAlt?1.:(1.+invoker.special1*.1)); invoker.FireEffect(); UTMainHandler.DoFlash(self,Color(16,255,0,255),1); A_AlertMonsters(); @@ -269,7 +269,7 @@ Class Razorjack : UnrealWeapon { Tag "$T_RAZORJACK"; Inventory.PickupMessage "$I_RAZORJACK"; - Weapon.UpSound "ripper/select"; + Weapon.UpSound "razorjack/select"; Weapon.SlotNumber 7; Weapon.SelectionOrder 1500; Weapon.SlotPriority 1; diff --git a/zscript/rifle.zsc b/zscript/rifle.zsc index d92c760..8f12829 100644 --- a/zscript/rifle.zsc +++ b/zscript/rifle.zsc @@ -225,7 +225,7 @@ Class URifle : UnrealWeapon Tag "$T_RIFLE"; Obituary "$O_SNIPER"; Inventory.PickupMessage "$I_RIFLE"; - Weapon.UpSound "sniper/select"; + Weapon.UpSound "rifle/select"; Weapon.SlotNumber 9; Weapon.SelectionOrder 900; Weapon.SlotPriority 1; diff --git a/zscript/ueightball.zsc b/zscript/ueightball.zsc index da375a7..7cc136b 100644 --- a/zscript/ueightball.zsc +++ b/zscript/ueightball.zsc @@ -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; diff --git a/zscript/uflakcannon.zsc b/zscript/uflakcannon.zsc index 6a61160..b8be565 100644 --- a/zscript/uflakcannon.zsc +++ b/zscript/uflakcannon.zsc @@ -121,7 +121,7 @@ Class UFlakSlug : FlakSlug UTMainHandler.DoBlast(self,120,75000); A_Explode(70,120); A_QuakeEx(4,4,4,8,0,170,"",QF_RELATIVE|QF_SCALEDOWN,falloff:120,rollIntensity:0.2); - A_PlaySound("flak/explode",CHAN_VOICE); + A_PlaySound("uflak/explode",CHAN_VOICE); A_AlertMonsters(); if ( !Tracer ) Spawn("SlugSmoke",pos); Spawn("SlugLight",pos); @@ -184,8 +184,8 @@ Class UFlakCannon : UnrealWeapon { action void A_Loading( bool first = false ) { - if ( first ) A_PlaySound("flak/load",CHAN_WEAPON,Dampener.Active(self)?.1:1.); - else A_PlaySound("flak/reload",CHAN_6,Dampener.Active(self)?.06:.6); + if ( first ) A_PlaySound("uflak/load",CHAN_WEAPON,Dampener.Active(self)?.1:1.); + else A_PlaySound("uflak/reload",CHAN_6,Dampener.Active(self)?.06:.6); } action void A_FireChunks() { @@ -193,7 +193,7 @@ Class UFlakCannon : UnrealWeapon if ( !weap ) return; if ( weap.Ammo1.Amount <= 0 ) return; if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return; - A_PlaySound("flak/fire",CHAN_WEAPON,Dampener.Active(self)?.2:1.); + A_PlaySound("uflak/fire",CHAN_WEAPON,Dampener.Active(self)?.2:1.); A_Overlay(PSP_FLASH,"Flash"); A_OverlayFlags(PSP_FLASH,PSPF_RenderStyle,true); A_OverlayRenderstyle(PSP_FLASH,STYLE_Add); @@ -252,7 +252,7 @@ Class UFlakCannon : UnrealWeapon if ( !weap ) return; if ( weap.Ammo1.Amount <= 0 ) return; if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return; - A_PlaySound("flak/altfire",CHAN_WEAPON,Dampener.Active(self)?.2:1.); + A_PlaySound("uflak/altfire",CHAN_WEAPON,Dampener.Active(self)?.2:1.); A_Overlay(PSP_FLASH,"Flash"); A_OverlayFlags(PSP_FLASH,PSPF_RenderStyle,true); A_OverlayRenderstyle(PSP_FLASH,STYLE_Add); @@ -292,7 +292,7 @@ Class UFlakCannon : UnrealWeapon { Tag "$T_FLAKCANNON"; Inventory.PickupMessage "$I_FLAKCANNON"; - Weapon.UpSound "flak/select"; + Weapon.UpSound "uflak/select"; Weapon.SlotNumber 6; Weapon.SelectionOrder 1100; Weapon.SlotPriority 1; @@ -342,7 +342,7 @@ Class UFlakCannon : UnrealWeapon FLKF A 1 A_FireChunks(); FLKF BCDEFGHI 1; FLKF J 5; - FLKE A 1 A_PlaySound("flak/click",CHAN_6,Dampener.Active(self)?.05:.5); + FLKE A 1 A_PlaySound("uflak/click",CHAN_6,Dampener.Active(self)?.05:.5); FLKE BCDEFGHIJKLMN 1; FLKE S 4 { diff --git a/zscript/uminigun.zsc b/zscript/uminigun.zsc index b42c483..38686e6 100644 --- a/zscript/uminigun.zsc +++ b/zscript/uminigun.zsc @@ -151,7 +151,7 @@ Class UMinigun : UnrealWeapon { Tag "$T_MINIGUN"; Inventory.PickupMessage "$I_MINIGUN"; - Weapon.UpSound "minigun/select"; + Weapon.UpSound "umini/select"; Weapon.SlotNumber 0; Weapon.SelectionOrder 500; Weapon.SlotPriority 1; diff --git a/zscript/upowerups.zsc b/zscript/upowerups.zsc index 770abc3..3bf1b7e 100644 --- a/zscript/upowerups.zsc +++ b/zscript/upowerups.zsc @@ -18,7 +18,7 @@ Class UInvisibility : UnrealInventory bActive = !bActive; if ( bActive ) { - Owner.A_PlaySound("invis/pickup",CHAN_ITEM); + Owner.A_PlaySound("uinvis/toggle",CHAN_ITEM); Owner.GiveInventory("PowerUInvisibility",1); } else Owner.TakeInventory("PowerUInvisibility",1); diff --git a/zscript/utranslocator.zsc b/zscript/utranslocator.zsc index 61623b9..d5ae93d 100644 --- a/zscript/utranslocator.zsc +++ b/zscript/utranslocator.zsc @@ -70,7 +70,7 @@ Class UTranslocatorModule : Actor Super.Tick(); if ( bAMBUSH && !Random[Transloc](0,40) ) { - A_PlaySound("transloc/spark"); + A_PlaySound("telehand/spark"); int numpt = Random[Transloc](20,40); for ( int i=0; i