diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 99f6a406b..0a3f80453 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -73,7 +73,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
anonymous: "匿名玩家"
level_difficulty: "难度："
campaign_beginner: "新手作战"
- awaiting_levels_adventurer_prefix: "我们每周开放五个关卡" # {change}
+ awaiting_levels_adventurer_prefix: "我们每周都会开放新关卡"
awaiting_levels_adventurer: "注册成为冒险家"
awaiting_levels_adventurer_suffix: "来优先尝试新关卡"
adjust_volume: "音量调节"
@@ -83,7 +83,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
campaign_old_multiplayer_description: "多个文明时代的遗迹。但已没有模拟运行这些陈旧、英雄芜绝的多人竞技场。"
share_progress_modal:
- blurb: "您的进度真快！快告诉其他人您从CodeCombat学到了什么！" # {change}
+ blurb: "您的进度真快！快告诉您的家长, 您从CodeCombat学到了什么！"
email_invalid: "邮件地址不可用。"
form_blurb: "输入他们的邮件地址，让他们知道CodeCombat的有趣"
form_label: "您的邮件地址"
@@ -255,8 +255,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
victory_new_item: "新的物品"
victory_viking_code_school: "这关真的超难! 如果您想成为一个软件开发人员，您就应该去试一下Viking Code School。在这里您可以把您的知识增长到另一个台阶。只需要14周您就能成为一个专业的网页开发人员。"
victory_become_a_viking: "成为一个维京人吧"
-# victory_bloc: "Great work! Your skills are improving, and someone's taking notice. If you've considered becoming a software developer, this may be your lucky day. Bloc is an online bootcamp that pairs you 1-on-1 with an expert mentor who will help train you into a professional developer! By beating A Mayhem of Munchkins, you're now eligible for a $500 price reduction with the code: CCRULES"
-# victory_bloc_cta: "Meet your mentor – learn about Bloc"
+ victory_bloc: "干得好! 你的技能正在提升, 并且已经有人注意着你了. 如果你正考虑着当一名软件工程师, 现在可能就是你的幸运日. Bloc 是个能提供在线一对一专业指导的, 能锻炼你成为专业开发者的训练营! 通过 矮人骚乱 后, 你可以使用价值 $500 的优惠码: CCRULES"
+ victory_bloc_cta: "会晤你的导师 – 了解 Bloc"
guide_title: "指南"
tome_minion_spells: "助手的咒语" # Only in old-style levels.
tome_read_only_spells: "只读的咒语" # Only in old-style levels.
@@ -293,7 +293,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
infinite_loop_reset_level: "重置关卡"
infinite_loop_comment_out: "为我的代码添加注释"
tip_toggle_play: "用 Ctrl+P 来暂停或继续"
- tip_scrub_shortcut: "用 Ctrl+[ 和 Ctrl+] 来倒退和快进。" # {change}
+ tip_scrub_shortcut: "用 Ctrl+[ 和 Ctrl+] 来倒退和快进。"
tip_guide_exists: "点击页面上方的指南, 可以获得更多有用信息。"
tip_open_source: "「CodeCombat」是100%开源的！"
tip_tell_friends: "喜欢Codecombat？那就赶快把它安利给朋友！"
@@ -361,7 +361,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
leaderboard:
leaderboard: "排行榜"
- view_other_solutions: "查看其它解答" # {change}
+ view_other_solutions: "查看排行榜"
scores: "分数"
top_players: "顶尖玩家是"
day: "今天"
@@ -401,9 +401,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
subscribe:
comparison_blurb: "亲，订阅CodeCombat，大力的提升您的技能！"
- feature1: "100+ 基本关卡（4个世界）" # {change}
- feature2: "10 个强大 英雄以及各式非凡技能!" # {change}
- feature3: "70+ 奖励关卡" # {change}
+ feature1: "110+ 基本关卡（4个世界）"
+ feature2: "10 个强大 英雄以及各式非凡技能!"
+ feature3: "70+ 奖励关卡"
feature4: "每月享有3500额外宝石"
feature5: "视频教学"
feature6: "专业邮件支援"
@@ -428,33 +428,33 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
parent_email_sent: "邮件已发送!"
parent_email_title: "什么是您父母的邮件地址？"
parents: "致家长"
- parents_title: "您的孩子将要学习编写程序。" # {change}
- parents_blurb1: "通过使用CodeCombat，您的孩子将学习编写真正的程序代码。他们将学到简单指令，进而处理更复杂的问题。"
- parents_blurb1a: "不用怀疑计算机编程能力将是您的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。您知道吗，计算机科学是收入最高的大学学位？"
- parents_blurb2: "每月支付9.99美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。" # {change}
+ parents_title: "亲爱的家长: 您的孩子将要学习编程. 您会支持孩子发展吗?"
+ parents_blurb1: "您的孩子已经玩了 __nLevels__ 关，并且学习了编程基础。请您为了培养他们的兴趣而给他们订阅，他们能继续玩下去。"
+ parents_blurb1a: "不用怀疑计算机编程能力将是您的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。您要知道计算机科学是收入最高的大学学位。"
+ parents_blurb2: "每月支付9.99美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。"
parents_blurb3: "无风险承诺：100%退款，一键取消订阅。"
payment_methods: "付费方式"
payment_methods_title: "可接受的付款方式"
payment_methods_blurb1: "我们现有的付费方式有信用卡和支付宝"
payment_methods_blurb2: "如果您想用其他付费方式,请联系我们"
-# sale_already_subscribed: "You're already subscribed!"
-# sale_blurb1: "Save 35%"
-# sale_blurb2: "off regular subscription price of $120 for a whole year!" # {changed}
-# sale_button: "Sale!"
-# sale_button_title: "Save 35% when you purchase a 1 year subscription"
-# sale_click_here: "Click Here"
-# sale_ends: "Ends"
-# sale_extended: "*Existing subscriptions will be extended by 1 year."
-# sale_feature_here: "Here's what you'll get:"
-# sale_feature2: "Access to 9 powerful new heroes with unique skills!"
-# sale_feature4: "42,000 bonus gems awarded immediately!"
-# sale_continue: "Ready to continue adventuring?"
-# sale_limited_time: "Limited time offer!"
-# sale_new_heroes: "New heroes!"
-# sale_title: "Back to School Sale"
-# sale_view_button: "Buy 1 year subscription for"
+ sale_already_subscribed: "您已经订阅!"
+ sale_blurb1: "和正常一年的订阅价格 $120 相比"
+ sale_blurb2: "年费订阅能节省 35%！"
+ sale_button: "促销"
+ sale_button_title: "年费订阅能节省 35% 的费用"
+ sale_click_here: "点击这里"
+ sale_ends: "结束"
+ sale_extended: "*已订阅用户会续期一年。"
+ sale_feature_here: "你将会获得这些："
+ sale_feature2: "可以使用 10 个强大的 新英雄 和各种技能!"
+ sale_feature4: "立即取得 42,000 个额外的宝石!"
+ sale_continue: "准备好继续探险吗?"
+ sale_limited_time: "限时优惠!"
+ sale_new_heroes: "新英雄!"
+ sale_title: "开学促销"
+ sale_view_button: "购买年费订阅："
stripe_description: "每月订阅"
-# stripe_description_year_sale: "1 Year Subscription (35% discount)"
+ stripe_description_year_sale: "年费订阅 (优惠 35%)"
subscription_required_to_play: "订阅后才可开始本关"
unlock_help_videos: "订阅后才可以解锁视频教学哦！"
personal_sub: "个人订阅" # Accounts Subscription View below
@@ -462,7 +462,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
managed_by: "管理"
will_be_cancelled: "将被取消"
currently_free: "您目前有一个免费订阅"
- currently_free_until: "您目前有一个免费订阅，直到" # {changed}
+ currently_free_until: "您目前有一个订阅，直到"
was_free_until: "您有过一个免费订阅，直到"
managed_subs: "管理订阅"
managed_subs_desc: "为其他玩家（学生、儿童等）添加订阅。"
@@ -526,6 +526,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
skill_docs:
writable: "可写" # Hover over "attack" in Your Skills while playing a level to see most of this
read_only: "只读"
+ action: "命令"
+ spell: "技能"
action_name: "名称"
action_cooldown: "释放时间"
action_specific_cooldown: "冷却时间"
@@ -582,15 +584,15 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
press_paragraph_1_link: "成套宣传包"
press_paragraph_1_suffix: "里的所有材料。 所有商标和图像的使用都不必事先联系我们。"
team: "团队"
- george_title: "CEO" # {change}
+ george_title: "共同创始人"
george_blurb: "商人"
- scott_title: "程序员" # {change}
+ scott_title: "共同创始人"
scott_blurb: "理性至上"
- nick_title: "程序员" # {change}
+ nick_title: "共同创始人"
nick_blurb: "充满动力的大牛"
michael_title: "程序员"
michael_blurb: "系统管理员"
- matt_title: "程序员" # {change}
+ matt_title: "共同创始人"
matt_blurb: "自行车爱好者"
cat_title: "首席关卡设计师"
cat_blurb: "气宗"
@@ -606,19 +608,19 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
intro_1: "CodeCombat 是一个教编程的网上游戏。学生会用编程语言写代码。"
intro_2: "无需经验!"
free_title: "要多少钱?"
- cost_china: "CodeCombat的前5个关卡在中国是免费的，在这之后需花费每月9.99美元来访问我们架设在中国专属服务器上的140多个关卡。"
- free_1: "有100多个覆盖了所有理论的免费关卡。" # {change}
+ cost_china: "CodeCombat的前5个关卡在中国是免费的，在这之后需花费每月9.99美元来访问我们架设在中国专属服务器上的180多个关卡。"
+ free_1: "有110多个覆盖了所有理论的免费关卡。"
free_2: "包月订阅可以访问视频教程和额外的练习关卡。"
teacher_subs_title: "教师可免费订阅!"
- teacher_subs_1: "请联系" # {change}
+ teacher_subs_1: "请填写我们的"
teacher_subs_2: "教师调查"
teacher_subs_3: "建立您的订阅。"
sub_includes_title: "订阅里包含了什么内容？"
- sub_includes_1: "除了100＋个基础关卡，学生包月订阅还可以使用这些附加功能：" # {change}
- sub_includes_2: "超过70个练习关卡" # {change}
+ sub_includes_1: "除了110+个基础关卡，学生包月订阅还可以使用这些附加功能："
+ sub_includes_2: "超过70个练习关卡"
sub_includes_3: "视频教学"
sub_includes_4: "优质的电子邮件支持"
- sub_includes_5: "10个具有独特技能的新英雄" # {change}
+ sub_includes_5: "10个具有独特技能的新英雄"
sub_includes_6: "每月享有3500额外宝石"
sub_includes_7: "私人部落"
monitor_progress_title: "我要如何查看学生的进度？"
@@ -649,8 +651,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
more_info_2: "教师论坛"
more_info_3: "是个与其他使用CodeCombat的教育工作者联系的良好平台。"
sys_requirements_title: "系统需求"
- sys_requirements_1: "因为CodeCombat是个游戏，它对于电脑的要求很高来保证运行的顺畅。我们已经优化过以便让它能在每一个最新浏览器或是比较旧的电脑跑得顺畅，所以每一个人都能享受CodeCombat带来的乐趣。如上，为了使您顺利的完成Hour of Code的学习，我们建议您：" # {change}
- sys_requirements_2: "使用最新版本的Chrome或是Firefox." # {change}
+ sys_requirements_1: "一个现代的浏览器. 需要更新的 Chrome, Firefox, Safari 或者 Internet Explorer 9 以上版本."
+ sys_requirements_2: "CodeCombat 暂时还不支持 iPad ."
teachers_survey:
title: "教师调查"
@@ -663,9 +665,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
approved_3: "进一步的说明已被送往"
denied_1: "您的免费订阅试用申请已被"
denied_2: "拒绝。"
- contact_1: "请联系"
- contact_2: "如果我们为教师提供免费订阅用评估的目的。您可以在我们的"
-# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
+ contact_1: "如果你有进一步的问题, 请联系"
+ contact_2: "。"
+ description_1: "我们可为教师提供用于评估的免费订阅. 你可以在我们的"
description_2: "教师"
description_3: "页面找到更多的信息。"
description_4: "请填写此简单问卷，我们将会向您的电子邮件发送设置说明。"
@@ -673,12 +675,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
school: "学校名字"
location: "城市"
age_students: "您的学生年龄为多少？"
- under: "几岁以下"
+ under: "低于"
other: "其他:"
amount_students: "请问您有多少学生需要教导？"
hear_about: "您是怎么知道CodeComabat的？"
fill_fields: "请填写所有问题。"
- thanks: "非常感谢！我们会很快寄您设置说明。"
+ thanks: "非常感谢！我们会很快寄给您设置说明。"
versions:
save_version_title: "保存新版本"
@@ -725,7 +727,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
admin: "管理"
new_password: "新密码"
new_password_verify: "再次输入密码"
- type_in_email: "输入您的邮箱地址来确认删除" # {change}
+ type_in_email: "输入您的邮箱地址来确认删除"
type_in_password: "同样的，输入您的密码。"
email_subscriptions: "邮箱订阅"
email_subscriptions_none: "取消订阅"
@@ -818,7 +820,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
average_achievements: "平均成就"
delete_clan: "刪除部落"
leave_clan: "离开部落"
- join_clan: "加人部落"
+ join_clan: "加入部落"
invite_1: "邀请："
invite_2: "*通过这个链接来邀请玩家加入部落。"
members: "成员"
@@ -836,7 +838,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
latest_achievement: "最新成就"
playtime: "游戏时间"
last_played: "最后玩了"
-# leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
+ leagues_explanation: "在部落里与其他成员组成联盟一起参加下面的多人竞技场."
classes:
archmage_title: "大法师"
@@ -1026,7 +1028,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
my_matches: "我的对手"
simulate: "模拟"
simulation_explanation: "通过模拟游戏，您可以让您的游戏更快的得到评分。"
-# simulation_explanation_leagues: "You will mainly help simulate games for allied players in your clans and courses."
+ simulation_explanation_leagues: "你会主要给在你的部落或者课程的同伴帮忙模拟游戏."
simulate_games: "模拟游戏！"
simulate_all: "重置并模拟游戏！"
games_simulated_by: "由您模拟过的游戏数:"
@@ -1036,8 +1038,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
ratio: "比率"
leaderboard: "排行榜"
battle_as: "我要加入这一方 "
- summary_your: "您 "
- summary_matches: "对手 - "
+ summary_your: "您在 "
+ summary_matches: "的比赛 - "
summary_wins: " 胜利, "
summary_losses: " 失败"
rank_no_code: "没有新代码可供评分"
@@ -1073,11 +1075,16 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
tournament_rules: "锦标赛规则"
tournament_blurb: "写代码，收金币，建军队，碎敌军，赢奖品，以及在我们奖励多达$40,000的Greed tournament里升级您的事业！ 快去查阅详情！"
tournament_blurb_criss_cross: "赢得竞拍，建造道路，智胜对手，夺取宝石，在纵横交错锦标赛中完成生涯晋级! 现在就查看详情！"
-# tournament_blurb_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
+ tournament_blurb_zero_sum: "在红方法师和蓝方法师的山峰对决中, 同时在收集金币和战术上发挥你的代码创造力. 竞赛在3月27日开始, 在4月6日(星期一)的下午5点(PDT 太平洋时区)结束. 为乐趣和荣耀竞赛吧! 浏览了解更多"
tournament_blurb_blog: "关注我们的博客"
rules: "规则"
winners: "胜利者"
-# league: "League"
+ league: "联盟"
+ red_ai: "红方 AI" # "Red AI Wins", at end of multiplayer match playback
+ blue_ai: "蓝方 AI"
+ wins: "胜利" # At end of multiplayer match playback
+ humans: "红方" # Ladder page display team name
+ ogres: "蓝方"
user:
stats: "成就"
@@ -1118,7 +1125,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
no_recent_games: "最近两个星期没有玩过游戏。"
payments: "支付方式"
purchased: "已购买"
-# sale: "Sale"
+ sale: "促销"
subscription: "订阅"
invoices: "票据"
service_apple: "设备：苹果"
@@ -1221,15 +1228,15 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
boolean_logic: "布尔逻辑"
break_statements: "Break语句"
classes: "类"
-# continue_statements: "Continue Statements"
+ continue_statements: "Continue 语句"
for_loops: "For循环"
functions: "函数"
-# graphics: "Graphics"
+ graphics: "图形"
if_statements: "If语句"
input_handling: "输入处理"
math_operations: "数学运算"
object_literals: "对象常量"
-# parameters: "Parameters"
+ parameters: "参数"
strings: "字符串"
variables: "变量"
vectors: "向量"
@@ -1325,8 +1332,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
prizes: "奖项"
total_value: "总价值"
in_cash: "现金"
- custom_wizard: "客制CodeCombat巫师"
- custom_avatar: "客制CodeCombat头像"
+ custom_wizard: "定制CodeCombat巫师"
+ custom_avatar: "定制CodeCombat头像"
heap: "给六个月的\"Startup\"访问"
credits: "信誉"
one_month_coupon: "优惠: 选择 Rails 或者 HTML"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 93ea12ce4..42f90712d 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -73,7 +73,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
anonymous: "匿名玩家"
level_difficulty: "難度"
campaign_beginner: "新手指南"
- awaiting_levels_adventurer_prefix: "我們每周將釋出五個關卡。" # {change}
+ awaiting_levels_adventurer_prefix: "我們每周將釋出新的關卡。" # {change}
awaiting_levels_adventurer: "註冊成為冒險家"
awaiting_levels_adventurer_suffix: "成為第一個挑戰新關卡的冒險家吧!"
adjust_volume: "調整音量"
@@ -83,7 +83,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
campaign_old_multiplayer_description: "多個文明時代的遺跡。已沒有模擬運行這些陳舊、英雄蕪絕的多人競技場。"
share_progress_modal:
- blurb: "您正在建立優秀的進度! 告訴別人您已經從CodeCombat學習到多少東西." # {change}
+ blurb: "您正在建立優秀的進度! 告訴您的家長, 您從CodeCombat學到了什麼！" # {change}
email_invalid: "郵件地址無效."
form_blurb: "在底下輸入他們的郵件並且我們將秀給他們!"
form_label: "郵件地址"
@@ -255,8 +255,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
victory_new_item: "新的物品"
victory_viking_code_school: "太厲害了, 您剛完成了非常困難的關卡! 如果您想成為一個軟件開發人員，您就應該去試一下Viking Code School。在這裡您可以把您的知識增長到另一個台階。只需要14個星期您就能成為一個專業的網頁開發人員。"
victory_become_a_viking: "成為一個維京人。"
-# victory_bloc: "Great work! Your skills are improving, and someone's taking notice. If you've considered becoming a software developer, this may be your lucky day. Bloc is an online bootcamp that pairs you 1-on-1 with an expert mentor who will help train you into a professional developer! By beating A Mayhem of Munchkins, you're now eligible for a $500 price reduction with the code: CCRULES"
-# victory_bloc_cta: "Meet your mentor – learn about Bloc"
+ victory_bloc: "做得好! 你的技能正在提升, 並且已經有人注意著你了. 如果你正考慮著當一名軟件工程師, 現在可能就是你的幸運日. Bloc 是個能提供在線一對一專業指導的,能鍛煉你成為專業開發者的訓練營! 通過矮人騷亂後, 你可以使用價值$500 的優惠碼: CCRULES"
+ victory_bloc_cta: "會晤你的導師 – 了解 Bloc"
guide_title: "指南"
tome_minion_spells: "助手的咒語" # Only in old-style levels.
tome_read_only_spells: "唯讀的咒語" # Only in old-style levels.
@@ -293,7 +293,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
infinite_loop_reset_level: "重置關卡"
infinite_loop_comment_out: "在我的程式碼中加入注解"
tip_toggle_play: "使用 Ctrl+P 切換 播放/暫停."
- tip_scrub_shortcut: "Ctrl+[ 快退; Ctrl+] 快進." # {change}
+ tip_scrub_shortcut: "Ctrl+[ 快退; Ctrl+] 快進."
tip_guide_exists: "點擊頁面上方的指南，可獲得更多有用的訊息."
tip_open_source: "「CodeCombat」100% 開源!"
tip_tell_friends: "喜歡Codecombat？那就把它介紹給朋友!"
@@ -339,7 +339,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
tip_open_source_contribute: "您可以幫助「CodeCombat」提高！"
tip_recurse: "迭代者人也，遞歸者神也 - L. Peter Deutsch"
tip_free_your_mind: "放下一切私心雜念，丟棄害怕、疑問和拒信，解放您的思維。 - 莫菲斯《駭客任務》"
- tip_strong_opponents: "即使是最强大的對手也有弱点的. - 宇智波鼬《火影忍者》"
+ tip_strong_opponents: "即使是最强大的對手也有弱点的。 - 宇智波鼬《火影忍者》"
tip_paper_and_pen: "在您開始編碼之前，您可以隨時用一張紙和一支筆作計劃。"
game_menu:
@@ -361,7 +361,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
leaderboard:
leaderboard: "排行榜"
- view_other_solutions: "查看其他解法" # {change}
+ view_other_solutions: "查看其他解法"
scores: "分數"
top_players: "頂級玩家由"
day: "今天"
@@ -401,9 +401,9 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
subscribe:
comparison_blurb: "訂閱 CodeCombat 來磨練您的技巧!"
- feature1: "100 個以上的基本關卡散佈在4張地圖中" # {change}
- feature2: "10 個強壯的新英雄並每隻都有不同技巧!" # {change}
- feature3: "70 個以上的額外關卡" # {change}
+ feature1: "110 個以上的基本關卡散佈在4張地圖中"
+ feature2: "10 個強壯的新英雄並每隻都有不同技巧!"
+ feature3: "70 個以上的額外關卡"
feature4: "每個月3500顆額外寶石!"
feature5: "視頻教學"
feature6: "頂級信箱支援"
@@ -428,33 +428,33 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
parent_email_sent: "已寄信!"
parent_email_title: "您父母信箱是?"
parents: "致家長"
- parents_title: "您的孩子將學習編寫程式." # {change}
- parents_blurb1: "使用 CodeCombat , 您的孩子學習真正的編寫程式. 他們學習從簡單的指令，漸進到更加進階的課題."
- parents_blurb1a: "不要懷疑計算機編程能力將是您的孩子作為一個成年人的基本技能。到2020年，77%的工作將會需要編碼能力，並且軟件工程師將在世界各地成為高需求職業。您知道嗎，計算機科學是收入最高的大學學位。"
- parents_blurb2: "每月支付 $9.99 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助." # {change}
+ parents_title: "親愛的家長: 您的孩子將要學習編程. 您會支持孩子發展嗎？"
+ parents_blurb1: "您的孩子已經玩了 __nLevels__ 關，並且學習了編程基礎。請您為了培養他們的興趣而給他們訂閱，他們能繼續玩下去。"
+ parents_blurb1a: "不要懷疑計算機編程能力將是您的孩子作為一個成年人的基本技能。到2020年，77%的工作將會需要編碼能力，並且軟件工程師將在世界各地成為高需求職業。您知道要計算機科學是收入最高的大學學位。"
+ parents_blurb2: "每月支付 $9.99 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助."
parents_blurb3: "沒有風險: 保證 100% 退費, 一步取消訂閱."
payment_methods: "付費方法"
payment_methods_title: "可接受的付款方式"
payment_methods_blurb1: "我們現有的付費方式有信用卡和支付寶"
payment_methods_blurb2: "如果您想用其他付費方式,請聯繫我們"
-# sale_already_subscribed: "You're already subscribed!"
-# sale_blurb1: "Save 35%"
-# sale_blurb2: "off regular subscription price of $120 for a whole year!" # {changed}
-# sale_button: "Sale!"
-# sale_button_title: "Save 35% when you purchase a 1 year subscription"
-# sale_click_here: "Click Here"
-# sale_ends: "Ends"
-# sale_extended: "*Existing subscriptions will be extended by 1 year."
-# sale_feature_here: "Here's what you'll get:"
-# sale_feature2: "Access to 9 powerful new heroes with unique skills!"
-# sale_feature4: "42,000 bonus gems awarded immediately!"
-# sale_continue: "Ready to continue adventuring?"
-# sale_limited_time: "Limited time offer!"
-# sale_new_heroes: "New heroes!"
-# sale_title: "Back to School Sale"
-# sale_view_button: "Buy 1 year subscription for"
+ sale_already_subscribed: "您已經訂閱！"
+ sale_blurb1: "和正常一年的訂閱價格 $120 相比"
+ sale_blurb2: "年費訂閱能節省 35%!"
+ sale_button: "促銷！"
+ sale_button_title: "年費訂閱能節省 35% 的費用"
+ sale_click_here: "點擊這裡"
+ sale_ends: "結束"
+ sale_extended: "*已訂閱用戶會續期一年。"
+ sale_feature_here: "你將會獲得這些："
+ sale_feature2: "可以使用10 個強大的新英雄 和各種技能！"
+ sale_feature4: "立即取得42,000 個額外的寶石！"
+ sale_continue: "準備好繼續探險嗎？"
+ sale_limited_time: "限時優惠！"
+ sale_new_heroes: "新英雄！"
+ sale_title: "開學促銷"
+ sale_view_button: "購買年費訂閱："
stripe_description: "每月訂閱"
-# stripe_description_year_sale: "1 Year Subscription (35% discount)"
+ stripe_description_year_sale: "年費訂閱 (35% 優惠)"
subscription_required_to_play: "您將需要訂閱來開啟這關."
unlock_help_videos: "訂閱來解開所有鎖住得教學影片."
personal_sub: "個人訂閱" # Accounts Subscription View below
@@ -462,7 +462,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
managed_by: "管理"
will_be_cancelled: "將被取消"
currently_free: "您目前有一個免費訂閱"
- currently_free_until: "您目前有一個免費訂閱，直到" # {changed}
+ currently_free_until: "您目前有一個訂閱，直到" # {changed}
was_free_until: "您有過一個免費訂閱，直到"
managed_subs: "管理訂閱"
managed_subs_desc: "為其他玩家（學生、兒童等）添加訂閱。"
@@ -526,6 +526,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
skill_docs:
writable: "可編輯" # Hover over "attack" in Your Skills while playing a level to see most of this
read_only: "唯讀"
+ action: "命令"
+ spell: "技能"
action_name: "名稱"
action_cooldown: "釋放時間"
action_specific_cooldown: "冷卻時間"
@@ -582,15 +584,15 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
press_paragraph_1_link: "新聞稿懶人包"
press_paragraph_1_suffix: "，裡面所有的LOGO和圖片都可以使用，並且不必另外知會我們。"
team: "製作團隊"
- george_title: "CEO" # {change}
+ george_title: "共同創辦人"
george_blurb: "商人"
- scott_title: "程式員" # {change}
+ scott_title: "共同創辦人"
scott_blurb: "理性至上"
- nick_title: "程式員" # {change}
+ nick_title: "程式員"
nick_blurb: "亢奮的Guru"
- michael_title: "程式員"
+ michael_title: "共同創辦人"
michael_blurb: "系統管理員"
- matt_title: "程式員" # {change}
+ matt_title: "共同創辦人"
matt_blurb: "競速單車玩家"
cat_title: "首席開卡設計師"
cat_blurb: "氣宗"
@@ -606,19 +608,19 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
intro_1: "CodeCombat 是一個教編程的網上游戲。學生會用編程語言寫代碼。"
intro_2: "無需經驗！"
free_title: "要多少錢？"
- cost_china: "CodeCombat的前5個關卡在中國是免費的，在這之後需花費每月9.99美元來訪問我們架設在中國專屬服務器上的140多個關卡。"
- free_1: "有100多個覆蓋了所有理論的免費關卡。" # {change}
+ cost_china: "CodeCombat的前5個關卡在中國是免費的，在這之後需花費每月9.99美元來訪問我們架設在中國專屬服務器上的180多個關卡。"
+ free_1: "有110多個覆蓋了所有理論的免費關卡。"
free_2: "包月訂閱可以訪問視頻教程和額外的練習關卡。"
teacher_subs_title: "教師可免費訂閱！"
teacher_subs_1: "請聯繫"
teacher_subs_2: "教師調查"
teacher_subs_3: "建立您的訂閱。"
sub_includes_title: "訂閱裡包含了什麼內容？"
- sub_includes_1: "除了100＋個基礎關卡，學生包月訂閱還可以使用這些附加功能：" # {change}
+ sub_includes_1: "除了110＋個基礎關卡，學生包月訂閱還可以使用這些附加功能："
sub_includes_2: "超過70個練習關卡"
sub_includes_3: "視頻教學"
sub_includes_4: "獨特的電子郵件支援"
- sub_includes_5: "10个具有独特技能的新英雄" # {change}
+ sub_includes_5: "10个具有独特技能的新英雄"
sub_includes_6: "每月享有3500額外寶石"
sub_includes_7: "私人部落"
monitor_progress_title: "我要如何查看學生的進度？"
@@ -649,8 +651,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
more_info_2: "教師論壇"
more_info_3: "是個與其他使用CodeCombat的教育工作者聯繫的良好平台。"
sys_requirements_title: "系統要求"
- sys_requirements_1: "因為CodeCombat是遊戲, 相比播放影片它讓電腦花費更多資源去順暢的執行. 為了讓所有人都可以接觸，我們已經讓它在現在的瀏覽器和老舊的電腦上執行最佳化. 以下是我們為了讓您順暢體驗Hour of Code所給的系統建議:" # {change}
- sys_requirements_2: "使用較新的Chrome or Firefox版本." # {change}
+ sys_requirements_1: "一個現代的瀏覽器。 需要更新的Chrome，Firefox、Safari或者Internet Explorer 9 以上版本。" # {change}
+ sys_requirements_2: "CodeCombat 暫時還不支持 iPad。" # {change}
teachers_survey:
title: "教師調查"
@@ -673,12 +675,12 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
school: "學校名字"
location: "城市"
age_students: "您的學生年齡為多少？"
- under: "幾歲以下"
+ under: "低於"
other: "其他:"
amount_students: "請問您有多少學生需要教導？"
hear_about: "您是怎麼知道CodeComabat的？"
fill_fields: "請填寫所有問題。"
- thanks: "非常感謝！我們會很快寄你設置說明。"
+ thanks: "非常感謝！我們會很快寄給您設置說明。"
versions:
save_version_title: "保存新版本"
@@ -725,7 +727,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
admin: "管理員"
new_password: "新密碼"
new_password_verify: "確認密碼"
- type_in_email: "輸入您的Email來確認刪除" # {change}
+ type_in_email: "輸入您的Email來確認刪除"
type_in_password: "還有輸入您的密碼。"
email_subscriptions: "訂閱"
email_subscriptions_none: "無Email訂閱"
@@ -836,7 +838,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
latest_achievement: "最新成就"
playtime: "遊戲時間"
last_played: "最後玩了"
-# leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
+ leagues_explanation: "在部落裡與其他成員組成聯盟一起參加下面的多人競技場。"
classes:
archmage_title: "大法師"
@@ -1026,7 +1028,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
my_matches: "我的對手"
simulate: "模擬"
simulation_explanation: "通過模擬遊戲，您可以使您的遊戲更快得到評分!"
-# simulation_explanation_leagues: "You will mainly help simulate games for allied players in your clans and courses."
+ simulation_explanation_leagues: "你會主要給在你的部落或者課程的同伴幫忙模擬遊戲。"
simulate_games: "模擬遊戲!"
simulate_all: "重置並模擬遊戲"
games_simulated_by: "您模擬過的次數:"
@@ -1040,7 +1042,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
summary_matches: "對手 - "
summary_wins: " 勝利, "
summary_losses: " 失敗"
- rank_no_code: "沒有新程式碼可評分No New Code to Rank"
+ rank_no_code: "沒有新程式碼可評分"
rank_my_game: "對我的遊戲評分!"
rank_submitting: "上傳中..."
rank_submitted: "已上傳以求評分"
@@ -1073,11 +1075,16 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
tournament_rules: "錦標賽規則"
tournament_blurb: "寫下程式碼, 收集金幣, 建立軍隊, 粉碎敵人, 贏得獎項,在我們價值$40,000的Greed錦標賽中升級您的職業! 查看"
tournament_blurb_criss_cross: "贏得競賽, 建造道路, 智勝對手, 收集寶石, 在我們的Criss-Crossand錦標賽中升級您的職業! 查看"
-# tournament_blurb_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
+ tournament_blurb_zero_sum: "在紅方法師和藍方法師的山峰對決中，同時在收集金幣和戰術上發揮你的代碼創造力。競賽在3月27日開始，在4月6日（星期一）的下午5點（PDT太平洋時區）結束。為樂趣和榮耀競賽吧！瀏覽了解更多"
tournament_blurb_blog: "我們的部落格"
rules: "規則"
winners: "贏家"
-# league: "League"
+ league: "聯盟"
+ red_ai: "紅隊 AI" # "Red AI Wins", at end of multiplayer match playback
+ blue_ai: "藍隊 AI"
+ wins: "勝利" # At end of multiplayer match playback
+ humans: "紅隊" # Ladder page display team name
+ ogres: "藍隊"
user:
stats: "統計"
@@ -1118,7 +1125,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
no_recent_games: "在過去兩個星期沒有玩過遊戲。"
payments: "付款"
purchased: "已購買"
-# sale: "Sale"
+ sale: "促銷"
subscription: "訂閱"
invoices: "收據"
service_apple: "設備: Apple"
@@ -1221,15 +1228,15 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
boolean_logic: "布爾邏輯"
break_statements: "Break語句"
classes: "類"
-# continue_statements: "Continue Statements"
+ continue_statements: "Continue 語句"
for_loops: "For循環"
functions: "函數"
-# graphics: "Graphics"
+ graphics: "圖形"
if_statements: "If語句"
input_handling: "輸入處理"
math_operations: "數學運算"
object_literals: "對象常量"
-# parameters: "Parameters"
+ parameters: "參數"
strings: "字符串"
variables: "變量"
vectors: "向量"
@@ -1325,8 +1332,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
prizes: "獎項"
total_value: "總價值"
in_cash: "現金"
- custom_wizard: "客制 CodeCombat 巫師"
- custom_avatar: "客制 CodeCombat 頭像"
+ custom_wizard: "定制 CodeCombat 巫師"
+ custom_avatar: "定制 CodeCombat 頭像"
heap: "給六個月的\"Startup\"訪問"
credits: "信譽"
one_month_coupon: "優惠: 選擇 Rails 或者 HTML"
diff --git a/app/styles/play/level/duel-stats-view.sass b/app/styles/play/level/duel-stats-view.sass
index 71eed7ad2..8ab0ef9b5 100644
--- a/app/styles/play/level/duel-stats-view.sass
+++ b/app/styles/play/level/duel-stats-view.sass
@@ -63,6 +63,9 @@
.health-bar-container .health-bar
background: hsla(205,100%,51%,1)
+ .thang-avatar-view
+ @include scaleX(-1)
+
.name-and-power
display: flex
flex-direction: row
diff --git a/app/styles/play/level/tome/cast_button.sass b/app/styles/play/level/tome/cast_button.sass
index 3a8a8c45c..44392ab9e 100644
--- a/app/styles/play/level/tome/cast_button.sass
+++ b/app/styles/play/level/tome/cast_button.sass
@@ -54,12 +54,23 @@
border-image: url(/images/level/code_toolbar_run_button_active_pressed.png) 14 20 20 20 fill round
padding: 2px 0 0 2px
- &.submit-button, &.done-button
+ &.submit-button, &.done-button, &.rank-button
margin-left: 10px
border-image: url(/images/level/code_toolbar_submit_button_active.png) 14 20 20 20 fill round
&:active
border-image: url(/images/level/code_toolbar_submit_button_active_pressed.png) 14 20 20 20 fill round
+
+ .ladder-submission-view
+ width: 45%
+ width: -webkit-calc(50% - 10px)
+ width: calc(50% - 10px)
+ display: inline-block
+
+ .btn.btn-illustrated
+ width: 100%
+ font-size: 18px
+
.cast-button
@include opacity(0.77)
diff --git a/app/templates/play/ladder/ladder-tab-view.jade b/app/templates/play/ladder/ladder-tab-view.jade
index 16991fa49..c8b5f8855 100644
--- a/app/templates/play/ladder/ladder-tab-view.jade
+++ b/app/templates/play/ladder/ladder-tab-view.jade
@@ -32,7 +32,7 @@ div#columns.row
td.score-cell= Math.round(sessionStats.totalScore * 100)
td.name-col-cell= session.get('creatorName') || "Anonymous"
td.fight-cell
- a(href="/play/level/#{level.get('slug') || level.id}?team=#{team.otherTeam}&opponent=#{session.id}")
+ a(href="/play/level/#{level.get('slug') || level.id}?team=#{team.otherTeam}&opponent=#{session.id}" + (league ? "&league=" + league.id : ""))
span(data-i18n="ladder.fight") Fight!
td.spectate-cell.iconic-cell
.glyphicon.glyphicon-eye-open
@@ -51,7 +51,7 @@ div#columns.row
td.score-cell= Math.round(sessionStats.totalScore * 100)
td.name-col-cell= session.get('creatorName') || "Anonymous"
td.fight-cell
- a(href="/play/level/#{level.get('slug') || level.id}?team=#{team.otherTeam}&opponent=#{session.id}")
+ a(href="/play/level/#{level.get('slug') || level.id}?team=#{team.otherTeam}&opponent=#{session.id}" + (league ? "&league=" + league.id : ""))
span(data-i18n="ladder.fight") Fight!
td.spectate-cell.iconic-cell
.glyphicon.glyphicon-eye-open
@@ -84,7 +84,7 @@ div#columns.row
span :
span= friend.team
br
- a(href="/play/level/#{level.get('slug') || level.id}/?team=#{friend.otherTeam}&opponent=#{friend._id}")
+ a(href="/play/level/#{level.get('slug') || level.id}/?team=#{friend.otherTeam}&opponent=#{friend._id}" + (league ? "&league=" + league.id : ""))
span(data-i18n="ladder.fight") Fight!
else if onFacebook || onGPlus
diff --git a/app/templates/play/ladder/ladder.jade b/app/templates/play/ladder/ladder.jade
index 8d7c6f98f..af30ff3e7 100644
--- a/app/templates/play/ladder/ladder.jade
+++ b/app/templates/play/ladder/ladder.jade
@@ -109,7 +109,7 @@ block content
div.column.col-md-2
.spectate-button-container
- a(href="/play/spectate/#{level.get('slug')}").spectate-button.btn.btn-illustrated.btn-info.center
+ a(href="/play/spectate/#{level.get('slug')}" + (league ? "?league=" + league.id : "")).spectate-button.btn.btn-illustrated.btn-info.center
span(data-i18n="play.spectate") Spectate
ul.nav.nav-pills
diff --git a/app/templates/play/ladder/my_matches_tab.jade b/app/templates/play/ladder/my_matches_tab.jade
index 8506604a8..fabbb7117 100644
--- a/app/templates/play/ladder/my_matches_tab.jade
+++ b/app/templates/play/ladder/my_matches_tab.jade
@@ -43,7 +43,7 @@ div#columns.row
td.name-cell= match.opponentName || "Anonymous"
td.time-cell= match.when
td.battle-cell
- a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}")
+ a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}" + (league ? "&league=" + league.id : ""))
if (match.state === 'win')
span(data-i18n="ladder.watch_victory") Watch your victory
else
diff --git a/app/templates/play/ladder/play_modal.jade b/app/templates/play/ladder/play_modal.jade
index 86631c841..175ccc658 100644
--- a/app/templates/play/ladder/play_modal.jade
+++ b/app/templates/play/ladder/play_modal.jade
@@ -12,7 +12,7 @@ block modal-body-content
option(value=option.id selected=(language === option.id))= option.name
div#noob-view.secret
- a(href="/play/level/#{levelID}-tutorial").btn.btn-success.btn-block.btn-lg
+ a(href="/play/level/#{levelID}-tutorial" + (league ? "?league=" + league.id : "")).btn.btn-success.btn-block.btn-lg
p
strong(data-i18n="ladder.tutorial_play") Play Tutorial
span(data-i18n="ladder.tutorial_recommended") Recommended if you've never played before
@@ -23,8 +23,8 @@ block modal-body-content
p.tutorial-suggestion
strong(data-i18n="ladder.tutorial_not_sure") Not sure what's going on?
|
- a(href="/play/level/#{levelID}-tutorial", data-i18n="ladder.tutorial_play_first") Play the tutorial first.
- a(href="/play/level/#{levelID}?team=#{teamID}")
+ a(href="/play/level/#{levelID}-tutorial" + (league ? "?league=" + league.id : ""), data-i18n="ladder.tutorial_play_first") Play the tutorial first.
+ a(href="/play/level/#{levelID}?team=#{teamID}" + (league ? "&league=" + league.id : ""))
div.play-option
img(src=myPortrait).my-icon.only-one
img(src="/images/pages/play/ladder/"+teamID+"_ladder_tutorial.png", style="border: 1px solid #{teamColor}; background: #{teamBackgroundColor}").my-team-icon.img-circle.only-one
@@ -39,7 +39,7 @@ block modal-body-content
span(data-i18n="ladder.warmup") Warmup
if challengers.easy
- a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.easy.sessionID}")
+ a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.easy.sessionID}" + (league ? "&league=" + league.id : ""))
div.play-option.easy-option
img(src=myPortrait).my-icon.only-one
img(src="/images/pages/play/ladder/"+teamID+"_ladder_easy.png", style="border: 1px solid #{teamColor}; background: #{teamBackgroundColor}").my-team-icon.img-circle.only-one
@@ -55,7 +55,7 @@ block modal-body-content
span(data-i18n="general.easy") Easy
if challengers.medium
- a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.medium.sessionID}")
+ a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.medium.sessionID}" + (league ? "&league=" + league.id : ""))
div.play-option.medium-option
img(src=myPortrait).my-icon.only-one
img(src="/images/pages/play/ladder/"+teamID+"_ladder_medium.png", style="border: 1px solid #{teamColor}; background: #{teamBackgroundColor}").my-team-icon.img-circle.only-one
@@ -71,7 +71,7 @@ block modal-body-content
span(data-i18n="general.medium") Medium
if challengers.hard
- a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.hard.sessionID}")
+ a(href="/play/level/#{levelID}?team=#{teamID}&opponent=#{challengers.hard.sessionID}" + (league ? "&league=" + league.id : ""))
div.play-option.hard-option
img(src=myPortrait).my-icon.only-one
img(src="/images/pages/play/ladder/"+teamID+"_ladder_hard.png", style="border: 1px solid #{teamColor}; background: #{teamBackgroundColor}").my-team-icon.img-circle.only-one
diff --git a/app/templates/play/level/control_bar.jade b/app/templates/play/level/control_bar.jade
index 2aec41d20..c122681f1 100644
--- a/app/templates/play/level/control_bar.jade
+++ b/app/templates/play/level/control_bar.jade
@@ -7,7 +7,7 @@
.levels-link-area
a.levels-link(href=homeLink || "/")
.glyphicon.glyphicon-play
- span(data-i18n="nav.play").home-text Levels
+ span(data-i18n=ladderGame ? "general.ladder" : "nav.play").home-text Levels
if isMultiplayerLevel && !observing
.multiplayer-area-container
diff --git a/app/templates/play/level/duel-stats-view.jade b/app/templates/play/level/duel-stats-view.jade
index e96f4be47..f1d57d0c0 100644
--- a/app/templates/play/level/duel-stats-view.jade
+++ b/app/templates/play/level/duel-stats-view.jade
@@ -7,7 +7,7 @@ for player in players
.player-power
.power-icon
.power-value
- .player-name= player.name
+ .player-name= player.name || 'Anoner'
.player-health
.health-icon
.health-bar-container
diff --git a/app/templates/play/level/tome/cast_button.jade b/app/templates/play/level/tome/cast_button.jade
index a8f2470cd..013ee73d9 100644
--- a/app/templates/play/level/tome/cast_button.jade
+++ b/app/templates/play/level/tome/cast_button.jade
@@ -2,9 +2,12 @@ button.btn.btn-lg.btn-illustrated.cast-button(title=castVerbose)
span(data-i18n="play_level.tome_run_button_ran") Ran
if !observing
- button.btn.btn-lg.btn-illustrated.submit-button(title=castRealTimeVerbose)
- span(data-i18n="play_level.tome_submit_button") Submit
- span.spl.secret.submit-again-time
-
- button.btn.btn-lg.btn-illustrated.done-button.secret
- span(data-i18n="play_level.done") Done
+ if mirror
+ .ladder-submission-view
+ else
+ button.btn.btn-lg.btn-illustrated.submit-button(title=castRealTimeVerbose)
+ span(data-i18n="play_level.tome_submit_button") Submit
+ span.spl.secret.submit-again-time
+
+ button.btn.btn-lg.btn-illustrated.done-button.secret
+ span(data-i18n="play_level.done") Done
diff --git a/app/views/ladder/LadderPlayModal.coffee b/app/views/ladder/LadderPlayModal.coffee
index 6fa076ea6..3a729cb9f 100644
--- a/app/views/ladder/LadderPlayModal.coffee
+++ b/app/views/ladder/LadderPlayModal.coffee
@@ -103,6 +103,7 @@ module.exports = class LadderPlayModal extends ModalView
{id: 'lua', name: 'Lua'}
{id: 'io', name: 'Io (Experimental)'}
]
+ ctx.league = @options.league
teamsList = teamDataFromLevel @level
teams = {}
teams[team.id] = team for team in teamsList
diff --git a/app/views/ladder/LadderView.coffee b/app/views/ladder/LadderView.coffee
index dfd1c09d7..cb756c7c9 100644
--- a/app/views/ladder/LadderView.coffee
+++ b/app/views/ladder/LadderView.coffee
@@ -108,6 +108,8 @@ module.exports = class LadderView extends RootView
e.preventDefault()
e.stopImmediatePropagation()
url = "/play/spectate/#{@level.get('slug')}?session-one=#{humanSession}&session-two=#{ogreSession}"
+ url += '&league=' + @league.id if @league
+ url += '&autoplay=false' if key.command
window.open url, if key.command then '_blank' else 'spectate' # New tab for spectating specific matches
#Backbone.Mediator.publish 'router:navigate', route: url
diff --git a/app/views/ladder/MyMatchesTabView.coffee b/app/views/ladder/MyMatchesTabView.coffee
index e6d3c34e7..43ed6d5c8 100644
--- a/app/views/ladder/MyMatchesTabView.coffee
+++ b/app/views/ladder/MyMatchesTabView.coffee
@@ -67,6 +67,7 @@ module.exports = class MyMatchesTabView extends CocoView
ctx.level = @level
ctx.levelID = @level.get('slug') or @level.id
ctx.teams = @teams
+ ctx.league = @options.league
convertMatch = (match, submitDate) =>
opponent = match.opponents[0]
@@ -116,7 +117,9 @@ module.exports = class MyMatchesTabView extends CocoView
placeholder = $(el)
sessionID = placeholder.data('session-id')
session = _.find @sessions.models, {id: sessionID}
- ladderSubmissionView = new LadderSubmissionView session: session, level: @level
+ if @level.get('slug') in ['ace-of-coders']
+ mirrorSession = (s for s in @sessions.models when s.get('team') isnt session.get('team'))[0]
+ ladderSubmissionView = new LadderSubmissionView session: session, level: @level, mirrorSession: mirrorSession
@insertSubView ladderSubmissionView, placeholder
@$el.find('.score-chart-wrapper').each (i, el) =>
diff --git a/app/views/play/SpectateView.coffee b/app/views/play/SpectateView.coffee
index d32b94ae5..ea7fe1639 100644
--- a/app/views/play/SpectateView.coffee
+++ b/app/views/play/SpectateView.coffee
@@ -257,7 +257,8 @@ module.exports = class SpectateLevelView extends RootView
startFrame = @lastWorldFramesLoaded ? 0
if @world.frames.length is @world.totalFrames # Finished loading
@lastWorldFramesLoaded = 0
- Backbone.Mediator.publish 'level:set-playing', playing: true # Since we paused at first, now we autostart playback.
+ unless @getQueryVariable('autoplay') is false
+ Backbone.Mediator.publish 'level:set-playing', playing: true # Since we paused at first, now we autostart playback.
else
@lastWorldFramesLoaded = @world.frames.length
for [spriteName, message] in @world.thangDialogueSounds startFrame
@@ -271,6 +272,8 @@ module.exports = class SpectateLevelView extends RootView
@sessionOne = data[0]._id
@sessionTwo = data[1]._id
url = "/play/spectate/#{@levelID}?session-one=#{@sessionOne}&session-two=#{@sessionTwo}"
+ if leagueID = @getQueryVariable 'league'
+ url += "&league=" + leagueID
Backbone.Mediator.publish 'router:navigate', {
route: url,
viewClass: SpectateLevelView,
diff --git a/app/views/play/common/LadderSubmissionView.coffee b/app/views/play/common/LadderSubmissionView.coffee
index 8c029ef4c..c47825a16 100644
--- a/app/views/play/common/LadderSubmissionView.coffee
+++ b/app/views/play/common/LadderSubmissionView.coffee
@@ -13,6 +13,7 @@ module.exports = class LadderSubmissionView extends CocoView
constructor: (options) ->
super options
@session = options.session
+ @mirrorSession = options.mirrorSession
@level = options.level
getRenderData: ->
@@ -62,20 +63,31 @@ module.exports = class LadderSubmissionView extends CocoView
console.log jqxhr.responseText
@setRankingButtonText 'failed' unless @destroyed
@transpileSession (transpiledCode) =>
-
ajaxData =
session: @session.id
levelID: @level.id
originalLevelID: @level.get('original')
levelMajorVersion: @level.get('version').major
transpiledCode: transpiledCode
-
- $.ajax '/queue/scoring', {
+ ajaxOptions =
type: 'POST'
data: ajaxData
success: success
error: failure
- }
+ if @mirrorSession
+ # Also submit the mirrorSession after the main session submits successfully.
+ mirrorAjaxData = _.clone ajaxData
+ mirrorAjaxData.session = @mirrorSession.id
+ if @session.get('team') is 'humans'
+ mirrorAjaxData.transpiledCode = 'hero-placeholder-1': transpiledCode['hero-placeholder']
+ else
+ mirrorAjaxData.transpiledCode = 'hero-placeholder': transpiledCode['hero-placeholder-1']
+ mirrorAjaxOptions = _.clone ajaxOptions
+ mirrorAjaxOptions.data = mirrorAjaxData
+ ajaxOptions.success = ->
+ $.ajax '/queue/scoring', mirrorAjaxOptions
+
+ $.ajax '/queue/scoring', ajaxOptions
transpileSession: (callback) ->
submittedCode = @session.get('code')
diff --git a/app/views/play/level/ControlBarView.coffee b/app/views/play/level/ControlBarView.coffee
index 3ce4307c3..d0a100bad 100644
--- a/app/views/play/level/ControlBarView.coffee
+++ b/app/views/play/level/ControlBarView.coffee
@@ -76,13 +76,18 @@ module.exports = class ControlBarView extends CocoView
@homeLink = '/play/ladder/' + levelID
@homeViewClass = 'views/ladder/LadderView'
@homeViewArgs.push levelID
+ if leagueID = @getQueryVariable 'league'
+ leagueType = if @level.get('type') is 'course-ladder' then 'course' else 'clan'
+ @homeViewArgs.push leagueType
+ @homeViewArgs.push leagueID
+ @homeLink += "/#{leagueType}/#{leagueID}"
else if @level.get('type', true) in ['hero', 'hero-coop']
@homeLink = '/play'
@homeViewClass = 'views/play/CampaignView'
campaign = @level.get 'campaign'
@homeLink += '/' + campaign
@homeViewArgs.push campaign
- else if @level.get('type', true) in ['course', 'course-ladder']
+ else if @level.get('type', true) in ['course']
@homeLink = '/courses/mock1'
@homeViewClass = 'views/courses/mock1/CourseDetailsView'
#campaign = @level.get 'campaign'
diff --git a/app/views/play/level/DuelStatsView.coffee b/app/views/play/level/DuelStatsView.coffee
index 52f6524af..ea9f843e7 100644
--- a/app/views/play/level/DuelStatsView.coffee
+++ b/app/views/play/level/DuelStatsView.coffee
@@ -89,7 +89,7 @@ module.exports = class DuelStatsView extends CocoView
palisade: 10
peasant: 50
powers = humans: 0, ogres: 0
- for thang in @options.thangs when thang.health > 0
+ for thang in @options.thangs when thang.health > 0 and thang.exists
powers[thang.team] += @costTable[thang.type] or 0 if powers[thang.team]?
for player in @players
utils.replaceText @$find(player.team, '.power-value'), powers[player.team]
diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee
index aa4e89b87..8a7f7b15f 100644
--- a/app/views/play/level/modal/HeroVictoryModal.coffee
+++ b/app/views/play/level/modal/HeroVictoryModal.coffee
@@ -369,9 +369,18 @@ module.exports = class HeroVictoryModal extends ModalView
@$el.find('.sign-up-poke').toggleClass('hide', not @readyToContinue)
onGameSubmitted: (e) ->
- ladderURL = "/play/ladder/#{@level.get('slug')}#my-matches"
+ @returnToLadder()
+
+ returnToLadder: ->
# Preserve the supermodel as we navigate back to the ladder.
- Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: 'views/ladder/LadderView', viewArgs: [{supermodel: @supermodel}, @level.get('slug')]
+ viewArgs = [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @level.get('slug')]
+ ladderURL = "/play/ladder/#{@level.get('slug') || @level.id}#my-matches"
+ if leagueID = @getQueryVariable 'league'
+ leagueType = if @level.get('type') is 'course-ladder' then 'course' else 'clan'
+ viewArgs.push leagueType
+ viewArgs.push leagueID
+ ladderURL += "/#{leagueType}/#{leagueID}"
+ Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: 'views/ladder/LadderView', viewArgs: viewArgs
playSelectionSound: (hero, preload=false) ->
return unless sounds = hero.get('soundTriggers')?.selected
@@ -433,9 +442,7 @@ module.exports = class HeroVictoryModal extends ModalView
onClickReturnToLadder: (e) ->
@playSound 'menu-button-click'
e.preventDefault()
- route = $(e.target).data('href')
- # Preserve the supermodel as we navigate back to the ladder.
- Backbone.Mediator.publish 'router:navigate', route: route, viewClass: 'views/ladder/LadderView', viewArgs: [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @level.get('slug')]
+ @returnToLadder()
onClickSignupButton: (e) ->
e.preventDefault()
diff --git a/app/views/play/level/tome/CastButtonView.coffee b/app/views/play/level/tome/CastButtonView.coffee
index ea114f6e2..59343ff0e 100644
--- a/app/views/play/level/tome/CastButtonView.coffee
+++ b/app/views/play/level/tome/CastButtonView.coffee
@@ -1,6 +1,8 @@
CocoView = require 'views/core/CocoView'
template = require 'templates/play/level/tome/cast_button'
{me} = require 'core/auth'
+LadderSubmissionView = require 'views/play/common/LadderSubmissionView'
+LevelSession = require 'models/LevelSession'
module.exports = class CastButtonView extends CocoView
id: 'cast-button-view'
@@ -28,6 +30,7 @@ module.exports = class CastButtonView extends CocoView
@castShortcut = '⇧↵'
@updateReplayabilityInterval = setInterval @updateReplayability, 1000
@observing = options.session.get('creator') isnt me.id
+ @loadMirrorSession() if @options.level.get('slug') in ['ace-of-coders']
destroy: ->
clearInterval @updateReplayabilityInterval
@@ -42,6 +45,7 @@ module.exports = class CastButtonView extends CocoView
context.castVerbose = castShortcutVerbose + ': ' + $.i18n.t('keyboard_shortcuts.run_code')
context.castRealTimeVerbose = castRealTimeShortcutVerbose + ': ' + $.i18n.t('keyboard_shortcuts.run_real_time')
context.observing = @observing
+ context.mirror = @mirrorSession?
context
afterRender: ->
@@ -55,6 +59,7 @@ module.exports = class CastButtonView extends CocoView
if @options.level.get('slug') is 'thornbush-farm'# and not @options.session.get('state')?.complete
@$el.find('.submit-button').hide() # Hide submit until first win so that script can explain it.
@updateReplayability()
+ @updateLadderSubmissionViews()
attachTo: (spellView) ->
@$el.detach().prependTo(spellView.toolbarView.$el).show()
@@ -96,6 +101,7 @@ module.exports = class CastButtonView extends CocoView
@casting = false
if @hasCastOnce # Don't play this sound the first time
@playSound 'cast-end', 0.5
+ _.delay (=> @ladderSubmissionView?.rankSession()), 1000 if @ladderSubmissionView
@hasCastOnce = true
@updateCastButton()
@world = e.world
@@ -136,6 +142,7 @@ module.exports = class CastButtonView extends CocoView
castText = $.i18n.t('play_level.tome_cast_button_ran')
@castButton.text castText
#@castButton.prop 'disabled', not castable
+ @ladderSubmissionView?.updateButton()
updateReplayability: =>
return if @destroyed
@@ -148,6 +155,18 @@ module.exports = class CastButtonView extends CocoView
waitTime = moment().add(timeUntilResubmit, 'ms').fromNow()
submitAgainLabel.text waitTime
+ loadMirrorSession: ->
+ url = "/db/level/#{@options.level.get('slug') or @options.level.id}/session"
+ url += "?team=#{if me.team is 'humans' then 'ogres' else 'humans'}"
+ mirrorSession = new LevelSession().setURL url
+ @mirrorSession = @supermodel.loadModel(mirrorSession, 'level_session', {cache: false}).model
+
+ updateLadderSubmissionViews: ->
+ @removeSubView subview for key, subview of @subviews when subview instanceof LadderSubmissionView
+ placeholder = @$el.find('.ladder-submission-view')
+ @ladderSubmissionView = new LadderSubmissionView session: @options.session, level: @options.level, mirrorSession: @mirrorSession
+ @insertSubView @ladderSubmissionView, placeholder
+
onJoinedRealTimeMultiplayerGame: (e) ->
@inRealTimeMultiplayerSession = true
diff --git a/app/views/play/menu/GameMenuModal.coffee b/app/views/play/menu/GameMenuModal.coffee
index f618cf4c7..bcde144b5 100644
--- a/app/views/play/menu/GameMenuModal.coffee
+++ b/app/views/play/menu/GameMenuModal.coffee
@@ -33,7 +33,7 @@ module.exports = class GameMenuModal extends ModalView
submenus = ['guide', 'options', 'save-load', 'multiplayer']
submenus = _.without submenus, 'guide' unless docs.specificArticles?.length or docs.generalArticles?.length
submenus = _.without submenus, 'save-load' unless me.isAdmin() or /https?:\/\/localhost/.test(window.location.href)
- submenus = _.without submenus, 'multiplayer' unless me.isAdmin() or @level?.get('type') in ['ladder', 'hero-ladder', 'course-ladder']
+ submenus = _.without submenus, 'multiplayer' unless me.isAdmin() or (@level?.get('type') in ['ladder', 'hero-ladder', 'course-ladder'] and @level.get('slug') not in ['ace-of-coders'])
@includedSubmenus = submenus
context.showTab = @options.showTab ? submenus[0]
context.submenus = submenus
diff --git a/app/views/play/menu/MultiplayerView.coffee b/app/views/play/menu/MultiplayerView.coffee
index 435dbccd1..9e03757d1 100644
--- a/app/views/play/menu/MultiplayerView.coffee
+++ b/app/views/play/menu/MultiplayerView.coffee
@@ -72,8 +72,15 @@ module.exports = class MultiplayerView extends CocoView
e.target.select()
onGameSubmitted: (e) ->
+ # Preserve the supermodel as we navigate back to the ladder.
+ viewArgs = [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @levelID]
ladderURL = "/play/ladder/#{@levelID}#my-matches"
- Backbone.Mediator.publish 'router:navigate', route: ladderURL
+ if leagueID = @getQueryVariable 'league'
+ leagueType = if @level?.get('type') is 'course-ladder' then 'course' else 'clan'
+ viewArgs.push leagueType
+ viewArgs.push leagueID
+ ladderURL += "/#{leagueType}/#{leagueID}"
+ Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: 'views/ladder/LadderView', viewArgs: viewArgs
updateLinkSection: ->
multiplayer = @$el.find('#multiplayer').prop('checked')