From: Mario <mario.mario@y7mail.com>
Date: Sat, 11 May 2013 11:52:36 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~242
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=210a4fc773244444b68dbbbca5fce8af8e216836;p=xonotic%2Fxonotic-data.pk3dir.git
Merge branch 'master' into Mario/monsters
---
210a4fc773244444b68dbbbca5fce8af8e216836
diff --cc qcsrc/common/notifications.qh
index 2738277463,42f1b9b162..08ca079c34
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@@ -595,29 -548,6 +595,29 @@@ void Send_Notification_WOVA
MSG_CENTER_NOTIF(1, CENTER_SUPERWEAPON_BROKEN, 0, 0, "", CPID_POWERUP, "0 0", _("^F2Superweapons have broken down"), "") \
MSG_CENTER_NOTIF(1, CENTER_SUPERWEAPON_LOST, 0, 0, "", CPID_POWERUP, "0 0", _("^F2Superweapons have been lost"), "") \
MSG_CENTER_NOTIF(1, CENTER_SUPERWEAPON_PICKUP, 0, 0, "", CPID_POWERUP, "0 0", _("^F2You now have a superweapon"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_AIM_REMOVE, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou need to aim at your turret to remove it"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_AIM_REPAIR, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou need to aim at your turret to repair it"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_AIM_UPGRADE, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou need to aim at your turret to upgrade it"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_ANNOUNCE_SPAWN, 1, 0, "s1", CPID_TOWERDEFENSE, "3 0", _("^K1A ^K2%s^K1 has arrived!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_CANTSPAWN, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou can't currently spawn a turret"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_GENDAMAGED, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^K1The generator is under attack!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_GENDESTROYED, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^K1A generator was destroyed!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_LIST, 1, 0, "s1", CPID_TOWERDEFENSE, "0 0", _("^BGAvilable turrets: ^F2%s"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_MAXHEALTH, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGThis turret is already at max health"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_MAXPOWER, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGThis turret is already at max power"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_MAXTURRETS, 0, 1, "f1", CPID_TOWERDEFENSE, "0 0", _("^BGYou can't spawn more than %s turrets"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_NOFUEL, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou don't have enough fuel to spawn that turret"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_NOFUEL_REPAIR, 0, 1, "f1", CPID_TOWERDEFENSE, "0 0", _("^BGYou need %s fuel to repair this turret"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_NOFUEL_UPGRADE, 0, 1, "f1", CPID_TOWERDEFENSE, "0 0", _("^BGYou need %s fuel to increase this turret's power"), "") \
- MSG_CENTER_NOTIF(1, CENTER_TD_PHASE_BUILD, 0, 3, "f1 f2 f3", CPID_TOWERDEFENSE, "5 0", _("^BGWave ^F2%s^BG build phase... Next monsters: ^F2%s^BG, wave starts in ^F2%s seconds"), "") \
++ MSG_CENTER_NOTIF(1, CENTER_TD_PHASE_BUILD, 0, 3, "f1 f2 f3", CPID_TOWERDEFENSE, "5 0", _("^BGWave ^F2%s^BG build phase... Next monsters: ^F2%s\n^BG wave starts in ^F2%s seconds"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_PHASE_COMBAT, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^K1Combat phase\n^K2Protect the generator from monsters!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_PROTECT, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGProtect the generator from waves of monsters!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_REMOVE, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGTurret removed"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_REPAIR, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^F1Turret repaired by 100 health points!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_SPAWN, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGYou spawned a turret"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_DISABLED, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^BGTurrets are disabled on this map"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_UPGRADE, 0, 0, "", CPID_TOWERDEFENSE, "0 0", _("^F1Turret power increased by 20 percent!"), "") \
+ MSG_CENTER_NOTIF(1, CENTER_TD_VICTORY, 1, 0, "s1", CPID_TOWERDEFENSE, "0 0", _("^F1%s^F1 victory!"), "") \
MULTITEAM_CENTER(1, CENTER_TEAMCHANGE_, 4, 0, 1, "", CPID_TEAMCHANGE, "1 f1", _("^K1Changing to ^TC^TT^K1 in ^COUNT"), "") \
MSG_CENTER_NOTIF(1, CENTER_TEAMCHANGE_AUTO, 0, 1, "", CPID_TEAMCHANGE, "1 f1", _("^K1Changing team in ^COUNT"), "") \
MSG_CENTER_NOTIF(1, CENTER_TEAMCHANGE_SPECTATE, 0, 1, "", CPID_TEAMCHANGE, "1 f1", _("^K1Spectating in ^COUNT"), "") \