codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-02 00:14:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Matt Lott 2015-05-12 20:51:27 -07:00
commit 674ad9e730
4 changed files with 59 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/models/ThangType.coffee
View file

@ -12,17 +12,24 @@ module.exports = class ThangType extends CocoModel
@heroes: @heroes:
captain: '529ec584c423d4e83b000014' captain: '529ec584c423d4e83b000014'
knight: '529ffbf1cf1818f2be000001' knight: '529ffbf1cf1818f2be000001'
'samurai': '53e12be0d042f23505c3023b' samurai: '53e12be0d042f23505c3023b'
'ninja': '52fc0ed77e01835453bd8f6c' raider: '55527eb0b8abf4ba1fe9a107'
goliath: ''
guardian: ''
ninja: '52fc0ed77e01835453bd8f6c'
'forest-archer': '5466d4f2417c8b48a9811e87' 'forest-archer': '5466d4f2417c8b48a9811e87'
trapper: '5466d449417c8b48a9811e83' trapper: '5466d449417c8b48a9811e83'
pixie: ''
assassin: ''
librarian: '52fbf74b7e01835453bd8d8e' librarian: '52fbf74b7e01835453bd8d8e'
'potion-master': '52e9adf7427172ae56002172' 'potion-master': '52e9adf7427172ae56002172'
sorcerer: '52fd1524c7e6cf99160e7bc9' sorcerer: '52fd1524c7e6cf99160e7bc9'
necromancer: ''
'dark-wizard': ''
@heroClasses: @heroClasses:
Warrior: ['captain', 'knight', 'samurai'] Warrior: ['captain', 'knight', 'samurai', 'raider', 'goliath', 'guardian']
Ranger: ['ninja', 'forest-archer', 'trapper'] Ranger: ['ninja', 'forest-archer', 'trapper', 'pixie', 'assassin']
Wizard: ['librarian', 'potion-master', 'sorcerer'] Wizard: ['librarian', 'potion-master', 'sorcerer', 'necromancer', 'dark-wizard']
@items: @items:
'simple-boots': '53e237bf53457600003e3f05' 'simple-boots': '53e237bf53457600003e3f05'
urlRoot: '/db/thang.type' urlRoot: '/db/thang.type'

88
app/styles/play/modal/play-heroes-modal.sass
View file

