Skip to content

Commit 359a189

Browse files
committed
Merge branch 'v4' of github.com:jcoffa/ObsiDnD into v4
2 parents 73b9c34 + a16b42d commit 359a189

5 files changed

Lines changed: 332 additions & 270 deletions

File tree

content/.obsidian/plugins/quickadd/data.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,13 @@
156156
"setFileExistsBehavior": false
157157
}
158158
],
159+
"macros": [],
159160
"inputPrompt": "single-line",
160161
"devMode": false,
161162
"templateFolderPath": "z_Templates",
162163
"announceUpdates": "major",
163-
"version": "2.9.4",
164-
"globalVariables": {},
165-
"onePageInputEnabled": false,
164+
"version": "1.8.1",
166165
"disableOnlineFeatures": true,
167-
"enableRibbonIcon": false,
168-
"showCaptureNotification": true,
169-
"showInputCancellationNotification": false,
170-
"enableTemplatePropertyTypes": false,
171166
"ai": {
172167
"defaultModel": "Ask me",
173168
"defaultSystemPrompt": "As an AI assistant within Obsidian, your primary goal is to help users manage their ideas and knowledge more effectively. Format your responses using Markdown syntax. Please use the [[Obsidian]] link format. You can write aliases for the links by writing [[Obsidian|the alias after the pipe symbol]]. To use mathematical notation, use LaTeX syntax. LaTeX syntax for larger equations should be on separate lines, surrounded with double dollar signs ($$). You can also inline math expressions by wrapping it in $ symbols. For example, use $$w_{ij}^{\text{new}}:=w_{ij}^{\text{current}}+etacdotdelta_jcdot x_{ij}$$ on a separate line, but you can write \"($eta$ = learning rate, $delta_j$ = error term, $x_{ij}$ = input)\" inline.",
@@ -257,5 +252,10 @@
257252
"migrateFileOpeningSettings": true,
258253
"setProviderModelDiscoveryMode": true
259254
},
260-
"macros": []
255+
"globalVariables": {},
256+
"onePageInputEnabled": false,
257+
"enableRibbonIcon": false,
258+
"showCaptureNotification": true,
259+
"showInputCancellationNotification": false,
260+
"enableTemplatePropertyTypes": false
261261
}

content/PCs/The Collector.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,46 @@ Wearing a nice vest, a tie, and spectacles. His mutton chops connect with his mo
1818
##### The Collector's Journal
1919

2020
- Entry 1 - *"A fascinating group so far Father, it happened just like the stories you use to tell. A group of capable heroes all ending up in the right place at the right time. I see potential in each and every one of them, and I have arrived in the Frozen Marches! You always said we would travel here one day, I have even met someone who knows of the Observatory you mentioned. I'm excited to explore it more, and see what treasures are hidden there that are in need of collecting."*
21+
- Entry 2 - *"I was thinking about you today Father, waking up in the tomb, completing it's many levels with my new allies and learning some lost history. It reminded me of our many expeditions. This party is filling the gap you had left after your passing, but they are not you Father. Everyday I learn something new about this group and I wonder about fate. You've spoken on fate before, but I never truly understood it until today. There is something acting on us here, something has drawn us all together, and appears to be pulling us towards something, legendary. It's exciting! Our shared story has already begun, I only wish that you could have been apart of it."*
2122

2223

2324
---
2425

2526

2627

28+
2729
### The Museum Plans
2830

2931
- Tilly's description must have the quote she provided me on our first interaction *"I breathe the Earth, and the Earth breaths with me"* - An amazing quote from an already great and powerful druid.
32+
- Garrison is a fantastic marvel! I am sure his statue will hold great value for all attendees, as well as his ideals. Garrison mentioned his *need* to protect, his *urge* to, that's going to draw in some good numbers. He even values the monsters, sparing the life of that Toppleganger, for a being that may not have a heart like yours or mine, Garrison's heart holds room for all he comes across that walk the path of good.
3033

3134
##### Future Legendary Party
3235

3336
- [[Zrandovorski]] - I would have preferred a sorcerer like Father, but a wizard is a nice surprise! Hopefully his knowledge can lead us to new heights, or better yet, forgotten lore! He's an odd fellow, but he has good in his heart and an adventurer's curiosity a perfect fit for the team I wish to build.
3437
- [[Tilly]] - I am curious to explore this young druids already rich backstory. That initial mission in Utopia revealed quite a bit, she reminds me of a younger version of myself after Father's passing. I hope our group can assist her in her mission. On another note, she's quite the killer, those rumors on the power of druids was no joke, Tilly packs a punch, I am not worried for any of us with her on our side.
3538
- [[Blake]] - Still a lot to learn about this quiet Rogue. He doesn't talk to much, but that's perfect! A quiet rogue that's able to act when a situation requires is incredibly ideal! He has the look, and he may still have learning to do, but he's a skilled killer, one I am glad is on our side.
3639
- [[Garrison]] - A warforged is an amazing find. I didn't get to learn a lot about this fascinating creation, but it's clear he has a kind soul. His curiosity about son, care for the townsfolk, they fit the role of a gentle giant very well. I'm excited to see their skills in combat, and learn more about there origins, hopefully N.G and Garrison allow me to learn what makes him tick.
37-
- [[NG]] - Something feels familiar about this Elf. Seems to be the only member of the group I could relate my older soul with, but he's a wizard with tools. His skills are surprising me, and access to magic, I am honestly not sure what he is yet but he fits a lot of required roles. I am excited to learn more about where he comes from, perhaps we have a piece of shared history.
40+
- [[NG]] - Something feels familiar about this Elf. Seems to be the only member of the group I could relate my older soul with, but he's a wizard with tools. His skills are surprising me, and access to magic, I am honestly not sure what he is yet but he fits a lot of required roles. I am excited to learn more about where he comes from, perhaps we have a piece of shared history.
41+
42+
43+
44+
# Son
45+
46+
- **Played By:** Brodie with party commentary
47+
- **Class:** The Coolest little guy
48+
- **Species:** Quasit (current form)
49+
- **Sessions Active:** [[Session 0]] - [[Session 2]] / [[Session 2]] - present
50+
- **Age:** Unknown
51+
52+
53+
54+
Father said I am a part of the the party too so that means I get to write in the journal! I am happy I get to write, I have not gotten to write before, sometimes when I think to fast, it's like I am writing words into my head.
55+
56+
##### The people that Father follows
57+
58+
- [[Zrandovorski]] - He's really red. I thought he was bleeding, or just really embarrassed but I think that's just his face. He told me about the rats in the snow, so I like him.
59+
- [[Tilly]] - I like Tilly, she let me climb onto her back and rubbed my head funny.
60+
- [[Blake]] - He is like a shadow, I get scared when I remember he is still there. Very quiet man, not like Father, which is a good thing.
61+
- [[Garrison]] - I wonder what he would taste like.
62+
- [[NG]] - Elf
63+
- [[The Collector|Father]] - Father is a kind man. He told me to write that, so I did.
210 KB
Loading

0 commit comments

Comments
 (0)