diff --git a/language.txt b/language.txt index 05de73f..2079b26 100644 --- a/language.txt +++ b/language.txt @@ -39,7 +39,7 @@ I_SHIELDBELT = "You got the Shield Belt."; I_BIOAMMO = "You picked up the Biosludge Ammo."; I_BIOAMMO2 = "You picked up the small Biosludge Ammo."; I_BIORIFLE = "You got the GES BioRifle."; -I_CHAINSAW = "It's been twenty five years since I've seen one of these."; // was five years in UT99 +I_CHAINSAW = "It's been 25 years since I've seen one of these."; // was five years in UT99 I_REDKEY = "You got the Red Key."; I_GREENKEY = "You got the Green Key."; I_BLUEKEY = "You got the Blue Key."; @@ -51,7 +51,7 @@ 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_CLIP = "You picked up a Clip."; +I_CLIP = "You picked up some Clips."; I_ENFORCER = "You picked up another Enforcer!"; I_FLAKAMMOL = "You picked up "; I_FLAKAMMOR = " Flak Shells."; @@ -260,7 +260,7 @@ I_SHIELDBELT = "Has obtenido el Cinturón Protector."; I_BIOAMMO = "Has recogido la Munición de Biolodo."; I_BIOAMMO2 = "Has recogido la Munición de Biolodo pequeña."; I_BIORIFLE = "Has obtenido el Biorifle GES."; -I_CHAINSAW = "Hace veinticinco años que no veo una de estas."; // was five years in UT99 +I_CHAINSAW = "Hace 25 años que no veo una de estas."; // was five years in UT99 I_REDKEY = "Has obtenido la Llave Roja."; I_GREENKEY = "Has obtenido la Llave Verde."; I_BLUEKEY = "Has obtenido la Llave Azul."; @@ -272,7 +272,7 @@ 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_CLIP = "Has recogido un Cargador."; +I_CLIP = "Has recogido unos Cargadores."; I_ENFORCER = "¡Has recogido otro Reforzador!"; I_FLAKAMMOL = "Has recogido "; I_FLAKAMMOR = " Proyectiles Antiaéreos."; diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc index 607cd00..5a56656 100644 --- a/zscript/utcommon.zsc +++ b/zscript/utcommon.zsc @@ -69,6 +69,7 @@ Class UTPlayer : DoomPlayer Player.ViewHeight 46; Player.GruntSpeed 20; +NOMENU; + +DONTTRANSLATE; UTPlayer.DollType DOLL_Male; UTPlayer.VoiceType VOICE_None; } @@ -740,7 +741,7 @@ Class UTPlayer : DoomPlayer // Ground if ( (player && (player.mo == self)) && player.cmd.yaw ) { - if ( InStateSequence(CurState,FindState("See")) + if ( InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) @@ -752,7 +753,7 @@ Class UTPlayer : DoomPlayer } else { - if ( InStateSequence(CurState,FindState("See")) + if ( InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) @@ -765,7 +766,7 @@ Class UTPlayer : DoomPlayer else if ( !bNoGravity && (waterlevel < 2) ) { // Falling - if ( InStateSequence(CurState,FindState("See")) + if ( InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) @@ -778,7 +779,7 @@ Class UTPlayer : DoomPlayer else { // Swimming - if ( InStateSequence(CurState,FindState("See")) + if ( InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) @@ -809,7 +810,7 @@ Class UTPlayer : DoomPlayer || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("Turn")) ) - SetStateLabel("See"); + SetStateLabel("See2"); } else if ( !bNoGravity && (waterlevel < 2) ) { @@ -818,7 +819,7 @@ Class UTPlayer : DoomPlayer || InStateSequence(CurState,FindState("SpawnAir")) || InStateSequence(CurState,FindState("SpawnSwim")) || InStateSequence(CurState,FindState("SpawnCrouch")) - || InStateSequence(CurState,FindState("See")) + || InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("Turn")) ) @@ -831,7 +832,7 @@ Class UTPlayer : DoomPlayer || InStateSequence(CurState,FindState("SpawnAir")) || InStateSequence(CurState,FindState("SpawnSwim")) || InStateSequence(CurState,FindState("SpawnCrouch")) - || InStateSequence(CurState,FindState("See")) + || InStateSequence(CurState,FindState("See2")) || InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("Turn")) ) @@ -957,10 +958,11 @@ Class UTPlayer : DoomPlayer #### # 5; PLYC A -1; Wait; - See: + // See state needs to be defined on each subclass for the selection menu + See2: #### # 5; PLAY HIJKL 4; - Goto See+1; + Goto See2+1; SeeAir: #### # 5; PLYA A 50;