Merge pull request #34 from Attnam/explore-conflicts

merge Explore conflicts into master
Attnam · Apr 11, 2015 · 0efb717 · 0efb717
2 parents 8eb7fd9 + 98e8486
commit 0efb717
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/Main/Source/char.cpp b/Main/Source/char.cpp
@@ -8168,12 +8168,7 @@ void character::ReceivePeaSoup(long)
 void character::AddPeaSoupConsumeEndMessage() const
 {
   if(IsPlayer())
-  {
-    if(CanHear())
-      ADD_MESSAGE("Mmmh! The soup is very tasty. You hear a small puff.");
-    else
-      ADD_MESSAGE("Mmmh! The soup is very tasty.");
-  }
+    ADD_MESSAGE("Mmmh! The soup is very tasty.%s", CanHear() ? " You hear a small puff." : "");
   else if(CanBeSeenByPlayer() && PLAYER->CanHear()) // change someday
     ADD_MESSAGE("You hear a small puff.");
 }

diff --git a/Main/Source/command.cpp b/Main/Source/command.cpp
@@ -63,7 +63,7 @@ command* commandsystem::Command[] =
   new command(&Dip, "dip", '!', '!', '!', false),
   new command(&Drink, "drink", 'D', 'D', 'D', true),
   new command(&Drop, "drop", 'd', 'd', 'd', true),
-  new command(&Eat, "eat", 'e', 'e',' e', true),
+  new command(&Eat, "eat", 'e', 'e', 'e', true),
   new command(&WhatToEngrave, "engrave", 'G', 'G', 'G', false),
   new command(&EquipmentScreen, "equipment menu", 'E', 'E', 'E', true),
   new command(&Go, "go", 'g', 'g', 'g', false),

diff --git a/Main/Source/nonhuman.cpp b/Main/Source/nonhuman.cpp
@@ -1900,14 +1900,14 @@ truth blinkdog::SpecialEnemySightedReaction(character*)
 
   if(!(RAND() & 31))
   {
-    MonsterTeleport("playful bark");
+    MonsterTeleport("a playful bark");
     return true;
   }
 
   if((!(RAND() & 3) && StateIsActivated(PANIC))
      || (!(RAND() & 7) && IsInBadCondition()))
   {
-    MonsterTeleport("frightened howl");
+    MonsterTeleport("a frightened howl");
     return true;
   }
 
@@ -1916,10 +1916,12 @@ truth blinkdog::SpecialEnemySightedReaction(character*)
 
 void blinkdog::MonsterTeleport(cchar* BarkMsg)
 {
-  if(CanBeSeenByPlayer())
-    ADD_MESSAGE("You hear a %s inside your head as %s vanishes!", BarkMsg, CHAR_NAME(DEFINITE));
+  if(IsPlayer())
+    ADD_MESSAGE("You vanish.");
+  else if(CanBeSeenByPlayer())
+    ADD_MESSAGE("You hear %s inside your head as %s vanishes!", BarkMsg, CHAR_NAME(DEFINITE));
   else
-    ADD_MESSAGE("You hear a %s inside your head.", BarkMsg);
+    ADD_MESSAGE("You hear %s inside your head.", BarkMsg);
 
   v2 Pos = GetPos();
   rect Border(Pos + v2(-5, -5), Pos + v2(5, 5));
@@ -1930,7 +1932,9 @@ void blinkdog::MonsterTeleport(cchar* BarkMsg)
 
   Move(Pos, true);
 
-  if(CanBeSeenByPlayer())
+  if(IsPlayer())
+    ADD_MESSAGE("You materialize.");
+  else if(CanBeSeenByPlayer())
     ADD_MESSAGE("%s materializes from nowhere!", CHAR_NAME(INDEFINITE));
 
   EditAP(-1000);
@@ -1944,7 +1948,7 @@ int unicorn::TakeHit(character* Enemy, item* Weapon, bodypart* EnemyBodyPart, v2
      && (StateIsActivated(PANIC)
 	 || (RAND() & 1 && IsInBadCondition())
 	 || !(RAND() & 7)))
-    MonsterTeleport("neighs in terror");
+    MonsterTeleport(" in terror");
 
   return Return;
 }
@@ -1961,20 +1965,24 @@ int blinkdog::TakeHit(character* Enemy, item* Weapon, bodypart* EnemyBodyPart, v
     if((RAND() & 1 && StateIsActivated(PANIC))
        || (!(RAND() & 3) && IsInBadCondition())
        || !(RAND() & 15))
-    MonsterTeleport("terrified yelp");
+    MonsterTeleport("a terrified yelp");
   }
 
   return Return;
 }
 
-void unicorn::MonsterTeleport(cchar* NeighMsg)
+void unicorn::MonsterTeleport(cchar* NeighDescription)
 {
-  if(CanBeSeenByPlayer())
-    ADD_MESSAGE("%s %s and disappears!", CHAR_NAME(DEFINITE), NeighMsg);
+  if(IsPlayer())
+    ADD_MESSAGE("You neigh%s and disappear.", NeighDescription);
+  else if(CanBeSeenByPlayer())
+    ADD_MESSAGE("%s neighs%s and disappears!", CHAR_NAME(DEFINITE), NeighDescription);
 
   Move(GetLevel()->GetRandomSquare(this), true);
 
-  if(CanBeSeenByPlayer())
+  if(IsPlayer())
+    ADD_MESSAGE("You reappear.");
+  else if(CanBeSeenByPlayer())
     ADD_MESSAGE("Suddenly %s appears from nothing!", CHAR_NAME(INDEFINITE));
 
   EditAP(-1000);

diff --git a/Script/char.dat b/Script/char.dat
@@ -119,7 +119,7 @@ character
   DefaultCommandFlags = FOLLOW_PLAYER|DONT_CONSUME_ANYTHING_VALUABLE;
   ConstantCommandFlags = 0;
   WillCarryItems = false;
-  ForceVomitMessage = "You push your fingers down to your throat and vomit.";
+  ForceVomitMessage = "You vomit.";
   SweatMaterial = SWEAT;
   Sweats = true;
   IsImmuneToItemTeleport = false;
@@ -312,6 +312,7 @@ humanoid
   CanApply = true;
   IsImmuneToLeprosy = false;
   WillCarryItems = true;
+  ForceVomitMessage = "You push your fingers down to your throat and vomit.";
   DisplacePriority = 0;
   UndeadVersions = true;
 }