Firq/firq-dev-website
Firq/firq-dev-website
1
0
Fork 0
Code Issues Pull requests Projects Releases 119 Packages 1 Wiki Activity Actions

Mergin dev - new header, updated servants #29

Merged
Firq merged 7 commits from dev into main 2024-06-15 17:20:52 +00:00
Conversation 0 Commits 7 Files changed 16 +834 -188
9 changed files with 834 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5181739230 - Show all commits

932
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "@firq/fgosite",
"type": "module",
"version": "0.1.26",
"version": "0.1.27",
"private": true,
"scripts": {
"dev": "astro dev",

BIN
src/assets/ce/bond-ce/scathach.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/assets/ce/bond-ce/sherlock.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
src/assets/ce/bond-ce/taigong.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
src/assets/servant/scathach_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 KiB

BIN
src/assets/servant/sherlock_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
src/assets/servant/taigong_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 68 KiB

88
static/data/_servantdata.json
View file

@ -1,9 +1,19 @@
[
{
"name": "Scathach",
"level": "120",
"np": "5",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "scathach_03.png",
"bondceImageFile": "scathach.png",
"bond10": true
},
{
"name": "Skadi",
"level": "120",
"np": "5",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "skadi_03.png",
"bondceImageFile": "skadi.png",
@ -13,7 +23,7 @@
"name": "Skadi",
"level": "70",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "skadi_02.png",
"bondceImageFile": "skadi.png",
@ -23,7 +33,7 @@
"name": "Skadi",
"level": "1",
"np": "1",
"skills": "10 / X / X ",
"skills": "10 / X / X",
"ml": "1",
"servantImageFile": "skadi_01.png",
"bondceImageFile": "skadi.png",
@ -33,18 +43,18 @@
"name": "Koyanskaya of Light",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "koyanlight_01.png",
"bondceImageFile": "koyanlight.png",
"bond10": false
"bond10": true
},
{
"name": "Castoria",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"ml": "7",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "castoria_02.png",
"bondceImageFile": "castoria.png",
"bond10": true
@ -53,7 +63,7 @@
"name": "Castoria",
"level": "70",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "castoria_01.png",
"bondceImageFile": "castoria.png",
@ -63,17 +73,17 @@
"name": "Oberon",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"ml": "Not Unlocked",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "oberon_02.png",
"bondceImageFile": "oberon.png",
"bond10": false
"bond10": true
},
{
"name": "Merlin",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "merlin_03.png",
"bondceImageFile": "merlin.png",
@ -83,7 +93,7 @@
"name": "Merlin",
"level": "70",
"np": "1",
"skills": "9 / 1 / 9 ",
"skills": "9 / 1 / 9",
"ml": "Not Unlocked",
"servantImageFile": "merlin_01.png",
"bondceImageFile": "merlin.png",
@ -93,7 +103,7 @@
"name": "Waver",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "waver_02.png",
"bondceImageFile": "waver.png",
@ -103,7 +113,7 @@
"name": "Reines",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "9",
"servantImageFile": "reines_01.png",
"bondceImageFile": "reines.png",
@ -113,7 +123,7 @@
"name": "Tamamo-no-Mae",
"level": "90",
"np": "2",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "tamamo_03.png",
"bondceImageFile": "tamamo.png",
@ -123,7 +133,7 @@
"name": "Van Gogh",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "gogh_01.png",
"bondceImageFile": "gogh.png",
@ -133,7 +143,7 @@
"name": "Miss Crane",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "crane_01.png",
"bondceImageFile": "crane.png",
@ -143,8 +153,8 @@
"name": "Ashiya Douman",
"level": "90",
"np": "1",
"skills": "9 / 9 / 10 ",
"ml": "Not Unlocked",
"skills": "9 / 9 / 10",
"ml": "10",
"servantImageFile": "douman_01.png",
"bondceImageFile": "douman.png",
"bond10": false
@ -153,27 +163,47 @@
"name": "Himiko",
"level": "90",
"np": "1",
"skills": "9 / 9 / 9 ",
"skills": "9 / 9 / 9",
"ml": "Not Unlocked",
"servantImageFile": "himiko_03.png",
"bondceImageFile": "himiko.png",
"bond10": false
},
{
"name": "Sherlock Holmes",
"level": "90",
"np": "1",
"skills": "9 / 10 / 9",
"ml": "Not Unlocked",
"servantImageFile": "sherlock_03.png",
"bondceImageFile": "sherlock.png",
"bond10": false
},
{
"name": "Nero (Bride)",
"level": "90",
"np": "1",
"skills": "10 / 10 / 9 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "bride_03.png",
"bondceImageFile": "bride.png",
"bond10": false
},
{
"name": "Taigon Wang",
"level": "70",
"np": "1",
"skills": "10 / 9 / 10",
"ml": "Not Unlocked",
"servantImageFile": "taigong_03.png",
"bondceImageFile": "taigong.png",
"bond10": false
},
{
"name": "Nightingale (Santa)",
"level": "80",
"np": "5",
"skills": "9 / 10 / 10 ",
"skills": "9 / 10 / 9",
"ml": "Not Unlocked",
"servantImageFile": "santagale_01.png",
"bondceImageFile": "santagale.png",
@ -183,7 +213,7 @@
"name": "Nightingale (Santa)",
"level": "60",
"np": "1",
"skills": "1 / 10 / 10 ",
"skills": "1 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "santagale_01.png",
"bondceImageFile": "santagale.png",
@ -193,7 +223,7 @@
"name": "Elisabeth Báthory",
"level": "40",
"np": "1",
"skills": "9 / 9 / X ",
"skills": "9 / 9 / X",
"ml": "Not Unlocked",
"servantImageFile": "liz_01.png",
"bondceImageFile": "liz.png",
@ -203,7 +233,7 @@
"name": "Wu Zetian",
"level": "60",
"np": "1",
"skills": "9 / 1 / 9 ",
"skills": "10 / 9 / 10",
"ml": "Not Unlocked",
"servantImageFile": "wu_01.png",
"bondceImageFile": "wu.png",
@ -213,7 +243,7 @@
"name": "Ibaraki-Douji",
"level": "40",
"np": "1",
"skills": "8 / 8 / X ",
"skills": "9 / 10 / X ",
"ml": "Not Unlocked",
"servantImageFile": "ibaraki_02.png",
"bondceImageFile": "ibaraki.png",
@ -223,7 +253,7 @@
"name": "Calamity Jane",
"level": "60",
"np": "1",
"skills": "1 / 9 / 9 ",
"skills": "1 / 9 / 9",
"ml": "Not Unlocked",
"servantImageFile": "jane_02.png",
"bondceImageFile": "jane.png",
@ -233,7 +263,7 @@
"name": "Chiron",
"level": "60",
"np": "1",
"skills": "1 / 9 / 9 ",
"skills": "1 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "chiron_01.png",
"bondceImageFile": "chiron.png",