Merge pull request #168 from SantiSev/fix-reset-ammo

Fix reset ammo common weapon
SantiSev · Jun 25, 2024 · 74ca6d7 · 74ca6d7
2 parents 42beff7 + 40c5cb1
commit 74ca6d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/assets/config.yaml b/assets/config.yaml
@@ -31,7 +31,7 @@ enemy:
     damage: 25
     speed: 5
     falling_speed: 10
-    respawn_time: 200 # unit is in game loops
+    respawn_time: 500 # unit is in game loops
     movement_range: 60
 
 map_editor: # Values should be multiples of 32

diff --git a/server/game_logic/weapons/guns.cpp b/server/game_logic/weapons/guns.cpp
@@ -67,6 +67,8 @@ DefaultGun::DefaultGun(uint8_t weapon_id, Player& player_owner, CollisionManager
                config->bullet_base_dmg * 2, config->bullet_base_shoot_rate,
                config->bullet_base_speed, config) {}
 
+void DefaultGun::reset_ammo() { ammo = 99; }
+
 void DefaultGun::shoot() {
 
     if (!can_shoot) {

diff --git a/server/game_logic/weapons/guns.h b/server/game_logic/weapons/guns.h
@@ -31,6 +31,7 @@ class DefaultGun: public Weapon {
     DefaultGun(uint8_t weapon_id, Player& player_owner, CollisionManager& collision_manager,
                const std::shared_ptr<Configuration>& config);
     void shoot() override;
+    void reset_ammo() override;
 };
 
 #endif  // GUNS_H
diff --git a/server/game_logic/weapons/weapon.h b/server/game_logic/weapons/weapon.h
@@ -55,7 +55,7 @@ class Weapon {
     void update_shoot_rate();
     virtual void shoot();
     void add_ammo(int added_ammo);
-    void reset_ammo();
+    virtual void reset_ammo();
     void change_infinite_ammo();
 
     virtual ~Weapon();