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
19 changed files with 64 additions and 29 deletions
Showing only changes of commit 2f3e28e346 - Show all commits

View file

@ -229,8 +229,6 @@
},
"active": "99690ee270617d17",
"lastOpenFiles": [
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Sunflower Slime.md",
"Animals/Slimes/Marsh Slime.md",
"Animals/Slimes/Lagoon Slime.md",
@ -238,6 +236,8 @@
"Animals/Slimes/Godot Slime.md",
"Animals/Slimes/Garden Slime.md",
"Animals/Slimes/Bark Slime.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/_index.md",
"Countries/Felmyr.md",
"Countries/Llasuki.md",
"conflict-files-obsidian-git.md",

View file

@ -11,6 +11,8 @@ variant3:
golden:
- "![[ababa-4.png]]"
- Everywhere
rarity: Common
type: Cold
---
# On the Ababa Slime

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[bark-4.png]]"
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[garden-4.png]]"
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[godot-4.png]]"
- Everywhere
rarity: Uncommon
type: Stone
---

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[honey-4.png]]"
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[lagoon-4.png]]"
- Everywhere
rarity: Common
type: Water
---

View file

@ -8,5 +8,8 @@ variant2:
variant3:
- "![[marsh-3.png]]"
- "[[Barrowmaw]]"
golden: "![[marsh-4.png]]"
golden:
- "![[marsh-4.png]]"
rarity: Common
type: Nature
---

View file

@ -11,4 +11,6 @@ variant3:
golden:
- "![[sunflower-4.png]]"
- Everywhere
rarity: Common
type: Nature
---

View file

@ -1,14 +1,14 @@
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", rarity as "Rarity", type as "Type" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", rarity as "Rarity", type as "Type" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
```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
```
```dataview
TABLE
"![[ " + (variant1[0] + \" \") + "]]",
" " + variant1[1] AS "Combined"
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 -->
| Slimes | Rarity | Type |
| ------------------------------------------------------ | -------- | ------ |
| [[Ababa Slime]] | Common | Cold |
| [[Bark Slime]] | Common | Nature |
| [[Garden Slime]] | Common | Nature |
| [[Godot Slime]] | Uncommon | Stone |
| [[Honey Slime]] | Common | Nature |
| [[Lagoon Slime]] | Common | Water |
| [[Marsh Slime]] | Common | Nature |
| [[Sunflower Slime]] | Common | Nature |
<!-- SerializedQuery END -->

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[ababa-4.png]]'
- Everywhere
rarity: Common
type: Cold
---
# On the Ababa Slime

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[bark-4.png]]'
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[garden-4.png]]'
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[godot-4.png]]'
- Everywhere
rarity: Uncommon
type: Stone
---

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[honey-4.png]]'
- Everywhere
rarity: Common
type: Nature
---

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[lagoon-4.png]]'
- Everywhere
rarity: Common
type: Water
---

View file

@ -8,7 +8,10 @@ variant2:
variant3:
- '![[marsh-3.png]]'
- '[[Barrowmaw]]'
golden: '![[marsh-4.png]]'
golden:
- '![[marsh-4.png]]'
rarity: Common
type: Nature
---

View file

@ -11,6 +11,8 @@ variant3:
golden:
- '![[sunflower-4.png]]'
- Everywhere
rarity: Common
type: Nature
---

View file

@ -1,18 +1,19 @@
---
---
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", rarity as "Rarity", type as "Type" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", rarity as "Rarity", type as "Type" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
````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
````
|Slimes|Rarity|Type|
|------|------|----|
|[Ababa Slime](Ababa%20Slime.md)|Common|Cold|
|[Bark Slime](Bark%20Slime.md)|Common|Nature|
|[Garden Slime](Garden%20Slime.md)|Common|Nature|
|[Godot Slime](Godot%20Slime.md)|Uncommon|Stone|
|[Honey Slime](Honey%20Slime.md)|Common|Nature|
|[Lagoon Slime](Lagoon%20Slime.md)|Common|Water|
|[Marsh Slime](Marsh%20Slime.md)|Common|Nature|
|[Sunflower Slime](Sunflower%20Slime.md)|Common|Nature|
````dataview
TABLE
"![[ " + (variant1[0] + \" \") + "]]",
" " + variant1[1] AS "Combined"
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 -->
<!-- SerializedQuery END -->