From 6fe58fbe14e8681026cfef16a8bac4fb2b40ff2a Mon Sep 17 00:00:00 2001 From: "wych(witch)" Date: Fri, 24 May 2024 22:14:04 -0500 Subject: [PATCH] [PUBLISHER] Merge #40 * PUSH NOTE : Races Landing.md * PUSH NOTE : Iscin.md * PUSH NOTE : Zilver.md * PUSH NOTE : Varis.md * PUSH NOTE : People Landing.md * PUSH NOTE : Moonie.md * PUSH NOTE : Elowyn.md * PUSH NOTE : Dunn.md * PUSH NOTE : Corrick.md * PUSH NOTE : Axiom.md * PUSH NOTE : Wizard.md * PUSH NOTE : Wizard Spells.md * PUSH NOTE : Thief.md * PUSH NOTE : Ranger.md * PUSH NOTE : Paladin.md * PUSH NOTE : Moves Landing.md * PUSH NOTE : Fighter.md * PUSH NOTE : Immolator.md * PUSH NOTE : Druid.md * PUSH NOTE : Cleric.md * PUSH NOTE : Bard.md * PUSH NOTE : Cleric Spells.md * PUSH NOTE : Barbarian.md * PUSH NOTE : Followers.md * PUSH NOTE : Favor.md * PUSH NOTE : Mysteries.md * PUSH NOTE : Fallen Suns.md * PUSH NOTE : Havenloft.md * PUSH NOTE : Hisa.md * PUSH NOTE : Bycrest.md * PUSH NOTE : Bur-Vusamyr.md * PUSH NOTE : Ash In the Snow Landing.md * DELETE FILE : content/Learning/Math/Trigonometry/Trigonometry Identities.md --- content/Geography/Havenloft.md | 6 +++ .../Trigonometry/Trigonometry Identities.md | 5 -- content/People/Axiom.md | 4 +- content/People/Corrick.md | 14 +++-- content/People/Dunn.md | 5 +- content/People/Elowyn.md | 4 +- content/People/Iscin.md | 53 +++++++++++++++++++ content/People/Moonie.md | 4 +- content/People/People Landing.md | 11 ++-- content/People/Varis.md | 17 ++++-- content/People/Zilver.md | 6 +-- content/index.md | 1 + 12 files changed, 104 insertions(+), 26 deletions(-) create mode 100644 content/Geography/Havenloft.md delete mode 100644 content/Learning/Math/Trigonometry/Trigonometry Identities.md create mode 100644 content/People/Iscin.md diff --git a/content/Geography/Havenloft.md b/content/Geography/Havenloft.md new file mode 100644 index 000000000..536886504 --- /dev/null +++ b/content/Geography/Havenloft.md @@ -0,0 +1,6 @@ +--- +created: 2024-05-24 21:48 +modified: 2024-05-24T21:49:32-05:00 +publish-ash: true +--- +Havenloft is a large continent north \ No newline at end of file diff --git a/content/Learning/Math/Trigonometry/Trigonometry Identities.md b/content/Learning/Math/Trigonometry/Trigonometry Identities.md deleted file mode 100644 index 5156b2f32..000000000 --- a/content/Learning/Math/Trigonometry/Trigonometry Identities.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -publish-ash: true -modified: 2024-04-15T11:46:31.941-05:00 -created: 2024-04-15T11:40:00 ---- diff --git a/content/People/Axiom.md b/content/People/Axiom.md index f41701dc1..921f22b06 100644 --- a/content/People/Axiom.md +++ b/content/People/Axiom.md @@ -8,11 +8,11 @@ DEX: 0.1 INT: 0 WIS: 0 CHA: 0 -ash-class: +ash-class: "[[Loose Notes/old vault/10 - Ash In The Snow/12 - Resources/12.01 - SRD/Wizard|Wizard]] (Archivist)" short-desc: A brilliant scholar from [[Bur-Vusamyr|Bur-Vusamyr]]. Travelling with [[Ash In the Snow/People/Axiom|Axiom]] and [[Ash In the Snow/People/Zilver|Zilver]], with Zilver as their ward. pronouns: race: Dragonborn -modified: 2024-03-29T16:49 +modified: 2024-05-24T22:12:20-05:00 created: 2024-01-01T00:00 --- diff --git a/content/People/Corrick.md b/content/People/Corrick.md index 5321e5809..133396f90 100644 --- a/content/People/Corrick.md +++ b/content/People/Corrick.md @@ -3,13 +3,21 @@ tags: - person/pc shortRepo: ash publish-ash: true +player: Kino STR: 0 DEX: 0 INT: 0 WIS: 0 CHA: 0 +pronouns: He/Him +race: Human +ash-class: "[[Ash In the Snow/Meta/Moves/Fighter|Fighter]]" +occupation: +age: +hometown: +relations: created: 2024-01-01T00:00 -modified: 2024-05-12T20:20:58-05:00 +modified: 2024-05-24T22:03:06-05:00 cssclasses: - page-white --- @@ -19,8 +27,8 @@ cssclasses: > | | | > | -------------- | ---------------- | > |**Aliases** | | -> |**Pronouns** | | -> |**Race** | | +> |**Pronouns** | He/Him | +> |**Race** | Human | > |**Age** | | > |**Occupation** | | > |**Hometown**|| diff --git a/content/People/Dunn.md b/content/People/Dunn.md index 5a68084d7..747cf51ec 100644 --- a/content/People/Dunn.md +++ b/content/People/Dunn.md @@ -9,10 +9,11 @@ INT: 0 WIS: 0 CHA: 0 created: 2024-01-01T00:00 -modified: 2024-04-22T11:18:38-05:00 +modified: 2024-05-24T22:05:32-05:00 ash-class: "[[Ash In the Snow/Meta/Moves/Cleric|Cleric]]" race: Human pronouns: He/Him +age: late 20s --- > [!infobox] @@ -22,7 +23,7 @@ pronouns: He/Him > |**Aliases** | - | > |**Pronouns** | He/Him | > |**Race** | Human | -> |**Age** | | +> |**Age** | late 20s | > |**Occupation** | | > |**Hometown**|| > diff --git a/content/People/Elowyn.md b/content/People/Elowyn.md index 7a18b55a3..d77cc9f64 100644 --- a/content/People/Elowyn.md +++ b/content/People/Elowyn.md @@ -19,7 +19,9 @@ hometown: age: relations: created: 2024-04-22T11:00:00 -modified: 2024-04-22T11:17:09-05:00 +modified: 2024-05-24T22:03:27-05:00 +cssclasses: + - page-white --- > [!infobox] diff --git a/content/People/Iscin.md b/content/People/Iscin.md new file mode 100644 index 000000000..15db358ab --- /dev/null +++ b/content/People/Iscin.md @@ -0,0 +1,53 @@ +--- +tags: + - person/pc +shortRepo: ash +publish-ash: true +player: Octobr +STR: 0 +DEX: 0 +INT: 0 +WIS: 0 +CHA: 0 +pronouns: She/Her +short-desc: A tall, lone wolf of an Elf and a wry smile. +ash-class: "[[Immolator]]" +ash-aliases: +race: Elf +occupation: Seems to currently be a hired hand around Brookhaven. +hometown: +age: " 20smth 30smth" +relations: +created: 2024-05-24T21:47:00 +modified: 2024-05-24T21:59:12-05:00 +--- + +> [!infobox] +> ###### Bio +> | | | +> | -------------- | ---------------- | +> |**Aliases** | | +> |**Pronouns** | She/Her | +> |**Race** | Elf | +> |**Age** | 20smth 30smth | +> |**Occupation** | Seems to currently be a hired hand around Brookhaven. | +> |**Hometown**|| +> +> ##### Relations +> | | | +> | -------------- | ------------------------- | +> +> ##### Stats +> | | | +> | ---- | ---- | +> | **STR** | 0 | +> | **DEX** | 0 | +> | **INT** | 0 | +> | **WIS** | 0 | +> | **CHA** | 0 | + + +A tall, lone wolf of an Elf and a wry smile. + + + \ No newline at end of file diff --git a/content/People/Moonie.md b/content/People/Moonie.md index 84fab9a68..4eab8975f 100644 --- a/content/People/Moonie.md +++ b/content/People/Moonie.md @@ -8,6 +8,8 @@ DEX: 0 INT: 0 WIS: 0 CHA: 0 +race: Dragonborn +ash-class: "[[Ash In the Snow/Meta/Moves/Barbarian|Barbarian]]" --- > [!infobox] @@ -16,7 +18,7 @@ CHA: 0 > | -------------- | ---------------- | > |**Aliases** | | > |**Pronouns** | | -> |**Race** | | +> |**Race** | Dragonborn | > |**Age** | | > |**Occupation** | | > |**Hometown**|| diff --git a/content/People/People Landing.md b/content/People/People Landing.md index 915ac274f..646076e83 100644 --- a/content/People/People Landing.md +++ b/content/People/People Landing.md @@ -2,10 +2,10 @@ publish-ash: true --- ## Player Characters -- [[./Axiom|Axiom]]: +- [[./Axiom|Axiom]] [ [[Loose Notes/old vault/10 - Ash In The Snow/12 - Resources/12.01 - SRD/Wizard|Wizard]] (Archivist) ]: - A brilliant scholar from [[Bur-Vusamyr|Bur-Vusamyr]]. Travelling with [[Ash In the Snow/People/Axiom|Axiom]] and [[Ash In the Snow/People/Zilver|Zilver]], with Zilver as their ward. -- [[./Corrick|Corrick]]: +- [[./Corrick|Corrick]] [ He/Him [[../Meta/Moves/Fighter|Fighter]] ]: - \- - [[./Dunn|Dunn]] [ He/Him [[../Meta/Moves/Cleric|Cleric]] ]: @@ -14,10 +14,13 @@ publish-ash: true - [[./Elowyn|Elowyn]] [ She/Her [[../Meta/Moves/Druid|Druid]] ]: - A sweet little old rabbitfolk druid -- [[./Moonie|Moonie]]: +- [[./Iscin|Iscin]] [ She/Her [[../Meta/Moves/Immolator|Immolator]] ]: + - A tall, lone wolf of an Elf and a wry smile. + +- [[./Moonie|Moonie]] [ [[../Meta/Moves/Barbarian|Barbarian]] ]: - \- -- [[./Varis|Varis]]: +- [[./Varis|Varis]] [ He/Him [[../Meta/Moves/Bard|Bard]] ]: - \- - [[./Zilver|Zilver]] [ He/They [[../Meta/Moves/Wizard|Wizard]] ]: diff --git a/content/People/Varis.md b/content/People/Varis.md index 205c489d3..eeec16779 100644 --- a/content/People/Varis.md +++ b/content/People/Varis.md @@ -9,7 +9,14 @@ INT: 0 WIS: 0 CHA: 0 created: 2024-01-01T00:00 -modified: 2024-03-29T16:49 +modified: 2024-05-24T22:09:16-05:00 +pronouns: He/Him +ash-class: "[[Ash In the Snow/Meta/Moves/Bard|Bard]]" +race: Elf/Tiefling +cssclasses: + - page-white +age: "36" +occupation: Diplomatic Attaché of the City of Hillcrest --- > [!infobox] @@ -17,10 +24,10 @@ modified: 2024-03-29T16:49 > | | | > | -------------- | ---------------- | > |**Aliases** | | -> |**Pronouns** | | -> |**Race** | | -> |**Age** | | -> |**Occupation** | | +> |**Pronouns** | He/Him | +> |**Race** | Elf/Tiefling | +> |**Age** | 36 | +> |**Occupation** | Diplomatic Attaché of the City of Hillcrest | > |**Hometown**|| > > ##### Relations diff --git a/content/People/Zilver.md b/content/People/Zilver.md index b648bb067..4a250270f 100644 --- a/content/People/Zilver.md +++ b/content/People/Zilver.md @@ -13,13 +13,13 @@ pronouns: He/They short-desc: A supposed prince from [[Bur-Vusamyr|Bur-Vusamyr]]. [[Ash In the Snow/People/Axiom|Axiom]] and [[Ash In the Snow/People/Moonie|Moonie]] are their companions. ash-class: "[[Ash In the Snow/Meta/Moves/Wizard|Wizard]]" ash-aliases: -race: +race: Human/Dragon(?) occupation: hometown: "[[Ash In The Snow/Locations/Tsurian Region/Ber-Vusamyr/Ber-Vusamyr|Ber-Vusamyr]]" age: relations: "[[Ash In the Snow/People/Axiom|Axiom]] and" created: 2024-01-01T00:00 -modified: 2024-03-29T16:49 +modified: 2024-05-24T22:09:58-05:00 --- > [!infobox] @@ -28,7 +28,7 @@ modified: 2024-03-29T16:49 > | -------------- | ---------------- | > |**Aliases** | | > |**Pronouns** | He/They | -> |**Race** | | +> |**Race** | Human/Dragon(?) | > |**Age** | | > |**Occupation** | | > |**Hometown**|[[Ash In The Snow/Locations/Tsurian Region/Ber-Vusamyr/Ber-Vusamyr|Ber-Vusamyr]]| diff --git a/content/index.md b/content/index.md index 16d068356..4a30ffca6 100644 --- a/content/index.md +++ b/content/index.md @@ -21,6 +21,7 @@ This is a world of snow and warmth. A world of disconnection and unbreakable bon - [[./People/Corrick|Corrick]] - [[./People/Dunn|Dunn]] - [[./People/Elowyn|Elowyn]] +- [[./People/Iscin|Iscin]] - [[./People/Moonie|Moonie]] - [[./People/Varis|Varis]] - [[./People/Zilver|Zilver]]