mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- New behaviour for gas grenades:
Gas grenades now don't cause direct damage on hit anymore. They will cause damage on start of turn or if you move inside a gas cloud. Of course gas mask still helps (except for creature gas and fire). Every tile moved inside a gas cloud deals a percentage of the normal damage (default 10%). This is set in Item_Settings.ini (DAMAGE_HEALTH_MOVE_EXPLOSIVE_MODIFIER, DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER). Tiles can now have multiple gas effects on them. Unfortunately this is not visualized (yet). Smoke doesn't make a character immune to other gas types anymore. The 25% chance of taking damage while moving through a gas cloud has been removed. Damage is now applied 100% of the time. - New modifiers for explosive damage in Item_Settings.ini (DAMAGE_HEALTH_EXPLOSIVE_MODIFIER, DAMAGE_BREATH_EXPLOSIVE_MODIFIER). These could fully replace EXPLOSIVES_DAMAGE_MODIFIER in Ja2_Options.ini but I left that general modifier untouched for now. - Some compiler warning fixes. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -648,7 +648,7 @@ void CreateTileDatabase( )
|
||||
TILE_ELEMENT TileElement;
|
||||
|
||||
// Loop through all surfaces and tiles and build database
|
||||
for( cnt1 = 0; cnt1 < giNumberOfTileTypes; cnt1++ )
|
||||
for( cnt1 = 0; cnt1 < (UINT32)giNumberOfTileTypes; cnt1++ )
|
||||
{
|
||||
// Get number of regions
|
||||
TileSurf = gTileSurfaceArray[ cnt1 ];
|
||||
@@ -1013,7 +1013,7 @@ BOOLEAN GetTypeSubIndexFromTileIndex( UINT32 uiCheckType, UINT16 usIndex, UINT16
|
||||
|
||||
*pusSubIndex = 0xffff;
|
||||
|
||||
CHECKF ( uiCheckType < giNumberOfTileTypes );
|
||||
CHECKF ( uiCheckType < (UINT32)giNumberOfTileTypes );
|
||||
|
||||
*pusSubIndex = usIndex - gTileTypeStartIndex[ uiCheckType ] + 1;
|
||||
|
||||
@@ -1026,7 +1026,7 @@ BOOLEAN GetTypeSubIndexFromTileIndexChar( UINT32 uiCheckType, UINT16 usIndex, UI
|
||||
|
||||
// Tile database is zero-based, Type indecies are 1-based!
|
||||
|
||||
CHECKF ( uiCheckType < giNumberOfTileTypes );
|
||||
CHECKF ( uiCheckType < (UINT32)giNumberOfTileTypes );
|
||||
|
||||
*pubSubIndex = (UINT8)(usIndex - gTileTypeStartIndex[ uiCheckType ] + 1);
|
||||
|
||||
@@ -1039,7 +1039,7 @@ BOOLEAN GetTileIndexFromTypeSubIndex( UINT32 uiCheckType, UINT16 usSubIndex, UIN
|
||||
|
||||
*pusTileIndex = 0xffff;
|
||||
|
||||
CHECKF ( uiCheckType < giNumberOfTileTypes );
|
||||
CHECKF ( uiCheckType < (UINT32)giNumberOfTileTypes );
|
||||
|
||||
*pusTileIndex = usSubIndex + gTileTypeStartIndex[ uiCheckType ] - 1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user