mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-05-04 01:43:40 -04:00
Fixed a couple bugs with Achievements not getting schema defaults.
This commit is contained in:
parent
b20b819a1f
commit
fa0f904fbb
5 changed files with 7 additions and 8 deletions
app
models
templates/editor/level
views
achievements
editor/level
|
@ -20,7 +20,7 @@ module.exports = class Achievement extends CocoModel
|
||||||
4: 'achievement-gold'
|
4: 'achievement-gold'
|
||||||
5: 'achievement-diamond'
|
5: 'achievement-diamond'
|
||||||
|
|
||||||
getStyle: -> Achievement.styleMapping[@get 'difficulty']
|
getStyle: -> Achievement.styleMapping[@get 'difficulty', true]
|
||||||
|
|
||||||
@defaultImageURL: '/images/achievements/default.png'
|
@defaultImageURL: '/images/achievements/default.png'
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,6 @@ else
|
||||||
td(style="width: 20px")
|
td(style="width: 20px")
|
||||||
img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
|
img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
|
||||||
td
|
td
|
||||||
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name')
|
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name', true)
|
||||||
td= achievement.get('description')
|
td= achievement.get('description', true)
|
||||||
td= achievement.get('worth')
|
td= achievement.get('worth', true)
|
||||||
|
|
|
@ -26,11 +26,11 @@ module.exports = class AchievementPopup extends CocoView
|
||||||
nextLevelXP = User.expForLevel(nextLevel)
|
nextLevelXP = User.expForLevel(nextLevel)
|
||||||
totalExpNeeded = nextLevelXP - currentLevelExp
|
totalExpNeeded = nextLevelXP - currentLevelExp
|
||||||
expFunction = @achievement.getExpFunction()
|
expFunction = @achievement.getExpFunction()
|
||||||
currentXP = me.get 'points'
|
currentXP = me.get 'points', true
|
||||||
if @achievement.isRepeatable()
|
if @achievement.isRepeatable()
|
||||||
achievedXP = expFunction(@earnedAchievement.get('previouslyAchievedAmount')) * @achievement.get('worth') if @achievement.isRepeatable()
|
achievedXP = expFunction(@earnedAchievement.get('previouslyAchievedAmount')) * @achievement.get('worth') if @achievement.isRepeatable()
|
||||||
else
|
else
|
||||||
achievedXP = @achievement.get 'worth'
|
achievedXP = @achievement.get 'worth', true
|
||||||
previousXP = currentXP - achievedXP
|
previousXP = currentXP - achievedXP
|
||||||
leveledUp = currentXP - achievedXP < currentLevelExp
|
leveledUp = currentXP - achievedXP < currentLevelExp
|
||||||
#console.debug 'Leveled up' if leveledUp
|
#console.debug 'Leveled up' if leveledUp
|
||||||
|
|
|
@ -37,7 +37,7 @@ module.exports = class LevelFeedbackView extends CocoView
|
||||||
context.allFeedback = []
|
context.allFeedback = []
|
||||||
context.averageRating = 0
|
context.averageRating = 0
|
||||||
context.totalRatings = 0
|
context.totalRatings = 0
|
||||||
if @allFeedback
|
if @allFeedback?.models.length
|
||||||
context.allFeedback = (m.attributes for m in @allFeedback.models when @allFeedback.models.length < 20 or m.get('review'))
|
context.allFeedback = (m.attributes for m in @allFeedback.models when @allFeedback.models.length < 20 or m.get('review'))
|
||||||
context.averageRating = _.reduce((m.get('rating') for m in @allFeedback.models), (acc, x) -> acc + (x ? 5)) / (@allFeedback.models.length)
|
context.averageRating = _.reduce((m.get('rating') for m in @allFeedback.models), (acc, x) -> acc + (x ? 5)) / (@allFeedback.models.length)
|
||||||
context.totalRatings = @allFeedback.models.length
|
context.totalRatings = @allFeedback.models.length
|
||||||
|
|
|
@ -18,7 +18,6 @@ module.exports = class NewAchievementModal extends NewModelModal
|
||||||
getRenderData: ->
|
getRenderData: ->
|
||||||
c = super()
|
c = super()
|
||||||
c.level = @level
|
c.level = @level
|
||||||
console.debug 'level', c.level
|
|
||||||
c
|
c
|
||||||
|
|
||||||
onAchievementSubmitted: (e) ->
|
onAchievementSubmitted: (e) ->
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue