diff --git a/app/assets/images/level/hud_info_icons.png b/app/assets/images/level/hud_info_icons.png new file mode 100644 index 000000000..bff087119 Binary files /dev/null and b/app/assets/images/level/hud_info_icons.png differ diff --git a/app/assets/images/level/info_icons.png b/app/assets/images/level/info_icons.png deleted file mode 100644 index de9ecfb6f..000000000 Binary files a/app/assets/images/level/info_icons.png and /dev/null differ diff --git a/app/assets/images/level/prop_health.png b/app/assets/images/level/prop_health.png deleted file mode 100644 index 87f3c8407..000000000 Binary files a/app/assets/images/level/prop_health.png and /dev/null differ diff --git a/app/assets/images/level/prop_inventory.png b/app/assets/images/level/prop_inventory.png deleted file mode 100644 index 37f147521..000000000 Binary files a/app/assets/images/level/prop_inventory.png and /dev/null differ diff --git a/app/assets/images/level/prop_pos.png b/app/assets/images/level/prop_pos.png deleted file mode 100644 index d3461a8e2..000000000 Binary files a/app/assets/images/level/prop_pos.png and /dev/null differ diff --git a/app/assets/images/level/prop_target.png b/app/assets/images/level/prop_target.png deleted file mode 100644 index 0f2b411ac..000000000 Binary files a/app/assets/images/level/prop_target.png and /dev/null differ diff --git a/app/lib/simulator/Simulator.coffee b/app/lib/simulator/Simulator.coffee index 521e810c7..f92bccb98 100644 --- a/app/lib/simulator/Simulator.coffee +++ b/app/lib/simulator/Simulator.coffee @@ -207,7 +207,12 @@ module.exports = class Simulator transpileSpell: (thang, spellKey, methodName) -> slugifiedThangID = _.string.slugify thang.id source = @currentUserCodeMap[[slugifiedThangID,methodName].join '/'] ? "" - @spells[spellKey].thangs[thang.id].aether.transpile source + aether = @spells[spellKey].thangs[thang.id].aether + try + aether.transpile source + catch e + console.log "Couldn't transpile #{spellKey}:\n#{source}\n", e + aether.transpile '' createAether: (methodName, method) -> aetherOptions = diff --git a/app/lib/world/names.coffee b/app/lib/world/names.coffee index 7ba332f60..a7a3f256e 100644 --- a/app/lib/world/names.coffee +++ b/app/lib/world/names.coffee @@ -58,6 +58,9 @@ module.exports.thangNames = thangNames = "Nikita" "Alana" "Lana" + "Joan" + "Helga" + "Annie" ] "Peasant": [ "Yorik" @@ -112,6 +115,8 @@ module.exports.thangNames = thangNames = "Roman" "Hunter" "Simon" + "Robin" + "Quinn" ] "Ogre Munchkin M": [ "Brack" @@ -151,13 +156,15 @@ module.exports.thangNames = thangNames = "Trung" "Axe Ox" "Vargutt" + "Grumus" + "Gug" ] "Ogre F": [ "Nareng" "Morthrug" "Glonc" "Marghurk" - + "Martha" ] "Ogre Brawler": [ "Grul'thock" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index 454278097..6a07f8345 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -1,83 +1,83 @@ module.exports = nativeDescription: "limba română", englishDescription: "Romanian", translation: common: loading: "Loading..." -# saving: "Saving..." -# sending: "Sending..." -# cancel: "Cancel" -# save: "Save" -# delay_1_sec: "1 second" -# delay_3_sec: "3 seconds" -# delay_5_sec: "5 seconds" -# manual: "Manual" -# fork: "Fork" -# play: "Play" + saving: "Se salvează..." + sending: "Se trimite..." + cancel: "Anulează" + save: "Salvează" + delay_1_sec: "1 secundă" + delay_3_sec: "3 secunde" + delay_5_sec: "5 secunde" + manual: "Manual" + fork: "Fork" + play: "Joaca" -# modal: -# close: "Close" -# okay: "Okay" + modal: + close: "Inchide" + okay: "Okay" -# not_found: -# page_not_found: "Page not found" + not_found: + page_not_found: "Pagina nu a fost gasită" -# nav: -# play: "Levels" -# editor: "Editor" -# blog: "Blog" -# forum: "Forum" -# admin: "Admin" -# home: "Home" -# contribute: "Contribute" -# legal: "Legal" -# about: "About" -# contact: "Contact" -# twitter_follow: "Follow" -# employers: "Employers" + nav: + play: "Nivele" + editor: "Editor" + blog: "Blog" + forum: "Forum" + admin: "Admin" + home: "Acasa" + contribute: "Contribuie" + legal: "Confidențialitate și termeni" + about: "Despre" + contact: "Contact" + twitter_follow: "Urmărește" + employers: "Angajați" -# versions: -# save_version_title: "Save New Version" -# new_major_version: "New Major Version" -# cla_prefix: "To save changes, first you must agree to our" -# cla_url: "CLA" -# cla_suffix: "." -# cla_agree: "I AGREE" + versions: + save_version_title: "Salvează noua versiune" + new_major_version: "Versiune nouă majoră" + cla_prefix: "Pentru a salva modificările mai intâi trebuie sa fiți de acord cu" + cla_url: "CLA" + cla_suffix: "." + cla_agree: "SUNT DE ACORD" -# login: -# sign_up: "Create Account" -# log_in: "Log In" -# log_out: "Log Out" -# recover: "recover account" + login: + sign_up: "Crează cont" + log_in: "Log In" + log_out: "Log Out" + recover: "recuperează cont" -# recover: -# recover_account_title: "Recover Account" -# send_password: "Send Recovery Password" + recover: + recover_account_title: "Recuperează Cont" + send_password: "Trimite parolă de recuperare" -# signup: -# create_account_title: "Create Account to Save Progress" -# description: "It's free. Just need a couple things and you'll be good to go:" -# email_announcements: "Receive announcements by email" -# coppa: "13+ or non-USA " -# coppa_why: "(Why?)" -# creating: "Creating Account..." -# sign_up: "Sign Up" -# log_in: "log in with password" + signup: + create_account_title: "Crează cont pentru a salva progresul" + description: "Este gratis. Doar câte ceva inainte si poți continua:"#contextual translation a bit off, could be better# It's free. Just need a couple things and you'll be good to go:" + email_announcements: "Receive announcements by email" + coppa: "13+ sau non-USA " + coppa_why: "(De ce?)" + creating: "Se crează contul..." + sign_up: "Înscrie-te" + log_in: "loghează-te cu parola" -# home: -# slogan: "Learn to Code JavaScript by Playing a Game" -# no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!" -# no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" -# play: "Play" + home: + slogan: "Învață sa scri JavaScript jucându-te"# again sounds funny# Learn to Code JavaScript by Playing a Game" + no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!" + no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargâ!" + play: "Joacâ" -# play: -# choose_your_level: "Choose Your Level" -# adventurer_prefix: "You can jump to any level below, or discuss the levels on " -# adventurer_forum: "the Adventurer forum" -# adventurer_suffix: "." -# campaign_beginner: "Beginner Campaign" -# campaign_beginner_description: "... in which you learn the wizardry of programming." -# campaign_dev: "Random Harder Levels" -# campaign_dev_description: "... in which you learn the interface while doing something a little harder." -# campaign_multiplayer: "Multiplayer Arenas" -# campaign_multiplayer_description: "... in which you code head-to-head against other players." + play: + choose_your_level: "Alege nivelul" + adventurer_prefix: "Poți să sari la orice nivel de mai jos"#what do you mean by discuss?# You can jump to any level below, or discuss the levels on " + adventurer_forum: "forumul Aventurierului"#sonds waaaaaay too funny#the Adventurer forum" + adventurer_suffix: "." + campaign_beginner: "Campanie pentru Începători" + campaign_beginner_description: "... în care se învață tainele programării." + campaign_dev: "Nivele aleatoare mai grele" + campaign_dev_description: "... în care se învață interfața, cu o dificultate puțin mai mare." + campaign_multiplayer: "Arene Multiplayer" + campaign_multiplayer_description: "... în care te lupți cap-la-cap contra alti jucători." # campaign_player_created: "Player-Created" # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # level_difficulty: "Difficulty: " diff --git a/app/styles/play/level/hud.sass b/app/styles/play/level/hud.sass index 7858f0365..4f6a5fea3 100644 --- a/app/styles/play/level/hud.sass +++ b/app/styles/play/level/hud.sass @@ -95,14 +95,35 @@ height: 100px @include user-select(text) - .prop - img - margin-right: 5px - width: 16px - height: 16px - .text-prop width: 50% + + .prop-label-icon + $iconSize: 16px + display: inline-block + width: $iconSize + height: $iconSize + margin-right: 5px + background: transparent url(/images/level/hud_info_icons.png) no-repeat + background-size: auto $iconSize + float: left + + &.prop-label-icon-pos + background-position-x: -1 * $iconSize + &.prop-label-icon-target + background-position-x: -2 * $iconSize + &.prop-label-icon-inventory + background-position-x: -3 * $iconSize + &.prop-label-icon-visualRange + background-position-x: -4 * $iconSize + &.prop-label-icon-attackDamage + background-position-x: -5 * $iconSize + &.prop-label-icon-attackRange + background-position-x: -6 * $iconSize + &.prop-label-icon-maxSpeed + background-position-x: -7 * $iconSize + &.prop-label-icon-gold + background-position-x: -8 * $iconSize .prop-value.bar-prop width: 100px diff --git a/app/templates/play/level/hud_prop.jade b/app/templates/play/level/hud_prop.jade index fcccab38e..705377d92 100644 --- a/app/templates/play/level/hud_prop.jade +++ b/app/templates/play/level/hud_prop.jade @@ -1,6 +1,6 @@ .prop(name="#{prop}") if hasIcon - img.prop-label(src="/images/level/prop_#{prop}.png", alt="#{prop}") + span(class="prop-label prop-label-icon prop-label-icon-#{prop}") else span.prop-label #{prop}: diff --git a/app/views/play/level/hud_view.coffee b/app/views/play/level/hud_view.coffee index f4580660b..7b036c433 100644 --- a/app/views/play/level/hud_view.coffee +++ b/app/views/play/level/hud_view.coffee @@ -247,7 +247,7 @@ module.exports = class HUDView extends View return null # included in the bar context = prop: prop - hasIcon: prop in ["health", "pos", "target", "inventory", "gold"] + hasIcon: prop in ["health", "pos", "target", "inventory", "gold", "visualRange", "attackDamage", "attackRange", "maxSpeed"] hasBar: prop in ["health"] $(prop_template(context))