yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 21:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: add monster_tank_stand from ReRelease

Browse source
This commit is contained in:
Denis Pauk 2023-10-24 13:50:17 +03:00
parent 600d6d34c1
commit fb5216ffcf
4 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/g_spawn.c
View file

@ -324,6 +324,7 @@ static spawn_t spawns[] = {
{"monster_soldier_ss", SP_monster_soldier_ss},
{"monster_tank", SP_monster_tank},
{"monster_tank_commander", SP_monster_tank},
{"monster_tank_stand", SP_monster_tank},
{"monster_medic", SP_monster_medic},
{"monster_flipper", SP_monster_flipper},
{"monster_chick", SP_monster_chick},

40
src/game/monster/tank/tank.c
View file

@ -33,6 +33,7 @@ void tank_doattack_rocket(edict_t *self);
void tank_reattack_blaster(edict_t *self);
void tank_walk(edict_t *self);
void tank_run(edict_t *self);
void Use_Boss3(edict_t * ent, edict_t * other, edict_t * activator);
static int sound_thud;
static int sound_pain;
@ -1205,6 +1206,26 @@ tank_blocked(edict_t *self, float dist)
return false;
}
void
tank_stand_think(edict_t * self)
{
if (!self)
{
return;
}
if (self->s.frame == FRAME_stand30)
{
self->s.frame = FRAME_stand01;
}
else
{
self->s.frame++;
}
self->nextthink = level.time + FRAMETIME;
}
/*
* QUAKED monster_tank (1 .5 0) (-32 -32 -16) (32 32 72) Ambush Trigger_Spawn Sight
*/
@ -1212,6 +1233,13 @@ tank_blocked(edict_t *self, float dist)
/*
* QUAKED monster_tank_commander (1 .5 0) (-32 -32 -16) (32 32 72) Ambush Trigger_Spawn Sight
*/
/*QUAKED monster_tank_stand (1 .5 0) (-32 -32 0) (32 32 90)
Just stands and cycles in one place until targeted, then teleports away.
N64 edition!
*/
void
SP_monster_tank(edict_t *self)
{
@ -1279,7 +1307,17 @@ SP_monster_tank(edict_t *self)
self->monsterinfo.currentmove = &tank_move_stand;
self->monsterinfo.scale = MODEL_SCALE;
walkmonster_start(self);
if (strcmp(self->classname, "monster_tank_stand") == 0)
{
self->monsterinfo.scale = MODEL_SCALE * 1.5f;
self->use = Use_Boss3;
self->think = tank_stand_think;
self->nextthink = level.time + FRAMETIME;
}
else
{
walkmonster_start(self);
}
self->monsterinfo.aiflags |= AI_IGNORE_SHOTS;
self->monsterinfo.blindfire = true;

1
src/game/savegame/tables/gamefunc_decs.h
View file

@ -335,6 +335,7 @@ extern void SP_CreateUnnamedSpawn ( edict_t * self ) ;
extern void SP_CreateCoopSpots ( edict_t * self ) ;
extern void SP_FixCoopSpots ( edict_t * self ) ;
extern void SP_monster_tank ( edict_t * self ) ;
extern void tank_stand_think ( edict_t * self ) ;
extern void tank_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void tank_dead ( edict_t * self ) ;
extern void tank_attack ( edict_t * self ) ;

1
src/game/savegame/tables/gamefunc_list.h
View file

@ -334,6 +334,7 @@
{"turret_sight", (byte *)turret_sight},
{"TurretAim", (byte *)TurretAim},
{"SP_monster_tank", (byte *)SP_monster_tank},
{"tank_stand_think", (byte *)tank_stand_think},
{"tank_die", (byte *)tank_die},
{"tank_dead", (byte *)tank_dead},
{"tank_attack", (byte *)tank_attack},