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

Whether a gun shoots fire or fire retardant is now set on the ammo with the <ammoflag>-tag, not the gun.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2021-07-15 18:22:53 +00:00
parent 320328a441
commit e6ea95eb8b
14 changed files with 99 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/XML_Items.cpp
-9
View File
@@ -298,7 +298,6 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
strcmp(name, "bloodbag" ) == 0 ||
strcmp(name, "emptybloodbag" ) == 0 ||
strcmp(name, "medicalsplint" ) == 0 ||
strcmp(name, "fireextinguisher" ) == 0 ||
strcmp(name, "sFireResistance" ) == 0 ||
strcmp(name, "usAdministrationModifier" ) == 0))
{
@@ -1544,13 +1543,6 @@ itemEndElementHandle(void *userData, const XML_Char *name)
if ( (BOOLEAN)atol( pData->szCharData ) )
pData->curItem.usItemFlag |= MEDICAL_SPLINT;
}
else if ( strcmp( name, "fireextinguisher" ) == 0 )
{
pData->curElement = ELEMENT;
if ( (BOOLEAN)atol( pData->szCharData ) )
pData->curItem.usItemFlag |= FIREEXTINGUISHER;
}
else if ( strcmp( name, "sFireResistance" ) == 0 )
{
pData->curElement = ELEMENT;
@@ -2200,7 +2192,6 @@ BOOLEAN WriteItemStats()
if ( HasItemFlag( cnt, BLOOD_BAG) ) FilePrintf( hFile, "\t\t<bloodbag>%d</bloodbag>\r\n", 1 );
if ( HasItemFlag( cnt, EMPTY_BLOOD_BAG ) ) FilePrintf( hFile, "\t\t<emptybloodbag>%d</emptybloodbag>\r\n", 1 );
if ( HasItemFlag( cnt, MEDICAL_SPLINT ) ) FilePrintf( hFile, "\t\t<medicalsplint>%d</medicalsplint>\r\n", 1 );
if ( HasItemFlag( cnt, FIREEXTINGUISHER ) ) FilePrintf( hFile, "\t\t<fireextinguisher>%d</fireextinguisher>\r\n", 1 );
FilePrintf(hFile,"\t\t<usRiotShieldStrength>%d</usRiotShieldStrength>\r\n", Item[cnt].usRiotShieldStrength );
FilePrintf(hFile,"\t\t<usRiotShieldGraphic>%d</usRiotShieldGraphic>\r\n", Item[cnt].usRiotShieldGraphic );
Utils/_ChineseText.cpp
+6 -2
View File
@@ -8501,7 +8501,9 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|防|火|护|甲", //L"|R|e|s|i|s|t|a|n|t |t|o |F|i|r|e",
L"|管|理|能|力|增|益|器", //L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|间|谍|能|力|增|益|器", //L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|医|用|夹|板", //L"|M|e|d|i|c|a|l |S|p|l|i|n|t", TODO.Translate
L"|医|用|夹|板", //L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8554,7 +8556,9 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \n可以降低%i%%的火焰伤害。", //L"\n \nThis armor lowers fire damage by %i%%.",
L"\n \n这个工具可以\n提高%i%%的管理工作的效率。", //L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \n这个工具可以\n提高%i%%的间谍能力。", //L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \n一旦应用, 这个物品可以提高对你的手臂\n或者腿部重伤的治疗速率。", //L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", TODO.Translate
L"\n \n一旦应用, 这个物品可以提高对你的手臂\n或者腿部重伤的治疗速率。", //L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_DutchText.cpp
+4
View File
@@ -8504,6 +8504,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8557,6 +8559,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_EnglishText.cpp
+4
View File
@@ -8502,6 +8502,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8555,6 +8557,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \nThis ammo can extinguish fire.", // 49
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_FrenchText.cpp
+4
View File
@@ -8491,6 +8491,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8544,6 +8546,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_GermanText.cpp
+4
View File
@@ -8346,6 +8346,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8399,6 +8401,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_ItalianText.cpp
+4
View File
@@ -8494,6 +8494,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8547,6 +8549,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_PolishText.cpp
+4
View File
@@ -8506,6 +8506,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8559,6 +8561,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=
Utils/_RussianText.cpp
+4
View File
@@ -8502,6 +8502,8 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|A|d|m|i|n|i|s|t|r|a|t|i|o|n |M|o|d|i|f|i|e|r",
L"|H|a|c|k|i|n|g |M|o|d|i|f|i|e|r",
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8555,6 +8557,8 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item makes you more effective at\nadministrative work by %i%%.",
L"\n \nThis item improves your hacking skills by %i%%.",
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
};
STR16 szUDBAdvStatsTooltipText[]=