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

Deleted Feature: The poison feature has been made obsolete by the disease feature and has been removed.

Browse Source 
GameDir >= r2245 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-05-20 20:39:51 +00:00
parent 62d5dd1854
commit b2217eaab9
49 changed files with 171 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
-2
View File
@@ -1059,9 +1059,7 @@ enum
CHOOSE_DETONATE_AND_REMOTE_DEFUSE_FREQUENCY_STR,
CHOOSE_TRIPWIRE_NETWORK,
MERC_VITAL_STATS_WITH_POISON_POPUPTEXT,
MERC_VITAL_STATS_WITH_FOOD_POPUPTEXT,
MERC_VITAL_STATS_WITH_POISON_AND_FOOD_POPUPTEXT,
FUNCTION_SELECTION_STR,
FILL_CANTEEN_STR,
Utils/XML_Items.cpp
+2 -13
View File
@@ -260,7 +260,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
strcmp(name, "Directional") == 0 ||
strcmp(name, "DrugType") == 0 ||
strcmp(name, "BlockIronSight") == 0 ||
strcmp(name, "PoisonPercentage") == 0 ||
strcmp(name, "ItemFlag") == 0 ||
strcmp(name, "FoodType") == 0 ||
strcmp(name, "DamageChance") == 0 ||
@@ -1353,11 +1352,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = ELEMENT;
pData->curItem.blockironsight = (BOOLEAN) atol(pData->szCharData);
}
else if(strcmp(name, "PoisonPercentage") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.bPoisonPercentage = (INT16) atol(pData->szCharData);
}
else if(strcmp(name, "ItemFlag") == 0)
{
pData->curElement = ELEMENT;
@@ -2078,9 +2072,7 @@ BOOLEAN WriteItemStats()
FilePrintf(hFile,"\t\t<DrugType>%d</DrugType>\r\n", Item[cnt].drugtype );
FilePrintf(hFile,"\t\t<BlockIronSight>%d</BlockIronSight>\r\n", Item[cnt].blockironsight );
FilePrintf(hFile,"\t\t<PoisonPercentage>%d</PoisonPercentage>\r\n", Item[cnt].bPoisonPercentage );
FilePrintf(hFile,"\t\t<ItemFlag>%d</ItemFlag>\r\n", Item[cnt].usItemFlag );
FilePrintf(hFile,"\t\t<FoodType>%d</FoodType>\r\n", Item[cnt].foodtype );
@@ -2090,10 +2082,7 @@ BOOLEAN WriteItemStats()
FilePrintf(hFile, "\t\t<CrowbarModifier>%d</CrowbarModifier>\r\n", Item[cnt].CrowbarModifier );
FilePrintf(hFile, "\t\t<DisarmModifier>%d</DisarmModifier>\r\n", Item[cnt].DisarmModifier );
FilePrintf(hFile, "\t\t<RepairModifier>%d</RepairModifier>\r\n", Item[cnt].RepairModifier );
// Flugente poison system
FilePrintf(hFile,"\t\t<PoisonPercentage>%d</PoisonPercentage>\r\n", Item[cnt].bPoisonPercentage );
FilePrintf(hFile,"\t\t<DamageChance>%d</DamageChance>\r\n", Item[cnt].usDamageChance );
FilePrintf(hFile,"\t\t<DirtIncreaseFactor>%4.2f</DirtIncreaseFactor>\r\n", Item[cnt].dirtIncreaseFactor );
Utils/_ChineseText.cpp
+1 -6
View File
@@ -3323,13 +3323,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"设置引爆频率 (1 - 4) 和拆除频率 (A - D):", //L"Set detonation frequency (1 - 4) and defusing frequency (A - D):",
L"设置引爆时间回合数 (1 - 4) 和拆除频率 (A - D):", //L"Set detonation time in turns (1 - 4) and defusing frequency (A - D):",
L"选择绊线的分层 (1 - 4) 和网格 (A - D):", //L"Select tripwire hierarchy (1 - 4) and network (A - D):",
// added by Flugente to display health and poisoning
L"生命: %d/%d\n毒性: %d/%d\n精力: %d/%d\n士气: %s",
// added by Flugente to display food status
L"生命: %d/%d\n精力: %d/%d\n士气: %s\n口渴: %d%s\n饥饿: %d%s",
L"生命: %d/%d\n毒性: %d/%d\n精力: %d/%d\n士气: %s\n口渴: %d%s\n饥饿: %d%s",
// added by Flugente: selection of a function to call in tactical
L"你想要做的是什么？",
@@ -8237,7 +8233,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%％坐飞机速度\n", //L" %s%d%% travel speed on air vehicles\n",
L" %s%d%％坐船速度\n", //L" %s%d%% travel speed on water vehicles\n",
L" %s%d%％中毒耐性\n", //L" %s%d%% poison resistance\n",
L" %s%d%％畏惧抵制\n", //L" %s%d%% fear resistance\n",
L" %s%d%％压制忍耐\n", //L" %s%d%% suppression resistance\n",
L" %s%d%％近战抗性\n", //L" %s%d%% physical resistance\n",
Utils/_DutchText.cpp
+1 -6
View File
@@ -3321,13 +3321,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Set detonation frequency (1 - 4) and defusing frequency (A - D):",
L"Set detonation time in turns (1 - 4) and defusing frequency (A - D):",
L"Select tripwire hierarchy (1 - 4) and network (A - D):",
// added by Flugente to display health and poisoning // TODO.Translate
L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s",
// added by Flugente to display food status
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
L"What do you want to do?",
@@ -8250,7 +8246,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% travel speed on air vehicles\n",
L" %s%d%% travel speed on water vehicles\n",
L" %s%d%% poison resistance\n",
L" %s%d%% fear resistance\n",
L" %s%d%% suppression resistance\n",
L" %s%d%% physical resistance\n",
Utils/_EnglishText.cpp
+1 -6
View File
@@ -3323,13 +3323,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Set detonation frequency (1 - 4) and defusing frequency (A - D):",
L"Set detonation time in turns (1 - 4) and defusing frequency (A - D):",
L"Select tripwire hierarchy (1 - 4) and network (A - D):",
// added by Flugente to display health and poisoning
L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s",
// added by Flugente to display food status
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
L"What do you want to do?",
@@ -8235,7 +8231,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% travel speed on air vehicles\n",
L" %s%d%% travel speed on water vehicles\n",
L" %s%d%% poison resistance\n",
L" %s%d%% fear resistance\n",
L" %s%d%% suppression resistance\n",
L" %s%d%% physical resistance\n",
Utils/_FrenchText.cpp
+1 -6
View File
@@ -3327,13 +3327,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Régler la fréquence de détonation (1-4) et désamorçage (A-D) :",
L"Régler le nombre de tours avant l'explosion (1-4) et désamorçage (A-D) :",
L"Régler l'ordre des fils (1-4) et du réseau (A-D) :",
// added by Flugente to display health and poisoning
L"Santé : %d/%d\nPoison : %d/%d\nÉnergie : %d/%d\nMoral : %s",
// added by Flugente to display food status
L"Santé : %d/%d\nÉnergie : %d/%d\nMoral : %s\nSoif : %d%s\nFaim : %d%s",
L"Santé : %d/%d\nPoison : %d/%d\nÉnergie : %d/%d\nMoral : %s\nSoif : %d%s\nFaim : %d%s",
// added by Flugente: selection of a function to call in tactical
L"Que voulez-vous faire ?",
@@ -8236,7 +8232,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% de vitesse dans les voyages aériens\n",
L" %s%d%% de vitesse dans les voyages sur l'eau\n",
L" %s%d%% de résistance au poison\n",
L" %s%d%% de résistance à la peur\n",
L" %s%d%% de résistance au tir de couverture\n",
L" %s%d%% de résistance physique\n",
Utils/_GermanText.cpp
-5
View File
@@ -3330,12 +3330,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Detonations-Zeit (in Züge) (1 - 4) und die Entschärfungs-Frequenz (A - D):",
L"Stolperdraht-Hierarchie (1 - 4) und das Netzwerk (A - D):",
// added by Flugente to display health and poisoning
L"Gesundheit: %d/%d\nGift: %d/%d\nAusdauer: %d/%d\nMoral: %s",
// added by Flugente to display food status
L"Gesundheit: %d/%d\nAusdauer: %d/%d\nMoral: %s\nWasser: %d%s\nEssen: %d%s",
L"Ges.: %d/%d\nGift: %d/%d\nAusd.: %d/%d\nMoral: %s\nWasser: %d%s\nEssen: %d%s",
// added by Flugente: selection of a function to call in tactical
L"Was möchten Sie tun?",
@@ -8067,7 +8063,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% travel speed on air vehicles\n",
L" %s%d%% travel speed on water vehicles\n",
L" %s%d%% poison resistance\n",
L" %s%d%% fear resistance\n",
L" %s%d%% suppression resistance\n",
L" %s%d%% physical resistance\n",
Utils/_ItalianText.cpp
+1 -6
View File
@@ -3316,13 +3316,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Set detonation frequency (1 - 4) and defusing frequency (A - D):",
L"Set detonation time in turns (1 - 4) and defusing frequency (A - D):",
L"Select tripwire hierarchy (1 - 4) and network (A - D):",
// added by Flugente to display health and poisoning // TODO.Translate
L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s",
// added by Flugente to display food status
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
L"What do you want to do?",
@@ -8245,7 +8241,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% travel speed on air vehicles\n",
L" %s%d%% travel speed on water vehicles\n",
L" %s%d%% poison resistance\n",
L" %s%d%% fear resistance\n",
L" %s%d%% suppression resistance\n",
L" %s%d%% physical resistance\n",
Utils/_PolishText.cpp
+1 -6
View File
@@ -3331,13 +3331,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Set detonation frequency (1 - 4) and defusing frequency (A - D):",
L"Set detonation time in turns (1 - 4) and defusing frequency (A - D):",
L"Select tripwire hierarchy (1 - 4) and network (A - D):",
// added by Flugente to display health and poisoning // TODO.Translate
L"Health: %d/%d\nPoison: %d/%d\nEnergy: %d/%d\nMorale: %s",
// added by Flugente to display food status
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
L"What do you want to do?",
@@ -8262,7 +8258,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% travel speed on air vehicles\n",
L" %s%d%% travel speed on water vehicles\n",
L" %s%d%% poison resistance\n",
L" %s%d%% fear resistance\n",
L" %s%d%% suppression resistance\n",
L" %s%d%% physical resistance\n",
Utils/_RussianText.cpp
+1 -6
View File
@@ -3320,13 +3320,9 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
L"Установите частоту активации (1 - 4) и частоту деактивации (A - D):",
L"Установите время до активации в ходах (1 - 4) и частоту деактивации (A - D):",
L"Выберите уровень (1 - 4) и сеть (A - D):",
// added by Flugente to display health and poisoning
L"Здоровье: %d/%d\nЯд: %d/%d\nЭнергия: %d/%d\nБоевой дух: %s",
// added by Flugente to display food status
L"Здоровье: %d/%d\nЭнергия: %d/%d\nБоевой дух: %s\nВода: %d%s\nПища: %d%s",
L"Здоровье: %d/%d\nЯд: %d/%d\nЭнергия: %d/%d\nБоевой дух: %s\nВода: %d%s\nПища: %d%s",
// added by Flugente: selection of a function to call in tactical
L"Что будем делать?",
@@ -8232,7 +8228,6 @@ STR16 szBackgroundText_Value[]=
L" %s%d%% скорость движения на воздушном транспорте\n",
L" %s%d%% скорость движения на водном транспорте\n",
L" %s%d%% сопротивление яду\n",
L" %s%d%% сопротивление страху\n",
L" %s%d%% сопротивление подавлению\n",
L" %s%d%% физическое сопротивление\n",