From bd603e65da87cccff92f3c13c1c18f58c4a4eb10 Mon Sep 17 00:00:00 2001
From: Mirio <opivy@hotmail.de>
Date: Mon, 5 Aug 2019 20:59:39 +0200
Subject: [PATCH] Improve messages

---
 maps/tutorial_level1.map     | 30 +++++++++++++++---------------
 maps/tutorial_level1.mapinfo |  2 +-
 maps/tutorial_level2.map     | 32 ++++++++++++++++----------------
 maps/tutorial_level2.mapinfo |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/maps/tutorial_level1.map b/maps/tutorial_level1.map
index cbed5e66..ab4b2d58 100644
--- a/maps/tutorial_level1.map
+++ b/maps/tutorial_level1.map
@@ -7183,7 +7183,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Crouch to walk below the obstacle."
+"message" "^7Press ^2Crouch ^7to get past the obstacle."
 "wait" "5"
 {
 brushDef
@@ -7200,7 +7200,7 @@ brushDef
 {
 "classname" "trigger_multiple"
 "wait" "5"
-"message" "Welcome to Xonotic!\nThis tutorial will guide you through basic techniques.\nWalk to the teleporter to begin!"
+"message" "^7Welcome to ^2Xonotic^7!\nThis tutorial will guide you through basic techniques.\nWalk to the teleporter to begin!"
 {
 brushDef
 {
@@ -7215,7 +7215,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Jump above the gap."
+"message" "^2Jump ^7across the gap."
 "wait" "5"
 {
 brushDef
@@ -7320,7 +7320,7 @@ brushDef
 {
 "classname" "func_door"
 "targetname" "door_basic_sprint"
-"message" "too slow"
+"message" "^7Too ^1slow^7!"
 "angle" "-1"
 "speed" "500"
 {
@@ -7353,7 +7353,7 @@ brushDef
 {
 "classname" "trigger_once"
 "sounds" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -7499,7 +7499,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Bunnyhop to reach the door before it closes."
+"message" "^7Keep holding ^2Jump ^7('^1Bunny hopping^7') to reach the door before it closes."
 "wait" "5"
 {
 brushDef
@@ -9438,7 +9438,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Reach the exit before the turret kills you, pick up health & armor items on the way!"
+"message" "^7Reach the exit before the ^1turret^7 kills you, pick up ^1health ^7& ^2armor ^7items on the way!"
 "wait" "5"
 "target" "checkpoint_exit_room"
 {
@@ -9478,7 +9478,7 @@ brushDef
 {
 "classname" "trigger_once"
 "target" "target_end_level"
-"message" "Congratulations! You completed this level!"
+"message" "^2Congratulations^7! You have completed this level!"
 {
 brushDef
 {
@@ -9510,7 +9510,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Shoot at your feet with the blaster to jump high."
+"message" "^2Shoot ^7at your feet with the ^2Blaster^7 to jump high."
 "target" "checkpoint_blaster_jump"
 "wait" "5"
 {
@@ -9527,7 +9527,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Shooting range: test out some weapons."
+"message" "^7Shooting range: test out some ^2weapon^7."
 "wait" "5"
 "target" "checkpoint_shooting_range"
 {
@@ -9571,7 +9571,7 @@ brushDef
 {
 "classname" "trigger_once"
 "sounds" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -9587,7 +9587,7 @@ brushDef
 {
 "classname" "trigger_once"
 "sounds" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -9701,7 +9701,7 @@ brushDef
 "target" "door_shotgun_practice"
 "targetname" "counter_weapon_shotgun"
 "count" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -9716,7 +9716,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Shoot the buttons with the shotgun"
+"message" "^2Shoot^7 the buttons with the ^2Shotgun^7!"
 "wait" "5"
 {
 brushDef
@@ -9743,7 +9743,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Slap the red structure with the shotgun secondary to clear the way."
+"message" "^2Slap ^7the red structure with the ^2Shotgun secondary ^7to clear the way."
 "wait" "5"
 {
 brushDef
diff --git a/maps/tutorial_level1.mapinfo b/maps/tutorial_level1.mapinfo
index 16b70ed3..efcfe1f4 100644
--- a/maps/tutorial_level1.mapinfo
+++ b/maps/tutorial_level1.mapinfo
@@ -1,6 +1,6 @@
 title Basic tutorial
 description Tutorial Level 1
-author Freddy SpiKe
+author Freddy, SpiKe
 cdtrack 4
 has turrets
 gametype dm
diff --git a/maps/tutorial_level2.map b/maps/tutorial_level2.map
index d85bb558..5a36ef8b 100644
--- a/maps/tutorial_level2.map
+++ b/maps/tutorial_level2.map
@@ -17659,7 +17659,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Welcome to the second level of the tutorial!"
+"message" "Welcome to the ^2second level ^7of the tutorial!"
 "wait" "5"
 {
 brushDef
@@ -17675,7 +17675,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "A bit harder now."
+"message" "^7A bit harder now."
 "wait" "5"
 {
 brushDef
@@ -17691,7 +17691,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Use the ramp to get to the higher position."
+"message" "^7Use the ^2ramp ^7to get to the higher position."
 "wait" "5"
 {
 brushDef
@@ -17726,7 +17726,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Use the ramp to jump over the pit."
+"message" "^7Use the ^2ramp ^7to jump across the pit."
 "wait" "5"
 {
 brushDef
@@ -17829,7 +17829,7 @@ brushDef
 {
 "classname" "func_door"
 "targetname" "door_blaster"
-"message" "too slow"
+"message" "^7Too ^1slow^7!"
 "angle" "-1"
 "speed" "500"
 "wait" "2.5"
@@ -17871,7 +17871,7 @@ brushDef
 {
 "classname" "trigger_once"
 "sounds" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -18065,7 +18065,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Use the blaster to accelerate through the corridor."
+"message" "^7Use the ^2Blaster ^7to accelerate through the corridor."
 "wait" "5"
 "target" "checkpoint_wall_blastering"
 {
@@ -18082,7 +18082,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Turn in the air to reach the teleporter."
+"message" "^7Turn in the air to reach the teleporter."
 "wait" "5"
 {
 brushDef
@@ -18099,7 +18099,7 @@ brushDef
 {
 "classname" "func_door"
 "targetname" "door_crylink"
-"message" "too slow"
+"message" "^7Too ^1slow^7!"
 "angle" "-1"
 "speed" "500"
 {
@@ -18140,7 +18140,7 @@ brushDef
 {
 "classname" "trigger_once"
 "sounds" "2"
-"message" "well done"
+"message" "^2Well done^7!"
 {
 brushDef
 {
@@ -18382,7 +18382,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Use crylink secondary fire to accelerate really fast."
+"message" "Use ^2Crylink secondary fire ^7to accelerate really fast."
 "wait" "5"
 "target" "checkpoint_crylink_boost"
 {
@@ -18587,7 +18587,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Shoot the button with an electro combo."
+"message" "^7Shoot the button with an ^2Electro combo^7."
 "wait" "5"
 "target" "checkpoint_weapon_electro"
 {
@@ -19184,7 +19184,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Hit the targets with the rockets, curve them if necessary."
+"message" "^7Hit the targets with the ^2Devastator^7, curve the rockets if necessary."
 "wait" "5"
 "target" "checkpoint_weapon_devastator"
 {
@@ -19205,7 +19205,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Shoot all the targets."
+"message" "^2Shoot ^7all the targets."
 "wait" "5"
 "target" "checkpoint_weapon_mortar"
 {
@@ -19274,7 +19274,7 @@ brushDef
 }
 {
 "classname" "trigger_multiple"
-"message" "Splash damage travels through walls."
+"message" "^2Splash damage ^7travels through walls."
 "wait" "5"
 "target" "checkpoint_splashdamage"
 {
@@ -19404,7 +19404,7 @@ brushDef
 {
 "classname" "trigger_multiple"
 "targetname" "msg_dooropened"
-"message" "Door open"
+"message" "^7Door open"
 {
 brushDef
 {
diff --git a/maps/tutorial_level2.mapinfo b/maps/tutorial_level2.mapinfo
index a3a9672c..0338c7f0 100644
--- a/maps/tutorial_level2.mapinfo
+++ b/maps/tutorial_level2.mapinfo
@@ -1,6 +1,6 @@
 title Intermediate tutorial
 description Tutorial Level 2
-author Freddy SpiKe
+author Freddy, SpiKe
 cdtrack 4
 gametype dm
 hidden
-- 
2.39.2