codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-27 17:45:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sort a few name categories; remove a log.

Browse source
This commit is contained in:
Nick Winter 2016-02-24 08:49:39 -08:00
parent cac20fd39c
commit 9a344d1a61
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/lib/sprites/SpriteBuilder.coffee
View file

@ -31,7 +31,6 @@ module.exports = class SpriteBuilder
for func in tweenData for func in tweenData
args = _.cloneDeep(func.a) args = _.cloneDeep(func.a)
@dereferenceArgs(args, locals) @dereferenceArgs(args, locals)
console.log 'found', args, 'for', func.n
tween = tween[func.n](args...) tween = tween[func.n](args...)
anim.timeline.addTween(tween) anim.timeline.addTween(tween)

42
app/lib/world/names.coffee
View file

@ -145,10 +145,10 @@ module.exports.thangNames = thangNames =
] ]
'Raven': [ 'Raven': [
# Animal # Animal
'Nevermore'
'Baltimore' 'Baltimore'
'Columbia' 'Columbia'
'Dawnstar' 'Dawnstar'
'Nevermore'
] ]
'Cougar': [ 'Cougar': [
# Animal # Animal
@ -160,35 +160,35 @@ module.exports.thangNames = thangNames =
'Frog': [ 'Frog': [
# Animal # Animal
'Bighead' 'Bighead'
'Hypnotoad'
'Freddy'
'Frogger'
'Froggy'
'Slippy'
'Wart'
'Bufo' 'Bufo'
'Bunda' 'Bunda'
'Dan\'l Webster' 'Dan\'l Webster'
'Freddy'
'Frogger'
'Froggy'
'Hypnotoad'
'Mr. Toad' 'Mr. Toad'
'Trevor' 'Slippy'
'Wei Qi'
'Toada' 'Toada'
'Trevor'
'Wart'
'Wei Qi'
] ]
'Horse': [ 'Horse': [
# Animal # Animal
'Abby' 'Abby'
'Cinamon' 'Beauty'
'Wildsilver' 'Cinnamon'
'Fleetfire' 'Codasus'
'Ed' 'Ed'
'Fleetfire'
'Hurricane'
'Lovelace'
'Miracle'
'Mirial'
'Powder' 'Powder'
'Silver' 'Silver'
'Hurricane' 'Wildsilver'
'Beauty'
'Lovelace'
'Mirial'
'Miracle'
'Codasus'
] ]
'Ogre M': [ 'Ogre M': [
# Male # Male
@ -247,8 +247,8 @@ module.exports.thangNames = thangNames =
'Haggar' 'Haggar'
'Heizenburg' 'Heizenburg'
'Ironjaw' 'Ironjaw'
'Muul'
'Mokuhr' 'Mokuhr'
'Muul'
'Ork\'han' 'Ork\'han'
'Roast Beefy' 'Roast Beefy'
'Toharg' 'Toharg'
@ -312,6 +312,7 @@ module.exports.thangNames = thangNames =
'Bonejangles' 'Bonejangles'
'Bonesworth' 'Bonesworth'
'Bonette' 'Bonette'
'Boneus'
'Doornail' 'Doornail'
'Drybones' 'Drybones'
'Grim' 'Grim'
@ -326,8 +327,8 @@ module.exports.thangNames = thangNames =
'Scraps' 'Scraps'
'Shelly' 'Shelly'
'Shishka-Bob' 'Shishka-Bob'
'Shishka-Larry'
'Shishka-Joe' 'Shishka-Joe'
'Shishka-Larry'
'Skeletor' 'Skeletor'
'Skellington' 'Skellington'
'Skulldugger' 'Skulldugger'
@ -339,7 +340,6 @@ module.exports.thangNames = thangNames =
'Tatava' 'Tatava'
'Ulna' 'Ulna'
'Yorick' 'Yorick'
'Boneus'
] ]
'Ogre Headhunter': [ 'Ogre Headhunter': [
# Male # Male