fixes #589

src/client/css/colors.less

@@ -48,6 +48,7 @@
 @purpleD: #393268;
 
 @pinkA: #fc66f7;
+@pinkB: #de43ae;
 
 @grayB: #c0c3cf;
 @grayC: #929398;
@@ -74,9 +75,52 @@
 }
 
 .color-red {
-	color: @red;
+	color: @red !important;
+}
+
+.color-redA {
+	color: @redA !important;
+}
+
+.color-blueA {
+	color: @blueA !important;
+}
+.color-blueB {
+	color: @blueB !important;
+}
+
+.color-greenB {
+	color: @greenB !important;
+}
+
+.color-yellowB {
+	color: @yellowB !important;
 }
 
 .color-green {
-	color: @green;
+	color: @green !important;
+}
+
+.color-brownC {
+	color: @brownC !important;
+}
+.color-brownD {
+	color: @brownD !important;
+}
+
+.color-grayA {
+	color: @white !important;
+}
+.color-grayB {
+	color: @grayB !important;
+}
+.color-grayC {
+	color: @grayC !important;
+}
+.color-grayD {
+	color: @grayD !important;
+}
+
+.color-pinkB {
+	color: @pinkB !important;	
 }

src/client/ui/templates/login/template.html

@@ -11,7 +11,7 @@
 		</div>
 		<div class="message"></div>
 	</div>
-	<div class="news" location="https://gitlab.com/Isleward/isleward/tags/v0.1.0">[ Latest release notes ]</div>
+	<div class="news" location="https://gitlab.com/Isleward/isleward/tags/v0.1.10">[ Latest release notes ]</div>
 	<div class="extra">
 		<div class="el button btnPatreon" location="https://patreon.com/bigbadwaffle">Pledge on Patreon</div>
 		<div class="el button btnPaypal" location="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BR2CC82WUAVEA">Donate on Paypal</div>

src/server/components/chatter.js

