Merge remote-tracking branch 'origin/master'

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 =

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"

app/locale/ro.coffee

@@ -1,83 +1,83 @@
 module.exports = nativeDescription: "limba română", englishDescription: "Romanian", translation:
   common:
     loading: "Loading..."
-#    saving: "Saving..."
+    saving: "Se salvează..."
-#    sending: "Sending..."
+    sending: "Se trimite..."
-#    cancel: "Cancel"
+    cancel: "Anulează"
-#    save: "Save"
+    save: "Salvează"
-#    delay_1_sec: "1 second"
+    delay_1_sec: "1 secundă"
-#    delay_3_sec: "3 seconds"
+    delay_3_sec: "3 secunde"
-#    delay_5_sec: "5 seconds"
+    delay_5_sec: "5 secunde"
-#    manual: "Manual"
+    manual: "Manual"
-#    fork: "Fork"
+    fork: "Fork"
-#    play: "Play"
+    play: "Joaca"
 
-#  modal:
+  modal:
-#    close: "Close"
+    close: "Inchide"
-#    okay: "Okay"
+    okay: "Okay"
 
-#  not_found:
+  not_found:
-#    page_not_found: "Page not found"
+    page_not_found: "Pagina nu a fost gasită"
 
-#  nav:
+  nav:
-#    play: "Levels"
+    play: "Nivele"
-#    editor: "Editor"
+    editor: "Editor"
-#    blog: "Blog"
+    blog: "Blog"
-#    forum: "Forum"
+    forum: "Forum"
-#    admin: "Admin"
+    admin: "Admin"
-#    home: "Home"
+    home: "Acasa"
-#    contribute: "Contribute"
+    contribute: "Contribuie"
-#    legal: "Legal"
+    legal: "Confidențialitate și termeni"
-#    about: "About"
+    about: "Despre"
-#    contact: "Contact"
+    contact: "Contact"
-#    twitter_follow: "Follow"
+    twitter_follow: "Urmărește"
-#    employers: "Employers"
+    employers: "Angajați"
 
-#  versions:
+  versions:
-#    save_version_title: "Save New Version"
+    save_version_title: "Salvează noua versiune"
-#    new_major_version: "New Major Version"
+    new_major_version: "Versiune nouă majoră"
-#    cla_prefix: "To save changes, first you must agree to our"
+    cla_prefix: "Pentru a salva modificările mai intâi trebuie sa fiți de acord cu"
-#    cla_url: "CLA"
+    cla_url: "CLA"
-#    cla_suffix: "."
+    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "SUNT DE ACORD"
 
-#  login:
+  login:
-#    sign_up: "Create Account"
+    sign_up: "Crează cont"
-#    log_in: "Log In"
+    log_in: "Log In"
-#    log_out: "Log Out"
+    log_out: "Log Out"
-#    recover: "recover account"
+    recover: "recuperează cont"
 
-#  recover:
+  recover:
-#    recover_account_title: "Recover Account"
+    recover_account_title: "Recuperează Cont"
-#    send_password: "Send Recovery Password"
+    send_password: "Trimite parolă de recuperare"
 
-#  signup:
+  signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Crează cont pentru a salva progresul"
-#    description: "It's free. Just need a couple things and you'll be good to go:"
+    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"
+    email_announcements: "Receive announcements by email"
-#    coppa: "13+ or non-USA "
+    coppa: "13+ sau non-USA "
-#    coppa_why: "(Why?)"
+    coppa_why: "(De ce?)"
-#    creating: "Creating Account..."
+    creating: "Se crează contul..."
-#    sign_up: "Sign Up"
+    sign_up: "Înscrie-te"
-#    log_in: "log in with password"
+    log_in: "loghează-te cu parola"
 
-#  home:
+  home:
-#    slogan: "Learn to Code JavaScript by Playing a Game"
+    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_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!"
+    no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargâ!"
-#    play: "Play"
+    play: "Joacâ"
 
-#  play:
+  play:
-#    choose_your_level: "Choose Your Level"
+    choose_your_level: "Alege nivelul"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
+    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: "the Adventurer forum"
+    adventurer_forum: "forumul Aventurierului"#sonds waaaaaay too funny#the Adventurer forum"
-#    adventurer_suffix: "."
+    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
+    campaign_beginner: "Campanie pentru Începători"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
+    campaign_beginner_description: "... în care se învață tainele programării."
-#    campaign_dev: "Random Harder Levels"
+    campaign_dev: "Nivele aleatoare mai grele"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
+    campaign_dev_description: "... în care se învață interfața, cu o dificultate puțin mai mare."
-#    campaign_multiplayer: "Multiplayer Arenas"
+    campaign_multiplayer: "Arene Multiplayer"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
+    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 <a href=\"/contribute#artisan\">Artisan Wizards</a>."
 #    level_difficulty: "Difficulty: "

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

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}: 
     

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))