New feature: guns can be cannibalized via merge, increasing the status of the first gun while lowering that of the second gun.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=350386&#msg_350386

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-07-25 17:13:43 +00:00
parent 6ce47c4cef
commit 57c9e16523
3 changed files with 116 additions and 26 deletions
+7 -2
View File
@@ -1178,8 +1178,12 @@ typedef struct
INT16 sBackpackWeightModifier; //modifier to weight calculation to climb.
BOOLEAN fAllowClimbing; //does item allow climbing while wearing it
BOOLEAN cigarette; // Flugenete: this item can be smoked
UINT8 usPortionSize; // Flugente: for consumables: how much of this item is consumed at once
BOOLEAN cigarette; // Flugente: this item can be smoked
UINT8 usPortionSize; // Flugente: for consumables: how much of this item is consumed at once
// Flugente: riot shields
UINT16 usRiotShieldStrength; // strength of shield
UINT16 usRiotShieldGraphic; // graphic of shield (when deployed in tactical, taken from Tilecache/riotshield.sti)
} INVTYPE;
@@ -1800,6 +1804,7 @@ typedef enum
MECHANICAL_MERGE_HARD,
TRIPWIRE_ROLL,
USE_ITEM_NEW,
CANNIBALIZE,
} MergeType;
extern UINT16 Merge[MAXITEMS+1][6];