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

- new feature: items can be applied to other persons

Browse Source 
- reduced cyanide drug effect to more reasonable values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-27 22:06:26 +00:00
parent a0486b6b3f
commit 49932ef904
29 changed files with 387 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Cursors.cpp
+20 -2
View File
@@ -119,12 +119,15 @@ CursorFileData CursorFileDatabase[] =
{ "CURSORS\\bullseye.sti" , FALSE, 0, 0, 0, NULL },
{ "CURSORS\\deadleap.sti" , FALSE, 0, 0, 0, NULL },
{ "CURSORS\\hammer.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // Flugente: fortification stuff
{ "CURSORS\\hammer.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // Flugente: fortification
{ "CURSORS\\hammer_r.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL },
{ "CURSORS\\handcuffs.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // Flugente: handcuffs stuff
{ "CURSORS\\handcuffs.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // Flugente: handcuffs
{ "CURSORS\\handcuffs_r.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL },
{ "CURSORS\\apply_r.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // Flugente: apply items - still needs animation
{ "CURSORS\\apply.sti" , FALSE, 0, ANIMATED_CURSOR, 3, NULL }, // yes, the red one is the 'valid' one - just like for taking items
{ "CURSORS\\can_01.sti" , FALSE, 0, 0, 0, NULL },
{ "CURSORS\\can_02.sti" , FALSE, 0, 0, 0, NULL },
{ "CURSORS\\cur_tagr_ncth.sti" , FALSE, 0, ANIMATED_CURSOR, 7, NULL },
@@ -1215,6 +1218,21 @@ CursorData CursorDatabase[] =
0, 0, 0, 0, 0,
2, CENTER_CURSOR, CENTER_CURSOR, 0, 0 , 0, 0 },
// Flugente: apply item
{ C_TRINGS, 6, 0, HIDE_SUBCURSOR, HIDE_SUBCURSOR,
C_APPLYITEM , 0, 0, CENTER_SUBCURSOR, CENTER_SUBCURSOR,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
2, CENTER_CURSOR, CENTER_CURSOR, 0, 0 , 0, 0 },
{ C_TRINGS, 6, 0, HIDE_SUBCURSOR, HIDE_SUBCURSOR,
C_APPLYITEM_RED , 0, 0, CENTER_SUBCURSOR, CENTER_SUBCURSOR,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
2, CENTER_CURSOR, CENTER_CURSOR, 0, 0 , 0, 0 },
{ C_TRINGS, 6, 0, HIDE_SUBCURSOR, HIDE_SUBCURSOR,
C_FUEL , 0, 0, CENTER_SUBCURSOR, CENTER_SUBCURSOR,
0, 0, 0, 0, 0,
Utils/Cursors.h
+5
View File
@@ -159,6 +159,9 @@ typedef enum
CURSOR_HANDCUFF,
CURSOR_HANDCUFF_RED,
CURSOR_APPLYITEM,
CURSOR_APPLYITEM_RED,
CURSOR_FUEL,
CURSOR_FUEL_RED,
@@ -236,6 +239,8 @@ typedef enum
C_FORTIFICATION_RED,
C_HANDCUFFS,
C_HANDCUFFS_RED,
C_APPLYITEM,
C_APPLYITEM_RED,
C_FUEL,
C_FUEL_RED,
C_ACTIONMODERED_NCTH,
Utils/Text.h
+1
View File
@@ -689,6 +689,7 @@ enum
STR_COVERT_TEST_OK,
STR_COVERT_TEST_FAIL,
STR_COVERT_STEAL_FAIL,
STR_COVERT_APPLYITEM_STEAL_FAIL,
TEXT_NUM_COVERT_STR
};
Utils/_ChineseText.cpp
+1
View File
@@ -7493,6 +7493,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_DutchText.cpp
+1
View File
@@ -7490,6 +7490,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_EnglishText.cpp
+1
View File
@@ -7479,6 +7479,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_FrenchText.cpp
+1
View File
@@ -7474,6 +7474,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_GermanText.cpp
+1
View File
@@ -7302,6 +7302,7 @@ STR16 szCovertTextStr[]=
L"%s's Verkleidung sollte überzeugen",
L"%s's Verkleidung wird auffliegen!",
L"%s wurde beim Stehlen erwischt!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_ItalianText.cpp
+1
View File
@@ -7476,6 +7476,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_PolishText.cpp
+1
View File
@@ -7497,6 +7497,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_RussianText.cpp
+1
View File
@@ -7478,6 +7478,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=
Utils/_TaiwaneseText.cpp
+1
View File
@@ -7494,6 +7494,7 @@ STR16 szCovertTextStr[]=
L"%s's disguise seems to be ok...",
L"%s's disguise will not hold.",
L"%s was caught stealing!",
L"%s tried to manipulate %s's inventory."
};
STR16 szCorpseTextStr[]=