Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Change all instances of spookDust -> spookySparkles

Browse Source
This commit is contained in:
Blade Barringer
2016-05-19 09:53:46 -05:00
parent 42bc4bdd3d
commit 5bd436f3c8
20 changed files with 98 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dist/sprites/spritesmith-main-0.css
Vendored
+2 -2
View File
@@ -346,13 +346,13 @@
width: 48px;
height: 52px;
}
.achievement-spookDust {
.achievement-spookySparkles {
background-image: url(spritesmith-main-0.png);
background-position: -25px -1601px;
width: 24px;
height: 26px;
}
.achievement-spookDust2x {
.achievement-spookySparkles2x {
background-image: url(spritesmith-main-0.png);
background-position: -980px -1548px;
width: 48px;
common/dist/sprites/spritesmith-main-5.css
Vendored
+48 -48
View File
@@ -270,7 +270,7 @@
}
.shop_armor_special_candycane {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -410px;
background-position: -1674px -451px;
width: 40px;
height: 40px;
}
@@ -282,19 +282,19 @@
}
.shop_armor_special_snowflake {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -615px;
background-position: -1674px -656px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Healer {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1189px;
background-position: -1674px -1230px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Mage {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1230px;
background-position: -1674px -1271px;
width: 40px;
height: 40px;
}
@@ -456,13 +456,13 @@
}
.shop_shield_special_winter2015Warrior {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1558px;
background-position: -1674px -1517px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2016Healer {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1476px;
background-position: -1599px -1599px;
width: 40px;
height: 40px;
}
@@ -1098,103 +1098,103 @@
}
.shop_head_rogue_3 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -984px;
background-position: -1674px -1025px;
width: 40px;
height: 40px;
}
.shop_head_rogue_4 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -943px;
background-position: -1674px -984px;
width: 40px;
height: 40px;
}
.shop_head_rogue_5 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -902px;
background-position: -1674px -943px;
width: 40px;
height: 40px;
}
.shop_head_special_0 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -861px;
background-position: -1674px -902px;
width: 40px;
height: 40px;
}
.shop_head_special_1 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -820px;
background-position: -1674px -861px;
width: 40px;
height: 40px;
}
.shop_head_special_2 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -738px;
background-position: -1674px -779px;
width: 40px;
height: 40px;
}
.shop_head_special_fireCoralCirclet {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -697px;
background-position: -1674px -738px;
width: 40px;
height: 40px;
}
.shop_head_warrior_1 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -656px;
background-position: -1674px -697px;
width: 40px;
height: 40px;
}
.shop_head_warrior_2 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -574px;
background-position: -1674px -615px;
width: 40px;
height: 40px;
}
.shop_head_warrior_3 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -533px;
background-position: -1674px -574px;
width: 40px;
height: 40px;
}
.shop_head_warrior_4 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -492px;
background-position: -1674px -533px;
width: 40px;
height: 40px;
}
.shop_head_warrior_5 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -451px;
background-position: -1674px -492px;
width: 40px;
height: 40px;
}
.shop_head_wizard_1 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -369px;
background-position: -1674px -410px;
width: 40px;
height: 40px;
}
.shop_head_wizard_2 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -328px;
background-position: -1674px -369px;
width: 40px;
height: 40px;
}
.shop_head_wizard_3 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -287px;
background-position: -1674px -328px;
width: 40px;
height: 40px;
}
.shop_head_wizard_4 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -246px;
background-position: -1674px -287px;
width: 40px;
height: 40px;
}
.shop_head_wizard_5 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -205px;
background-position: -1674px -246px;
width: 40px;
height: 40px;
}
@@ -1296,7 +1296,7 @@
}
.shop_headAccessory_special_bearEars {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -164px;
background-position: -1674px -205px;
width: 40px;
height: 40px;
}
@@ -1314,31 +1314,31 @@
}
.shop_headAccessory_special_lionEars {
background-image: url(spritesmith-main-5.png);
background-position: -1599px -1599px;
background-position: -1674px 0px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_pandaEars {
background-image: url(spritesmith-main-5.png);
background-position: -1674px 0px;
background-position: -1674px -41px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_pigEars {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -41px;
background-position: -1674px -82px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_tigerEars {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -82px;
background-position: -1674px -123px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_wolfEars {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -123px;
background-position: -1674px -164px;
width: 40px;
height: 40px;
}
@@ -1464,55 +1464,55 @@
}
.shop_shield_healer_1 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1025px;
background-position: -1674px -1066px;
width: 40px;
height: 40px;
}
.shop_shield_healer_2 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1066px;
background-position: -1674px -1107px;
width: 40px;
height: 40px;
}
.shop_shield_healer_3 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1107px;
background-position: -1674px -1148px;
width: 40px;
height: 40px;
}
.shop_shield_healer_4 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1148px;
background-position: -1674px -1189px;
width: 40px;
height: 40px;
}
.shop_shield_healer_5 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1271px;
background-position: -1674px -1312px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_0 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1312px;
background-position: -1674px -1353px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_1 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1353px;
background-position: -1674px -1394px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_2 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1394px;
background-position: -1674px -1435px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_3 {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1435px;
background-position: -1674px -1476px;
width: 40px;
height: 40px;
}
@@ -2056,6 +2056,12 @@
width: 64px;
height: 54px;
}
.ghost {
background-image: url(spritesmith-main-5.png);
background-position: -455px -1144px;
width: 90px;
height: 90px;
}
.inventory_present {
background-image: url(spritesmith-main-5.png);
background-position: -1616px -1049px;
@@ -2172,7 +2178,7 @@
}
.inventory_special_opaquePotion {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -779px;
background-position: -1674px -820px;
width: 40px;
height: 40px;
}
@@ -2194,7 +2200,7 @@
width: 57px;
height: 54px;
}
.inventory_special_spookDust {
.inventory_special_spookySparkles {
background-image: url(spritesmith-main-5.png);
background-position: -1299px -1508px;
width: 57px;
@@ -2238,23 +2244,17 @@
}
.seafoam_star {
background-image: url(spritesmith-main-5.png);
background-position: -455px -1144px;
background-position: -364px -1144px;
width: 90px;
height: 90px;
}
.shop_armoire {
background-image: url(spritesmith-main-5.png);
background-position: -1674px -1517px;
background-position: -1674px -1558px;
width: 40px;
height: 40px;
}
.snowman {
background-image: url(spritesmith-main-5.png);
background-position: -364px -1144px;
width: 90px;
height: 90px;
}
.spookman {
background-image: url(spritesmith-main-5.png);
background-position: -273px -1144px;
width: 90px;
common/dist/sprites/spritesmith-main-5.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 255 KiB

common/dist/sprites/spritesmith-main-6.css
Vendored
+2 -2
View File
@@ -682,7 +682,7 @@
width: 32px;
height: 32px;
}
.shop_spookDust {
.shop_spookySparkles {
background-image: url(spritesmith-main-6.png);
background-position: -790px -1176px;
width: 32px;
@@ -730,7 +730,7 @@
width: 40px;
height: 40px;
}
.shop_heallAll {
.shop_healAll {
background-image: url(spritesmith-main-6.png);
background-position: -791px -1643px;
width: 40px;
common/img/sprites/spritesmith/achievements/achievement-spookDust.png → common/img/sprites/spritesmith/achievements/achievement-spookySparkles.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

common/img/sprites/spritesmith/achievements/achievement-spookDust2x.png → common/img/sprites/spritesmith/achievements/achievement-spookySparkles2x.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

common/img/sprites/spritesmith/misc/spookman.png → common/img/sprites/spritesmith/misc/ghost.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

common/img/sprites/spritesmith/misc/inventory_special_spookDust.png → common/img/sprites/spritesmith/misc/inventory_special_spookySparkles.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

common/img/sprites/spritesmith/shop/shop_spookDust.png → common/img/sprites/spritesmith/shop/shop_spookySparkles.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

common/locales/en/limited.json
+1 -1
View File
@@ -5,7 +5,7 @@
"annoyingFriends": "Annoying Friends",
"annoyingFriendsText": "Got snowballed <%= snowballs %> times by party members.",
"alarmingFriends": "Alarming Friends",
"alarmingFriendsText": "Got spooked <%= spookDust %> times by party members.",
"alarmingFriendsText": "Got spooked <%= spookySparkles %> times by party members.",
"agriculturalFriends": "Agricultural Friends",
"agriculturalFriendsText": "Got transformed into a flower <%= seeds %> times by party members.",
"aquaticFriends": "Aquatic Friends",
common/locales/en/spells.json
+2 -2
View File
@@ -52,8 +52,8 @@
"spellSpecialSaltText": "Salt",
"spellSpecialSaltNotes": "Someone has snowballed you. Ha ha, very funny. Now get this snow off me!",
"spellSpecialSpookDustText": "Spooky Sparkles",
"spellSpecialSpookDustNotes": "Turn a friend into a floating blanket with eyes!",
"spellSpecialSpookySparklesText": "Spooky Sparkles",
"spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!",
"spellSpecialOpaquePotionText": "Opaque Potion",
"spellSpecialOpaquePotionNotes": "Cancel the effects of Spooky Sparkles.",
common/script/content/spells.js
+12 -12
View File
@@ -265,7 +265,7 @@ spells.special = {
cast (user, target, req) {
if (!user.items.special.snowball) throw new NotAuthorized(t('spellNotOwned')(req.language));
target.stats.buffs.snowball = true;
target.stats.buffs.spookDust = false;
target.stats.buffs.spookySparkles = false;
target.stats.buffs.shinySeed = false;
target.stats.buffs.seafoam = false;
if (!target.achievements.snowball) target.achievements.snowball = 0;
@@ -285,22 +285,22 @@ spells.special = {
user.stats.gp -= 5;
},
},
spookDust: {
text: t('spellSpecialSpookDustText'),
spookySparkles: {
text: t('spellSpecialSpookySparklesText'),
mana: 0,
value: 15,
previousPurchase: true,
target: 'user',
notes: t('spellSpecialSpookDustNotes'),
notes: t('spellSpecialSpookySparklesNotes'),
cast (user, target, req) {
if (!user.items.special.spookDust) throw new NotAuthorized(t('spellNotOwned')(req.language));
if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
target.stats.buffs.snowball = false;
target.stats.buffs.spookDust = true;
target.stats.buffs.spookySparkles = true;
target.stats.buffs.shinySeed = false;
target.stats.buffs.seafoam = false;
if (!target.achievements.spookDust) target.achievements.spookDust = 0;
target.achievements.spookDust++;
user.items.special.spookDust--;
if (!target.achievements.spookySparkles) target.achievements.spookySparkles = 0;
target.achievements.spookySparkles++;
user.items.special.spookySparkles--;
},
},
opaquePotion: {
@@ -311,7 +311,7 @@ spells.special = {
target: 'self',
notes: t('spellSpecialOpaquePotionNotes'),
cast (user) {
user.stats.buffs.spookDust = false;
user.stats.buffs.spookySparkles = false;
user.stats.gp -= 5;
},
},
@@ -325,7 +325,7 @@ spells.special = {
cast (user, target, req) {
if (!user.items.special.shinySeed) throw new NotAuthorized(t('spellNotOwned')(req.language));
target.stats.buffs.snowball = false;
target.stats.buffs.spookDust = false;
target.stats.buffs.spookySparkles = false;
target.stats.buffs.shinySeed = true;
target.stats.buffs.seafoam = false;
if (!target.achievements.shinySeed) target.achievements.shinySeed = 0;
@@ -355,7 +355,7 @@ spells.special = {
cast (user, target, req) {
if (!user.items.special.seafoam) throw new NotAuthorized(t('spellNotOwned')(req.language));
target.stats.buffs.snowball = false;
target.stats.buffs.spookDust = false;
target.stats.buffs.spookySparkles = false;
target.stats.buffs.shinySeed = false;
target.stats.buffs.seafoam = true;
if (!target.achievements.seafoam) target.achievements.seafoam = 0;