From f90c891bcebfd4f46312ee9e4b2c5cda189c75e0 Mon Sep 17 00:00:00 2001 From: Ava Date: Tue, 25 Jul 2023 12:21:23 -0400 Subject: [PATCH] Variable invoker texts --- code/game/gamemodes/cult/arcane_tome.dm | 4 +++- code/game/gamemodes/cult/runes/_rune.dm | 2 ++ code/game/gamemodes/cult/runes/sacrifice.dm | 3 ++- nano/templates/arcane_tome.tmpl | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cult/arcane_tome.dm b/code/game/gamemodes/cult/arcane_tome.dm index 4b7c7fb3e23..a2f93cb59df 100644 --- a/code/game/gamemodes/cult/arcane_tome.dm +++ b/code/game/gamemodes/cult/arcane_tome.dm @@ -63,9 +63,11 @@ if (!initial(NR.can_write)) continue var/obj/item/paper/talisman/T = initial(NR.talisman_path) + var/req_invokers = initial(NR.required_invokers) + var/invokers_text = initial(NR.invokers_text) runes[++runes.len] = list( "name" = initial(NR.rune_name), - "invokers" = initial(NR.required_invokers), + "invoker_data" = invokers_text != null ? invokers_text : (req_invokers > 1 ? req_invokers : null), "talisman" = T ? initial(T.tome_desc) : null, "shorthand" = initial(NR.rune_shorthand) ? initial(NR.rune_shorthand) : initial(NR.rune_desc), "typepath" = NR diff --git a/code/game/gamemodes/cult/runes/_rune.dm b/code/game/gamemodes/cult/runes/_rune.dm index e850001290a..2c1236cba80 100644 --- a/code/game/gamemodes/cult/runes/_rune.dm +++ b/code/game/gamemodes/cult/runes/_rune.dm @@ -20,6 +20,8 @@ var/obj/item/paper/talisman/talisman_path /// How many cultists need to be adjacent to this rune and able to speak in order to activate it. var/required_invokers = 1 + /// If non-null, this will be displayed in the rune's tome description instead of the invoker number. + var/invokers_text /// The actual name of this rune (like "Sacrifice", "Convert", or so on), shown to cultists or ghosts that examine it. var/rune_name /// Very short description of the rune's functionality, to be shown as a tooltip in the tome. diff --git a/code/game/gamemodes/cult/runes/sacrifice.dm b/code/game/gamemodes/cult/runes/sacrifice.dm index 619a6171aff..61299564b53 100644 --- a/code/game/gamemodes/cult/runes/sacrifice.dm +++ b/code/game/gamemodes/cult/runes/sacrifice.dm @@ -1,9 +1,10 @@ /obj/effect/rune/sacrifice rune_name = "Sacrifice" rune_desc = "Offer a living thing or a body to the Geometer of Blood. Living beings require three invokers to sacrifice, while dead beings require only one." - rune_shorthand = "Offers a creature to the Geometer for consumption." + rune_shorthand = "Offers a creature to the Geometer for consumption. Living beings require three invokers; dead being require only one." circle_words = list(CULT_WORD_HELL, CULT_WORD_BLOOD, CULT_WORD_JOIN) invocation = "Barhah hra zar'garis!" + invokers_text = "1 or 3" var/mob/living/sacrificing /// Fetches a sacrifice on top of this rune, aiming for the most "valuable" one (by way of species rarity, role, objective, and so on). diff --git a/nano/templates/arcane_tome.tmpl b/nano/templates/arcane_tome.tmpl index 0dcd93af22d..424b372fc95 100644 --- a/nano/templates/arcane_tome.tmpl +++ b/nano/templates/arcane_tome.tmpl @@ -17,7 +17,7 @@

The tome is an essential tool, and every cultist should have one unless they have a good reason not to. It's small enough to fit into pockets, webbing, and so on, so it should be easy to find a place to squeeze it. That being said, arcane tomes are strange things to nonbelievers, and security may become concerned if they see one, especially near runes; try and keep it concealed.

- If need be, your tome can serve as a weapon as well. Simply switch to Harm intent and attack your foes with it to deal burn damage. Naturally, it will be abundantly obvious to the target that you are doing something otherworldly and very harmful. + If need be, your tome can serve as a weapon as well. Simply switch to Harm intent and attack your foes with it to deal burn damage. Naturally, doing so will be abundantly obvious to your target and everyone around. {{else data.archive == 2}} Runes are eldritch scrawlings, etched with precise shapes and words to invoke the power of Nar-Sie. They are the primary source of your power as a cultist, and they allow you to perform anomalous feats akin to magic. Some runes can be made into talismans that offer something akin to their abilities in a more portable form.

@@ -49,8 +49,8 @@
{{:value.shorthand}}
- {{if value.invokers > 1}} -
Required invokers - {{:value.invokers}} + {{if value.invoker_data}} +
Required invokers - {{:value.invoker_data}} {{/if}} {{if value.talisman}}
Talisman effect - {{:value.talisman}} @@ -63,7 +63,7 @@
Entries marked with an asterisk (*) can be made into a talisman.

{{for data.runes}} - {{:helper.link(value.name + (value.talisman ? " *" : "") + (value.invokers > 1 ? " (" + value.invokers + " invokers)" : ""), null, { "write_rune" : value.typepath })}} + {{:helper.link(value.name + (value.talisman ? " *" : "") + (value.invoker_data ? " (" + value.invoker_data + " invokers)" : ""), null, { "write_rune" : value.typepath })}} {{/for}}
{{/if}}