codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-11 00:02:19 -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'

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

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

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'