mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Skill Tooltip on Merc Portrait (by Buggler)
- Skills/Traits tooltip over merc portrait in Tactical & Strategic screen - Fixed Traits tooltip on 'more' popup in personnel screen - Increased Energy Bar Color Contrast - Swapped Mechanical & Explosive Skill in Tactical & Strategic screen to standardize across all screens including AIM, MERC & Personnel screen Optional Skill Tooltip On Merc Portrait (by Buggler) - Option to show skill/traits tooltip on merc portrait in AIM/MERC hire screen - Enhanced merc inventory tooltip to show full BR info in AIM/MERC hire screen - Fixed BR heavy weapon AP tooltip display bug - Fixed MERC Exp Lv statistic color git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5802 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
@@ -1834,8 +1834,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"智慧", // wisdom
|
||||
L"级别", // experience level
|
||||
L"枪法", // marksmanship skill
|
||||
L"爆破", // explosive skill
|
||||
L"机械", // mechanical skill
|
||||
L"爆破", // explosive skill
|
||||
L"医疗", // medical skill
|
||||
};
|
||||
|
||||
@@ -4214,7 +4214,7 @@ STR16 MercInfo[] =
|
||||
L"已雇佣", //"Hired",
|
||||
L"日薪: ", //"Salary:",
|
||||
L"每日", //"per Day",
|
||||
L"可选装备: ", //"Optional Gear:",
|
||||
L"装备: ", //"Gear:",
|
||||
L"合计: ", //"Total:",
|
||||
L"阵亡", //"Deceased",
|
||||
|
||||
|
||||
@@ -1830,8 +1830,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Wij", // wisdom
|
||||
L"Niv", // experience level
|
||||
L"Tre", // marksmanship skill
|
||||
L"Exp", // explosive skill
|
||||
L"Tec", // mechanical skill
|
||||
L"Exp", // explosive skill
|
||||
L"Med", // medical skill
|
||||
};
|
||||
|
||||
@@ -4216,7 +4216,7 @@ STR16 MercInfo[] =
|
||||
L"Ingehuurd",
|
||||
L"Salaris:",
|
||||
L"Per Dag",
|
||||
L"Aanv. Uitrusting:",
|
||||
L"Gear:", //TODO.Translate
|
||||
L"Totaal:",
|
||||
L"Overleden",
|
||||
|
||||
@@ -4653,7 +4653,7 @@ STR16 CharacterInfo[] =
|
||||
L"Extra Info", // Title for the additional info for the merc's bio
|
||||
L"Actieve Leden", //20 // Title of the page
|
||||
L"Aanv. Uitrusting:", // Displays the optional gear cost
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's //TODO.Translate
|
||||
L"MEDISCHE aanbetaling nodig", // If the merc required a medical deposit, this is displayed
|
||||
L"Uitrusting 1", // Text on Starting Gear Selection Button 1 // TODO.Translate
|
||||
L"Uitrusting 2", // Text on Starting Gear Selection Button 2
|
||||
|
||||
@@ -1834,8 +1834,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Wis", // wisdom
|
||||
L"Lvl", // experience level
|
||||
L"Mrk", // marksmanship skill
|
||||
L"Exp", // explosive skill
|
||||
L"Mec", // mechanical skill
|
||||
L"Exp", // explosive skill
|
||||
L"Med", // medical skill
|
||||
};
|
||||
|
||||
@@ -2906,7 +2906,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
|
||||
L"Health: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
|
||||
L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s\nWater: %d%s\nFood: %d%s",
|
||||
|
||||
// added by Flugente: selection of a function to call in tactical
|
||||
// added by Flugente: selection of a function to call in tactical // TODO.Translate
|
||||
L"What do you want to do?",
|
||||
L"Fill canteens",
|
||||
L"Clean gun",
|
||||
@@ -4213,7 +4213,7 @@ STR16 MercInfo[] =
|
||||
L"Hired",
|
||||
L"Salary:",
|
||||
L"per Day",
|
||||
L"Optional Gear:",
|
||||
L"Gear:",
|
||||
L"Total:",
|
||||
L"Deceased",
|
||||
|
||||
@@ -7503,7 +7503,7 @@ STR16 szPrisonerTextStr[]=
|
||||
L"Prisoners have been released!",
|
||||
L"The army now occupies the prison in %s, the prisoners were freed!",
|
||||
L"The enemy refuses to surrender!",
|
||||
L"The enemy refuses to take you as prisoners - they prefer you dead!",
|
||||
L"The enemy refuses to take you as prisoners - they prefer you dead!", // TODO.Translate
|
||||
L"This behaviour is set OFF in your ini settings.",
|
||||
};
|
||||
|
||||
|
||||
@@ -1838,8 +1838,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Sag", // sagesse
|
||||
L"Niv", // experience level
|
||||
L"Tir", // marksmanship skill
|
||||
L"Exp", // explosive skill
|
||||
L"Méc", // mechanical skill
|
||||
L"Exp", // explosive skill
|
||||
L"Méd", // medical skill
|
||||
};
|
||||
|
||||
@@ -4211,7 +4211,7 @@ STR16 MercInfo[] =
|
||||
L"Engagé",
|
||||
L"Salaire :",
|
||||
L"Par jour",
|
||||
L"Matériel optionnel :", // TODO.Translate
|
||||
L"Gear :", // TODO.Translate
|
||||
L"Total :", // TODO.Translate
|
||||
L"Décédé(e)",
|
||||
|
||||
@@ -4648,7 +4648,7 @@ STR16 CharacterInfo[] =
|
||||
L"Info. complémentaires", // Title for the additional info for the merc's bio
|
||||
L"Membres actifs", //20 // Title of the page
|
||||
L"Matériel optionnel :", // Displays the optional gear cost
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's //TODO.Translate
|
||||
L"Dépôt Médical", // If the merc required a medical deposit, this is displayed
|
||||
L"Kit 1", // Text on Starting Gear Selection Button 1
|
||||
L"Kit 2", // Text on Starting Gear Selection Button 2
|
||||
@@ -5143,7 +5143,7 @@ STR16 zOptionsToggleText[] =
|
||||
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
|
||||
L"Mark Remaining Hostiles", //TODO.Translate
|
||||
L"Show LBE Content", //TODO.Translate
|
||||
L"Invert mouse wheel", // TODO.Translate
|
||||
L"Invert mouse wheel",
|
||||
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
|
||||
L"Forcer envois Bobby Ray", // force all pending Bobby Ray shipments
|
||||
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
|
||||
@@ -5258,7 +5258,7 @@ STR16 zOptionsScreenHelpText[] =
|
||||
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
|
||||
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
|
||||
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
|
||||
L"When ON, inverts mouse wheel directions.", // TODO.Translate
|
||||
L"When ON, inverts mouse wheel directions.",
|
||||
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
|
||||
L"Forcer tous les envois en attente de Bobby Ray",
|
||||
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
|
||||
|
||||
@@ -1835,8 +1835,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Wsh", // wisdom
|
||||
L"Erf", // experience level
|
||||
L"Trf", // marksmanship skill
|
||||
L"Spr", // explosive skill
|
||||
L"Tec", // mechanical skill
|
||||
L"Spr", // explosive skill
|
||||
L"Med", // medical skill
|
||||
};
|
||||
|
||||
@@ -4140,7 +4140,7 @@ STR16 MercInfo[] =
|
||||
L"Angestellt",
|
||||
L"Sold:",
|
||||
L"Pro Tag",
|
||||
L"Zusätzl. Ausrüst:",
|
||||
L"Ausr.:",
|
||||
L"Gesamt:",
|
||||
L"Verstorben",
|
||||
|
||||
@@ -4993,7 +4993,7 @@ STR16 zOptionsToggleText[] =
|
||||
#endif
|
||||
L"Inventar Popup-Menüs", // the_bob : enable popups for picking items from sector inv
|
||||
L"Übrige Feinde markieren",
|
||||
L"Tascheninhalt anzeigen",
|
||||
L"Tascheninhalt anzeigen",
|
||||
L"Mausradrichtung umkehren",
|
||||
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
|
||||
L"Erzwinge BR Lieferung", // force all pending Bobby Ray shipments
|
||||
@@ -5012,7 +5012,7 @@ STR16 zOptionsToggleText[] =
|
||||
};
|
||||
|
||||
//This is the help text associated with the above toggles.
|
||||
STR16 zOptionsScreenHelpText[] =
|
||||
STR16 zOptionsScreenHelpText[] =
|
||||
{
|
||||
// HEADROCK HAM 4: Added more tooltip text to some toggles, in order to explain them better.
|
||||
|
||||
@@ -5109,7 +5109,7 @@ STR16 zOptionsScreenHelpText[] =
|
||||
#endif
|
||||
L"Wenn diese Funktion aktiviert ist, und Sie mit der linken Maustaste auf einen freien Söldner-Inventarplatz klicken (während das Sektor-Inventar angezeigt wird), wird ein hilfreiches Popup-Menü eingeblendet.",
|
||||
L"Wenn diese Funktion aktiviert ist, wird die ungefähre Postion der verbleibenden Feinde auf der Übersichtskarte schraffiert",
|
||||
L"Wenn diese Funktion aktiviert ist, wird in der erweiterten Beschreibung von Taschen statt den Anbauteilen deren Inhalt angezeigt.",
|
||||
L"Wenn diese Funktion aktiviert ist, wird in der erweiterten Beschreibung von Tashen statt den Anbauteilen deren Inhalt angezeigt.",
|
||||
L"Wenn diese Funktion aktiviert ist, wird die Mausradrichtung umgekehrt",
|
||||
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
|
||||
L"Force all pending Bobby Ray shipments",
|
||||
@@ -7330,8 +7330,8 @@ STR16 szPrisonerTextStr[]=
|
||||
L"Gefangene freigelassen!",
|
||||
L"Die Armee hat das Gefängnis in %s besetzt, die Gefangenen wurden befreit!",
|
||||
L"Der Gegner weigert sich aufzugeben!",
|
||||
L"Der Gegner will uns tot sehen!",
|
||||
L"Dieses Feature ist in der ini auf AUS gesetzt.",
|
||||
L"The enemy refuses to take you as prisoners - they prefer you dead!", // TODO.Translate
|
||||
L"This behaviour is set OFF in your ini settings.",
|
||||
};
|
||||
|
||||
STR16 szMTATextStr[]= // TODO.Translate
|
||||
|
||||
@@ -1826,8 +1826,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Sag", // wisdom
|
||||
L"Liv", // experience level
|
||||
L"Tir", // marksmanship skill
|
||||
L"Esp", // explosive skill
|
||||
L"Mec", // mechanical skill
|
||||
L"Esp", // explosive skill
|
||||
L"PS", // medical skill
|
||||
};
|
||||
|
||||
@@ -4204,7 +4204,7 @@ STR16 MercInfo[] =
|
||||
L"Assoldato",
|
||||
L"Salario:",
|
||||
L"Al giorno",
|
||||
L"Dispositivo opzionale:",
|
||||
L"Gear:", //TODO.Translate
|
||||
L"Totale:",
|
||||
L"Deceduto",
|
||||
|
||||
@@ -4640,7 +4640,7 @@ STR16 CharacterInfo[] =
|
||||
L"Ulteriori informazioni", // Title for the additional info for the merc's bio
|
||||
L"Membri attivi", //20 // Title of the page
|
||||
L"Dispositivo opzionale:", // Displays the optional gear cost
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's //TODO.Translate
|
||||
L"Deposito MEDICO richiesto", // If the merc required a medical deposit, this is displayed
|
||||
L"Kit 1", // Text on Starting Gear Selection Button 1 // TODO.Translate
|
||||
L"Kit 2", // Text on Starting Gear Selection Button 2
|
||||
|
||||
@@ -1841,8 +1841,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Int", // wisdom
|
||||
L"DoŚ", // experience level
|
||||
L"Str", // marksmanship skill
|
||||
L"Wyb", // explosive skill
|
||||
L"Mec", // mechanical skill
|
||||
L"Wyb", // explosive skill
|
||||
L"Med", // medical skill
|
||||
};
|
||||
|
||||
@@ -4212,7 +4212,7 @@ STR16 MercInfo[] =
|
||||
L"Najęty",
|
||||
L"Koszt:",
|
||||
L"Dziennie",
|
||||
L"Opcjonalne wyposażenie:",
|
||||
L"Gear:", //TODO.Translate
|
||||
L"Razem:",
|
||||
L"Nie żyje",
|
||||
|
||||
@@ -4649,7 +4649,7 @@ STR16 CharacterInfo[] =
|
||||
L"Dodatkowe informacje", // Title for the additional info for the merc's bio
|
||||
L"Aktywni członkowie", //20 // Title of the page
|
||||
L"Opcjonalne wyposażenie:", // Displays the optional gear cost
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's
|
||||
L"gear", //"gear", //tais: Displays the optional gear cost in nsgi, this moved and can have only a small room, so just make it "gear" without extra's //TODO.Translate
|
||||
L"Wymagany jest zastaw na życie", // If the merc required a medical deposit, this is displayed
|
||||
L"Zestaw nr 1", // Text on Starting Gear Selection Button 1
|
||||
L"Zestaw nr 2", // Text on Starting Gear Selection Button 2
|
||||
|
||||
@@ -1834,8 +1834,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Инт", // wisdom
|
||||
L"Опт", // experience level
|
||||
L"Мет", // marksmanship skill
|
||||
L"Взр", // explosive skill
|
||||
L"Мех", // mechanical skill
|
||||
L"Взр", // explosive skill
|
||||
L"Мед", // medical skill
|
||||
};
|
||||
|
||||
@@ -4203,7 +4203,7 @@ STR16 MercInfo[] =
|
||||
L"Нанят",
|
||||
L"Oплaтa",
|
||||
L"в день",
|
||||
L"Снаряжение:",
|
||||
L"Снаряж.:",
|
||||
L"Всего:",
|
||||
L"Погиб",
|
||||
|
||||
|
||||
+10
-10
@@ -1834,8 +1834,8 @@ STR16 pShortAttributeStrings[] =
|
||||
L"Wis", // wisdom
|
||||
L"Lvl", // experience level
|
||||
L"Mrk", // marksmanship skill
|
||||
L"Exp", // explosive skill
|
||||
L"Mec", // mechanical skill
|
||||
L"Exp", // explosive skill
|
||||
L"Med", // medical skill
|
||||
};
|
||||
|
||||
@@ -2931,7 +2931,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
|
||||
L"What do you want to do?",
|
||||
L"Demand surrender",
|
||||
L"Offer surrender",
|
||||
L"Talk",
|
||||
L"Talk",
|
||||
};
|
||||
|
||||
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
|
||||
@@ -4217,7 +4217,7 @@ STR16 MercInfo[] =
|
||||
L"Hired",
|
||||
L"Salary:",
|
||||
L"per Day",
|
||||
L"Optional Gear:",
|
||||
L"Gear:",
|
||||
L"Total:",
|
||||
L"Deceased",
|
||||
|
||||
@@ -5149,8 +5149,8 @@ STR16 zOptionsToggleText[] =
|
||||
#endif
|
||||
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
|
||||
L"Mark Remaining Hostiles", //TODO.Translate
|
||||
L"Show LBE Content", //TODO.Translate
|
||||
L"Invert mouse wheel", // TODO.Translate
|
||||
L"Show LBE Content", //TODO.Translate
|
||||
L"Invert mouse wheel", // TODO.Translate
|
||||
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
|
||||
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
|
||||
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
|
||||
@@ -5265,8 +5265,8 @@ STR16 zOptionsScreenHelpText[] =
|
||||
#endif
|
||||
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
|
||||
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
|
||||
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
|
||||
L"When ON, inverts mouse wheel directions.", // TODO.Translate
|
||||
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
|
||||
L"When ON, inverts mouse wheel directions.", // TODO.Translate
|
||||
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
|
||||
L"Force all pending Bobby Ray shipments",
|
||||
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
|
||||
@@ -7519,9 +7519,9 @@ STR16 szPrisonerTextStr[]=
|
||||
L"Prisoners were sent to %s!",
|
||||
L"Prisoners have been released!",
|
||||
L"The army now occupies the prison in %s, the prisoners were freed!",
|
||||
L"The enemy refuses to surrender!",
|
||||
L"The enemy refuses to take you as prisoners - they prefer you dead!", // TODO.Translate
|
||||
L"This behaviour is set OFF in your ini settings.",
|
||||
L"The enemy refuses to surrender!",
|
||||
L"The enemy refuses to take you as prisoners - they prefer you dead!", // TODO.Translate
|
||||
L"This behaviour is set OFF in your ini settings.",
|
||||
};
|
||||
|
||||
STR16 szMTATextStr[]= // TODO.Translate
|
||||
|
||||
Reference in New Issue
Block a user