diff --git a/Carola.md b/Carola.md deleted file mode 100644 index b28b04f..0000000 --- a/Carola.md +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/NPCs/Carola.md b/NPCs/Carola.md new file mode 100644 index 0000000..761f671 --- /dev/null +++ b/NPCs/Carola.md @@ -0,0 +1,24 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:23 +Tags: #npc +NPC Info +--- +Name: Carola +Age: +Title: +Race: +Class: +Aliases: [[]],[[]] +Locations: [[The Night Star Theater]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[]], [[]] + +Information +--- + +Lead actress in the Willow Maiden + + diff --git a/NPCs/Celia Lettiere.md b/NPCs/Celia Lettiere.md new file mode 100644 index 0000000..f94b4bd --- /dev/null +++ b/NPCs/Celia Lettiere.md @@ -0,0 +1,21 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:34 +Tags: #npc +NPC Info +--- +Name: Celia Lettiere +Age: +Title: +Race: +Class: +Aliases: [[]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[Conciri Meranzeum]], [[]] + +Information +--- + diff --git a/Clarence.md b/NPCs/Clarence.md similarity index 83% rename from Clarence.md rename to NPCs/Clarence.md index 82a950e..a6b7134 100644 --- a/Clarence.md +++ b/NPCs/Clarence.md @@ -19,4 +19,4 @@ Organization: [[]], [[]] Information --- -The current form of the [[the shapeshifter]] +The current form of the [[The Shapeshifter]] diff --git a/NPCs/Cosra.md b/NPCs/Cosra.md index f3b0269..3772eb5 100644 --- a/NPCs/Cosra.md +++ b/NPCs/Cosra.md @@ -13,7 +13,7 @@ Class: Locations: [[The Conciri Library]],[[]] Relatives: [[]], [[]] Connections: [[]], [[]] -Organization: [[Meranzi]], [[]] +Organization: [[Conciri Meranzeum]],[[]] Information --- diff --git a/NPCs/Elrithia Renfallan.md b/NPCs/Elrithia Renfallan.md new file mode 100644 index 0000000..8c2c94d --- /dev/null +++ b/NPCs/Elrithia Renfallan.md @@ -0,0 +1,23 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:32 +Tags: #npc +NPC Info +--- +Name: Elrithia Renfallan +Age: +Title: Arcanist +Race: +Class: +Aliases: [[]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[Conciri Meranzeum]], [[]] + +Information +--- + + +Publications: diff --git a/NPCs/Euphemia.md b/NPCs/Euphemia.md index 3d35b4a..ece7a30 100644 --- a/NPCs/Euphemia.md +++ b/NPCs/Euphemia.md @@ -22,7 +22,7 @@ Information High Abjurer Euphemia Moretti, Headmistress of the Institute of Wards, Sigils, Protections, and Counter Curses at The Conciri Meranzeum - +![[Euphemia Moretti.jpeg]] liten tynn gammel dame grått hår dratt over ørene sandaktig hudfarge diff --git a/NPCs/Poldi.md b/NPCs/Poldi.md index b22e89a..807d0bf 100644 --- a/NPCs/Poldi.md +++ b/NPCs/Poldi.md @@ -18,4 +18,6 @@ Organization: [[The Night Star Theater]], [[]] Information --- -Ung mann garnet rød hudfarge, amber øyne, en Tiefling. \ No newline at end of file +Ung mann garnet rød hudfarge, amber øyne, en Tiefling. + +Han attendet oss da vi var i [[The Night Star Theater]] i [[Session 67]] \ No newline at end of file diff --git a/NPCs/Rahier de Maromme.md b/NPCs/Rahier de Maromme.md new file mode 100644 index 0000000..56fa031 --- /dev/null +++ b/NPCs/Rahier de Maromme.md @@ -0,0 +1,21 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:34 +Tags: #npc +NPC Info +--- +Name: Rahier de Maromme +Age: +Title: High Transmuter +Race: +Class: +Aliases: [[]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[Conciri Meranzeum]], [[]] + +Information +--- + diff --git a/NPCs/Siniball Calvacanti.md b/NPCs/Siniball Calvacanti.md new file mode 100644 index 0000000..5597c7f --- /dev/null +++ b/NPCs/Siniball Calvacanti.md @@ -0,0 +1,21 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:34 +Tags: #npc +NPC Info +--- +Name: Siniball Calvacanti +Age: +Title: +Race: +Class: +Aliases: [[]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[Conciri Meranzeum]], [[]] + +Information +--- + diff --git a/NPCs/Tarnan Heartfield.md b/NPCs/Tarnan Heartfield.md new file mode 100644 index 0000000..997a9b4 --- /dev/null +++ b/NPCs/Tarnan Heartfield.md @@ -0,0 +1,21 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:33 +Tags: #npc +NPC Info +--- +Name: Tarnan Heartfield +Age: +Title: First Biologist +Race: +Class: +Aliases: [[]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[Conciri Meranzeum]], [[]] + +Information +--- + diff --git a/NPCs/The Shapeshifter.md b/NPCs/The Shapeshifter.md new file mode 100644 index 0000000..9d2f62a --- /dev/null +++ b/NPCs/The Shapeshifter.md @@ -0,0 +1,21 @@ +MetaData +--- +Date: 2023-10-27 +Time: 15:24 +Tags: #npc +NPC Info +--- +Name: the shapeshifter +Age: +Title: +Race: +Class: +Aliases: [[Clarence]],[[]] +Locations: [[]],[[]] +Relatives: [[]], [[]] +Connections: [[]], [[]] +Organization: [[]], [[]] + +Information +--- + diff --git a/Penelli Navara.md b/Penelli Navara.md deleted file mode 100644 index e69de29..0000000 diff --git a/Ink Spray Grotto.md b/Places/Ink Spray Grotto.md similarity index 100% rename from Ink Spray Grotto.md rename to Places/Ink Spray Grotto.md diff --git a/The Salty Siren.md b/Places/The Salty Siren.md similarity index 100% rename from The Salty Siren.md rename to Places/The Salty Siren.md diff --git a/Sessions/Session 67.md b/Sessions/Session 67.md index c80a7d8..d73ade7 100644 --- a/Sessions/Session 67.md +++ b/Sessions/Session 67.md @@ -57,7 +57,7 @@ Kan jeg bruke må preppe: * Locate Object * Moonbeam -Ari blir Carolas drinking buddy. +Ari blir [[Carola]]s drinking buddy. Cairne Valiant og Narthael går til en bar på brygga, finner diff --git a/Sessions/Session 68.md b/Sessions/Session 68.md index 314fd35..f6a7f57 100644 --- a/Sessions/Session 68.md +++ b/Sessions/Session 68.md @@ -34,7 +34,7 @@ Sidenote: Ser nå at Polymorph ikke har en effekt på shapechangers. Det kan være en måte å detecte en shapechanger uten å gjøre masse damage. -Vi blir konfrontert af guarden fra auksjonen, det er shapeshifteren vår. +Vi blir konfrontert av guarden fra auksjonen, det er shapeshifteren vår. It's [[The Shapeshifter]] diff --git a/the shapeshifter.md b/the shapeshifter.md deleted file mode 100644 index e69de29..0000000 diff --git a/zMedia/Euphemia Moretti.jpeg b/zMedia/Euphemia Moretti.jpeg new file mode 100644 index 0000000..acacb81 Binary files /dev/null and b/zMedia/Euphemia Moretti.jpeg differ