1
0
Fork 0

Pull Edikoyo-Main into Edikoyo-n04 #1

Merged
n04 merged 107 commits from Edikoyo/EdikoyoWiki:main into main 2024-09-07 23:41:19 +00:00
18 changed files with 76 additions and 95 deletions
Showing only changes of commit 6349c680d4 - Show all commits

View file

@ -6,6 +6,7 @@
"art_variant1": "multitext", "art_variant1": "multitext",
"art_variant2": "multitext", "art_variant2": "multitext",
"art_variant3": "multitext", "art_variant3": "multitext",
"art_golden": "text" "art_golden": "text",
"golden": "multitext"
} }
} }

View file

@ -229,18 +229,18 @@
}, },
"active": "99690ee270617d17", "active": "99690ee270617d17",
"lastOpenFiles": [ "lastOpenFiles": [
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Ababa Slime.md", "Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md",
"Animals/Slimes/Honey Slime.md",
"Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md", "Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md", "Animals/Slimes/Bark Slime.md",
"Animals/Slimes/_index.md",
"Countries/Felmyr.md", "Countries/Felmyr.md",
"Countries/Llasuki.md", "Countries/Llasuki.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Godot Slime.md",
"Countries/Vosaka.md", "Countries/Vosaka.md",
"Images/Slimes/garden-1.png", "Images/Slimes/garden-1.png",
"Images/Slimes/sunflower-2.png", "Images/Slimes/sunflower-2.png",

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- "![[ababa-3.png]]" - "![[ababa-3.png]]"
- "[[Barrowmaw]]" - "[[Barrowmaw]]"
golden: "![[ababa-4.png]]" golden:
- "![[ababa-4.png]]"
- Everywhere
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[bark-3.png]]" - "![[bark-3.png]]"
- "[[Lekia]]" - "[[Lekia]]"
golden: "![[bark-4.png]]" golden:
- "![[bark-4.png]]"
- Everywhere
--- ---

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[garden-3.png]]" - "![[garden-3.png]]"
- "[[Dolfeyja]]" - "[[Dolfeyja]]"
golden: "![[garden-4.png]]" golden:
- "![[garden-4.png]]"
- Everywhere
--- ---

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[godot-3.png]]" - "![[godot-3.png]]"
- "[[Soljord]]" - "[[Soljord]]"
golden: "![[godot-4.png]]" golden:
- "![[godot-4.png]]"
- Everywhere
--- ---

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[honey-3.png]]" - "![[honey-3.png]]"
- "[[Mantine]]" - "[[Mantine]]"
golden: "![[honey-4.png]]" golden:
- "![[honey-4.png]]"
- Everywhere
--- ---

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[lagoon-3.png]]" - "![[lagoon-3.png]]"
- "[[Felmyr]]" - "[[Felmyr]]"
golden: "![[lagoon-4.png]]" golden:
- "![[lagoon-4.png]]"
- Everywhere
--- ---

View file

@ -8,5 +8,7 @@ variant2:
variant3: variant3:
- "![[sunflower-3.png]]" - "![[sunflower-3.png]]"
- "[[Blanchister]]" - "[[Blanchister]]"
golden: "![[sunflower-4.png]]" golden:
- "![[sunflower-4.png]]"
- Everywhere
--- ---

View file

