From 113c71e141be7d8debbc6d63445f2eda298b2472 Mon Sep 17 00:00:00 2001 From: George Saines Date: Mon, 3 Mar 2014 18:03:54 -0800 Subject: [PATCH 1/5] adding new hud icons --- app/assets/images/level/hud_info_icons.png | Bin 0 -> 8571 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/level/hud_info_icons.png 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 0000000000000000000000000000000000000000..bff08711922f2cee437293e67171e84d08edb0db GIT binary patch literal 8571 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 Date: Tue, 4 Mar 2014 08:30:50 -0800 Subject: [PATCH 2/5] Simulator now swaps in empty methods when code doesn't compile. --- app/lib/simulator/Simulator.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 = From 195b1941eabe33186e720d6deab92918d436306f Mon Sep 17 00:00:00 2001 From: Yos Riady Date: Wed, 5 Mar 2014 02:53:54 +0800 Subject: [PATCH 3/5] Added even more names for #53 --- app/lib/world/names.coffee | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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" From 4556536df4d2f36052cc718a6313e6547aafb7b1 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Tue, 4 Mar 2014 11:15:31 -0800 Subject: [PATCH 4/5] Hooked up new HUD icons. --- app/assets/images/level/info_icons.png | Bin 646 -> 0 bytes app/assets/images/level/prop_health.png | Bin 513 -> 0 bytes app/assets/images/level/prop_inventory.png | Bin 571 -> 0 bytes app/assets/images/level/prop_pos.png | Bin 576 -> 0 bytes app/assets/images/level/prop_target.png | Bin 581 -> 0 bytes app/styles/play/level/hud.sass | 33 +++++++++++++++++---- app/templates/play/level/hud_prop.jade | 2 +- app/views/play/level/hud_view.coffee | 2 +- 8 files changed, 29 insertions(+), 8 deletions(-) delete mode 100644 app/assets/images/level/info_icons.png delete mode 100644 app/assets/images/level/prop_health.png delete mode 100644 app/assets/images/level/prop_inventory.png delete mode 100644 app/assets/images/level/prop_pos.png delete mode 100644 app/assets/images/level/prop_target.png diff --git a/app/assets/images/level/info_icons.png b/app/assets/images/level/info_icons.png deleted file mode 100644 index de9ecfb6f43c4cad12d76ee4f32e8a54781d776c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)ZF{Dw*MJJ3uwJQnJXUGD%M9zKnXsN+uKIA<{uED7H^=bMRPm~}=?u2~9 zk{dAOVBnDJG2|f^f)JqRYxDHU%ME=@7-Gv zBq2xuRfCurh>sbS{rb-JH5W4;C&G zD!hAVmM{=(Ii7UM*^-5j8_H{;+eEOSltjDAwv=)n!Bhx3=UXrD+vsyG z(_+*a1dB)xyInujr^V4s$oVCQuIf2YGj4hn=h4C;h g*tSGd{pl4t24w6<%WBZ`qyPW_07*qoM6N<$g3yRBAOHXW diff --git a/app/assets/images/level/prop_health.png b/app/assets/images/level/prop_health.png deleted file mode 100644 index 87f3c840753e0f8d73b7a4c2fbe736c41918965a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmV+c0{;DpP)dK7^7Z?|4V%SJbG`hjS0wf9) zr*rAdIdhH+U%>AbKC!<$KmML?r?sa0X4^a;-0YR+*=e(l`GI|TF#NDs zsEs7PZ{nw?dYUagVuo5v&0x}dSVUWC1#Sn~s?E)`uQrnSi5oroy=+qkq@tGionLM* zEeu*<6Xdw`W@9XY{k(NS25L^I2o+&M)}?lYKI#lxksq8_61a?9PA8)Yc!jL+0-Ylz zC}f5c=<8)Jfx}iNTm71F4FgP@)e3!slaSKPQJUV{xs||)&EC(k^gtQRh{&Qx7>i%h zNY)NF;$MiI&u3REl?mpX2z|q(1YN8V_SF{e>&O#cYx6=8Yil zz>2z}f4(_=k(6KZI}w5!4`c6xY@5>CTje4hjSAIfwTApONsiT@&mm29K*)bvI<{)z zi;r#Bo^>ME*<8?Ij%LltU3wX6VOrV-4d4iQ)oF=R%dfr|Cf(_zchzl<%iBBM1g%>^ z3FkD>F**n$qjd1MW%*9kT4#$z>4T73MM6m%Oi+IT@y66CmB$XB00000NkvXXu0mjf Dg0S#3 diff --git a/app/assets/images/level/prop_inventory.png b/app/assets/images/level/prop_inventory.png deleted file mode 100644 index 37f147521f63e34e9723f8d9b8fa7a0a2d97ed25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 571 zcmV-B0>u4^P)I-|+0D+6o$>o{^GbdD-jU+9+X0x#{lz5tZ1Lp)3t=-Pu%1 ze)#-lm`-YOtc~*lmwfJ%aG-TWXZ%vTcsF7*_f$Y zYsicTd0~yQA%KjOl&UZW5uLM@NbWq_{?`4D5F`ug%qN|zivlS(MjMMLhy(yuBIT^v z`>}WNLT%&5a__K@8;diW8>@n4nr6R#AAo?{H`h9?w(y3aT$*p593KxS*;4BodsQ>p zs6pDh5Z7S)@q=>MgQH!oqYC4{Ua76E)f4IFgzzANf`KYaJJI>+IPIU423d`>5-l=S zV;wLvULZoJ)h-yGB&i;r96f(>fB$c9l-qW@ zrKkB+Ygcb3jk(qJ_4l8456;fNc7Ni^^~>aq^zP-(i?{DSK7I7??ya>~uiuOeMoLPi zbdm!J6;*I~Wx*MJsX5#451F_**GNa_QUC<$y%!_`05NBI{vWs`3)qrO;z$4h002ov JPDHLkV1l3N1Tp{s diff --git a/app/assets/images/level/prop_pos.png b/app/assets/images/level/prop_pos.png deleted file mode 100644 index d3461a8e259b684e07591c84d4366294e1039667..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmV-G0>Axp8Nan2^1(@|4))Fc^fvP{>awTOVXGBqPJ1Ro03Vp{;X+ zx8`oX$jpOUb&0~uJocyW^p{*U`jY+mu8q(J2od8b?hPL4D-Y9xhwTaCW_wUvPMwMN zy|A}xiGeX5AxA_3S<+oeM{{#a?(M7D2q1;Q^OqZ`TD(4Usu_<=%{U_fsKtWeeHW|o zaHDUaQ|VO=-qEpO^L%>2Ay-B@qscnQtt#{1TIy!-tR!%g+ZP;6t4Bo|Nc5c#&H@1k z0Na#)W2aH96?W_Xlgt)hgZaCcYGrn6uO9CiRWd~FfOV3%cA3m&dm63lxMWQ09F{3CMhN%8uB{>q)w;iwn+}whR#o0Axs}!Cfeh4|k&GK_q%fl>gfO5ulEI zpRrIIAaDc#%F4>oxIT}Yo$B8k{~{V5u1C$t0$9hD@r~t-hybABd~zZVXGQTdl%s?n z=yG4EGv_>QxdWe&gSD)a#N3iHtVWLL#gs?*(TS`s!$2!Si&Q%@7VtlXr5Ox_NvCiC O0000H|9z(_)c z6@`V3ny71xi?A%q%+CECJ`cIL*jA__#b9Vw}cIi^s1;iZj1{@zJ@>i|1Nyz1b^6r@TQ0z??BO9F)F%>HsDMc{?R{LzQd8CR?7XdCw`oJN3Xas?dGN5ujl0MCm6_9(Xz?n5_AK&WZk~ Tn9!vg00000NkvXXu0mjf*)9cL 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)) From e02780e4415de899f0d2ccdc5ea1b649d16e3ec7 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Tue, 4 Mar 2014 21:26:52 +0200 Subject: [PATCH 5/5] Update for ro.coffee -first 80 lines done --- app/locale/ro.coffee | 136 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 68 deletions(-) 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: "