diff --git a/language.txt b/language.txt index 0b78275..032d16e 100644 --- a/language.txt +++ b/language.txt @@ -18,7 +18,7 @@ DAMNUM_TYPECOLOR_GRENADEDEATH = "DamTan"; /* Obituaries */ O_BIORIFLE = "%o drank a glass of %k's dripping green load."; O_CHAINSAW = "%k ripped into %o with a blood soaked Chainsaw."; -O_EIGHTBALL = "%o was smacked down by %k's Rocket Launcher."; +O_UTROCKET = "%o was smacked down by %k's Rocket Launcher."; O_ENFORCER = "%k riddled %o full of holes with the Enforcer."; O_ENFORCER2 = "%k riddled %o full of holes with dual Enforcers."; O_FLAKCANNON = "%o was ripped to shreds by %k's Flak Cannon."; @@ -50,7 +50,7 @@ I_BLUESKULL = "You got the Blue Skull."; I_GOLDSKULL = "You got the Gold Skull."; I_ROCKETAMMO = "You picked up a Rocket Pack."; I_ROCKETAMMO2 = "You picked up a Rocket."; -I_EIGHTBALL = "You got the Rocket Launcher."; +I_UTROCKET = "You got the Rocket Launcher."; I_CLIP = "You picked up some Clips."; I_ENFORCER = "You picked up another Enforcer!"; I_FLAKAMMOL = "You picked up "; @@ -70,7 +70,6 @@ I_BACKPACK = "You got a Backpack."; I_INVISIBILITY = "You have Invisibility."; I_MAPREVEALER = "You got the Computer Map."; I_JUMPBOOTS = "You picked up the AntiGrav boots."; -I_SEARCHLIGHT = "You picked up the Searchlight."; I_PULSEAMMO = "You picked up a Pulse Cell."; I_PULSEGUN = "You got a Pulse Gun."; I_RIPPERAMMO = "You picked up Razor Blades."; @@ -108,7 +107,7 @@ T_BLUESKULL = "Blue Skull"; T_GOLDSKULL = "Gold Skull"; T_ROCKETAMMO = "Rocket Pack"; T_ROCKETAMMO2 = "Single Rocket"; -T_EIGHTBALL = "Rocket Launcher"; +T_UTROCKET = "Rocket Launcher"; T_CLIP = "Clip"; T_ENFORCER = "Enforcer"; T_ENFORCER2 = "Dual Enforcers"; @@ -126,7 +125,6 @@ T_UDAMAGE = "Damage Amplifier"; T_BACKPACK = "Backpack"; T_INVISIBILITY = "Invisibility"; T_JUMPBOOTS = "AntiGrav Boots"; -T_SEARCHLIGHT = "Searchlight"; T_PULSEAMMO = "Pulse Cell"; T_PULSEGUN = "Pulse Gun"; T_RIPPERAMMO = "Razor Blades"; @@ -151,7 +149,6 @@ D_SHIELDBELT = "The Shield Belt has depleted."; D_UDAMAGE = "Damage Amplifier has worn off."; D_INVISIBILITY = "Invisibility has worn off."; D_JUMPBOOTS = "The AntiGrav Boots have drained."; -D_SEARCHLIGHT = "Searchlight batteries have died."; D_UTINVUL = "Invulnerability has worn off."; D_UTVISION = "Night Vision has worn off."; N_TBOSS = "Xan"; @@ -250,7 +247,7 @@ FLAK_CBIZ = "Biz:"; /* Obituaries */ O_BIORIFLE = "%o bebió un vaso del líquido verde y espeso de %k."; O_CHAINSAW = "%k cortó en pedazos a %o con una Motosierra ensangrentada."; -O_EIGHTBALL = "%o fue vapulead@[ao_esp] por el Lanzacohetes de %k."; +O_UTROCKET = "%o fue vapulead@[ao_esp] por el Lanzacohetes de %k."; O_ENFORCER = "%k acribilló a %o con el Reforzador."; O_ENFORCER2 = "%k acribilló a %o con dos Reforzadores."; O_FLAKCANNON = "%o fue hech@[ao_esp] añicos por el Cañón Antiaéreo de %k."; @@ -282,7 +279,7 @@ I_BLUESKULL = "Has obtenido la Calavera Azul."; I_GOLDSKULL = "Has obtenido la Calavera Dorada."; I_ROCKETAMMO = "Has recogido un paquete de Cohetes."; I_ROCKETAMMO2 = "Has recogido un Cohete."; -I_EIGHTBALL = "Has obtenido el Lanzacohetes."; +I_UTROCKET = "Has obtenido el Lanzacohetes."; I_CLIP = "Has recogido unos Cargadores."; I_ENFORCER = "¡Has recogido otro Reforzador!"; I_FLAKAMMOL = "Has recogido "; @@ -302,7 +299,6 @@ I_BACKPACK = "Has obtenido una Mochila."; I_INVISIBILITY = "Tienes la Invisibilidad."; I_MAPREVEALER = "Has obtenido un Mapa Computarizado."; I_JUMPBOOTS = "Has recogido las Botas Antigravedad."; -I_SEARCHLIGHT = "Has recogido el Faro."; I_PULSEAMMO = "Has recogido una Pila de Impulsos."; I_PULSEGUN = "Has obtenido el Arma de Impulsos."; I_RIPPERAMMO = "Has recogido Cuchillas."; @@ -340,7 +336,7 @@ T_BLUESKULL = "Calavera Azul"; T_GOLDSKULL = "Calavera Dorada"; T_ROCKETAMMO = "Paquete de Cohetes"; T_ROCKETAMMO2 = "Un Cohete"; -T_EIGHTBALL = "Lanzacohetes"; +T_UTROCKET = "Lanzacohetes"; T_CLIP = "Cargador"; T_ENFORCER = "Reforzadores"; T_ENFORCER2 = "Dos Reforzadores"; @@ -358,7 +354,6 @@ T_UDAMAGE = "Amplificador de Daño"; T_BACKPACK = "Mochila"; T_INVISIBILITY = "Invisibilidad"; T_JUMPBOOTS = "Botas Antigravedad"; -T_SEARCHLIGHT = "Faro"; T_PULSEAMMO = "Pila de Impulsos"; T_PULSEGUN = "Arma de Impulsos"; T_RIPPERAMMO = "Cuchillas"; @@ -383,7 +378,6 @@ D_SHIELDBELT = "El Cinturón Protector se ha agotado."; D_UDAMAGE = "El Amplificador de Daño ha desaparecido."; D_INVISIBILITY = "La Invisibilidad ha desaparecido."; D_JUMPBOOTS = "Las Botas Antigravedad se han agotado."; -D_SEARCHLIGHT = "Las pilas del Faro se han agotado."; D_UTINVUL = "La Invulnerabilidad ha desaparecido."; D_UTVISION = "La Visión Nocturna ha desaparecido."; M_SINGLEROCKETON = "Modo de Cohetes Instantáneos activado"; diff --git a/sndinfo.txt b/sndinfo.txt index 7f307e3..04c63fb 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -260,13 +260,13 @@ bullet/hit1 impact1 bullet/hit2 impact2 $random bullet/hit { bullet/hit1 bullet/hit2 } -ges/hit gelhit -ges/select gelselec -ges/fire gelshot -ges/charge bioaltrp -ges/explode explg02 -$limit ges/hit 64 -$limit ges/explode 64 +bio/hit gelhit +bio/select gelselec +bio/fire gelshot +bio/charge bioaltrp +bio/explode explg02 +$limit bio/hit 64 +$limit bio/explode 64 shock/select tazersel shock/fire tazefire diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index 4e0c73c..6603350 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -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