mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-04-14 19:56:23 +00:00
Merge pull request #5664 from HabitRPG/sabrecat/death-modal
Kinder, gentler death
This commit is contained in:
Sabe Jones
commit
63a8bf63cb
11 changed files with 719 additions and 678 deletions
2
common/dist/sprites/habitrpg-shared.css
vendored
2
common/dist/sprites/habitrpg-shared.css
vendored
File diff suppressed because one or more lines are too long
196
common/dist/sprites/spritesmith2.css
vendored
196
common/dist/sprites/spritesmith2.css
vendored
|
|
@ -3150,85 +3150,85 @@
|
|||
}
|
||||
.shop_armor_armoire_gladiatorArmor {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1312px;
|
||||
background-position: -1729px -1476px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_armoire_lunarArmor {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1189px;
|
||||
background-position: -1729px -1435px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_armoire_rancherRobes {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1148px;
|
||||
background-position: -1729px -1312px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_blueHairbow {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1107px;
|
||||
background-position: -1729px -1271px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_gladiatorHelm {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -943px;
|
||||
background-position: -1729px -1230px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_lunarCrown {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -902px;
|
||||
background-position: -1729px -1066px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_rancherHat {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -861px;
|
||||
background-position: -1729px -1025px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_redHairbow {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -820px;
|
||||
background-position: -1729px -984px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_royalCrown {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -697px;
|
||||
background-position: -1729px -943px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_armoire_violetFloppyHat {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -656px;
|
||||
background-position: -1729px -820px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_shield_armoire_gladiatorShield {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -615px;
|
||||
background-position: -1729px -779px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_armoire_basicCrossbow {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -574px;
|
||||
background-position: -1729px -738px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_armoire_lunarSceptre {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -533px;
|
||||
background-position: -1729px -697px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_armoire_rancherLasso {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -492px;
|
||||
background-position: -1729px -656px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
|
@ -3402,115 +3402,115 @@
|
|||
}
|
||||
.shop_armor_healer_1 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -451px;
|
||||
background-position: -1729px -615px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_healer_2 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -410px;
|
||||
background-position: -1729px -574px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_healer_3 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -369px;
|
||||
background-position: -1729px -533px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_healer_4 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -328px;
|
||||
background-position: -1729px -492px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_healer_5 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1392px -1679px;
|
||||
background-position: -1729px -451px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_rogue_1 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1351px -1679px;
|
||||
background-position: -1524px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_rogue_2 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1310px -1679px;
|
||||
background-position: -1483px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_rogue_3 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1269px -1679px;
|
||||
background-position: -1442px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_rogue_4 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1228px -1679px;
|
||||
background-position: -1401px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_rogue_5 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1679px -1638px;
|
||||
background-position: -1360px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_0 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -1638px;
|
||||
background-position: -1319px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_1 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1597px -1638px;
|
||||
background-position: -1688px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_2 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1556px -1638px;
|
||||
background-position: -1647px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_finnedOceanicArmor {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1515px -1638px;
|
||||
background-position: -1606px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_warrior_1 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1474px -1638px;
|
||||
background-position: -1565px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_warrior_2 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1433px -1638px;
|
||||
background-position: -1524px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_warrior_3 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1392px -1638px;
|
||||
background-position: -1483px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_warrior_4 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1269px -1638px;
|
||||
background-position: -1442px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_warrior_5 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1228px -1638px;
|
||||
background-position: -1319px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
|
@ -3534,7 +3534,7 @@
|
|||
}
|
||||
.shop_armor_wizard_4 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -82px;
|
||||
background-position: -1729px -246px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
|
@ -3648,73 +3648,73 @@
|
|||
}
|
||||
.slim_armor_wizard_1 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -910px;
|
||||
background-position: -1137px -1638px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_wizard_2 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -819px;
|
||||
background-position: -1638px -910px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_wizard_3 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -728px;
|
||||
background-position: -1638px -819px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_wizard_4 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -637px;
|
||||
background-position: -1638px -728px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_wizard_5 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -546px;
|
||||
background-position: -1638px -637px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_special_birthday {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -455px;
|
||||
background-position: -1638px -546px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_special_birthday2015 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -364px;
|
||||
background-position: -1638px -455px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shop_armor_special_birthday {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1310px -1638px;
|
||||
background-position: -1360px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_birthday2015 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1351px -1638px;
|
||||
background-position: -1401px -1638px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.slim_armor_special_birthday {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -273px;
|
||||
background-position: -1638px -364px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_special_birthday2015 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -182px;
|
||||
background-position: -1638px -273px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -91px;
|
||||
background-position: -1638px -182px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
|
|
@ -3732,295 +3732,301 @@
|
|||
}
|
||||
.broad_armor_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px 0px;
|
||||
background-position: -1638px -91px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1470px -1547px;
|
||||
background-position: -1638px 0px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1349px -1547px;
|
||||
background-position: -1440px -1547px;
|
||||
width: 120px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1243px -1547px;
|
||||
background-position: -1334px -1547px;
|
||||
width: 105px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1152px -1547px;
|
||||
background-position: -1243px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shield_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1061px -1547px;
|
||||
background-position: -1152px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shield_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -955px -1547px;
|
||||
background-position: -1046px -1547px;
|
||||
width: 105px;
|
||||
height: 90px;
|
||||
}
|
||||
.shield_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -864px -1547px;
|
||||
background-position: -955px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shop_armor_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1433px -1679px;
|
||||
background-position: -1565px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1474px -1679px;
|
||||
background-position: -1606px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1515px -1679px;
|
||||
background-position: -1647px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_armor_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1556px -1679px;
|
||||
background-position: -1688px -1679px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1597px -1679px;
|
||||
background-position: -1729px 0px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1638px -1679px;
|
||||
background-position: -1729px -41px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1679px -1679px;
|
||||
background-position: -1729px -82px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px 0px;
|
||||
background-position: -1729px -123px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_shield_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -41px;
|
||||
background-position: -1729px -164px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_shield_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1353px;
|
||||
background-position: -1729px -205px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_shield_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -123px;
|
||||
background-position: -1729px -1517px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -164px;
|
||||
background-position: -1729px -287px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -205px;
|
||||
background-position: -1729px -328px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -246px;
|
||||
background-position: -1729px -369px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_weapon_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -287px;
|
||||
background-position: -1729px -410px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.slim_armor_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -773px -1547px;
|
||||
background-position: -864px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -652px -1547px;
|
||||
background-position: -743px -1547px;
|
||||
width: 120px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -546px -1547px;
|
||||
background-position: -637px -1547px;
|
||||
width: 105px;
|
||||
height: 90px;
|
||||
}
|
||||
.slim_armor_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -455px -1547px;
|
||||
background-position: -546px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.weapon_special_fallHealer {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -864px -1456px;
|
||||
background-position: -455px -1547px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.weapon_special_fallMage {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -743px -1456px;
|
||||
background-position: -834px -1456px;
|
||||
width: 120px;
|
||||
height: 90px;
|
||||
}
|
||||
.weapon_special_fallRogue {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -637px -1456px;
|
||||
background-position: -728px -1456px;
|
||||
width: 105px;
|
||||
height: 90px;
|
||||
}
|
||||
.weapon_special_fallWarrior {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -546px -1456px;
|
||||
background-position: -637px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_special_gaymerx {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -455px -1456px;
|
||||
background-position: -546px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_special_gaymerx {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -364px -1456px;
|
||||
background-position: -455px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shop_armor_special_gaymerx {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -738px;
|
||||
background-position: -1729px -861px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_special_gaymerx {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -779px;
|
||||
background-position: -1729px -902px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.slim_armor_special_gaymerx {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -273px -1456px;
|
||||
background-position: -364px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.back_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -182px -1456px;
|
||||
background-position: -273px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -91px -1456px;
|
||||
background-position: -182px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.head_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: 0px -1456px;
|
||||
background-position: -91px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shop_armor_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -984px;
|
||||
background-position: -1729px -1107px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_back_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1025px;
|
||||
background-position: -1729px -1148px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_head_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1066px;
|
||||
background-position: -1729px -1189px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.slim_armor_mystery_201402 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1456px -1365px;
|
||||
background-position: 0px -1456px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.broad_armor_mystery_201403 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1456px -1274px;
|
||||
background-position: -1456px -1365px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.headAccessory_mystery_201403 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1456px -1183px;
|
||||
background-position: -1456px -1274px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.shop_armor_mystery_201403 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1230px;
|
||||
background-position: -1729px -1353px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.shop_headAccessory_mystery_201403 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1729px -1271px;
|
||||
background-position: -1729px -1394px;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
.slim_armor_mystery_201403 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1456px -1092px;
|
||||
background-position: -1456px -1183px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.back_mystery_201404 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1137px -1638px;
|
||||
background-position: -1456px -1092px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.headAccessory_mystery_201404 {
|
||||
background-image: url(spritesmith2.png);
|
||||
background-position: -1228px -1638px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
|
|
|
|||
BIN
common/dist/sprites/spritesmith2.png
vendored
BIN
common/dist/sprites/spritesmith2.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 110 KiB After Width: | Height: | Size: 110 KiB |
660
common/dist/sprites/spritesmith3.css
vendored
660
common/dist/sprites/spritesmith3.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith3.png
vendored
BIN
common/dist/sprites/spritesmith3.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 87 KiB |
472
common/dist/sprites/spritesmith4.css
vendored
472
common/dist/sprites/spritesmith4.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith4.png
vendored
BIN
common/dist/sprites/spritesmith4.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 552 KiB After Width: | Height: | Size: 550 KiB |
BIN
common/img/sprites/spritesmith/misc/knockout.png
Normal file
BIN
common/img/sprites/spritesmith/misc/knockout.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
7
common/locales/en/death.json
Normal file
7
common/locales/en/death.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"lostAllHealth": "You ran out of Health!",
|
||||
"dontDespair": "Don't despair!",
|
||||
"deathPenaltyDetails": "You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you'll do great.",
|
||||
"refillHealthTryAgain": "Refill Health & Try Again",
|
||||
"dyingOftenTips": "Is this happening often? <a href='http://habitrpg.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Here are some tips!</a>"
|
||||
}
|
||||
|
|
@ -60,3 +60,7 @@ ul
|
|||
.tasks-lists .row .col-md-3
|
||||
padding-right: 0
|
||||
padding-left: 0
|
||||
|
||||
.flex-column
|
||||
display: flex
|
||||
flex-direction: column
|
||||
|
|
|
|||
|
|
@ -1,16 +1,40 @@
|
|||
//div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
|
||||
script(type='text/ng-template', id='modals/death.html')
|
||||
.modal-body.death-modal
|
||||
.container-fluid
|
||||
.row
|
||||
.col-md-3
|
||||
figure
|
||||
.GrimReaper
|
||||
.col-md-9
|
||||
h2=env.t('youDied')
|
||||
.row
|
||||
.col-md-3
|
||||
p
|
||||
a.btn.btn-danger.btn-lg(ng-click='user.ops.revive({}); $close()')=env.t('continue')
|
||||
.col-md-9
|
||||
p=env.t('dieText')
|
||||
include ../avatar/generated_avatar
|
||||
|
||||
script(type='text/ng-template', id='modals/death.html')
|
||||
.modal-header
|
||||
h3.text-center=env.t('lostAllHealth')
|
||||
.modal-body
|
||||
.container-fluid(ng-controller='UserCtrl')
|
||||
.col-md-6
|
||||
.hero-stats
|
||||
.meter-label(tooltip=env.t('health'))
|
||||
span.glyphicon.glyphicon-heart
|
||||
.meter.health(tooltip='{{Math.round(user.stats.hp * 100) / 100}}')
|
||||
.bar(ng-style='{"width": Shared.percent(user.stats.hp, Shared.maxHealth)+"%"}')
|
||||
span.meter-text.value
|
||||
| {{Math.ceil(user.stats.hp)}} / {{::Shared.maxHealth}}
|
||||
figure.herobox.text-center
|
||||
.character-sprites
|
||||
+costumeSetting('back')
|
||||
span(ng-class="'skin_' + profile.preferences.skin + '_sleep'")
|
||||
span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}')
|
||||
+costumeSetting('armor', {prefix: "profile.preferences.size + '_' + "})
|
||||
+costumeSetting('back', {suffix: " + '_collar'"})
|
||||
+costumeSetting('body')
|
||||
span(class='head_0')
|
||||
- var hairTypes = ['base', 'bangs', 'mustache', 'beard']
|
||||
each type in hairTypes
|
||||
span(class='hair_#{type}_{{profile.preferences.hair.#{type}}}_{{profile.preferences.hair.color}}')
|
||||
+costumeSetting('eyewear')
|
||||
+costumeSetting('head')
|
||||
+costumeSetting('headAccessory')
|
||||
span(class='hair_flower_{{profile.preferences.hair.flower}}')
|
||||
+costumeSetting('shield')
|
||||
+costumeSetting('weapon')
|
||||
span(class='knockout')
|
||||
.col-md-6
|
||||
h4(style='margin-top:1.5em')=env.t('dontDespair')
|
||||
p(style='margin-top:1.5em')=env.t('deathPenaltyDetails')
|
||||
.modal-footer
|
||||
a.btn.btn-danger.btn-lg.flex-column(ng-click='user.ops.revive({}); $close()')=env.t('refillHealthTryAgain')
|
||||
h4.text-center!=env.t('dyingOftenTips')
|
||||
|
|
|
|||
Loading…
Reference in a new issue