Merge pull request #77762 from Night-Pryanik/secubot

Monsters spawned via `place_critter_within` now gain ammo on spawn
CleverRaven · Nov 15, 2024 · 537adea · 537adea
2 parents 36181ca + 71760f6
commit 537adea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/computer_session.cpp b/src/computer_session.cpp
@@ -1634,13 +1634,10 @@ void computer_session::failure_manhacks()
 
 void computer_session::failure_secubots()
 {
-    int num_robots = 1;
     const tripoint_range<tripoint> range =
         get_map().points_in_radius( get_player_character().pos(), 3 );
-    for( int i = 0; i < num_robots; i++ ) {
-        if( g->place_critter_within( mon_secubot, range ) ) {
-            add_msg( m_warning, _( "Secubots emerge from compartments in the floor." ) );
-        }
+    if( g->place_critter_within( mon_secubot, range ) ) {
+        add_msg( m_warning, _( "A secubot emerges from a compartment in the floor." ) );
     }
 }
 

diff --git a/src/game.cpp b/src/game.cpp
@@ -5111,7 +5111,9 @@ monster *game::place_critter_within( const mtype_id &id, const tripoint_range<tr
     if( id.is_null() ) {
         return nullptr;
     }
-    return place_critter_within( make_shared_fast<monster>( id ), range );
+    shared_ptr_fast<monster> mon = make_shared_fast<monster>( id );
+    mon->ammo = mon->type->starting_ammo;
+    return place_critter_within( mon, range );
 }
 
 monster *game::place_critter_within( const shared_ptr_fast<monster> &mon,