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

some renames and sniper stuff

Browse source
This commit is contained in:
Magnus Auvinen 2007-12-15 12:04:48 +00:00
parent a3c5960ffe
commit 1ba4e8d4ef
3 changed files with 107 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
datasrc/teewars.ds
View file

@ -486,37 +486,6 @@ weapons {
overchargetime 0.0
}
ninja {
sprite_body sprites.game.weapon_ninja_body
sprite_cursor sprites.game.weapon_ninja_cursor
sprite_proj sprites.game.weapon_ninja_proj
sprite_muzzles {
sprites.game.hadoken1
sprites.game.hadoken2
sprites.game.hadoken3
}
nummuzzlesprites 3
muzzleoffsetx 40.0
muzzleoffsety -4.0
maxammo 0
costammo 0
recoil 0
firedelay 800
muzzleduration 0
visual_size 96
offsetx 0.0
offsety 0.0
meleedamage 9
meleereach 0
ammoregentime 0
duration 15000
movetime 200
velocity 50
chargetime 0.0
overchargetime 0.0
}
sniper {
sprite_body sprites.game.weapon_rocket_body
sprite_cursor sprites.game.weapon_rocket_cursor
@ -547,6 +516,38 @@ weapons {
chargetime 0.5
overchargetime 10.0
}
ninja {
sprite_body sprites.game.weapon_ninja_body
sprite_cursor sprites.game.weapon_ninja_cursor
sprite_proj sprites.game.weapon_ninja_proj
sprite_muzzles {
sprites.game.hadoken1
sprites.game.hadoken2
sprites.game.hadoken3
}
nummuzzlesprites 3
muzzleoffsetx 40.0
muzzleoffsety -4.0
maxammo 0
costammo 0
recoil 0
firedelay 800
muzzleduration 0
visual_size 96
offsetx 0.0
offsety 0.0
meleedamage 9
meleereach 0
ammoregentime 0
duration 15000
movetime 200
velocity 50
chargetime 0.0
overchargetime 0.0
}
}
sprites {

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

@ -234,7 +234,6 @@ public:
int ammo;
int ammocost;
int weaponstage;
int chargetick;
bool got;
} weapons[NUM_WEAPONS];
int active_weapon;
@ -243,6 +242,8 @@ public:
int reload_timer;
int attack_tick;
int sniper_chargetick;
int damage_taken;
int emote_type;
@ -270,7 +271,7 @@ public:
// ninja
vec2 activationdir;
int ninjaactivationtick;
int ninja_activationtick;
int extrapowerflags;
int currentcooldown;
int currentactivation;

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

@ -389,7 +389,8 @@ void player::reset()
damage_taken_tick = 0;
attack_tick = 0;
numobjectshit = 0;
ninjaactivationtick = 0;
ninja_activationtick = 0;
sniper_chargetick = -1;
currentmovetime = 0;
active_weapon = WEAPON_GUN;
@ -481,6 +482,10 @@ void player::try_respawn()
health = 10;
armor = 0;
jumped = 0;
ninja_activationtick = 0;
sniper_chargetick = -1;
dead = false;
set_flag(entity::FLAG_PHYSICS);
state = STATE_PLAYING;
@ -549,7 +554,7 @@ int player::handle_ninja()
{
vec2 direction = normalize(vec2(input.target_x, input.target_y));
if ((server_tick() - ninjaactivationtick) > (data->weapons[WEAPON_NINJA].duration * server_tickspeed() / 1000))
if ((server_tick() - ninja_activationtick) > (data->weapons[WEAPON_NINJA].duration * server_tickspeed() / 1000))
{
// time's up, return
weapons[WEAPON_NINJA].got = false;
@ -643,10 +648,48 @@ int player::handle_ninja()
int player::handle_sniper()
{
return 0;
/*
struct input_count button = count_input(previnput.fire, input.fire);
if (button.releases)
bool must_release = false;
int current_load = (server_tick()-sniper_chargetick) / server_tickspeed() + 1;
if(input.fire&1)
{
if(sniper_chargetick == -1)
{
// start charge
sniper_chargetick = server_tick();
}
else
{
if(current_load > weapons[WEAPON_SNIPER].ammo+3)
must_release = true;
}
}
if(button.releases || must_release)
{
vec2 direction = normalize(vec2(input.target_x, input.target_y));
// released
sniper_chargetick = -1;
if(current_load > weapons[WEAPON_SNIPER].ammo)
current_load = weapons[WEAPON_SNIPER].ammo;
weapons[WEAPON_SNIPER].ammo -= current_load;
new projectile(projectile::WEAPON_PROJECTILETYPE_SNIPER,
client_id, pos+vec2(0,0), direction*50.0f,
100, this, current_load, 0, 0, -1, WEAPON_SNIPER);
create_sound(pos, SOUND_SNIPER_FIRE);
}
*/
/*
if(button.releases)
{
vec2 direction = normalize(vec2(input.target_x, input.target_y));
// Check if we were charging, if so fire
@ -697,11 +740,11 @@ int player::handle_sniper()
}
// While charging, don't move
return MODIFIER_RETURNFLAGS_OVERRIDEVELOCITY|MODIFIER_RETURNFLAGS_NOHOOK;
return 0;
}
else if (weapons[WEAPON_SNIPER].weaponstage)
weapons[WEAPON_SNIPER].weaponstage = WEAPONSTAGE_SNIPER_NEUTRAL;
}
}*/
return 0;
}
@ -776,11 +819,11 @@ int player::handle_weapons()
}
}
// don't update other weapons while sniper is active
/*
if (active_weapon == WEAPON_SNIPER)
{
// don't update other weapons while sniper is active
return handle_sniper();
}
*/
if(count_input(previnput.fire, input.fire).presses) //previnput.fire != input.fire && (input.fire&1))
{
@ -792,12 +835,15 @@ int player::handle_weapons()
switch(active_weapon)
{
case WEAPON_HAMMER:
{
// reset objects hit
numobjectshit = 0;
create_sound(pos, SOUND_HAMMER_FIRE);
break;
}
case WEAPON_GUN:
{
new projectile(WEAPON_GUN,
client_id,
pos+vec2(0,0),
@ -807,6 +853,7 @@ int player::handle_weapons()
1, 0, 0, -1, WEAPON_GUN);
create_sound(pos, SOUND_GUN_FIRE);
break;
}
case WEAPON_ROCKET:
{
new projectile(WEAPON_ROCKET,
@ -840,6 +887,20 @@ int player::handle_weapons()
create_sound(pos, SOUND_SHOTGUN_FIRE);
break;
}
case WEAPON_SNIPER:
{
new projectile(WEAPON_SNIPER,
client_id,
pos+vec2(0,0),
direction*300.0f,
100,
this,
1, 0, 0, -1, WEAPON_SNIPER);
create_sound(pos, SOUND_SNIPER_FIRE);
break;
}
}
weapons[active_weapon].ammo--;
@ -1324,7 +1385,7 @@ void powerup::tick()
case POWERUP_NINJA:
{
// activate ninja on target player
pplayer->ninjaactivationtick = server_tick();
pplayer->ninja_activationtick = server_tick();
pplayer->weapons[WEAPON_NINJA].got = true;
pplayer->last_weapon = pplayer->active_weapon;
pplayer->active_weapon = WEAPON_NINJA;