@ -1,15 +1,15 @@
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> ```dataview
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> TABLE WITHOUT ID file.link as "Slimes", variant1[0] + variant[1] as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name
```
| Slimes | Variant 1 | Variant 2 | Variant 3 | Golden Variant | ```dataview
| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------- | TABLE
| [[Ababa Slime]] | <ul><li>![[ababa-1.png]]</li><li>[[Batanoka]]</li></ul> | <ul><li>![[ababa-2.png]]</li><li>[[Faelani]]</li></ul> | <ul><li>![[ababa-3.png]]</li><li>[[Barrowmaw]]</li></ul> | ![[ababa-4.png]] | variant1[0] AS variant0,
| [[Bark Slime]] | <ul><li>![[bark-1.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[bark-2.png]]</li><li>[[Gudoko]]</li></ul> | <ul><li>![[bark-3.png]]</li><li>[[Lekia]]</li></ul> | ![[bark-4.png]] | variant1[1] AS variant1
| [[Garden Slime]] | <ul><li>![[garden-1.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[garden-2.png]]</li><li>[[Soljord]]</li></ul> | <ul><li>![[garden-3.png]]</li><li>[[Dolfeyja]]</li></ul> | ![[garden-4.png]] | variant1[0] + variant1[1]
| [[Godot Slime]] | <ul><li>![[godot-1.png]]</li><li>[[Gokolm]]</li></ul> | <ul><li>![[godot-2.png]]</li><li>[[Dasona]]</li></ul> | <ul><li>![[godot-3.png]]</li><li>[[Soljord]]</li></ul> | ![[godot-4.png]] | FROM "Animals/Slimes"
| [[Honey Slime]] | <ul><li>![[honey-1.png]]</li><li>[[Dahallow]]</li></ul> | <ul><li>![[honey-2.png]]</li><li>[[Krakala]]</li></ul> | <ul><li>![[honey-3.png]]</li><li>[[Mantine]]</li></ul> | ![[honey-4.png]] | WHERE file.name != "_index"
| [[Lagoon Slime]] | <ul><li>![[lagoon-1.png]]</li><li>[[Dahallow]]</li></ul> | <ul><li>![[lagoon-2.png]]</li><li>[[Mantine]]</li></ul> | <ul><li>![[lagoon-3.png]]</li><li>[[Felmyr]]</li></ul> | ![[lagoon-4.png]] | ```
| [[Marsh Slime]] | <ul><li>![[marsh-1.png]]</li><li>[[Oshela]]</li></ul> | <ul><li>![[marsh-2.png]]</li><li>[[Vikogyna]]</li></ul> | <ul><li>![[marsh-3.png]]</li><li>[[Barrowmaw]]</li></ul> | ![[marsh-4.png]] |
| [[Sunflower Slime]] | <ul><li>![[sunflower-1.png]]</li><li>[[Calcetron]]</li></ul> | <ul><li>![[sunflower-2.png]]</li><li>[[Llasuki]]</li></ul> | <ul><li>![[sunflower-3.png]]</li><li>[[Blanchister]]</li></ul> | ![[sunflower-4.png]] | <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] + variant[1] as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery END -->

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[ababa-3.png]]' - '![[ababa-3.png]]'
- '[[Barrowmaw]]' - '[[Barrowmaw]]'
golden: '![[ababa-4.png]]' golden:
- '![[ababa-4.png]]'
- Everywhere
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[bark-3.png]]' - '![[bark-3.png]]'
- '[[Lekia]]' - '[[Lekia]]'
golden: '![[bark-4.png]]' golden:
- '![[bark-4.png]]'
- Everywhere
--- ---

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[garden-3.png]]' - '![[garden-3.png]]'
- '[[Dolfeyja]]' - '[[Dolfeyja]]'
golden: '![[garden-4.png]]' golden:
- '![[garden-4.png]]'
- Everywhere
--- ---

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[godot-3.png]]' - '![[godot-3.png]]'
- '[[Soljord]]' - '[[Soljord]]'
golden: '![[godot-4.png]]' golden:
- '![[godot-4.png]]'
- Everywhere
--- ---

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[honey-3.png]]' - '![[honey-3.png]]'
- '[[Mantine]]' - '[[Mantine]]'
golden: '![[honey-4.png]]' golden:
- '![[honey-4.png]]'
- Everywhere
--- ---

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[lagoon-3.png]]' - '![[lagoon-3.png]]'
- '[[Felmyr]]' - '[[Felmyr]]'
golden: '![[lagoon-4.png]]' golden:
- '![[lagoon-4.png]]'
- Everywhere
--- ---

View file

@ -8,7 +8,9 @@ variant2:
variant3: variant3:
- '![[sunflower-3.png]]' - '![[sunflower-3.png]]'
- '[[Blanchister]]' - '[[Blanchister]]'
golden: '![[sunflower-4.png]]' golden:
- '![[sunflower-4.png]]'
- Everywhere
--- ---

View file

