OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Language adjustments.

Browse source 
Separation of See state for playerclasses so player selection doesn't crap out.
This commit is contained in:
Marisa the Magician 2019-09-01 22:09:31 +02:00
commit cad3f9d1b9
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
language.txt
View file

@ -39,7 +39,7 @@ I_SHIELDBELT = "You got the Shield Belt.";
I_BIOAMMO = "You picked up the Biosludge Ammo."; I_BIOAMMO = "You picked up the Biosludge Ammo.";
I_BIOAMMO2 = "You picked up the small Biosludge Ammo."; I_BIOAMMO2 = "You picked up the small Biosludge Ammo.";
I_BIORIFLE = "You got the GES BioRifle."; 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_REDKEY = "You got the Red Key.";
I_GREENKEY = "You got the Green Key."; I_GREENKEY = "You got the Green Key.";
I_BLUEKEY = "You got the Blue 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_ROCKETAMMO = "You picked up a Rocket Pack.";
I_ROCKETAMMO2 = "You picked up a Rocket."; I_ROCKETAMMO2 = "You picked up a Rocket.";
I_EIGHTBALL = "You got the Rocket Launcher."; 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_ENFORCER = "You picked up another Enforcer!";
I_FLAKAMMOL = "You picked up "; I_FLAKAMMOL = "You picked up ";
I_FLAKAMMOR = " Flak Shells."; 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_BIOAMMO = "Has recogido la Munición de Biolodo.";
I_BIOAMMO2 = "Has recogido la Munición de Biolodo pequeña."; I_BIOAMMO2 = "Has recogido la Munición de Biolodo pequeña.";
I_BIORIFLE = "Has obtenido el Biorifle GES."; 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_REDKEY = "Has obtenido la Llave Roja.";
I_GREENKEY = "Has obtenido la Llave Verde."; I_GREENKEY = "Has obtenido la Llave Verde.";
I_BLUEKEY = "Has obtenido la Llave Azul."; 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_ROCKETAMMO = "Has recogido un paquete de Cohetes.";
I_ROCKETAMMO2 = "Has recogido un Cohete."; I_ROCKETAMMO2 = "Has recogido un Cohete.";
I_EIGHTBALL = "Has obtenido el Lanzacohetes."; 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_ENFORCER = "¡Has recogido otro Reforzador!";
I_FLAKAMMOL = "Has recogido "; I_FLAKAMMOL = "Has recogido ";
I_FLAKAMMOR = " Proyectiles Antiaéreos."; I_FLAKAMMOR = " Proyectiles Antiaéreos.";

20
zscript/utcommon.zsc
View file

@ -69,6 +69,7 @@ Class UTPlayer : DoomPlayer
Player.ViewHeight 46; Player.ViewHeight 46;
Player.GruntSpeed 20; Player.GruntSpeed 20;
+NOMENU; +NOMENU;
+DONTTRANSLATE;
UTPlayer.DollType DOLL_Male; UTPlayer.DollType DOLL_Male;
UTPlayer.VoiceType VOICE_None; UTPlayer.VoiceType VOICE_None;
} }
@ -740,7 +741,7 @@ Class UTPlayer : DoomPlayer
// Ground // Ground
if ( (player && (player.mo == self)) && player.cmd.yaw ) 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("SeeAir"))
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
@ -752,7 +753,7 @@ Class UTPlayer : DoomPlayer
} }
else else
{ {
if ( InStateSequence(CurState,FindState("See")) if ( InStateSequence(CurState,FindState("See2"))
|| InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeAir"))
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
@ -765,7 +766,7 @@ Class UTPlayer : DoomPlayer
else if ( !bNoGravity && (waterlevel < 2) ) else if ( !bNoGravity && (waterlevel < 2) )
{ {
// Falling // Falling
if ( InStateSequence(CurState,FindState("See")) if ( InStateSequence(CurState,FindState("See2"))
|| InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeAir"))
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
@ -778,7 +779,7 @@ Class UTPlayer : DoomPlayer
else else
{ {
// Swimming // Swimming
if ( InStateSequence(CurState,FindState("See")) if ( InStateSequence(CurState,FindState("See2"))
|| InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeAir"))
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
@ -809,7 +810,7 @@ Class UTPlayer : DoomPlayer
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
|| InStateSequence(CurState,FindState("Turn")) ) || InStateSequence(CurState,FindState("Turn")) )
SetStateLabel("See"); SetStateLabel("See2");
} }
else if ( !bNoGravity && (waterlevel < 2) ) else if ( !bNoGravity && (waterlevel < 2) )
{ {
@ -818,7 +819,7 @@ Class UTPlayer : DoomPlayer
|| InStateSequence(CurState,FindState("SpawnAir")) || InStateSequence(CurState,FindState("SpawnAir"))
|| InStateSequence(CurState,FindState("SpawnSwim")) || InStateSequence(CurState,FindState("SpawnSwim"))
|| InStateSequence(CurState,FindState("SpawnCrouch")) || InStateSequence(CurState,FindState("SpawnCrouch"))
|| InStateSequence(CurState,FindState("See")) || InStateSequence(CurState,FindState("See2"))
|| InStateSequence(CurState,FindState("SeeSwim")) || InStateSequence(CurState,FindState("SeeSwim"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
|| InStateSequence(CurState,FindState("Turn")) ) || InStateSequence(CurState,FindState("Turn")) )
@ -831,7 +832,7 @@ Class UTPlayer : DoomPlayer
|| InStateSequence(CurState,FindState("SpawnAir")) || InStateSequence(CurState,FindState("SpawnAir"))
|| InStateSequence(CurState,FindState("SpawnSwim")) || InStateSequence(CurState,FindState("SpawnSwim"))
|| InStateSequence(CurState,FindState("SpawnCrouch")) || InStateSequence(CurState,FindState("SpawnCrouch"))
|| InStateSequence(CurState,FindState("See")) || InStateSequence(CurState,FindState("See2"))
|| InStateSequence(CurState,FindState("SeeAir")) || InStateSequence(CurState,FindState("SeeAir"))
|| InStateSequence(CurState,FindState("SeeCrouch")) || InStateSequence(CurState,FindState("SeeCrouch"))
|| InStateSequence(CurState,FindState("Turn")) ) || InStateSequence(CurState,FindState("Turn")) )
@ -957,10 +958,11 @@ Class UTPlayer : DoomPlayer
#### # 5; #### # 5;
PLYC A -1; PLYC A -1;
Wait; Wait;
See: // See state needs to be defined on each subclass for the selection menu
See2:
#### # 5; #### # 5;
PLAY HIJKL 4; PLAY HIJKL 4;
Goto See+1; Goto See2+1;
SeeAir: SeeAir:
#### # 5; #### # 5;
PLYA A 50; PLYA A 50;