edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

new experimental weapon

Browse source
This commit is contained in:
Joel de Vahl 2007-12-27 17:46:32 +00:00
parent e59ef41843
commit 4fd640c705
4 changed files with 112 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
datasrc/teewars.ds
View file

@ -527,6 +527,37 @@ weapons {
overchargetime 10.0
}
bomb {
sprite_body sprites.game.weapon_rocket_body
sprite_cursor sprites.game.weapon_rocket_cursor
sprite_proj sprites.game.weapon_rocket_proj
sprite_muzzles {
sprites.game.weapon_shotgun_muzzle1
sprites.game.weapon_shotgun_muzzle2
sprites.game.weapon_shotgun_muzzle3
}
nummuzzlesprites 3
muzzleoffsetx 0.0
muzzleoffsety 0.0
maxammo 10
costammo 1
recoil 10
firedelay 800
muzzleduration 0
visual_size 128
offsetx 24.0
offsety -2.0
meleedamage 0
meleereach 0
ammoregentime 0
duration -1
movetime 0
velocity 0
chargetime 1.0
overchargetime 10.0
}
ninja {
sprite_body sprites.game.weapon_ninja_body
sprite_cursor sprites.game.weapon_ninja_cursor

2
src/game/client/gc_client.cpp
View file

@ -972,6 +972,8 @@ static void render_projectile(const obj_projectile *prev, const obj_projectile *
float gravity = -400;
if(current->type != WEAPON_ROCKET)
gravity = -100;
if(current->type == WEAPON_BOMB)
gravity = 0;
float ct = (client_tick()-current->start_tick)/(float)SERVER_TICK_SPEED + client_ticktime()*1/(float)SERVER_TICK_SPEED;
vec2 startpos(current->x, current->y);

3
src/game/server/gs_common.h
View file

@ -245,6 +245,8 @@ public:
int sniper_chargetick;
int bomb_firetick;
int damage_taken;
int emote_type;
@ -317,6 +319,7 @@ public:
int handle_weapons();
int handle_ninja();
int handle_sniper();
int handle_bomb();
virtual void tick();
virtual void tick_defered();

104
src/game/server/gs_server.cpp
View file

@ -335,6 +335,31 @@ void game_world::tick()
remove_entities();
}
struct input_count
{
int presses;
int releases;
};
static input_count count_input(int prev, int cur)
{
input_count c = {0,0};
prev &= INPUT_STATE_MASK;
cur &= INPUT_STATE_MASK;
int i = prev;
while(i != cur)
{
i = (i+1)&INPUT_STATE_MASK;
if(i&1)
c.presses++;
else
c.releases++;
}
return c;
}
//////////////////////////////////////////////////
// projectile
//////////////////////////////////////////////////
@ -368,6 +393,8 @@ void projectile::tick()
float gravity = -400;
if(type != WEAPON_ROCKET)
gravity = -100;
if(type == WEAPON_BOMB)
gravity = 0;
float pt = (server_tick()-start_tick-1)/(float)SERVER_TICK_SPEED;
float ct = (server_tick()-start_tick)/(float)SERVER_TICK_SPEED;
@ -380,10 +407,17 @@ void projectile::tick()
vec2 new_pos;
entity *targetplayer = (entity*)intersect_player(prevpos, curpos, new_pos, powner);
player *p = (player*) powner;
if(targetplayer || collide || lifespan < 0 )
if(targetplayer || collide || lifespan < 0 || (type == WEAPON_BOMB && count_input(p->previnput.fire, p->input.fire).releases))
{
if (lifespan >= 0 || weapon == WEAPON_ROCKET)
if(type == WEAPON_BOMB)
{
p->bomb_firetick = -1;
p->reload_timer = data->weapons[WEAPON_BOMB].firedelay * server_tickspeed() / 1000;
}
if (lifespan >= 0 || weapon == WEAPON_ROCKET || weapon == WEAPON_BOMB)
create_sound(pos, sound_impact);
if (flags & PROJECTILE_FLAGS_EXPLODE)
@ -467,6 +501,7 @@ void player::reset()
numobjectshit = 0;
ninja_activationtick = 0;
sniper_chargetick = -1;
bomb_firetick = -1;
currentmovetime = 0;
active_weapon = WEAPON_GUN;
@ -672,6 +707,8 @@ void player::try_respawn()
//weapons[WEAPON_SNIPER].got = true;
//weapons[WEAPON_SNIPER].ammo = data->weapons[WEAPON_SNIPER].maxammo;
weapons[WEAPON_BOMB].got = true;
weapons[WEAPON_BOMB].ammo = data->weapons[WEAPON_BOMB].maxammo;
active_weapon = WEAPON_GUN;
last_weapon = WEAPON_HAMMER;
wanted_weapon = WEAPON_GUN;
@ -694,30 +731,6 @@ bool player::is_grounded()
return false;
}
struct input_count
{
int presses;
int releases;
};
static input_count count_input(int prev, int cur)
{
input_count c = {0,0};
prev &= INPUT_STATE_MASK;
cur &= INPUT_STATE_MASK;
int i = prev;
while(i != cur)
{
i = (i+1)&INPUT_STATE_MASK;
if(i&1)
c.presses++;
else
c.releases++;
}
return c;
}
int player::handle_ninja()
{
@ -917,6 +930,32 @@ int player::handle_sniper()
return 0;
}
int player::handle_bomb()
{
struct input_count button = count_input(previnput.fire, input.fire);
if(button.releases)
{
}
else if(input.fire & 1 && bomb_firetick == -1 && reload_timer == 0)
{
vec2 direction = normalize(vec2(input.target_x, input.target_y));
new projectile(WEAPON_BOMB,
client_id,
pos+vec2(0,0),
direction*7.0f,
100,
this,
1, projectile::PROJECTILE_FLAGS_EXPLODE, 0, SOUND_ROCKET_EXPLODE, WEAPON_ROCKET);
create_sound(pos, SOUND_ROCKET_FIRE);
bomb_firetick = server_tick();
attack_tick = server_tick();
weapons[active_weapon].ammo--;
}
return 0;
}
int player::handle_weapons()
{
vec2 direction = normalize(vec2(input.target_x, input.target_y));
@ -993,6 +1032,8 @@ int player::handle_weapons()
if (active_weapon == WEAPON_SNIPER)
return handle_sniper();
*/
if (active_weapon == WEAPON_BOMB)
return handle_bomb();
if(reload_timer == 0)
{
@ -1662,8 +1703,15 @@ void create_explosion(vec2 p, int owner, int weapon, bool bnodamage)
{
// deal damage
entity *ents[64];
const float radius = 128.0f;
const float innerradius = 42.0f;
float radius = 128.0f;
float innerradius = 42.0f;
if(weapon == WEAPON_BOMB)
{
radius = 256.0f;
innerradius = 64.0f;
}
int num = world->find_entities(p, radius, ents, 64);
for(int i = 0; i < num; i++)
{