@ -7,23 +7,23 @@ $heroCanvasHeight: 275px
@include user-select(none) @include user-select(none)
//- Clear modal defaults //- Clear modal defaults
.modal-dialog .modal-dialog
padding: 0 padding: 0
width: 820px width: 820px
height: 658px height: 658px
//- Background //- Background
#play-heroes-background #play-heroes-background
position: absolute position: absolute
top: -59px top: -59px
left: -20px left: -20px
//- Header //- Header
h1 h1
position: absolute position: absolute
left: 154px left: 154px
@ -67,9 +67,9 @@ $heroCanvasHeight: 275px
&:hover &:hover
color: yellow color: yellow
//- Carousel character portraits //- Carousel character portraits
#hero-carousel #hero-carousel
width: 750px width: 750px
height: 386px height: 386px
@ -87,7 +87,7 @@ $heroCanvasHeight: 275px
margin-left: 0 margin-left: 0
.hero-indicator .hero-indicator
width: 104px width: 97px
height: 98px height: 98px
margin: 0 -11px margin: 0 -11px
position: relative position: relative
@ -131,27 +131,27 @@ $heroCanvasHeight: 275px
//- Small transformations to jumble the hero icons a little //- Small transformations to jumble the hero icons a little
.hero-index-0 .hero-index-0
transform: rotate(-5deg) transform: rotate(-5deg)
z-index: 2 z-index: 2
.hero-index-1 .hero-index-1
top: -3px top: -3px
z-index: 1 z-index: 1
.hero-index-2 .hero-index-2
top: -3px top: -3px
transform: rotate(5deg) transform: rotate(5deg)
z-index: 1 z-index: 1
.hero-index-3 .hero-index-3
transform: rotate(-1deg) transform: rotate(-1deg)
z-index: 0 z-index: 0
.hero-index-4 .hero-index-4
transform: rotate(3deg) transform: rotate(3deg)
.hero-index-5 .hero-index-5
z-index: 0 z-index: 0
@ -159,7 +159,7 @@ $heroCanvasHeight: 275px
transform: rotate(6deg) transform: rotate(6deg)
top: -8px top: -8px
z-index: 1 z-index: 1
.hero-index-8 .hero-index-8
transform: rotate(4deg) transform: rotate(4deg)
@ -176,7 +176,7 @@ $heroCanvasHeight: 275px
width: 334px width: 334px
height: $heroCanvasHeight height: $heroCanvasHeight
float: left float: left
.hero-stats .hero-stats
width: 400px width: 400px
height: $heroCanvasHeight height: $heroCanvasHeight
@ -196,23 +196,23 @@ $heroCanvasHeight: 275px
h2 h2
margin-top: 0px margin-top: 0px
color: white color: white
.hero-description .hero-description
margin-bottom: 4px margin-bottom: 4px
.hero-stat-row .hero-stat-row
margin: 3px 0 margin: 3px 0
.stat-label .stat-label
float: left float: left
width: 100px width: 100px
color: rgb(203,170,148) color: rgb(203,170,148)
.stat-value .stat-value
display: inline-block display: inline-block
width: 280px width: 280px
color: rgb(244,189,68) color: rgb(244,189,68)
.stat-progress .stat-progress
background: rgb(32,27,22) background: rgb(32,27,22)
height: 15px height: 15px
@ -222,24 +222,24 @@ $heroCanvasHeight: 275px
top: 2px top: 2px
left: -3px left: -3px
width: 70% width: 70%
.stat-progress-bar .stat-progress-bar
height: 7px height: 7px
border-radius: 7px border-radius: 7px
&.attack .stat-progress-bar &.attack .stat-progress-bar
background: #c32424 background: #c32424
&.health .stat-progress-bar &.health .stat-progress-bar
background: #0f802a background: #0f802a
&.speed .stat-progress-bar &.speed .stat-progress-bar
background: #4d52ab background: #4d52ab
//- Carousel switch buttons //- Carousel switch buttons
a.left, a.right a.left, a.right
color: rgb(74,61,51) color: rgb(74,61,51)
position: absolute position: absolute
@ -247,15 +247,15 @@ $heroCanvasHeight: 275px
width: 40px width: 40px
height: 84px height: 84px
font-size: 24px font-size: 24px
.glyphicon .glyphicon
position: relative position: relative
top: 27px top: 27px
left: 8px left: 8px
&:hover, &:active &:hover, &:active
color: rgb(126,105,88) color: rgb(126,105,88)
a.right a.right
right: -49px right: -49px
@ -312,7 +312,7 @@ $heroCanvasHeight: 275px
border: 3px solid rgb(7,65,83) border: 3px solid rgb(7,65,83)
background: rgb(0,119,168) background: rgb(0,119,168)
border-radius: 0 border-radius: 0
&:disabled &:disabled
background: rgb(72, 106, 113) background: rgb(72, 106, 113)
opacity: 1 opacity: 1
@ -327,7 +327,7 @@ $heroCanvasHeight: 275px
//#restricted-hero-button //#restricted-hero-button
//- Programming select box //- Programming select box
.form .form
position: absolute position: absolute
left: 32px left: 32px
@ -335,33 +335,33 @@ $heroCanvasHeight: 275px
width: 541px width: 541px
height: 102px height: 102px
padding: 10px 40px padding: 10px 40px
.help-block .help-block
color: rgb(51,51,51) color: rgb(51,51,51)
font-size: 14px font-size: 14px
font-weight: bold font-weight: bold
select select
font-size: 18px font-size: 18px
.fancy-select .fancy-select
display: inline-block display: inline-block
width: 100% width: 100%
.options .options
text-transform: none text-transform: none
.trigger, .options .trigger, .options
background-color: rgb(239,232,217) background-color: rgb(239,232,217)
color: black color: black
.trigger .trigger
text-transform: uppercase text-transform: uppercase
border: 3px solid black border: 3px solid black
font-size: 16px font-size: 16px
padding: 5px 10px padding: 5px 10px
width: 100% width: 100%
//- the little triangle on the right side of the fancy select box //- the little triangle on the right side of the fancy select box
&:after &:after
border: 8px solid transparent border: 8px solid transparent
@ -397,7 +397,7 @@ $heroCanvasHeight: 275px
background-image: url(/images/common/code_languages/lua_small.png) background-image: url(/images/common/code_languages/lua_small.png)
&[data-value="io"] &[data-value="io"]
background-image: url(/images/common/code_languages/io_small.png) background-image: url(/images/common/code_languages/io_small.png)
#confirm-button #confirm-button
background: url(/images/pages/play/modal/confirm-button.png) background: url(/images/pages/play/modal/confirm-button.png)
width: 209px width: 209px
@ -411,15 +411,15 @@ $heroCanvasHeight: 275px
font-size: 26px font-size: 26px
font-family: $headings-font-family font-family: $headings-font-family
color: white color: white
body.ipad #play-heroes-modal body.ipad #play-heroes-modal
// iPad is Python-only for now, and has its own reset button. // iPad is Python-only for now, and has its own reset button.
.form .form
display: none display: none
body[lang='ru'] body[lang='ru']
#play-heroes-modal #play-heroes-modal
#hero-carousel .hero-item .hero-stats h2 #hero-carousel .hero-item .hero-stats h2
font-size: 24px font-size: 24px

