- New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.

- Fix: SoldierToSoldierLineOfSightTest was called against NOBODY

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-03-15 17:54:04 +00:00
parent bc94c319c6
commit 69f4b2cf34
17 changed files with 118 additions and 35 deletions
+2 -2
View File
@@ -715,8 +715,8 @@ extern STR16 szUDBGenExplosiveStatsTooltipText[ 23 ]; // silversurfer Repair
extern STR16 szUDBGenExplosiveStatsExplanationsTooltipText[ 23 ]; // silversurfer Repair Ease: 22->23
extern STR16 szUDBGenCommonStatsTooltipText[ 1 ]; // silversurfer new for items that don't fit the other categories
extern STR16 szUDBGenCommonStatsExplanationsTooltipText[ 1 ]; // silversurfer new for items that don't fit the other categories
extern STR16 szUDBGenSecondaryStatsTooltipText[ 37 ]; // Flugente Food System: 26 -> 28 external feeding: 28->30 JMich_SkillsModifiers: 31 for Defusal kit - covert item: 31->32 silversurfer more tags: 32->37
extern STR16 szUDBGenSecondaryStatsExplanationsTooltipText[ 37 ]; // Flugente Food System: 26 -> 28 external feeding: 28->30 JMich_SkillsModifiers: 31 for Defusal kit - covert item: 31->32 silversurfer more tags: 32->37
extern STR16 szUDBGenSecondaryStatsTooltipText[]; // Flugente Food System: 26 -> 28 external feeding: 28->30 JMich_SkillsModifiers: 31 for Defusal kit - covert item: 31->32 silversurfer more tags: 32->37
extern STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]; // Flugente Food System: 26 -> 28 external feeding: 28->30 JMich_SkillsModifiers: 31 for Defusal kit - covert item: 31->32 silversurfer more tags: 32->37
extern STR16 szUDBAdvStatsTooltipText[ 66 ]; // Flugente Overheating Weapons: 48->56 poison: 56->57 dirt: 57->58 food:58->64 silversurfer Best Laser Range:64->65 silversurfer PercentRecoilModifier: 66
extern STR16 szUDBAdvStatsExplanationsTooltipText[ 65 ]; // Flugente Overheating Weapons: 48->56 poison: 56->57 dirt: 57->58 food:58->64 silversurfer Best Laser Range:64->65 silversurfer PercentRecoilModifier: 65
extern STR16 szUDBAdvStatsExplanationsTooltipTextForWeapons[ 53 ]; // Flugente Overheating Weapons: 48->52 silversurfer Best Laser Range:64->65 silversurfer PercentRecoilModifier: 53
+2
View File
@@ -7564,6 +7564,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|水|中|下|沉", //L"|S|i|n|k|s",
L"|双|手|操|作", //|T|w|o|-|H|a|n|d|e|d",
L"|挡|住|准|心", //L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7605,6 +7606,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \n这个物品掉在水中会下沉消失", //L"\n \nThis item sinks when put in water.",
L"\n \n这个物品需要两只手一起操作使用", //L"\n \nThis item requires both hands to be used.",
L"\n \n这个物品会挡住准心\n 你无法再使用准心瞄准", //L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7573,6 +7573,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7614,6 +7615,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7561,6 +7561,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|e|l |A|m|m|o",
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7602,6 +7603,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.",
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7560,6 +7560,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|N|e |f|l|o|t|t|e |p|a|s",
L"|À |d|e|u|x |m|a|i|n|s",
L"|B|l|o|q|u|e |l|e |v|i|s|e|u|r",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7601,6 +7602,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nCet objet coule dans l'eau.",
L"\n \nCet objet exige les deux mains pour être utilisé.",
L"\n \nCet Objet bloquera votre viseur\nde ce fait vous ne pouvez pas l'utiliser.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7387,6 +7387,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7428,6 +7429,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nDieser Gegenstand versinkt in Wasser.",
L"\n \nDieser Gegenstand muß mit beiden Händen benutzt werden.",
L"\n \nDieser Gegenstand verhindert die Verwendung von Kimme und Korn.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7564,6 +7564,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7605,6 +7606,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7581,6 +7581,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7622,6 +7623,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7564,6 +7564,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7605,6 +7606,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -7573,6 +7573,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|S|i|n|k|s",
L"|T|w|o|-|H|a|n|d|e|d",
L"|B|l|o|c|k|s |I|r|o|n |S|i|g|h|t|s",
L"|A|n|t|i|-|M|a|t|e|r|i|a|l |A|m|m|o", // TODO.Translate
};
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -7614,6 +7615,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nThis item sinks when put in water.",
L"\n \nThis item requires both hands to be used.",
L"\n \nThis item will block your iron sights\nso you cannot use them.",
L"\n \nThis ammo can destroy light walls\nand various other objects.", // TODO.Translate
};
STR16 szUDBAdvStatsTooltipText[]=