New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects.

For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

Requires GameDir >= r2099.

Does not break savegame compatibility.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-08-10 13:45:11 +00:00
parent 09244c2369
commit 36e9d15edc
96 changed files with 5569 additions and 1573 deletions
+11 -9
View File
@@ -54,6 +54,8 @@ enum
OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_GOOD, // other guy attempted to solve the conflict agressively, and we thought that was good
OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_BAD, // other guy attempted to solve the conflict agressively, and we thought that was bad
OPINIONEVENT_DISEASE_DISGUSTING, // we have a disease, which others might find disgusting
OPINIONEVENT_DISEASE_TREATMENT, // someone treated our diseases
OPINIONEVENT_MAX
};
@@ -223,17 +225,17 @@ extern DynamicOpinionEvent gDynamicOpinionEvent[OPINIONEVENT_MAX];
#define OPINIONFLAG_STAGE3_SOLVECONFLICT_AGGRESSIVE_BAD 0x00040000 //262144
#define OPINIONFLAG_STAGE4_SOLVECONFLICT_AGGRESSIVE_BAD 0x00080000 //524288
/*#define OPINIONFLAG_STAGE1_AGAINST_US 0x00100000 //1048576 // was against us in dialogue
#define OPINIONFLAG_STAGE2_AGAINST_US 0x00200000 //2097152
#define OPINIONFLAG_STAGE3_AGAINST_US 0x00400000 //4194304
#define OPINIONFLAG_STAGE4_AGAINST_US 0x00800000 //8388608
#define OPINIONFLAG_STAGE1_DISEASE_DISGUSTING 0x00100000 //1048576 // is diseased, which we find disgusting
#define OPINIONFLAG_STAGE2_DISEASE_DISGUSTING 0x00200000 //2097152
#define OPINIONFLAG_STAGE3_DISEASE_DISGUSTING 0x00400000 //4194304
#define OPINIONFLAG_STAGE4_DISEASE_DISGUSTING 0x00800000 //8388608
#define OPINIONFLAG_STAGE1_FOR_US 0x01000000 //16777216 // other guy was for us in dialogue
#define OPINIONFLAG_STAGE2_FOR_US 0x02000000 //33554432
#define OPINIONFLAG_STAGE3_FOR_US 0x04000000 //67108864
#define OPINIONFLAG_STAGE4_FOR_US 0x08000000 //134217728
#define OPINIONFLAG_STAGE1_DISEASE_TREATMENT 0x01000000 //16777216 // treated our disease, which we like
#define OPINIONFLAG_STAGE2_DISEASE_TREATMENT 0x02000000 //33554432
#define OPINIONFLAG_STAGE3_DISEASE_TREATMENT 0x04000000 //67108864
#define OPINIONFLAG_STAGE4_DISEASE_TREATMENT 0x08000000 //134217728
#define OPINIONFLAG_STAGE1_AGAINST_ENEMY 0x10000000 //268435456 // was against our dialogue enemy in dialogue
/*#define OPINIONFLAG_STAGE1_AGAINST_ENEMY 0x10000000 //268435456 // was against our dialogue enemy in dialogue
#define OPINIONFLAG_STAGE2_AGAINST_ENEMY 0x20000000 //536870912
#define OPINIONFLAG_STAGE3_AGAINST_ENEMY 0x40000000 //1073741824
#define OPINIONFLAG_STAGE4_AGAINST_ENEMY 0x80000000 //2147483648*/