@@ -39,9 +39,11 @@ define([
 				if (!this.global)
 					this.obj.syncer.set(false, 'chatter', 'msg', pick.msg);
 				else {
+					//HACK
+					//This shouldn't always be pink, but only events use this atm so it's fine
 					this.obj.instance.syncer.queue('onGetMessages', {
 						messages: {
-							class: 'q2',
+							class: 'color-pinkB',
 							message: this.obj.name + ': ' + pick.msg
 						}
 					});

src/server/components/door.js

@@ -131,7 +131,7 @@ define([
 					obj.instance.syncer.queue('onGetMessages', {
 						id: obj.id,
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: 'The ' + key.name + ' disintegrates on use',
 							type: 'info'
 						}]

src/server/components/equipment.js

@@ -101,7 +101,7 @@ define([
 				this.obj.instance.syncer.queue('onGetMessages', {
 					id: this.obj.id,
 					messages: [{
-						class: 'q0',
+						class: 'color-redA',
 						message: equipMsg.msg || 'you cannot equip that item',
 						type: 'info'
 					}]
@@ -296,7 +296,7 @@ define([
 					this.obj.instance.syncer.queue('onGetMessages', {
 						id: this.obj.id,
 						messages: [{
-							class: 'q4',
+							class: 'color-redA',
 							message: 'you unequip your ' + item.name + ' as it zaps you',
 							type: 'rep'
 						}]

src/server/components/extensions/factionVendor.js

@@ -195,7 +195,7 @@ define([
 				requestedBy.instance.syncer.queue('onGetMessages', {
 					id: requestedBy.id,
 					messages: [{
-						class: 'q0',
+						class: 'color-redA',
 						message: `your reputation is too low to buy that item`,
 						type: 'info'
 					}]

src/server/components/extensions/socialCommands.js

@@ -116,7 +116,7 @@ define([
 			obj.socket.emit('events', {
 				onGetMessages: [{
 					messages: [{
-						class: 'q0',
+						class: 'color-yellowB',
 						message: 'joined channel: ' + value,
 						type: 'info'
 					}]
@@ -140,7 +140,7 @@ define([
 				obj.socket.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: 'you are not currently in that channel',
 							type: 'info'
 						}]
@@ -168,7 +168,7 @@ define([
 			this.obj.socket.emit('events', {
 				onGetMessages: [{
 					messages: [{
-						class: 'q0',
+						class: 'color-yellowB',
 						message: 'left channel: ' + value,
 						type: 'info'
 					}]

src/server/components/inventory.js

@@ -165,7 +165,7 @@ define([
 				this.obj.instance.syncer.queue('onGetMessages', {
 					id: this.obj.id,
 					messages: [{
-						class: 'q0',
+						class: 'color-redA',
 						message: learnMsg.msg || 'you cannot learn that ability',
 						type: 'info'
 					}]
@@ -630,7 +630,7 @@ define([
 						this.obj.instance.syncer.queue('onGetMessages', {
 							id: this.obj.id,
 							messages: [{
-								class: 'q0',
+								class: 'color-redA',
 								message: 'your bags are too full to loot any more items',
 								type: 'info'
 							}]

src/server/components/player.js

@@ -120,7 +120,7 @@ define([
 			io.sockets.emit('events', {
 				onGetMessages: [{
 					messages: [{
-						class: 'q3',
+						class: 'color-blueB',
 						message: this.obj.name + ' has come online'
 					}]
 				}],

src/server/components/reputation.js

@@ -129,25 +129,25 @@ define([
 			this.obj.instance.syncer.queue('onGetMessages', {
 				id: this.obj.id,
 				messages: [{
-					class: 'q1',
+					class: (action == 'gained') ? 'color-greenB' : 'color-redA',
 					message: 'you ' + action + ' ' + Math.abs(gain) + ' reputation with ' + blueprint.name,
 					type: 'rep'
 				}]
 			}, [this.obj.serverId]);
 
 			if (faction.tier != oldTier) {
-				this.sendMessage(blueprint.tiers[faction.tier].name, blueprint.name);
+				this.sendMessage(blueprint.tiers[faction.tier].name, blueprint.name, (faction.tier > oldTier));
 				this.obj.equipment.unequipFactionGear(faction.id, faction.tier);
 			}
 
 			this.syncFaction(factionId, fullSync);
 		},
 
-		sendMessage: function (tierName, factionName) {
+		sendMessage: function (tierName, factionName, didIncrease) {
 			this.obj.instance.syncer.queue('onGetMessages', {
 				id: this.obj.id,
 				messages: [{
-					class: 'q4',
+					class: didIncrease ? 'color-greenB' : 'color-redA',
 					message: 'you are now ' + tierName + ' with ' + factionName,
 					type: 'rep'
 				}]

src/server/components/social.js

@@ -26,12 +26,12 @@ define([
 			};
 		},
 
-		sendMessage: function (msg) {
+		sendMessage: function (msg, color) {
 			this.obj.socket.emit('event', {
 				event: 'onGetMessages',
 				data: {
 					messages: [{
-						class: 'q0',
+						class: color || 'q0',
 						message: msg,
 						type: 'chat'
 					}]
@@ -44,7 +44,7 @@ define([
 				this.obj.socket.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: 'you are not in a party',
 							type: 'info'
 						}]
@@ -63,7 +63,7 @@ define([
 				player.socket.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q0',
+							class: 'color-grayB',
 							message: '(party: ' + charname + '): ' + message,
 							type: 'chat'
 						}]
@@ -84,7 +84,7 @@ define([
 				this.obj.socket.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: 'syntax: $channel message',
 							type: 'info'
 						}]
@@ -95,7 +95,7 @@ define([
 				this.obj.socket.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: 'you are not currently in channel: ' + channel,
 							type: 'info'
 						}]
@@ -108,7 +108,7 @@ define([
 						pList[i].socket.emit('events', {
 							onGetMessages: [{
 								messages: [{
-									class: 'q0',
+									class: 'color-grayB',
 									message: '[' + channel + '] ' + this.obj.auth.charname + ': ' + message,
 									type: channel.trim()
 								}]
@@ -141,7 +141,7 @@ define([
 
 			var charname = this.obj.auth.charname;
 
-			var msgStyle = roles.getRoleMessageStyle(this.obj) || ('q');
+			var msgStyle = roles.getRoleMessageStyle(this.obj) || ('color-grayB');
 
 			var messageString = msg.data.message;
 			if (messageString[0] == '@') {
@@ -226,8 +226,8 @@ define([
 			if (!source)
 				return;
 
-			source.social.sendMessage('invite sent');
-			this.sendMessage(source.name + ' has invited you to join a party');
+			source.social.sendMessage('invite sent', 'color-yellowB');
+			this.sendMessage(source.name + ' has invited you to join a party', 'color-yellowB');
 
 			this.obj.socket.emit('event', {
 				event: 'onGetInvite',
@@ -262,7 +262,7 @@ define([
 				var msg = source.name + ' has joined the party';
 				if (p == sourceId)
 					msg = 'you have joined a party';
-				player.social.sendMessage(msg);
+				player.social.sendMessage(msg, 'color-yellowB');
 
 				player
 					.socket.emit('event', {
@@ -277,7 +277,7 @@ define([
 			if (!target)
 				return;
 
-			this.sendMessage(target.name + ' declined your party invitation');
+			this.sendMessage(target.name + ' declined your party invitation', 'color-redA');
 		},
 
 		//Gets called on the player that requested to leave
@@ -358,7 +358,7 @@ define([
 		//Gets called on the player that requested the removal
 		removeFromParty: function (msg) {
 			if (!this.isPartyLeader) {
-				this.sendMessage('you are not the party leader');
+				this.sendMessage('you are not the party leader', 'color-redA');
 				return;
 			}
 
@@ -374,7 +374,7 @@ define([
 						onGetParty: [this.party],
 						onGetMessages: [{
 							messages: [{
-								class: 'q0',
+								class: 'color-yellowB',
 								message: target.name + ' has been removed from the party'
 							}]
 						}]
@@ -384,7 +384,7 @@ define([
 			target.socket.emit('events', {
 				onGetMessages: [{
 					messages: [{
-						class: 'q0',
+						class: 'color-redA',
 						message: 'you have been removed from the party'
 					}]
 				}],
@@ -400,7 +400,7 @@ define([
 				this.isPartyLeader = null;
 				this.updatePartyOnThread();
 
-				this.sendMessage('your party has been disbanded');
+				this.sendMessage('your party has been disbanded', 'color-yellowB');
 			}
 		},
 

src/server/components/stats.js

@@ -454,7 +454,7 @@ define([
 
 							this.obj.instance.syncer.queue('onGetMessages', {
 								messages: {
-									class: 'color-red',
+									class: 'color-redA',
 									message: `(level ${this.values.level}) ${this.obj.name} has forever left the shores of the living.`
 								}
 							});

src/server/components/trade.js

@@ -155,7 +155,7 @@ define([
 				this.obj.instance.syncer.queue('onGetMessages', {
 					id: this.obj.id,
 					messages: [{
-						class: 'q0',
+						class: 'color-redA',
 						message: `you can't afford that item`,
 						type: 'info'
 					}]
@@ -177,7 +177,7 @@ define([
 					this.obj.instance.syncer.queue('onGetMessages', {
 						id: this.obj.id,
 						messages: [{
-							class: 'q0',
+							class: 'color-redA',
 							message: `you have already unlocked that skin`,
 							type: 'info'
 						}]
@@ -231,8 +231,8 @@ define([
 				this.obj.instance.syncer.queue('onGetMessages', {
 					id: this.obj.id,
 					messages: [{
-						class: 'q0',
-						message: item.name + ' (unlocked)',
+						class: 'color-greenB',
+						message: 'Unlocked skin: ' + item.name,
 						type: 'info'
 					}]
 				}, [this.obj.serverId]);

src/server/config/quests/templates/questTemplate.js

@@ -16,7 +16,7 @@ define([
 				this.obj.instance.syncer.queue('onGetMessages', {
 					id: this.obj.id,
 					messages: [{
-						class: 'q0',
+						class: 'color-yellowB',
 						message: 'quest obtained (' + this.name + ')'
 					}]
 				}, [this.obj.serverId]);
@@ -34,7 +34,7 @@ define([
 			this.obj.instance.syncer.queue('onGetMessages', {
 				id: this.obj.id,
 				messages: [{
-					class: 'q0',
+					class: 'color-yellowB',
 					message: 'quest ready for turn-in (' + this.name + ')'
 				}]
 			}, [this.obj.serverId]);
@@ -53,7 +53,7 @@ define([
 			obj.instance.syncer.queue('onGetMessages', {
 				id: obj.id,
 				messages: [{
-					class: 'q0',
+					class: 'color-yellowB',
 					message: 'quest completed (' + this.name + ')'
 				}]
 			}, [obj.serverId]);

src/server/config/roles.js

@@ -82,7 +82,7 @@ define([
 			player.instance.syncer.queue('onGetMessages', {
 				id: player.id,
 				messages: {
-					class: 'color-green',
+					class: 'color-redA',
 					message: msg
 				}
 			}, [player.serverId]);

src/server/events/events.js

@@ -158,7 +158,7 @@ define([
 			if (event.winText) {
 				this.instance.syncer.queue('onGetMessages', {
 					messages: {
-						class: 'q4',
+						class: 'color-pinkB',
 						message: event.winText
 					}
 				});
@@ -210,7 +210,7 @@ define([
 				if (n) {
 					this.instance.syncer.queue('onGetMessages', {
 						messages: {
-							class: 'q4',
+							class: 'color-pinkB',
 							message: n.msg
 						}
 					});

src/server/misc/mail.js

@@ -77,7 +77,7 @@ define([
 						player.instance.syncer.queue('onGetMessages', {
 							id: player.id,
 							messages: [{
-								class: 'q0',
+								class: 'color-greenB',
 								message: r.msg,
 								type: 'info'
 							}]

src/server/objects/objects.js

@@ -284,7 +284,7 @@ define([
 				io.sockets.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q1',
+							class: 'color-blueB',
 							message: player.name + ' has reached level ' + obj.level
 						}]
 					}],

src/server/security/connections.js

@@ -39,7 +39,7 @@ define([
 				io.sockets.emit('events', {
 					onGetMessages: [{
 						messages: [{
-							class: 'q3',
+							class: 'color-blueB',
 							message: player.name + ' has gone offline'
 						}]
 					}],
@@ -98,7 +98,7 @@ define([
 			io.sockets.emit('events', {
 				onGetMessages: [{
 					messages: [{
-						class: 'q3',
+						class: 'color-blueB',
 						message: player.name + ' has gone offline'
 					}]
 				}],