1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

When talking to an enemy, we can surrender to him if he hasn't asked us to before.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-01-19 20:22:51 +00:00
parent f8531461d3
commit d55a57007d
14 changed files with 96 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+2
View File
@@ -742,6 +742,8 @@ enum
STR_PRISONER_RELEASED,
STR_PRISONER_ARMY_FREED_PRISON,
STR_PRISONER_REFUSE_SURRENDER,
STR_PRISONER_REFUSE_TAKE_PRISONERS,
SRT_PRISONER_INI_SETTING_OFF,
TEXT_NUM_PRISONER_STR
};
Utils/_ChineseText.cpp
+3
View File
@@ -2920,6 +2920,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"你现在没有可用的监狱关押这些俘虏，你不得不放他们走。", //L"You have no prison for these prisoners, you have to let them go",
L"Yes - 将俘虏送入监狱 No - 放俘虏离开这里", //L"Yes - Send prisoners to jail No - Let them go",
L"劝说敌人投降？", //L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7507,6 +7508,8 @@ STR16 szPrisonerTextStr[]=
L"俘虏已被释放！", //L"Prisoners have been released!",
L"军队已占领 %s 监狱，俘虏已被释放！", //L"The army now occupies the prison in %s, the prisoners were freed!",
L"这敌人丫宁死不从！",//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
Utils/_DutchText.cpp
+3
View File
@@ -2917,6 +2917,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7505,6 +7506,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_EnglishText.cpp
+3 -1
View File
@@ -2918,7 +2918,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
// added by Flugente: decide what to do with prisoners
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk",
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7492,6 +7492,8 @@ 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"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]=
Utils/_FrenchText.cpp
+3
View File
@@ -2924,6 +2924,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7484,6 +7485,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_GermanText.cpp
+3
View File
@@ -2922,6 +2922,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7319,6 +7320,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.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_ItalianText.cpp
+3
View File
@@ -2912,6 +2912,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7492,6 +7493,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_PolishText.cpp
+3
View File
@@ -2927,6 +2927,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7506,6 +7507,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_RussianText.cpp
+3
View File
@@ -2920,6 +2920,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7458,6 +7459,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate
Utils/_TaiwaneseText.cpp
+3
View File
@@ -2921,6 +2921,7 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"You have no prison for these prisoners, you have to let them go",
L"Yes - Send prisoners to jail No - Let them go",
L"Ask enemy for surrender?",
L"1 - Ask enemy for surrender 2 - Surrender to enemy 3,4 - Talk", // TODO.Translate
};
//Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.
@@ -7509,6 +7510,8 @@ 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!", // TODO.Translate
L"This behaviour is set OFF in your ini settings.",
};
STR16 szMTATextStr[]= // TODO.Translate