mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-03 00:32:14 -04:00
Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas.
This commit is contained in:
parent
4d68080c4c
commit
3eeb9a6a26
7 changed files with 12 additions and 21 deletions
app
templates
views
server/queues/scoring
|
@ -13,7 +13,6 @@ block header
|
|||
a(href='/clans', data-i18n="clans.clans") Clans
|
||||
a(href='http://discourse.codecombat.com/', data-i18n="nav.forum")
|
||||
a(href='/community', data-i18n="nav.community")
|
||||
//a(href='/play/ladder', data-i18n="home.multiplayer").multiplayer-nav-link
|
||||
|
||||
if me.get('anonymous') === false
|
||||
span.dropdown
|
||||
|
@ -63,6 +62,7 @@ block footer
|
|||
a(href='http://blog.codecombat.com/', data-i18n="nav.blog")
|
||||
a(href='/contribute', tabindex=-1, data-i18n="nav.contribute") Contribute
|
||||
a(href='/legal', tabindex=-1, data-i18n="nav.legal") Legal
|
||||
a(href='/play/ladder', tabindex=-1, data-i18n="home.multiplayer").multiplayer-nav-link
|
||||
if me.isAdmin()
|
||||
a(href='/admin', data-i18n="nav.admin") Admin
|
||||
|
||||
|
|
|
@ -16,8 +16,6 @@ table.table
|
|||
block tableBody
|
||||
for document in documents
|
||||
- var data = document.attributes;
|
||||
- if(data.slug == 'ace-of-coders' && new Date() < new Date(1441863900000))
|
||||
- continue;
|
||||
tr(class=document.getOwner() == me.id ? 'mine' : '')
|
||||
td
|
||||
a(href="/editor/#{page}/#{data.slug || data._id}")
|
||||
|
|
|
@ -17,8 +17,6 @@ if campaign
|
|||
a(href=level.type == 'hero' ? '#' : level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.slug}", disabled=level.disabled, data-level-slug=level.slug, data-level-path=level.levelPath || 'level', data-level-name=level.name)
|
||||
if level.slug == 'lost-viking'
|
||||
img.star(src="/file/db/thang.type/5441c3144e9aeb727cc97111/portrait.png")
|
||||
else if level.slug == 'robot-ragnarok'
|
||||
img.star(src="/file/db/thang.type/54ea35fd2b7506e891ca70d5/portrait.png")
|
||||
else if level.requiresSubscription
|
||||
img.star(src="/images/pages/play/star.png")
|
||||
if levelStatusMap[level.slug] === 'complete'
|
||||
|
|
|
@ -191,7 +191,6 @@ module.exports = class ClanDetailsView extends RootView
|
|||
name: utils.i18n(campaign.attributes, 'fullName') or utils.i18n(campaign.attributes, 'name')
|
||||
levels: []
|
||||
for levelID, level of campaign.get('levels')
|
||||
continue if level.slug is 'ace-of-coders' and new Date() < new Date(1441863900000)
|
||||
campaignLevelProgression.levels.push
|
||||
ID: levelID
|
||||
slug: level.slug
|
||||
|
|
|
@ -55,6 +55,13 @@ module.exports = class LadderHomeView extends RootView
|
|||
context
|
||||
|
||||
heroArenas = [
|
||||
{
|
||||
name: 'Ace of Coders'
|
||||
difficulty: 3
|
||||
id: 'ace-of-coders'
|
||||
image: '/file/db/level/55de80407a57948705777e89/Ace-of-Coders-banner.png'
|
||||
description: 'Battle for control over the icy treasure chests as your gigantic warrior marshals his armies against his mirror-match nemesis.'
|
||||
}
|
||||
{
|
||||
name: 'Zero Sum'
|
||||
difficulty: 3
|
||||
|
@ -62,13 +69,6 @@ heroArenas = [
|
|||
image: '/file/db/level/550363b4ec31df9c691ab629/MAR26-Banner_Zero%20Sum.png'
|
||||
description: 'Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer.'
|
||||
}
|
||||
{
|
||||
name: 'Ace of Coders'
|
||||
difficulty: 3
|
||||
id: 'ace-of-coders'
|
||||
image: '/file/db/level/550363b4ec31df9c691ab629/MAR26-Banner_Zero%20Sum.png'
|
||||
description: 'Battle for control over the icy treasure chests as your gigantic warrior marshals his armies against his mirror-match nemesis.'
|
||||
}
|
||||
{
|
||||
name: 'Cavern Survival'
|
||||
difficulty: 1
|
||||
|
@ -99,8 +99,6 @@ heroArenas = [
|
|||
}
|
||||
]
|
||||
|
||||
heroArenas = _.reject heroArenas, id: 'ace-of-coders' if new Date() < new Date(1441863900000)
|
||||
|
||||
oldArenas = [
|
||||
{
|
||||
name: 'Criss-Cross'
|
||||
|
|
|
@ -267,7 +267,7 @@ module.exports = class CampaignView extends RootView
|
|||
level.locked = false if @campaign?.get('name') is 'Auditions'
|
||||
level.locked = false if @campaign?.get('name') is 'Intro'
|
||||
level.locked = false if me.isInGodMode()
|
||||
level.locked = false if level.slug is 'robot-ragnarok'
|
||||
#level.locked = false if level.slug is 'robot-ragnarok'
|
||||
level.disabled = true if level.adminOnly and @levelStatusMap[level.slug] not in ['started', 'complete']
|
||||
level.disabled = false if me.isInGodMode()
|
||||
level.color = 'rgb(255, 80, 60)'
|
||||
|
@ -324,8 +324,7 @@ module.exports = class CampaignView extends RootView
|
|||
me.isPremium() or
|
||||
not nextLevel.requiresSubscription or
|
||||
(nextLevel.slug is 'boom-and-bust' and not @levelStatusMap['defense-of-plainswood']) or
|
||||
(nextLevel.slug is 'favorable-odds' and not @levelStatusMap['the-raised-sword']) or
|
||||
(nextLevel.slug is 'robot-ragnarok' and @levelStatusMap['the-raised-sword'])
|
||||
(nextLevel.slug is 'favorable-odds' and not @levelStatusMap['the-raised-sword'])
|
||||
)
|
||||
nextLevel.next = true
|
||||
foundNext = true
|
||||
|
@ -381,7 +380,7 @@ module.exports = class CampaignView extends RootView
|
|||
particleKey.push 'premium' if level.requiresSubscription
|
||||
particleKey.push 'gate' if level.slug in ['kithgard-gates', 'siege-of-stonehold', 'clash-of-clones', 'summits-gate']
|
||||
particleKey.push 'hero' if level.unlocksHero and not level.unlockedHero
|
||||
particleKey.push 'item' if level.slug is 'robot-ragnarok' # TODO: generalize
|
||||
#particleKey.push 'item' if level.slug is 'robot-ragnarok' # TODO: generalize
|
||||
continue if particleKey.length is 2 # Don't show basic levels
|
||||
continue unless level.hidden or _.intersection(particleKey, ['item', 'hero-ladder', 'replayable']).length
|
||||
@particleMan.addEmitter level.position.x / 100, level.position.y / 100, particleKey.join('-')
|
||||
|
|
|
@ -66,7 +66,7 @@ getRandomSessions = (user, callback) ->
|
|||
|
||||
# Sampling by level: we pick a level, then find a human and ogre session for that level, one at random, one biased towards recent submissions.
|
||||
#ladderLevelIDs = ['greed', 'criss-cross', 'brawlwood', 'dungeon-arena', 'gold-rush', 'sky-span'] # Let's not give any extra simulations to old ladders.
|
||||
ladderLevelIDs = ['dueling-grounds', 'cavern-survival', 'multiplayer-treasure-grove', 'harrowland', 'zero-sum', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders']
|
||||
ladderLevelIDs = ['dueling-grounds', 'cavern-survival', 'multiplayer-treasure-grove', 'harrowland', 'zero-sum', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders', 'ace-of-coders']
|
||||
sampleByLevel = (callback) ->
|
||||
levelID = _.sample ladderLevelIDs
|
||||
favorRecentHumans = Math.random() < 0.5 # We pick one session favoring recent submissions, then find another one uniformly to play against
|
||||
|
@ -76,7 +76,6 @@ findRandomSession = (queryParams, callback) ->
|
|||
# In MongoDB 3.2, we will be able to easily get a random document with aggregate $sample: https://jira.mongodb.org/browse/SERVER-533
|
||||
queryParams.submitted = true
|
||||
favorRecent = queryParams.favorRecent
|
||||
favorRecent = false # temp, for Ace of Coders tournament
|
||||
delete queryParams.favorRecent
|
||||
if favorRecent
|
||||
return findRecentRandomSession queryParams, callback
|
||||
|
|
Loading…
Add table
Reference in a new issue