Some improvements for handling new art.

This commit is contained in:
Nick Winter 2015-06-16 13:50:33 -07:00
parent 624dabd55a
commit 593f7a9dd7
8 changed files with 21 additions and 8 deletions

View file

@ -69,3 +69,10 @@ Whether you're novice or pro, the CodeCombat team is ready to help you implement
![Alex Crooks](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alex%20Crooks/alex_100.png)
![Danny Whittaker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Danny%20Whittaker/danny_100.png)
![Kevin Holland](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Kevin%20Holland/kevin_100.png)
![Joachim Brehmer](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Joachim%20Brehmer/joachim_100.png)
![Jose Antonini](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Jose%20Antonini/jose_antonini_100.png)
![Oleg Ulyanicky](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Oleg%20Ulyanickiy/oleg_100.png)
![Pavel Konstantynov](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Pavel%20Konstantinov/pavel_100.png)
![Popey Gilbert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Popey%20Gilbert/popey_100.png)
![Rob Blanckaert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rob%20Blanckaert/rob_blanckaert_100.png)

Binary file not shown.

After

(image error) Size: 12 KiB

Binary file not shown.

After

(image error) Size: 9.3 KiB

Binary file not shown.

After

(image error) Size: 10 KiB

View file

@ -1,6 +1,6 @@
SpriteBuilder = require 'lib/sprites/SpriteBuilder'
floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Grass01', 'Grass02', 'Grass03', 'Grass04', 'Grass05', 'Goal Trigger', 'Obstacle', 'Sand 01', 'Sand 02', 'Sand 03', 'Sand 04', 'Sand 05', 'Sand 06', 'Talus 1', 'Talus 2', 'Talus 3', 'Talus 4', 'Talus 5', 'Talus 6', 'Firn 1', 'Firn 2', 'Firn 3', 'Firn 4', 'Firn 5', 'Firn 6']
floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Grass01', 'Grass02', 'Grass03', 'Grass04', 'Grass05', 'Goal Trigger', 'Obstacle', 'Sand 01', 'Sand 02', 'Sand 03', 'Sand 04', 'Sand 05', 'Sand 06', 'Talus 1', 'Talus 2', 'Talus 3', 'Talus 4', 'Talus 5', 'Talus 6', 'Firn 1', 'Firn 2', 'Firn 3', 'Firn 4', 'Firn 5', 'Firn 6', 'Ice Rink 1', 'Ice Rink 2', 'Ice Rink 3']
module.exports = class SingularSprite extends createjs.Sprite
childMovieClips: null

View file

@ -92,9 +92,11 @@ block content
li.row
img(src="/images/pages/about/george_small.png").img-thumbnail
a(href="http://www.georgesaines.com/")
img(src="/images/pages/about/george_small.png").img-thumbnail
.team_bio
h4.team_name George Saines
h4.team_name
a(href="http://www.georgesaines.com/") George Saines
p(data-i18n="about.george_title")
| Cofounder
p(data-i18n="about.george_blurb")
@ -143,7 +145,7 @@ block content
| Floor Is Lava
a(href="https://soundcloud.com/taking-off")
img(src="/images/pages/about/placeholder.png").img-thumbnail
img(src="/images/pages/about/jose_small.png").img-thumbnail
.team_bio
h4.team_name
a(href="https://soundcloud.com/taking-off") Jose Antonini
@ -155,7 +157,7 @@ block content
li.row
a(href="http://retrostylegames.com/")
img(src="/images/pages/about/placeholder.png").img-thumbnail
img(src="/images/pages/about/pavel_small.png").img-thumbnail
.team_bio
h4.team_name
a(href="http://retrostylegames.com/") Pavel Konstantinov
@ -165,7 +167,7 @@ block content
| RetroStyle Games
a(href="http://retrostylegames.com/")
img(src="/images/pages/about/placeholder.png").img-thumbnail
img(src="/images/pages/about/oleg_small.png").img-thumbnail
.team_bio
h4.team_name
a(href="http://retrostylegames.com/") Oleg Ulyanickiy

View file

@ -70,6 +70,7 @@ defaultTasks =
'Add other Components like Shoots or Casts if needed.'
'Configure other Components, like Moves, Attackable, Attacks, etc.'
'Override the HasAPI type if it will not be correctly inferred.'
'Add to Existence System power table.'
]
Hero: commonTasks.concat animatedThangTypeTasks.concat purchasableTasks.concat [
'Set the hero class.'

View file

@ -616,7 +616,7 @@ module.exports = class InventoryModal extends ModalView
for slot, original of equipment
item = _.find @items.models, (item) -> item.get('original') is original
continue unless dollImages = item?.get('dollImages')
didAdd = @addDollImage slot, dollImages, heroClass, gender
didAdd = @addDollImage slot, dollImages, heroClass, gender, item
slotsWithImages.push slot if didAdd if item.get('original') isnt '54ea39342b7506e891ca70f2' # Circlet of the Magi needs hair under it
@$el.find('#hero-image-hair').toggle not ('head' in slotsWithImages)
@$el.find('#hero-image-thumb').toggle not ('gloves' in slotsWithImages)
@ -626,7 +626,7 @@ module.exports = class InventoryModal extends ModalView
removeDollImages: ->
@$el.find('.doll-image').remove()
addDollImage: (slot, dollImages, heroClass, gender) ->
addDollImage: (slot, dollImages, heroClass, gender, item) ->
heroClass = @selectedHero?.get('heroClass') ? 'Warrior'
gender = if @selectedHero?.get('slug') in heroGenders.male then 'male' else 'female'
didAdd = false
@ -637,6 +637,9 @@ module.exports = class InventoryModal extends ModalView
imageKeys = ["#{gender}", "#{gender}Thumb"]
else if heroClass is 'Wizard' and slot is 'torso'
imageKeys = [gender, "#{gender}Back"]
else if heroClass is 'Ranger' and slot is 'head' and item.get('original') in ['5441c2be4e9aeb727cc97105', '5441c3144e9aeb727cc97111']
# All-class headgear like faux fur hat, viking helmet is abusing ranger glove slot
imageKeys = ["#{gender}Ranger"]
else
imageKeys = [gender]
for imageKey in imageKeys