mirror of
https://github.com/unknownworlds/NS.git
synced 2024-11-23 04:52:16 +00:00
Mantis 0000992 and 0000971:
o Changed the popupmenu to better reflect the new teammate orders o Moved vox-sounds around to match the new menu o Added entries for teammate orders popup in titles.txt o Teammate order popups now fetches text from titles.txt git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@59 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl
parent
9a4f8002d6
commit
ae26e361bd
9 changed files with 112 additions and 58 deletions
Binary file not shown.
Binary file not shown.
BIN
dev/tankefugl/sound/vox/sreq5.wav
Normal file
BIN
dev/tankefugl/sound/vox/sreq5.wav
Normal file
Binary file not shown.
BIN
dev/tankefugl/sound/vox/sreq6.wav
Normal file
BIN
dev/tankefugl/sound/vox/sreq6.wav
Normal file
Binary file not shown.
BIN
dev/tankefugl/sound/vox/ssay13.wav
Normal file
BIN
dev/tankefugl/sound/vox/ssay13.wav
Normal file
Binary file not shown.
BIN
dev/tankefugl/sound/vox/ssay14.wav
Normal file
BIN
dev/tankefugl/sound/vox/ssay14.wav
Normal file
Binary file not shown.
|
|
@ -2333,7 +2333,7 @@ int AvHHud::IssueOrder(const char* pszName, int iSize, void* pbuf)
|
|||
if (this->GetInTopDownMode() == false)
|
||||
{
|
||||
cl_entity_s* theLocalPlayer = gEngfuncs.GetLocalPlayer();
|
||||
if (theLocalPlayer->index == ordertarget)
|
||||
if (theLocalPlayer->index == ordersource) //ordertarget)
|
||||
{
|
||||
hud_player_info_t info;
|
||||
memset(&info, 0, sizeof(info));
|
||||
|
|
@ -2341,8 +2341,11 @@ int AvHHud::IssueOrder(const char* pszName, int iSize, void* pbuf)
|
|||
|
||||
string temp;
|
||||
string nameFormat;
|
||||
// TODO: fetch from titles.txt
|
||||
switch (ordertype) {
|
||||
// fetch from titles.txt
|
||||
sprintf(temp, "TeammateOrder%d", ordertype);
|
||||
LocalizeString(temp.c_str(), nameFormat);
|
||||
|
||||
/* switch (ordertype) {
|
||||
case TEAMMATE_MARINE_ORDER_WELD:
|
||||
nameFormat = "Weld %s";
|
||||
break;
|
||||
|
|
@ -2367,7 +2370,7 @@ int AvHHud::IssueOrder(const char* pszName, int iSize, void* pbuf)
|
|||
case TEAMMATE_ALIEN_ORDER_UNKNOWN:
|
||||
nameFormat = "%s";
|
||||
break;
|
||||
}
|
||||
}*/
|
||||
sprintf(temp, nameFormat.c_str(), info.name);
|
||||
|
||||
this->SetDisplayOrder(1, ordertype, temp, "", "");
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ Comms
|
|||
|
||||
MenuTalk
|
||||
{
|
||||
Talk
|
||||
Order
|
||||
}
|
||||
|
||||
MenuAttacked
|
||||
|
|
@ -585,7 +585,7 @@ MenuAllClear
|
|||
|
||||
MenuYell
|
||||
{
|
||||
Yell
|
||||
Request
|
||||
}
|
||||
|
||||
MenuSay
|
||||
|
|
@ -623,6 +623,11 @@ MenuFollowMe
|
|||
"Follow me"
|
||||
}
|
||||
|
||||
MenuWeldMe
|
||||
{
|
||||
"Weld me"
|
||||
}
|
||||
|
||||
MenuCovering
|
||||
{
|
||||
"Covering"
|
||||
|
|
@ -1053,6 +1058,50 @@ MenuDemote
|
|||
Demote
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// Teammate order texts
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
TeammateOrder0
|
||||
{
|
||||
Weld %s
|
||||
}
|
||||
|
||||
TeammateOrder1
|
||||
{
|
||||
Follow %s
|
||||
}
|
||||
|
||||
TeammateOrder2
|
||||
{
|
||||
%s is covering you
|
||||
}
|
||||
|
||||
TeammateOrder3
|
||||
{
|
||||
%s
|
||||
}
|
||||
|
||||
TeammateOrder4
|
||||
{
|
||||
Heal %s
|
||||
}
|
||||
|
||||
TeammateOrder5
|
||||
{
|
||||
Follow %s
|
||||
}
|
||||
|
||||
TeammateOrder6
|
||||
{
|
||||
%s is covering
|
||||
}
|
||||
|
||||
TeammateOrder7
|
||||
{
|
||||
%s
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
// Don't localize these, they are sprite names: //
|
||||
// (sprites/640(or 320)name.spr) //
|
||||
|
|
@ -1140,7 +1189,7 @@ Need healing
|
|||
|
||||
MenuAlienCommSayingThree
|
||||
{
|
||||
Need backup
|
||||
Follow me
|
||||
}
|
||||
|
||||
MenuAlienCommSayingsEast
|
||||
|
|
|
|||
|
|
@ -557,13 +557,13 @@ start PieMenu SoldierMenu
|
|||
node2 = 4/2/#MenuTalk/0
|
||||
node3 = 4/2/4/#MenuFollowMe/7
|
||||
node4 = 4/2/2/#MenuCovering/8
|
||||
node5 = 4/2/0/#MenuTaunt/9
|
||||
node5 = 4/2/0/#MenuWeldMe/14
|
||||
node6 = 4/6/#MenuYell/0
|
||||
node7 = 4/6/0/#MenuNeedHealth/10
|
||||
node8 = 4/6/6/#MenuNeedAmmo/11
|
||||
node9 = 4/6/4/#MenuInPosition/12
|
||||
node9 = 4/6/4/#MenuNeedOrder/80
|
||||
node10 = 4/4/#MenuSay/0
|
||||
node11 = 4/4/2/#MenuMoveOut/14
|
||||
node11 = 4/4/2/#MenuTaunt/9
|
||||
node12 = 4/4/4/#MenuEnemySpotted/13
|
||||
node13 = 4/4/6/#MenuAllClear/15
|
||||
|
||||
|
|
@ -587,12 +587,12 @@ start PieMenu SoldierMenu
|
|||
' Switch between light and heavy weapon
|
||||
node17 = 6/6/#MenuNextWeapon/1
|
||||
|
||||
node18 = 2/#MenuOrders/0
|
||||
node19 = 2/0/#MenuNeedOrder/80
|
||||
node20 = 2/4/#MenuAck/81
|
||||
node18 = 2/#MenuAck/81
|
||||
'node19 = 2/0/#MenuNeedOrder/80
|
||||
'node20 = 2/0/#MenuAck/81
|
||||
|
||||
' Administrative
|
||||
node21 = 0/#MenuVoteCommanderDown/6
|
||||
node19 = 0/#MenuVoteCommanderDown/6
|
||||
end
|
||||
|
||||
start PieMenu SoldierCombatMenu
|
||||
|
|
@ -615,13 +615,13 @@ start PieMenu SoldierCombatMenu
|
|||
node2 = 4/2/#MenuTalk/0
|
||||
node3 = 4/2/4/#MenuFollowMe/7
|
||||
node4 = 4/2/2/#MenuCovering/8
|
||||
node5 = 4/2/0/#MenuTaunt/9
|
||||
node5 = 4/2/0/#MenuWeldMe/14
|
||||
node6 = 4/6/#MenuYell/0
|
||||
node7 = 4/6/0/#MenuNeedHealth/10
|
||||
node8 = 4/6/6/#MenuNeedAmmo/11
|
||||
node9 = 4/6/4/#MenuInPosition/12
|
||||
node9 = 4/6/4/#MenuNeedOrder/80
|
||||
node10 = 4/4/#MenuSay/0
|
||||
node11 = 4/4/2/#MenuMoveOut/14
|
||||
node11 = 4/4/2/#MenuTaunt/9
|
||||
node12 = 4/4/4/#MenuEnemySpotted/13
|
||||
node13 = 4/4/6/#MenuAllClear/15
|
||||
|
||||
|
|
@ -682,34 +682,35 @@ start PieMenu AlienMenu
|
|||
|
||||
' Administrative
|
||||
node8 = 0/#MenuAlienComm/0
|
||||
node9 = 0/6/#MenuAlienCommSayingOne/7
|
||||
node10 = 0/2/#MenuAlienCommSayingTwo/8
|
||||
node9 = 0/0/#MenuAlienCommSayingOne/9
|
||||
node10 = 0/6/#MenuAlienCommSayingTwo/10
|
||||
node11 = 0/2/#MenuAlienCommSayingThree/7
|
||||
|
||||
node11 = 6/#MenuAlienUpgrade/0
|
||||
node12 = 6/0/#MenuAlienMovementUpgrades/0
|
||||
node13 = 6/0/0/#MenuAlienUpgradeMoveOne/107
|
||||
node14 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
|
||||
node15 = 6/0/2/#MenuAlienUpgradeMoveThree/109
|
||||
node16 = 6/6/#MenuAlienSensoryUpgrades/0
|
||||
node17 = 6/6/4/#MenuAlienUpgradeSenOne/110
|
||||
node18 = 6/6/6/#MenuAlienUpgradeSenTwo/111
|
||||
node19 = 6/6/0/#MenuAlienUpgradeSenThree/112
|
||||
node20 = 6/4/#MenuAlienDefenseUpgrades/0
|
||||
node21 = 6/4/6/#MenuAlienUpgradeDefOne/101
|
||||
node22 = 6/4/4/#MenuAlienUpgradeDefTwo/102
|
||||
node23 = 6/4/2/#MenuAlienUpgradeDefThree/103
|
||||
node12 = 6/#MenuAlienUpgrade/0
|
||||
node13 = 6/0/#MenuAlienMovementUpgrades/0
|
||||
node14 = 6/0/0/#MenuAlienUpgradeMoveOne/107
|
||||
node15 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
|
||||
node16 = 6/0/2/#MenuAlienUpgradeMoveThree/109
|
||||
node17 = 6/6/#MenuAlienSensoryUpgrades/0
|
||||
node18 = 6/6/4/#MenuAlienUpgradeSenOne/110
|
||||
node19 = 6/6/6/#MenuAlienUpgradeSenTwo/111
|
||||
node20 = 6/6/0/#MenuAlienUpgradeSenThree/112
|
||||
node21 = 6/4/#MenuAlienDefenseUpgrades/0
|
||||
node22 = 6/4/6/#MenuAlienUpgradeDefOne/101
|
||||
node23 = 6/4/4/#MenuAlienUpgradeDefTwo/102
|
||||
node24 = 6/4/2/#MenuAlienUpgradeDefThree/103
|
||||
|
||||
node24 = 2/#MenuAlienBuild/0
|
||||
node25 = 2/#MenuAlienBuild/0
|
||||
|
||||
node25 = 2/0/#MenuAlienBuildUpgrades/0
|
||||
node26 = 2/0/0/#MenuAlienMovementChamber/94
|
||||
node27 = 2/0/6/#MenuAlienSensoryChamber/93
|
||||
node28 = 2/0/2/#MenuAlienDefenseChamber/92
|
||||
node26 = 2/0/#MenuAlienBuildUpgrades/0
|
||||
node27 = 2/0/0/#MenuAlienMovementChamber/94
|
||||
node28 = 2/0/6/#MenuAlienSensoryChamber/93
|
||||
node29 = 2/0/2/#MenuAlienDefenseChamber/92
|
||||
|
||||
node29 = 2/2/#MenuAlienAdvBuild/0
|
||||
node30 = 2/2/0/#MenuAlienOffensiveChamber/91
|
||||
node31 = 2/2/4/#MenuAlienHive/95
|
||||
node32 = 2/2/2/#MenuAlienResourceTower/90
|
||||
node30 = 2/2/#MenuAlienAdvBuild/0
|
||||
node31 = 2/2/0/#MenuAlienOffensiveChamber/91
|
||||
node32 = 2/2/4/#MenuAlienHive/95
|
||||
node33 = 2/2/2/#MenuAlienResourceTower/90
|
||||
end
|
||||
|
||||
start PieMenu AlienCombatMenu
|
||||
|
|
@ -739,25 +740,26 @@ start PieMenu AlienCombatMenu
|
|||
|
||||
' Administrative
|
||||
node7 = 0/#MenuAlienComm/0
|
||||
node8 = 0/6/#MenuAlienCommSayingOne/7
|
||||
node9 = 0/2/#MenuAlienCommSayingTwo/8
|
||||
node8 = 0/0/#MenuAlienCommSayingOne/9
|
||||
node9 = 0/6/#MenuAlienCommSayingTwo/10
|
||||
node10 = 0/2/#MenuAlienCommSayingThree/7
|
||||
|
||||
node10 = 6/#MenuAlienUpgrade/0
|
||||
node11 = 6/0/#MenuAlienMovementUpgrades/0
|
||||
node12 = 6/0/0/#MenuAlienUpgradeMoveOne/107
|
||||
node13 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
|
||||
node14 = 6/0/2/#MenuAlienUpgradeMoveThree/109
|
||||
node15 = 6/6/#MenuAlienSensoryUpgrades/0
|
||||
node16 = 6/6/4/#MenuAlienUpgradeSenOne/110
|
||||
node17 = 6/6/6/#MenuAlienUpgradeSenTwo/111
|
||||
node18 = 6/6/0/#MenuAlienUpgradeSenThree/112
|
||||
node19 = 6/4/#MenuAlienDefenseUpgrades/0
|
||||
node20 = 6/4/6/#MenuAlienUpgradeDefOne/101
|
||||
node21 = 6/4/4/#MenuAlienUpgradeDefTwo/102
|
||||
node22 = 6/4/2/#MenuAlienUpgradeDefThree/103
|
||||
node11 = 6/#MenuAlienUpgrade/0
|
||||
node12 = 6/0/#MenuAlienMovementUpgrades/0
|
||||
node13 = 6/0/0/#MenuAlienUpgradeMoveOne/107
|
||||
node14 = 6/0/6/#MenuAlienUpgradeMoveTwo/108
|
||||
node15 = 6/0/2/#MenuAlienUpgradeMoveThree/109
|
||||
node16 = 6/6/#MenuAlienSensoryUpgrades/0
|
||||
node17 = 6/6/4/#MenuAlienUpgradeSenOne/110
|
||||
node18 = 6/6/6/#MenuAlienUpgradeSenTwo/111
|
||||
node19 = 6/6/0/#MenuAlienUpgradeSenThree/112
|
||||
node20 = 6/4/#MenuAlienDefenseUpgrades/0
|
||||
node21 = 6/4/6/#MenuAlienUpgradeDefOne/101
|
||||
node22 = 6/4/4/#MenuAlienUpgradeDefTwo/102
|
||||
node23 = 6/4/2/#MenuAlienUpgradeDefThree/103
|
||||
|
||||
node23 = 2/#MenuUnlockHiveTwo/118
|
||||
node24 = 2/2/#MenuUnlockHiveThree/126
|
||||
node24 = 2/#MenuUnlockHiveTwo/118
|
||||
node25 = 2/2/#MenuUnlockHiveThree/126
|
||||
end
|
||||
|
||||
start MarqueeComponent SelectionBox
|
||||
|
|
|
|||
Loading…
Reference in a new issue