mirror/anarch
1
0
Fork 0
mirror of https://gitlab.com/drummyfish/anarch.git synced 2024-11-21 16:35:08 -05:00
Code Issues Projects Releases Wiki Activity

Attack player only if visible

Browse Source
This commit is contained in:
Miloslav Číž 2020-11-14 12:27:09 +01:00
parent d601b5521e
commit e35e29bd0b
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
game.h
View File

@ -2146,6 +2146,24 @@ void SFG_getMonsterWorldPosition(SFG_MonsterRecord *monster, RCL_Unit *x,
+ RCL_UNITS_PER_SQUARE / 2; + RCL_UNITS_PER_SQUARE / 2;
} }
/**
Checks a 3D point visibility from player's position (WITHOUT considering
facing direction).
*/
static inline uint8_t SFG_spriteIsVisible(RCL_Vector2D pos, RCL_Unit height)
{
return
RCL_castRay3D(
SFG_player.camera.position,
SFG_player.camera.height,
pos,
height,
SFG_floorHeightAt,
SFG_ceilingHeightAt,
SFG_game.visibilityRayConstraints
) == RCL_UNITS_PER_SQUARE;
}
void SFG_monsterPerformAI(SFG_MonsterRecord *monster) void SFG_monsterPerformAI(SFG_MonsterRecord *monster)
{ {
uint8_t state = SFG_MR_STATE(*monster); uint8_t state = SFG_MR_STATE(*monster);
@ -2177,7 +2195,15 @@ void SFG_monsterPerformAI(SFG_MonsterRecord *monster)
SFG_GET_MONSTER_AGGRESSIVITY(SFG_MONSTER_TYPE_TO_INDEX(type))) SFG_GET_MONSTER_AGGRESSIVITY(SFG_MONSTER_TYPE_TO_INDEX(type)))
) )
{ {
if (SFG_random() % 4 != 0) RCL_Vector2D pos;
pos.x = SFG_MONSTER_COORD_TO_RCL_UNITS(monster->coords[0]);
pos.y = SFG_MONSTER_COORD_TO_RCL_UNITS(monster->coords[1]);
if (SFG_random() % 4 != 0 &&
SFG_spriteIsVisible(pos,currentHeight + // only if player is visible
SFG_SPRITE_SIZE_TO_HEIGHT_ABOVE_GROUND(
SFG_GET_MONSTER_SPRITE_SIZE(
SFG_MONSTER_TYPE_TO_INDEX(type)))))
{ {
// attack // attack
@ -2185,12 +2211,8 @@ void SFG_monsterPerformAI(SFG_MonsterRecord *monster)
if (type != SFG_LEVEL_ELEMENT_MONSTER_WARRIOR) if (type != SFG_LEVEL_ELEMENT_MONSTER_WARRIOR)
{ {
RCL_Vector2D pos;
RCL_Vector2D dir; RCL_Vector2D dir;
pos.x = SFG_MONSTER_COORD_TO_RCL_UNITS(monster->coords[0]);
pos.y = SFG_MONSTER_COORD_TO_RCL_UNITS(monster->coords[1]);
dir.x = SFG_player.camera.position.x - pos.x dir.x = SFG_player.camera.position.x - pos.x
- 128 * SFG_MONSTER_AIM_RANDOMNESS + - 128 * SFG_MONSTER_AIM_RANDOMNESS +
SFG_random() * SFG_MONSTER_AIM_RANDOMNESS; SFG_random() * SFG_MONSTER_AIM_RANDOMNESS;
@ -2864,24 +2886,6 @@ static inline uint16_t SFG_getMapRevealBit(uint8_t squareX, uint8_t squareY)
return 1 << ((squareY / 16) * 4 + squareX / 16); return 1 << ((squareY / 16) * 4 + squareX / 16);
} }
/**
Checks a 3D point visibility from player's position (WITHOUT considering
facing direction).
*/
static inline uint8_t SFG_spriteIsVisible(RCL_Vector2D pos, RCL_Unit height)
{
return
RCL_castRay3D(
SFG_player.camera.position,
SFG_player.camera.height,
pos,
height,
SFG_floorHeightAt,
SFG_ceilingHeightAt,
SFG_game.visibilityRayConstraints
) == RCL_UNITS_PER_SQUARE;
}
/** /**
Returns a tangent in RCL_Unit of vertical autoaim, given current game state. Returns a tangent in RCL_Unit of vertical autoaim, given current game state.
*/ */

8
main_sdl.c
View File

@ -47,7 +47,7 @@
#define SFG_BACKGROUND_BLUR 1 #define SFG_BACKGROUND_BLUR 1
#else #else
// lower quality // lower quality
#define SFG_FPS 30 #define SFG_FPS 35
#define SFG_SCREEN_RESOLUTION_X 640 #define SFG_SCREEN_RESOLUTION_X 640
#define SFG_SCREEN_RESOLUTION_Y 480 #define SFG_SCREEN_RESOLUTION_Y 480
#define SFG_RAYCASTING_SUBSAMPLE 2 #define SFG_RAYCASTING_SUBSAMPLE 2
@ -55,19 +55,19 @@
#define SFG_DIMINISH_SPRITES 0 #define SFG_DIMINISH_SPRITES 0
#define SFG_DITHERED_SHADOW 0 #define SFG_DITHERED_SHADOW 0
#define SFG_BACKGROUND_BLUR 0 #define SFG_BACKGROUND_BLUR 0
#define SFG_RAYCASTING_MAX_STEPS 20 #define SFG_RAYCASTING_MAX_STEPS 18
#define SFG_RAYCASTING_MAX_HITS 8 #define SFG_RAYCASTING_MAX_HITS 8
#endif #endif
#else #else
// emscripten // emscripten
#define SFG_FPS 30 #define SFG_FPS 35
#define SFG_SCREEN_RESOLUTION_X 512 #define SFG_SCREEN_RESOLUTION_X 512
#define SFG_SCREEN_RESOLUTION_Y 320 #define SFG_SCREEN_RESOLUTION_Y 320
#define SFG_CAN_EXIT 0 #define SFG_CAN_EXIT 0
#define SFG_RESOLUTION_SCALEDOWN 2 #define SFG_RESOLUTION_SCALEDOWN 2
#define SFG_DITHERED_SHADOW 1 #define SFG_DITHERED_SHADOW 1
#define SFG_BACKGROUND_BLUR 0 #define SFG_BACKGROUND_BLUR 0
#define SFG_RAYCASTING_MAX_STEPS 20 #define SFG_RAYCASTING_MAX_STEPS 18
#define SFG_RAYCASTING_MAX_HITS 8 #define SFG_RAYCASTING_MAX_HITS 8
#include <emscripten.h> #include <emscripten.h>