sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(goldenknight): add shop img for shield_special_goldenknight and fix

Browse source 
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
This commit is contained in:
Tyler Renelle 2014-11-17 12:14:14 -08:00
parent 83a22b8133
commit d74f9d7a47
16 changed files with 4250 additions and 4202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/habitrpg-shared.css vendored
View file

File diff suppressed because one or more lines are too long

4
dist/habitrpg-shared.js vendored
View file

@ -11367,8 +11367,8 @@ gear = {
})
},
goldenknight: {
text: t('weaponSpecialGoldenknightText'),
notes: t('weaponSpecialGoldenknightNotes', {
text: t('shieldSpecialGoldenknightText'),
notes: t('shieldSpecialGoldenknightNotes', {
attrs: 25
}),
con: 25,

126
dist/spritesmith0.css vendored
View file

@ -1434,25 +1434,25 @@
}
.hair_mustache_1_pgreen {
background-image: url(spritesmith0.png);
background-position: -424px -444px;
background-position: -637px -1138px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_pgreen {
background-image: url(spritesmith0.png);
background-position: -449px -459px;
background-position: -662px -1153px;
width: 60px;
height: 60px;
}
.hair_mustache_1_porange {
background-image: url(spritesmith0.png);
background-position: -728px -1138px;
background-position: -424px -444px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_porange {
background-image: url(spritesmith0.png);
background-position: -753px -1153px;
background-position: -449px -459px;
width: 60px;
height: 60px;
}
@ -2826,323 +2826,335 @@
}
.hair_bangs_3_ppink {
background-image: url(spritesmith0.png);
background-position: -637px -1138px;
background-position: -637px -1502px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_ppink {
background-image: url(spritesmith0.png);
background-position: -662px -1153px;
background-position: -662px -1517px;
width: 60px;
height: 60px;
}
.hair_bangs_3_ppurple {
background-image: url(spritesmith0.png);
background-position: -455px -592px;
background-position: -728px -1138px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_ppurple {
background-image: url(spritesmith0.png);
background-position: -480px -607px;
background-position: -753px -1153px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pumpkin {
background-image: url(spritesmith0.png);
background-position: -364px -592px;
background-position: -455px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pumpkin {
background-image: url(spritesmith0.png);
background-position: -389px -607px;
background-position: -480px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -273px -592px;
background-position: -364px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -298px -607px;
background-position: -389px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: -182px -592px;
background-position: -273px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: -207px -607px;
background-position: -298px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -91px -592px;
background-position: -182px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -116px -607px;
background-position: -207px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: 0px -592px;
background-position: -91px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -25px -607px;
background-position: -116px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -606px -444px;
background-position: 0px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -631px -459px;
background-position: -25px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -515px -444px;
background-position: -606px -444px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -540px -459px;
background-position: -631px -459px;
width: 60px;
height: 60px;
}
.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -798px -91px;
background-position: -515px -444px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -823px -106px;
background-position: -540px -459px;
width: 60px;
height: 60px;
}
.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -798px 0px;
background-position: -798px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -823px -15px;
background-position: -823px -106px;
width: 60px;
height: 60px;
}
.hair_base_1_TRUred {
background-image: url(spritesmith0.png);
background-position: -637px -683px;
background-position: -798px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_TRUred {
background-image: url(spritesmith0.png);
background-position: -662px -698px;
background-position: -823px -15px;
width: 60px;
height: 60px;
}
.hair_base_1_black {
background-image: url(spritesmith0.png);
background-position: -546px -683px;
background-position: -637px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_black {
background-image: url(spritesmith0.png);
background-position: -571px -698px;
background-position: -662px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_blond {
background-image: url(spritesmith0.png);
background-position: -455px -683px;
background-position: -546px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_blond {
background-image: url(spritesmith0.png);
background-position: -480px -698px;
background-position: -571px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_blue {
background-image: url(spritesmith0.png);
background-position: -364px -683px;
background-position: -455px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_blue {
background-image: url(spritesmith0.png);
background-position: -389px -698px;
background-position: -480px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_brown {
background-image: url(spritesmith0.png);
background-position: -273px -683px;
background-position: -364px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_brown {
background-image: url(spritesmith0.png);
background-position: -298px -698px;
background-position: -389px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_candycane {
background-image: url(spritesmith0.png);
background-position: -182px -683px;
background-position: -273px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_candycane {
background-image: url(spritesmith0.png);
background-position: -207px -698px;
background-position: -298px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_candycorn {
background-image: url(spritesmith0.png);
background-position: -91px -683px;
background-position: -182px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_candycorn {
background-image: url(spritesmith0.png);
background-position: -116px -698px;
background-position: -207px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_frost {
background-image: url(spritesmith0.png);
background-position: 0px -683px;
background-position: -91px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_frost {
background-image: url(spritesmith0.png);
background-position: -25px -698px;
background-position: -116px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -707px -546px;
background-position: 0px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -732px -561px;
background-position: -25px -698px;
width: 60px;
height: 60px;
}
.hair_base_1_green {
background-image: url(spritesmith0.png);
background-position: -707px -455px;
background-position: -707px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_green {
background-image: url(spritesmith0.png);
background-position: -732px -470px;
background-position: -732px -561px;
width: 60px;
height: 60px;
}
.hair_base_1_halloween {
background-image: url(spritesmith0.png);
background-position: -707px -364px;
background-position: -707px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_halloween {
background-image: url(spritesmith0.png);
background-position: -732px -379px;
background-position: -732px -470px;
width: 60px;
height: 60px;
}
.hair_base_1_holly {
background-image: url(spritesmith0.png);
background-position: -707px -273px;
background-position: -707px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_holly {
background-image: url(spritesmith0.png);
background-position: -732px -288px;
background-position: -732px -379px;
width: 60px;
height: 60px;
}
.hair_base_1_midnight {
background-image: url(spritesmith0.png);
background-position: -707px -182px;
background-position: -707px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_midnight {
background-image: url(spritesmith0.png);
background-position: -732px -197px;
background-position: -732px -288px;
width: 60px;
height: 60px;
}
.hair_base_1_pblue {
background-image: url(spritesmith0.png);
background-position: -707px -91px;
background-position: -707px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_pblue {
background-image: url(spritesmith0.png);
background-position: -732px -106px;
background-position: -732px -197px;
width: 60px;
height: 60px;
}
.hair_base_1_pgreen {
background-image: url(spritesmith0.png);
background-position: -707px 0px;
background-position: -707px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_pgreen {
background-image: url(spritesmith0.png);
background-position: -732px -15px;
background-position: -732px -106px;
width: 60px;
height: 60px;
}
.hair_base_1_porange {
background-image: url(spritesmith0.png);
background-position: -546px -592px;
background-position: -707px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_porange {
background-image: url(spritesmith0.png);
background-position: -732px -15px;
width: 60px;
height: 60px;
}
.hair_base_1_ppink {
background-image: url(spritesmith0.png);
background-position: -546px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_ppink {
background-image: url(spritesmith0.png);
background-position: -571px -607px;
width: 60px;

BIN
dist/spritesmith0.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 130 KiB

4000
dist/spritesmith1.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith1.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 77 KiB

802
dist/spritesmith2.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith2.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 109 KiB

936
dist/spritesmith3.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith3.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 258 KiB

1998
dist/spritesmith4.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith4.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 202 KiB

After

Width:  |  Height:  |  Size: 202 KiB

582
dist/spritesmith5.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith5.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 174 KiB

BIN
img/sprites/spritesmith/gear/shield/shop/shop_shield_special_goldenknight.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

2
script/content.coffee
View file

@ -275,7 +275,7 @@ gear =
special:
0: text: t('shieldSpecial0Text'), notes: t('shieldSpecial0Notes', {per: 20}), per: 20, value:150, canOwn: ((u)-> +u.backer?.tier >= 45)
1: text: t('shieldSpecial1Text'), notes: t('shieldSpecial1Notes', {attrs: 6}), con: 6, str: 6, per: 6, int:6, value:170, canOwn: ((u)-> +u.contributor?.level >= 5)
goldenknight: text: t('weaponSpecialGoldenknightText'), notes: t('weaponSpecialGoldenknightNotes', {attrs: 25}), con: 25, per: 25, value:200, canOwn: ((u)-> u.items.gear.owned.shield_special_goldenknight?)
goldenknight: text: t('shieldSpecialGoldenknightText'), notes: t('shieldSpecialGoldenknightNotes', {attrs: 25}), con: 25, per: 25, value:200, canOwn: ((u)-> u.items.gear.owned.shield_special_goldenknight?)
#Winter event
yeti: event: events.winter, specialClass: 'warrior', text: t('shieldSpecialYetiText'), notes: t('shieldSpecialYetiNotes', {con: 7}), con: 7, value: 70
ski: event: events.winter, specialClass: 'rogue', text: t('weaponSpecialSkiText'), notes: t('weaponSpecialSkiNotes', {str: 8}), str: 8, value: 90