@ -1,67 +1,19 @@
--- ---
--- ---
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", variant1 as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant| ````dataview
|------|---------|---------|---------|--------------| TABLE WITHOUT ID file.link as "Slimes", variant1[0] + variant[1] as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name
|[Ababa Slime](Ababa%20Slime.md)|<ul><li> ````
![ababa-1.png](..\..\Images\Slimes\ababa-1.png)</li><li>
[Batanoka](..\..\Countries\Batanoka.md)</li></ul>|<ul><li>
![ababa-2.png](..\..\Images\Slimes\ababa-2.png)</li><li>
[Faelani](..\..\Countries\Faelani.md)</li></ul>|<ul><li>
![ababa-3.png](..\..\Images\Slimes\ababa-3.png)</li><li>
[Barrowmaw](..\..\Countries\Barrowmaw.md)</li></ul>|![ababa-4.png](..\..\Images\Slimes\ababa-4.png)|
|[Bark Slime](Bark%20Slime.md)|<ul><li>
![bark-1.png](..\..\Images\Slimes\bark-1.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![bark-2.png](..\..\Images\Slimes\bark-2.png)</li><li>
[Gudoko](..\..\Countries\Gudoko.md)</li></ul>|<ul><li>
![bark-3.png](..\..\Images\Slimes\bark-3.png)</li><li>
[Lekia](..\..\Countries\Lekia.md)</li></ul>|![bark-4.png](..\..\Images\Slimes\bark-4.png)|
|[Garden Slime](Garden%20Slime.md)|<ul><li>
![garden-1.png](..\..\Images\Slimes\garden-1.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![garden-2.png](..\..\Images\Slimes\garden-2.png)</li><li>
[Soljord](..\..\Countries\Soljord.md)</li></ul>|<ul><li>
![garden-3.png](..\..\Images\Slimes\garden-3.png)</li><li>
[Dolfeyja](..\..\Countries\Dolfeyja.md)</li></ul>|![garden-4.png](..\..\Images\Slimes\garden-4.png)|
|[Godot Slime](Godot%20Slime.md)|<ul><li>
![godot-1.png](..\..\Images\Slimes\godot-1.png)</li><li>
[Gokolm](..\..\Countries\Gokolm.md)</li></ul>|<ul><li>
![godot-2.png](..\..\Images\Slimes\godot-2.png)</li><li>
[Dasona](..\..\Countries\Dasona.md)</li></ul>|<ul><li>
![godot-3.png](..\..\Images\Slimes\godot-3.png)</li><li>
[Soljord](..\..\Countries\Soljord.md)</li></ul>|![godot-4.png](..\..\Images\Slimes\godot-4.png)|
|[Honey Slime](Honey%20Slime.md)|<ul><li>
![honey-1.png](..\..\Images\Slimes\honey-1.png)</li><li>
[Dahallow](..\..\Countries\Dahallow.md)</li></ul>|<ul><li>
![honey-2.png](..\..\Images\Slimes\honey-2.png)</li><li>
[Krakala](..\..\Countries\Krakala.md)</li></ul>|<ul><li>
![honey-3.png](..\..\Images\Slimes\honey-3.png)</li><li>
[Mantine](..\..\Countries\Mantine.md)</li></ul>|![honey-4.png](..\..\Images\Slimes\honey-4.png)|
|[Lagoon Slime](Lagoon%20Slime.md)|<ul><li>
![lagoon-1.png](..\..\Images\Slimes\lagoon-1.png)</li><li>
[Dahallow](..\..\Countries\Dahallow.md)</li></ul>|<ul><li>
![lagoon-2.png](..\..\Images\Slimes\lagoon-2.png)</li><li>
[Mantine](..\..\Countries\Mantine.md)</li></ul>|<ul><li>
![lagoon-3.png](..\..\Images\Slimes\lagoon-3.png)</li><li>
[Felmyr](..\..\Countries\Felmyr.md)</li></ul>|![lagoon-4.png](..\..\Images\Slimes\lagoon-4.png)|
|[Marsh Slime](Marsh%20Slime.md)|<ul><li>
![marsh-1.png](..\..\Images\Slimes\marsh-1.png)</li><li>
[Oshela](..\..\Countries\Oshela.md)</li></ul>|<ul><li>
![marsh-2.png](..\..\Images\Slimes\marsh-2.png)</li><li>
[Vikogyna](..\..\Countries\Vikogyna.md)</li></ul>|<ul><li>
![marsh-3.png](..\..\Images\Slimes\marsh-3.png)</li><li>
[Barrowmaw](..\..\Countries\Barrowmaw.md)</li></ul>|![marsh-4.png](..\..\Images\Slimes\marsh-4.png)|
|[Sunflower Slime](Sunflower%20Slime.md)|<ul><li>
![sunflower-1.png](..\..\Images\Slimes\sunflower-1.png)</li><li>
[Calcetron](..\..\Countries\Calcetron.md)</li></ul>|<ul><li>
![sunflower-2.png](..\..\Images\Slimes\sunflower-2.png)</li><li>
[Llasuki](..\..\Countries\Llasuki.md)</li></ul>|<ul><li>
![sunflower-3.png](..\..\Images\Slimes\sunflower-3.png)</li><li>
[Blanchister](..\..\Countries\Blanchister.md)</li></ul>|![sunflower-4.png](..\..\Images\Slimes\sunflower-4.png)|
<!-- SerializedQuery END --> ````dataview
TABLE
variant1[0] AS variant0,
variant1[1] AS variant1
variant1[0] + variant1[1]
FROM "Animals/Slimes"
WHERE file.name != "_index"
````
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", variant1[0] + variant[1] as "Variant 1", variant2 as "Variant 2", variant3 as "Variant 3", golden as "Golden Variant" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->