@@ -815,11 +815,29 @@ define(function( require )
815
815
816
816
if ( pkt ?. damage > 0 ) {
817
817
if ( srcEntity . GID === Session . Character . GID ) {
818
+ // I deal damage
818
819
ChatBox . addText ( ( DB . getMessage ( 1607 ) ) . replace ( '%s' , dstEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
819
820
ChatBox . TYPE . INFO , ChatBox . FILTER . BATTLE )
820
- } else {
821
+ } else if ( dstEntity . GID === Session . Character . GID ) {
822
+ // I receive damage
821
823
ChatBox . addText ( DB . getMessage ( 1605 ) . replace ( '%s' , srcEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
822
824
ChatBox . TYPE . INFO , ChatBox . FILTER . BATTLE )
825
+ } else if ( srcEntity . GID === Session . homunId || srcEntity . GID === Session . merId || srcEntity . GID === Session . petId || srcEntity . GID === Session . elemId ) {
826
+ // My buddy deals damage
827
+ ChatBox . addText ( DB . getMessage ( 1608 ) . replace ( '%s' , srcEntity . display . name ) . replace ( '%s' , dstEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
828
+ ChatBox . TYPE . INFO , ChatBox . FILTER . BATTLE )
829
+ } else if ( dstEntity . GID === Session . homunId || dstEntity . GID === Session . merId || dstEntity . GID === Session . petId || dstEntity . GID === Session . elemId ) {
830
+ // My buddy receives damage
831
+ ChatBox . addText ( DB . getMessage ( 1606 ) . replace ( '%s' , dstEntity . display . name ) . replace ( '%s' , srcEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
832
+ ChatBox . TYPE . INFO , ChatBox . FILTER . BATTLE )
833
+ } else if ( getModule ( 'UI/Components/PartyFriends/PartyFriends' ) . isGroupMember ( srcEntity . display . name ) ) {
834
+ // Party member deals damage
835
+ ChatBox . addText ( DB . getMessage ( 1608 ) . replace ( '%s' , srcEntity . display . name ) . replace ( '%s' , dstEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
836
+ ChatBox . TYPE . INFO , ChatBox . FILTER . PARTY_BATTLE )
837
+ } else if ( getModule ( 'UI/Components/PartyFriends/PartyFriends' ) . isGroupMember ( dstEntity . display . name ) ) {
838
+ // Party member receives damage
839
+ ChatBox . addText ( DB . getMessage ( 1606 ) . replace ( '%s' , dstEntity . display . name ) . replace ( '%s' , srcEntity . display . name ) . replace ( '%d' , pkt . damage ) ,
840
+ ChatBox . TYPE . INFO , ChatBox . FILTER . PARTY_BATTLE )
823
841
}
824
842
}
825
843
}
0 commit comments