8000 Robust optimization & fixing of hero-icon-images by Chaboi45 · Pull Request #7953 · codecombat/codecombat · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Robust optimization & fixing of hero-icon-images #7953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Robust optimization & fixing of hero-icon-images #7953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/pages/play/hero-portrait-frame.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 5 additions & 28 deletions app/styles/clans/clan-details.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,35 +143,12 @@
.progress-level-cell-started, .progress-level-cell-complete
cursor: pointer

.player-hero-icon
background: transparent url(/images/pages/play/play-spritesheet.png)
background-size: cover
background-position: (-2 * $spriteSheetSize) 0
display: inline-block
width: 30px
.player-hero
height: 30px
margin: 0px 2px
vertical-align: middle

.player-hero-icon
background-position: (-4 * $spriteSheetSize) 0

&.knight
background-position: (-5 * $spriteSheetSize) 0
&.librarian
background-position: (-6 * $spriteSheetSize) 0
&.ninja
background-position: (-7 * $spriteSheetSize) 0
&.potion-master
background-position: (-8 * $spriteSheetSize) 0
&.samurai
background-position: (-9 * $spriteSheetSize) 0
&.trapper
background-position: (-10 * $spriteSheetSize) 0
&.forest-archer
background-position: (-11 * $spriteSheetSize) 0
&.sorcerer
background-position: (-12 * $spriteSheetSize) 0
width: 30px
background-image: url(/images/pages/play/hero-portrait-frame.png)
padding: 6px
background-size: contain

td.code-language-cell
width: 30px
Expand Down
40 changes: 10 additions & 30 deletions app/styles/play/campaign-view.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,49 +637,29 @@ $gameControlMargin: 30px
.player-level
margin-left: 5px

.player-name
margin-left: 45px
.player-hero
height: 30px
width: 30px
background-image: url(/images/pages/play/hero-portrait-frame.png)
padding: 6px
background-size: contain
margin-left: 10px
margin-right: 2px

a
color: white

$spriteSheetSize: 30px

.player-hero-icon
background: transparent url(/images/pages/play/play-spritesheet.png)
background-size: cover
background-position: (-2 * $spriteSheetSize) 0
display: inline-block
width: 30px
height: 30px
margin: 0px 2px


.level-indicator
margin-left: 15px
color: white
display: inline-block
margin: 0 2px

.player-hero-icon
margin-left: 10px
background-position: (-4 * $spriteSheetSize) 0

&.knight
background-position: (-5 * $spriteSheetSize) 0
&.librarian
background-position: (-6 * $spriteSheetSize) 0
&.ninja
background-position: (-7 * $spriteSheetSize) 0
&.potion-master
background-position: (-8 * $spriteSheetSize) 0
&.samurai
background-position: (-9 * $spriteSheetSize) 0
&.trapper
background-position: (-10 * $spriteSheetSize) 0
&.forest-archer
background-position: (-11 * $spriteSheetSize) 0
&.sorcerer
background-position: (-12 * $spriteSheetSize) 0


.campaign-control-button
position: absolute
Expand Down
6 changes: 3 additions & 3 deletions app/templates/clans/clan-details.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ block content
td
span.spr(data-i18n="clans.chieftain") Chieftain
td
span.spr.player-hero-icon(data-memberid=clan.get('ownerID'))
img.spr.player-hero(data-memberid=clan.get('ownerID'))
a(href='/user/' + clan.get('ownerID'))= owner.get('name')
if stats.averageLevel
tr
Expand Down Expand Up @@ -141,7 +141,7 @@ block content
td
div
span.hero-icon-cell
span.spr.player-hero-icon(data-memberid=member.id)
img.spr.player-hero(data-memberid=member.id)
span.code-language-cell
if memberLanguageMap && memberLanguageMap[member.id]
span.code-language-cell(style=`background-image: url(/images/common/code_languages/${memberLanguageMap[member.id]}_small.png)`, title=memberLanguageMap[member.id])
Expand Down Expand Up @@ -238,7 +238,7 @@ block content
each member in members
tr
td.hero-icon-cell
span.spr.player-hero-icon(data-memberid=member.id)
img.spr.player-hero(data-memberid=member.id)
td.code-language-cell
if memberLanguageMap && memberLanguageMap[member.id]
span.code-language-cell(style=`background-image: url(/images/common/code_languages/${memberLanguageMap[member.id]}_small.png)`, title=memberLanguageMap[member.id])
Expand Down
2 changes: 1 addition & 1 deletion app/templates/play/campaign-view.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
5D32 Expand Up @@ -394,7 +394,7 @@ if showGameDevAlert
.rtl-allowed
span.level-indicator(data-i18n="general.player_level")
span.player-level.spr= me.level()
span.player-hero-icon
img.player-hero
if me.get('anonymous')
span.player-name(data-i18n="play.anonymous") Anonymous Player
button.btn.btn-illustrated.login-button.btn-warning(data-i18n="login.log_in")
Expand Down
2 changes: 1 addition & 1 deletion app/views/clans/ClanDetailsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ module.exports = (ClanDetailsView = (function () {
for (const slug in ThangType.heroes) {
const original = ThangType.heroes[slug]
if (original === hero) {
result1.push(this.$el.find(`.player-hero-icon[data-memberID=${member.id}]`).removeClass('.player-hero-icon').addClass('player-hero-icon ' + slug))
result1.push(this.$el.find(`.player-hero[data-memberID=${member.id}]`).attr('src', `/file/db/thang.type/${hero}/portrait.png`))
}
}
return result1
Expand Down
5 changes: 3 additions & 2 deletions app/views/play/CampaignView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,12 +1723,13 @@ class CampaignView extends RootView {
updateHero () {
const hero = me.get('heroConfig')?.thangType
if (!hero) { return }
for (const [slug, original] of Object.entries(ThangType.heroes)) {
for (const original of Object.values(ThangType.heroes)) {
if (original === hero) {
this.$el.find('.player-hero-icon').removeClass().addClass(`player-hero-icon ${slug}`)
this.$el.find('.player-hero').attr('src', `/file/db/thang.type/${hero}/portrait.png`)
return
}
}

console.error("CampaignView hero update couldn't find hero slug for original:", hero)
}

Expand Down
Loading
0