From 213a66b2ab1106f0bbdf8855fd46df14395c8a6b Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Tue, 12 May 2015 16:59:19 -0700 Subject: [PATCH 1/2] Implemented Arryn. --- app/models/ThangType.coffee | 17 ++++++++++++----- app/views/play/level/LevelHUDView.coffee | 2 +- app/views/play/menu/InventoryModal.coffee | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index cb8cc927f..4b5931e9f 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -12,17 +12,24 @@ module.exports = class ThangType extends CocoModel @heroes: captain: '529ec584c423d4e83b000014' knight: '529ffbf1cf1818f2be000001' - 'samurai': '53e12be0d042f23505c3023b' - 'ninja': '52fc0ed77e01835453bd8f6c' + samurai: '53e12be0d042f23505c3023b' + raider: '55527eb0b8abf4ba1fe9a107' + goliath: '' + guardian: '' + ninja: '52fc0ed77e01835453bd8f6c' 'forest-archer': '5466d4f2417c8b48a9811e87' trapper: '5466d449417c8b48a9811e83' + pixie: '' + assassin: '' librarian: '52fbf74b7e01835453bd8d8e' 'potion-master': '52e9adf7427172ae56002172' sorcerer: '52fd1524c7e6cf99160e7bc9' + necromancer: '' + 'dark-wizard': '' @heroClasses: - Warrior: ['captain', 'knight', 'samurai'] - Ranger: ['ninja', 'forest-archer', 'trapper'] - Wizard: ['librarian', 'potion-master', 'sorcerer'] + Warrior: ['captain', 'knight', 'samurai', 'raider', 'goliath', 'guardian'] + Ranger: ['ninja', 'forest-archer', 'trapper', 'pixie', 'assassin'] + Wizard: ['librarian', 'potion-master', 'sorcerer', 'necromancer', 'dark-wizard'] @items: 'simple-boots': '53e237bf53457600003e3f05' urlRoot: '/db/thang.type' diff --git a/app/views/play/level/LevelHUDView.coffee b/app/views/play/level/LevelHUDView.coffee index 2aae1ee6b..d44db0849 100644 --- a/app/views/play/level/LevelHUDView.coffee +++ b/app/views/play/level/LevelHUDView.coffee @@ -101,7 +101,7 @@ module.exports = class LevelHUDView extends CocoView createProperties: -> 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 name = @thang.hudName or (if @thang.type then "#{@thang.id} - #{@thang.type}" else @thang.id) utils.replaceText @$el.find('.thang-name'), name diff --git a/app/views/play/menu/InventoryModal.coffee b/app/views/play/menu/InventoryModal.coffee index 359e54034..ed4f5a155 100644 --- a/app/views/play/menu/InventoryModal.coffee +++ b/app/views/play/menu/InventoryModal.coffee @@ -659,8 +659,8 @@ module.exports = class InventoryModal extends ModalView heroGenders = - male: ['knight', 'samurai', 'trapper', 'potion-master'] - female: ['captain', 'ninja', 'forest-archer', 'librarian', 'sorcerer'] + male: ['knight', 'samurai', 'trapper', 'potion-master', 'goliath', 'assassin', 'necromancer'] + female: ['captain', 'ninja', 'forest-archer', 'librarian', 'sorcerer', 'raider', 'guardian', 'pixie', 'dark-wizard'] gear = 'simple-boots': '53e237bf53457600003e3f05' From ee2540dcf26c5a1066ab27e5228eb27a520c6fd1 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Tue, 12 May 2015 20:49:08 -0700 Subject: [PATCH 2/2] :bug:Fix choose hero icon widths Fixes #2753 --- app/styles/play/modal/play-heroes-modal.sass | 88 ++++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/app/styles/play/modal/play-heroes-modal.sass b/app/styles/play/modal/play-heroes-modal.sass index 35a7f0f64..511d5577a 100644 --- a/app/styles/play/modal/play-heroes-modal.sass +++ b/app/styles/play/modal/play-heroes-modal.sass @@ -7,23 +7,23 @@ $heroCanvasHeight: 275px @include user-select(none) //- Clear modal defaults - + .modal-dialog padding: 0 width: 820px height: 658px - - + + //- Background - + #play-heroes-background position: absolute top: -59px left: -20px - - + + //- Header - + h1 position: absolute left: 154px @@ -67,9 +67,9 @@ $heroCanvasHeight: 275px &:hover color: yellow - + //- Carousel character portraits - + #hero-carousel width: 750px height: 386px @@ -87,7 +87,7 @@ $heroCanvasHeight: 275px margin-left: 0 .hero-indicator - width: 104px + width: 97px height: 98px margin: 0 -11px position: relative @@ -131,27 +131,27 @@ $heroCanvasHeight: 275px //- Small transformations to jumble the hero icons a little - + .hero-index-0 transform: rotate(-5deg) z-index: 2 - + .hero-index-1 top: -3px z-index: 1 - + .hero-index-2 top: -3px transform: rotate(5deg) z-index: 1 - + .hero-index-3 transform: rotate(-1deg) z-index: 0 .hero-index-4 transform: rotate(3deg) - + .hero-index-5 z-index: 0 @@ -159,7 +159,7 @@ $heroCanvasHeight: 275px transform: rotate(6deg) top: -8px z-index: 1 - + .hero-index-8 transform: rotate(4deg) @@ -176,7 +176,7 @@ $heroCanvasHeight: 275px width: 334px height: $heroCanvasHeight float: left - + .hero-stats width: 400px height: $heroCanvasHeight @@ -196,23 +196,23 @@ $heroCanvasHeight: 275px h2 margin-top: 0px color: white - + .hero-description margin-bottom: 4px - + .hero-stat-row margin: 3px 0 - + .stat-label float: left width: 100px color: rgb(203,170,148) - + .stat-value display: inline-block width: 280px color: rgb(244,189,68) - + .stat-progress background: rgb(32,27,22) height: 15px @@ -222,24 +222,24 @@ $heroCanvasHeight: 275px top: 2px left: -3px width: 70% - + .stat-progress-bar height: 7px border-radius: 7px - - + + &.attack .stat-progress-bar background: #c32424 - + &.health .stat-progress-bar background: #0f802a - + &.speed .stat-progress-bar background: #4d52ab - + //- Carousel switch buttons - + a.left, a.right color: rgb(74,61,51) position: absolute @@ -247,15 +247,15 @@ $heroCanvasHeight: 275px width: 40px height: 84px font-size: 24px - + .glyphicon position: relative top: 27px left: 8px - + &:hover, &:active color: rgb(126,105,88) - + a.right right: -49px @@ -312,7 +312,7 @@ $heroCanvasHeight: 275px border: 3px solid rgb(7,65,83) background: rgb(0,119,168) border-radius: 0 - + &:disabled background: rgb(72, 106, 113) opacity: 1 @@ -327,7 +327,7 @@ $heroCanvasHeight: 275px //#restricted-hero-button //- Programming select box - + .form position: absolute left: 32px @@ -335,33 +335,33 @@ $heroCanvasHeight: 275px width: 541px height: 102px padding: 10px 40px - + .help-block color: rgb(51,51,51) font-size: 14px font-weight: bold - + select font-size: 18px - + .fancy-select display: inline-block width: 100% .options text-transform: none - + .trigger, .options background-color: rgb(239,232,217) color: black - + .trigger text-transform: uppercase border: 3px solid black font-size: 16px padding: 5px 10px width: 100% - + //- the little triangle on the right side of the fancy select box &:after border: 8px solid transparent @@ -397,7 +397,7 @@ $heroCanvasHeight: 275px background-image: url(/images/common/code_languages/lua_small.png) &[data-value="io"] background-image: url(/images/common/code_languages/io_small.png) - + #confirm-button background: url(/images/pages/play/modal/confirm-button.png) width: 209px @@ -411,15 +411,15 @@ $heroCanvasHeight: 275px font-size: 26px font-family: $headings-font-family color: white - + body.ipad #play-heroes-modal // iPad is Python-only for now, and has its own reset button. .form display: none - + body[lang='ru'] - #play-heroes-modal + #play-heroes-modal #hero-carousel .hero-item .hero-stats h2 font-size: 24px