spectral blade messages

goblinhack · Nov 10, 2023 · ce6514a · ce6514a
1 parent 8ef310e
commit ce6514a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/game_player.cpp b/src/game_player.cpp
@@ -92,7 +92,7 @@ void Game::place_player(void)
         }
         level->thing_new("tentacleye", point(x + 1, y));
       }
-      if (1) {
+      if (0) {
         auto w = level->thing_new("mace", point(x, y));
         t->carry(w, carry_options);
         if (1) {

diff --git a/src/thing_attack.cpp b/src/thing_attack.cpp
@@ -632,6 +632,7 @@ bool Thing::attack(Thingp victim, ThingAttackOptionsp attack_options)
   idle_count_set(0);
 
   auto owner = top_owner();
+  auto l     = leader();
 
   if (d1000() < chance_d1000_teleport_attack()) {
     TeleportOptions teleport_options;
@@ -2031,7 +2032,9 @@ bool Thing::attack(Thingp victim, ThingAttackOptionsp attack_options)
         }
 
         if (! hit) {
-          if (is_player() || (owner && owner->is_player())) {
+          if (is_player() || (l && l->is_player())) {
+            msg("Your %s misses %s.%%fg=reset$", text_long_name().c_str(), victim->text_the().c_str());
+          } else if (is_player() || (owner && owner->is_player())) {
             if (fumble) {
               msg("%%fg=orange$You fumble and miss %s.%%fg=reset$", victim->text_the().c_str());
               popup("You fumble");

diff --git a/src/thing_hit.cpp b/src/thing_hit.cpp
@@ -221,6 +221,8 @@ int Thing::ai_hit_actual(Thingp              hitter,      // an arrow / monst /.
     return false;
   }
 
+  auto l = hitter->leader();
+
   dbg("Hit actual, damage %d", damage);
   TRACE_NO_INDENT();
 
@@ -1423,7 +1425,7 @@ int Thing::ai_hit_actual(Thingp              hitter,      // an arrow / monst /.
       TRACE_NO_INDENT();
 
       if (o_top && o_top->is_player()) {
-        dbg("Player is onwer of dead or dying thing");
+        dbg("Player is owner of dead or dying thing");
         if (! o_top->is_dead && ! o_top->is_dying) {
           if (is_drained) {
             msg("Your %s is drained.", text_long_name().c_str());
@@ -2178,6 +2180,8 @@ int Thing::ai_hit_actual(Thingp              hitter,      // an arrow / monst /.
       real_hitter->msg("%s hits %s with %s.", real_hitter->text_The().c_str(), text_the().c_str(),
                        hitter->text_the().c_str());
     }
+  } else if (l && l->is_player()) {
+    msg("Your %s hits %s.%%fg=reset$", hitter->text_long_name().c_str(), text_the().c_str());
   } else if (real_hitter != this) {
     TRACE_NO_INDENT();
     //