mirror of
https://git.code.sf.net/p/quake/prozac-qfcc
synced 2024-11-10 07:11:51 +00:00
- Rewrote the engie build menu
- made FFs so you can build them near eachother (or overlapping!) - fix that annoying bug where people's colors kept going white - I need to make the color defines (eg DARKBLUE) be the exact number, not number + 1. (in the TODO now)
This commit is contained in:
Adam Olsen
parent
6fca29e666
commit
162a1e4caa
5 changed files with 59 additions and 87 deletions
1
BUGS
1
BUGS
|
|
@ -8,5 +8,4 @@
|
|||
- hacked forcefields get you teamkills
|
||||
- the "speed cheat" checker needs to be ripped out, it's kinda useless
|
||||
- sometimes rockets go through armor..
|
||||
- a bunch of people's colors kept going white
|
||||
- crashed alot on prozac :/
|
||||
|
|
|
|||
2
TODO
2
TODO
|
|
@ -18,4 +18,4 @@ X the thief skill should set the "invisible" face
|
|||
o "slave teslas"
|
||||
o instead of not allowing two fastest legs when upgraded, restrict the health/armor you're allowed when you have fast legs
|
||||
o make a seperate menu for detonating engineer buildings
|
||||
o remove RPrint, since it's really kinda pointless and just makes the code uglier
|
||||
o remove RPrint, since it's really kinda pointless and just makes the code ugliero change the color defines (eg DARKBLUE) to be the exact number, not number + 1
|
||||
|
|
|
|||
|
|
@ -446,8 +446,7 @@ void() DecodeLevelParms =
|
|||
self.armortype = parm9 * 0.01;
|
||||
|
||||
SetTeamName (self);
|
||||
setinfokey (self, "topcolor", "0");
|
||||
setinfokey (self, "bottomcolor", "0");
|
||||
SetPlayerColor (self, TeamGetNiceColor (self.team_no), TeamGetColor (self.team_no) - 1);
|
||||
|
||||
// TeamFortress Parameters
|
||||
// Detect whether this is the first entrance into a map
|
||||
|
|
|
|||
3
field.qc
3
field.qc
|
|
@ -288,7 +288,7 @@ void() Field_touch_SUB =
|
|||
}
|
||||
|
||||
}
|
||||
else // non player entities
|
||||
else if (other.classname != "force_field") // non player entities
|
||||
{
|
||||
if (IsMonster(other))
|
||||
{
|
||||
|
|
@ -1069,7 +1069,6 @@ void (vector place) WhereGen =
|
|||
if (fabs (place_z - te.origin_z) > FIELDGEN_MAXZ)
|
||||
sprint (self, PRINT_HIGH,
|
||||
"Your field generators are at different heights, they won't link\n");
|
||||
dprint (ftos (place_z) + " " + ftos (te.origin_z) + "\n");
|
||||
|
||||
// return the final building place
|
||||
return;
|
||||
|
|
|
|||
137
menu.qc
137
menu.qc
|
|
@ -1081,104 +1081,76 @@ void(float inp) Menu_Spy_Color_Input =
|
|||
|
||||
void() Menu_Engineer =
|
||||
{
|
||||
//Set up empty menu
|
||||
local string line1;
|
||||
local string line2;
|
||||
local string line3;
|
||||
local string line4;
|
||||
local string line5;
|
||||
local string line6;
|
||||
local string line7;
|
||||
local string st = "";
|
||||
|
||||
//Check line for Dispenser
|
||||
if (self.has_dispenser == TRUE)
|
||||
line1 = "Áãôéïî: \n\n“®® Destroy Dispenser \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_DISPENSER && (self.cutf_items & CUTF_DISPENSER))//SB
|
||||
line1 = "Áãôéïî: \n\n“.. Build Dispenser \n";
|
||||
st += "\<Action\>: \n\n";
|
||||
if (self.has_dispenser)
|
||||
st += "\x93\<..\> Destroy Dispenser \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_DISPENSER && (self.cutf_items & CUTF_DISPENSER))
|
||||
st += "\x93.. Build Dispenser \n";
|
||||
else
|
||||
line1 = "Áãôéïî: \n\n \n";
|
||||
st += "\n";
|
||||
|
||||
if (self.has_sentry == TRUE)
|
||||
line2 = "”®® Destroy Sentry Gun \n";
|
||||
if (self.has_sentry)
|
||||
st += "\x94\<..\> Destroy Sentry Gun \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_SENTRYGUN && self.cutf_items & CUTF_SENTRYGUN)
|
||||
line2 = "”.. Build Sentry Gun \n";
|
||||
st += "\x94.. Build Sentry Gun \n";
|
||||
else
|
||||
line2 = " \n";
|
||||
st += "\n";
|
||||
|
||||
if (self.has_tesla == TRUE)
|
||||
line3 = "•®® Destroy Tesla Sentry \n";
|
||||
if (self.has_tesla)
|
||||
st += "\x95\<..\> Destroy Tesla Sentry \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_TESLA && self.tf_items & NIT_TESLA)
|
||||
line3 = "•.. Build Tesla Sentry \n";
|
||||
st += "\x95.. Build Tesla Sentry \n";
|
||||
else
|
||||
line3 = " \n";
|
||||
st += "\n";
|
||||
|
||||
if (self.has_camera == TRUE)
|
||||
line4 = "®® Destroy Security Camera \n"; //CH impulse 4 for both
|
||||
if (self.has_camera)
|
||||
st += "\x96\<..\> Destroy Security Camera \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_CAMERA && self.tf_items & NIT_SECURITY_CAMERA)
|
||||
line4 = ".. Launch Security Camera \n";
|
||||
st += "\x96.. Launch Security Camera \n";
|
||||
else
|
||||
line4 = " \n";
|
||||
|
||||
if (self.has_teleporter != 0) //CH messy, yes
|
||||
{
|
||||
if (self.has_teleporter == 1 && self.ammo_cells >= BUILD_COST_TELEPORTER)
|
||||
line5 = ".. Build a Teleporter Pad \n®® Destroy a Teleporter Pad \n"; //ofn the number is 5
|
||||
else if (self.has_teleporter == 1 && self.ammo_cells < BUILD_COST_TELEPORTER)
|
||||
line5 = "®® Destroy a Teleporter Pad \n"; // 6
|
||||
if (self.has_teleporter == 2)
|
||||
line5 = "®® Destroy Both Teleporter Pads \n"; // 6
|
||||
}
|
||||
else if (self.ammo_cells >= BUILD_COST_TELEPORTER && self.tf_items & NIT_TELEPORTER)
|
||||
line5 = ".. Build a Teleporter Pad \n";
|
||||
else
|
||||
line5 = " \n";
|
||||
st += "\n";
|
||||
|
||||
if (self.has_sensor==TRUE)
|
||||
{
|
||||
line6 = "™®® Destroy Motion Sensor \n";
|
||||
}
|
||||
if (self.has_teleporter < 2 && self.ammo_cells >= BUILD_COST_TELEPORTER)
|
||||
st += "\x97.. Build a Teleporter Pad \n";
|
||||
else
|
||||
st += "\n";
|
||||
|
||||
if (self.has_teleporter == 2)
|
||||
st += "\x98\<..\> Destroy Both Teleporter Pads \n";
|
||||
else if (self.has_teleporter == 1)
|
||||
st += "\x98\<..\> Destroy a Teleporter Pad \n";
|
||||
else
|
||||
st += "\n";
|
||||
|
||||
if (self.has_sensor)
|
||||
st += "\x99\<..\> Destroy Motion Sensor \n";
|
||||
else if (self.ammo_cells >= BUILD_COST_SENSOR && self.cutf_items & CUTF_SENSOR)
|
||||
{
|
||||
line6 = "™.. Deploy Motion Sensor \n";
|
||||
}
|
||||
st += "\x99.. Deploy Motion Sensor \n";
|
||||
else
|
||||
{
|
||||
line6 = " \n";
|
||||
}
|
||||
|
||||
if (self.has_fieldgen != 0) //CH messy, yes
|
||||
{
|
||||
if (self.has_fieldgen == 1 && self.ammo_cells >= BUILD_COST_FIELDGEN)
|
||||
line7 = "š.. Build a Field Generator \n›®® Destroy a Field Generator \n\n.. Îïôèéîç \n"; //ofn the number is 5
|
||||
else if (self.has_fieldgen == 1 && self.ammo_cells < BUILD_COST_FIELDGEN)
|
||||
line7 = "›®® Destroy a Field Generator \n\n.. Îïôèéîç \n"; // 6
|
||||
st += "\n";
|
||||
|
||||
if (self.has_fieldgen < 2 && self.ammo_cells >= BUILD_COST_FIELDGEN)
|
||||
st += "\x9a.. Build a Field Generator \n";
|
||||
#ifdef FIELD_FORCEMODE
|
||||
|
||||
if (self.has_fieldgen >= 2)
|
||||
{
|
||||
if (GetFieldForcedStatus())
|
||||
line7 = "š.. Force field: Ãìïóåä Íïäå \n›®® Destroy Both Field Generators \n\n.. Îïôèéîç \n";
|
||||
else
|
||||
line7 = "š.. Force field: Éîôåììéçåîô Íïäå \n›®® Destroy Both Field Generators \n\n.. Îïôèéîç \n";
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if (self.has_fieldgen >= 2)
|
||||
line7 = "›®® Destroy Both Field Generators \n\n.. Îïôèéîç \n"; // 6
|
||||
|
||||
else if (self.has_fieldgen == 2)
|
||||
st += "\x9a.. Force field: " + (GetFieldForcedStatus() ? "\<Closed Mode\> \n" : "\<Intelligent Mode\> \n");
|
||||
#endif
|
||||
|
||||
}
|
||||
else if (self.ammo_cells >= BUILD_COST_FIELDGEN && self.cutf_items & CUTF_FIELDGEN)
|
||||
line7 = "š.. Build a Field Generator \n\n.. Îïôèéîç \n";
|
||||
else
|
||||
line7 = " \n.. Îïôèéîç \n";
|
||||
st += "\n";
|
||||
|
||||
if (self.has_fieldgen == 2)
|
||||
st += "\x9b\<..\> Destroy Both Field Generators \n";
|
||||
else if (self.has_fieldgen == 1)
|
||||
st += "\x9b\<..\> Destroy a Field Generator \n";
|
||||
else
|
||||
st += "\n";
|
||||
|
||||
st += "\n\x92.. \<Nothing\> \n";
|
||||
|
||||
//Finally, we output the menu...
|
||||
CenterPrint7(self,line1,line2,line3,line4,line5,line6,line7);
|
||||
CenterPrint (self, st);
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -1232,7 +1204,9 @@ void(float inp) Menu_Engineer_Input =
|
|||
self.impulse = 0;
|
||||
}
|
||||
//CH uses 5 and 6
|
||||
else if (inp == 5 && (self.has_teleporter == 0 || self.has_teleporter == 1) && self.ammo_cells >= BUILD_COST_TELEPORTER) //ch if have one out, can build
|
||||
else if (inp == 5
|
||||
&& (self.has_teleporter == 0 || self.has_teleporter == 1)
|
||||
&& self.ammo_cells >= BUILD_COST_TELEPORTER) //ch if have one out, can build
|
||||
{
|
||||
if (HasFlag(self.team_no) == FALSE) {
|
||||
CenterPrint(self, "No building until your team has the flag!\n");
|
||||
|
|
@ -1311,16 +1285,16 @@ void(float inp) Menu_Engineer_Input =
|
|||
te = find(te, classname, "building_fieldgen");
|
||||
}
|
||||
|
||||
if (mindist < FIELDGEN_HACKEDRANGE) // * 2
|
||||
/* if (mindist < FIELDGEN_HACKEDRANGE) // * 2
|
||||
{
|
||||
sprint(self, PRINT_HIGH, "There are interferences with other field generators here!\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
{*/
|
||||
TeamFortress_Build(BUILD_FIELDGEN);
|
||||
ResetMenu();
|
||||
self.impulse = 0;
|
||||
}
|
||||
// }
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1400,6 +1374,7 @@ void(float inp) Menu_Engineer_Input =
|
|||
|
||||
// Otherwise, the impulse is passed on
|
||||
};
|
||||
|
||||
//CH to reduce code.
|
||||
void(entity person, string build) Add_Building_Teamkill =
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue