Browse Source

Fixes to messages to client from gate/bind. Messages are now private and match live..mostly.

devn00b 1 year ago
parent
commit
9d9a5ec294
2 changed files with 7 additions and 7 deletions
  1. 4 4
      EQ2/source/WorldServer/client.cpp
  2. 3 3
      server/Spells/Commoner/SetRecallPoint.lua

+ 4 - 4
EQ2/source/WorldServer/client.cpp

@@ -8373,7 +8373,7 @@ bool Client::Bind() {
 	int canbind = BindAllowed();
 	
 	if(canbind == 0) {
-		
+		Message(CHANNEL_MERCHANT, "You cannot bind at this location.");		
 		return false;
 	} 
 	player->GetPlayerInfo()->SetBindZone(GetCurrentZone()->GetZoneID());
@@ -8381,20 +8381,20 @@ bool Client::Bind() {
 	player->GetPlayerInfo()->SetBindY(player->GetY());
 	player->GetPlayerInfo()->SetBindZ(player->GetZ());
 	player->GetPlayerInfo()->SetBindHeading(player->GetHeading());
-
+	Message(CHANNEL_MERCHANT, "Your spirit has been bound to this location.");
 	return true;
 }
 
 bool Client::Gate(bool is_spell) {
 	if (player->GetPlayerInfo()->GetBindZoneID() == 0)
-		SimpleMessage(CHANNEL_NARRATIVE, "You can not cast recall spells. You have no bind location set.");
+		SimpleMessage(CHANNEL_MERCHANT, "You can not cast recall spells. You have no bind location set.");
 		return false;
 
 	ZoneServer* zone = zone_list.Get(player->GetPlayerInfo()->GetBindZoneID());
 	if (zone) {
 		int cangate = GateAllowed();
 		if(cangate == 0) {
-			SimpleMessage(CHANNEL_NARRATIVE, "You can not cast recall spells in this zone.");
+			SimpleMessage(CHANNEL_MERCHANT, "You can not cast recall spells in this zone.");
 			return false;
 		}
 		player->SetX(player->GetPlayerInfo()->GetBindZoneX());

+ 3 - 3
server/Spells/Commoner/SetRecallPoint.lua

@@ -13,16 +13,16 @@ function cast(Caster, Target)
 	
 	if ( incombat == true)
 	then
-		Say(Caster, "You cannot use Set Recall Point while in combat.")
+		SendMessage(Caster, "You cannot use Set Recall Point while in combat.", "red")
 	    goto exit;
 	end
 	
 	if( canbind == 0 )
 	then
-		Say(Caster, "You cannot use Set Recall Point at this location. Please try in a city or suburb.")
+		SendMessage(Caster, "You cannot use Set Recall Point at this location. Please try in a city or suburb.", "red")
 	else
 		Bind(Caster)
     end
 
 ::exit::
-end
+end