2
app/views/play/level/LevelHUDView.coffee
View file

@ -101,7 +101,7 @@ module.exports = class LevelHUDView extends CocoView
createProperties: -> createProperties: ->
if @thang.id in ['Hero Placeholder', 'Hero Placeholder 1'] if @thang.id in ['Hero Placeholder', 'Hero Placeholder 1']
name = {knight: 'Tharin', captain: 'Anya', librarian: 'Hushbaum', sorcerer: 'Pender', 'potion-master': 'Omarn', samurai: 'Hattori', ninja: 'Amara'}[@thang.type] ? 'Hero' name = {knight: 'Tharin', captain: 'Anya', librarian: 'Hushbaum', sorcerer: 'Pender', 'potion-master': 'Omarn', samurai: 'Hattori', ninja: 'Amara', raider: 'Arryn', goliath: 'Okar', guardian: 'Illia', pixie: 'Zana', assassin: 'Ritic', necromancer: 'Nalfar', 'dark-wizard': 'Usara'}[@thang.type] ? 'Hero'
else else
name = @thang.hudName or (if @thang.type then "#{@thang.id} - #{@thang.type}" else @thang.id) name = @thang.hudName or (if @thang.type then "#{@thang.id} - #{@thang.type}" else @thang.id)
utils.replaceText @$el.find('.thang-name'), name utils.replaceText @$el.find('.thang-name'), name

4
app/views/play/menu/InventoryModal.coffee
View file

@ -659,8 +659,8 @@ module.exports = class InventoryModal extends ModalView
heroGenders = heroGenders =
male: ['knight', 'samurai', 'trapper', 'potion-master'] male: ['knight', 'samurai', 'trapper', 'potion-master', 'goliath', 'assassin', 'necromancer']
female: ['captain', 'ninja', 'forest-archer', 'librarian', 'sorcerer'] female: ['captain', 'ninja', 'forest-archer', 'librarian', 'sorcerer', 'raider', 'guardian', 'pixie', 'dark-wizard']
gear = gear =
'simple-boots': '53e237bf53457600003e3f05' 'simple-boots': '53e237bf53457600003e3f05'