Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: implemented revolver

Browse source
This commit is contained in:
Sara 2025-08-04 13:45:16 +02:00
parent 47970091ff
commit 945baf0994
12 changed files with 12403 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

60
modules/wave_survival/weapons/revolver.cpp
View file

@ -1,9 +1,13 @@
#include "revolver.h"
#include "scene/animation/animation_player.h"
#include "wave_survival/macros.h"
#include "wave_survival/player_camera.h"
#include "wave_survival/player_input.h"
void Revolver::_bind_methods() {
ClassDB::bind_method(D_METHOD("start_recoil"), &self_type::start_recoil);
BIND_PROPERTY(Variant::FLOAT, single_action_spread);
BIND_PROPERTY(Variant::FLOAT, double_action_spread);
}
void Revolver::play_equip_anim() {
@ -14,14 +18,25 @@ void Revolver::play_equip_anim() {
void Revolver::shoot() {
if (!is_animating()) {
this->muzzle->shoot();
if (this->alt_active) {
get_anim()->queue("fire_single");
get_anim()->queue("idle_single");
this->alt_active = false;
this->muzzle->set_spread(this->single_action_spread);
this->muzzle->shoot();
start_recoil();
} else {
this->muzzle->set_spread(this->double_action_spread);
get_anim()->queue("fire_double");
get_anim()->queue("idle_double");
}
get_anim()->queue("idle_double");
}
}
void Revolver::cock_hammer() {
if (!this->alt_active && !is_animating()) {
this->alt_active = true;
get_anim()->queue("to_single");
get_anim()->queue("idle_single");
}
}
@ -32,7 +47,9 @@ void Revolver::on_primary_fire(bool pressed) {
}
void Revolver::on_alt_mode(bool pressed) {
this->alt_requested = pressed;
if (!this->alt_active && pressed) {
cock_hammer();
}
}
void Revolver::ready() {
@ -43,11 +60,12 @@ void Revolver::ready() {
}
void Revolver::process(double delta) {
String const current{ get_anim()->get_current_animation() };
double animation_time{ get_anim()->get_current_animation_position() };
if (current == "fire_single" || current == "fire_double") {
double t{ animation_time / this->recoil_time };
get_camera()->recoil(Math::lerp((double)this->recoil_force, 0.0, CLAMP(t, 0.0, 1.0)) * delta);
//String const current{ get_anim()->get_current_animation() };
//double animation_time{ get_anim()->get_current_animation_position() };
if (this->recoil_timer > 0.0) {
this->recoil_timer -= delta;
double t{ 1.0 - CLAMP(this->recoil_timer / this->recoil_time, 0.0, 1.0) };
get_camera()->recoil(Math::lerp((double)this->recoil_force, 0.0, t) * delta);
}
}
@ -71,3 +89,27 @@ void Revolver::_notification(int what) {
void Revolver::notify_selected() {
play_equip_anim();
}
bool Revolver::allows_running() const {
return true;
}
void Revolver::start_recoil() {
this->recoil_timer = this->recoil_time;
}
void Revolver::set_single_action_spread(float value) {
this->single_action_spread = value;
}
float Revolver::get_single_action_spread() const {
return this->single_action_spread;
}
void Revolver::set_double_action_spread(float value) {
this->double_action_spread = value;
}
float Revolver::get_double_action_spread() const {
return this->double_action_spread;
}