Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
Purge11 committed Sep 7, 2024
1 parent 8620d44 commit 2ee6629
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 13 deletions.
20 changes: 19 additions & 1 deletion src/app/_json/psps.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
[
{
"name": "Wood Elf Archer Forga",
"id": "",
"partner": "Can be used on [Ranged] partners",
"location": "Can be obtained from Summer Event.",
"buff": "Elf",
"skin": "Elf",
"class": "raid"
},
{
"name": "Vampire Marie",
"id": "",
"partner": "Can be used on [Magic] partners",
"location": "Can be obtained from Fortune Wheel.",
"buff": "Marie",
"skin": "Marie",
"class": "pve"
},
{
"name": "Guardian Lucifer",
"id": "",
"partner": "Can be used on [Long Range]] partners",
"partner": "Can be used on [Long Range] partners",
"location": "Can be obtained in VoidMall for 2000 coins",
"buff": "GuardianLuci",
"skin": "GuardianLuciSkill",
Expand Down
4 changes: 4 additions & 0 deletions src/app/_json/sellable-items.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"name": "Fernon's Energy - 80kk",
"img": "../../assets/img/sellable/fernon_energy.png"
},
{
"name": "Fused Biome Soul - 60kk",
"img": "../../assets/img/sellable/fernon_energy.png"
},
{
"name": "Timespace Master - 50kk",
"img": "../../assets/img/sellable/timespace_master.png"
Expand Down
17 changes: 5 additions & 12 deletions src/app/badges/badges.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h3>Additional Notes:</h3>
body {
background: linear-gradient(135deg, #2e2e2e, #444444);
font-family: 'Arial', sans-serif;
color: #ddd;
color: #f4f4f4;
}

.badges {
Expand All @@ -92,7 +92,7 @@ <h3>Additional Notes:</h3>
width: 80%;
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.4);
margin: 20px;
color: #fff;
color: #f4f4f4;
}

.badges-title {
Expand All @@ -109,22 +109,15 @@ <h3>Additional Notes:</h3>
border-radius: 10px;
}

h2 {
color: #ffcc00;
font-size: 2em;
margin-top: 20px;
margin-bottom: 15px;
}

h3 {
h2, h3 {
color: #ffcc66;
font-size: 1.6em;
margin-top: 20px;
}

p, ul {
font-size: 1.2em;
color: #423c3c;
font-size: 1.3em;
color: #f4f4f4;
line-height: 1.8em;
}

Expand Down
Binary file added src/assets/img/psps/buffs/Elf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/psps/buffs/Marie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/psps/skins/Elf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/psps/skins/Marie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/sellable/1013.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2ee6629

Please sign in to comment.