Skip to content

Some issues for the Wispen Testament and others. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IwasConfused wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Some issues for the Wispen Testament and others. #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75d7010
Change the text to a translatable string.
IwasConfused May 10, 2025
60a7da8
Added 3 strings for item transfer node gui.
IwasConfused May 10, 2025
52023b2
Fix some readability issues.
IwasConfused May 10, 2025
98b9b40
Added recipe and removed blank.
IwasConfused May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/resources/assets/affinity/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,9 @@
"color": "yellow"
}
],
"gui.affinity.item_transfer_node.ignore_damage":"Ignore damage",
"gui.affinity.item_transfer_node.ignore_data":"Ignore data",
"gui.affinity.item_transfer_node.invert_filter":"Invert filter",

"advancement.affinity.root.title": "Affinity",
"advancement.affinity.root.description": "Tomfoolery awaits",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ functionality...{}
needs some time to recover{}, to prevent a painful death as outlined previously.


All such items (like the numerous [Staffs](^affinity:staffs)), have their usage costs {concept}outlined in their tooltip{}.
All such items (like the numerous [Staffs](^affinity:staff_prototyping)), have their usage costs {concept}outlined in their tooltip{}.

---

Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/assets/affinity/lavender/entries/wispen_testament/aethum_flux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Of course, further required is a means of...

@next-page

...forming flux (of which there are numerous) - the [Matter Harvesting Hearth](^affinity:matter_harvesting_heart)
...forming flux (of which there are numerous) - the [Matter Harvesting Hearth](^affinity:matter_harvesting_hearth)
might present a good starting point.


Expand Down
3 changes: 0 additions & 3 deletions ...es/assets/affinity/lavender/entries/wispen_testament/crystallized_experience.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ leaving behind some sugary {item}Crystallized Experience{}.

@next-page


;;;;;

Consuming this clump once more {concept}restores 30 levels worth of experience{} - precisely the amount it took to create
it in the first place.

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/affinity/lavender/entries/wispen_testament/inquiry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Being able to obtain detailed information about all sorts of magical contraption


The {item}Wand of Inquiry{} (in a certain sense not much more than an educated {item}Eye of Ender{} strapped to an
[Uncanny Rod](^affinity:uncanny_rod)), thus, is an instrument designed precisely for this purpose.
[Uncanny Rod](^affinity:wand_of_iridescence)), thus, is an instrument designed precisely for this purpose.

;;;;;

Expand Down
14 changes: 8 additions & 6 deletions ...esources/assets/affinity/lavender/entries/wispen_testament/socle_composition.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
A specialized device is required to assemble the imposing columns of stone, adorned with a special material, that are
{item}Ritual Socles{}.

<recipe;affinity:assembly/ritual_socle_composer>
<recipe;affinity:assembly/infused_stone>

;;;;;

Expand All @@ -30,14 +30,16 @@ Eerily similar in appearance and function to a {item}Stonecutter{}, the {item}Ri

@next-page


<recipe;affinity:assembly/ritual_socle_composer>


At this time, the following three materials are known to produce admissible {concept}socle ornaments{}:

;;;;;

<recipe;affinity:ornament_carving/stone_socle_ornament>
<recipe;affinity:ornament_carving/prismarine_socle_ornament>
<recipe;affinity:ornament_carving/purpur_socle_ornament>

;;;;;

They provide, in the order listed, an {concept}increasing boost to the stability{} of a ritual's flux-field.

@entry-end
They provide, in the order listed, an {concept}increasing boost to the stability{} of a ritual's flux-field.
7 changes: 7 additions & 0 deletions ...ources/assets/affinity/lavender/entries/wispen_testament/wand_of_iridescence.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,18 @@ form networks like those employed to create, transport and process [Aethum Flux]

;;;;;

<recipe;affinity:assembly/uncanny_rod>


<recipe;affinity:assembly/emerald_wand_of_iridescence>

@next-page

To do this, {concept}use the wand on two blocks in succession{} to either create or release the link between them.


If you need to join multiple blocks to the same hub, {concept}right-click the wand in your inventory{} to make it
remember the initial block.

@entry-end

2 changes: 1 addition & 1 deletion ...main/resources/assets/affinity/lavender/entries/wispen_testament/wisp_forest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Hardly any reliable methods to {concept}locate a Wisp Forest{} are known - keepi

The presence of said {concept}Azalea Trees{} in the {concept}Wisp Forests{} is hardly a coincidence - it is due to
the same [Aethum](^affinity:aethum){concept}-affine properties{} which make their wood the perfect material for
[Staffs](^affinity:staffs).
[Staffs](^affinity:staff_prototyping).

@entry-end

8 changes: 4 additions & 4 deletions src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
```

Found swarming the vast expanses of the [Wisp Forests](^affinity:wisp_forests) and the former's namesake, the
Found swarming the vast expanses of the [Wisp Forests](^affinity:wisp_forest) and the former's namesake, the
{concept}Wisps{} are a curious species. Born of [Aethum](^affinity:aethum), they exhibit only mostly-physical form
and an innate affinity for all things magical.

Expand All @@ -37,7 +37,7 @@ discussed on the following pages.
The {concept}Inert Wisp{} is the most frequent and least distinguished of the bunch.


They move in small groups all over the [Wisp Forest](^affinity:wisp_forests), not interested in anything and of no
They move in small groups all over the [Wisp Forest](^affinity:wisp_forest), not interested in anything and of no
greater interest to anybody either.


Expand All @@ -58,7 +58,7 @@ qualities of the others.
<|item-spotlight@lavender:book_components|item=affinity:wise_wisp_matter|>

As implied by their name, the {concept}Wise Wisps{} are the most intelligent inhabitants of the
[Wisp Forest](^affinity:wisp_forests). They move in groups similar in size to the {concept}Inert Wisps{}, but in lower
[Wisp Forest](^affinity:wisp_forest). They move in groups similar in size to the {concept}Inert Wisps{}, but in lower
numbers overall.


Expand All @@ -78,7 +78,7 @@ or the processing of information is required.

<|item-spotlight@lavender:book_components|item=affinity:vicious_wisp_matter|>

Last but not least, the {concept}Vicious Wisps{} are the guards of the [Wisp Forest](^affinity:wisp_forests) and defend
Last but not least, the {concept}Vicious Wisps{} are the guards of the [Wisp Forest](^affinity:wisp_forest) and defend
it against any and all intruders.


Expand Down
178 changes: 89 additions & 89 deletions src/main/resources/assets/affinity/owo_ui/item_transfer_node.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
<owo-ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/wisp-forest/owo-lib/1.20.3/owo-ui.xsd">
<components>
<flow-layout direction="vertical">
<children>
<flow-layout direction="vertical">
<children>
<texture texture="affinity:textures/gui/item_transfer_node.png" region-width="176"
region-height="192"/>

<flow-layout direction="horizontal" id="content-container">
<children>
<flow-layout direction="horizontal" id="node-preview-anchor">
<children/>

<padding>
<bottom>50</bottom>
<horizontal>-25</horizontal>
</padding>
</flow-layout>

<stack-layout>
<!--
We wrap the node click area in a stack here since it overlaps with the
preview anchor, causing its tooltip not to show since the algorithm cannot
clearly determine whether it or the preview anchor is hovered. By creating a
new parent context we remove this ambiguity, making its tooltip render again

glisco, 5.4.2024
-->
<children>
<flow-layout direction="vertical" id="node-click-area">
<children/>

<sizing>
<horizontal method="fixed">75</horizontal>
<vertical method="fixed">75</vertical>
</sizing>
</flow-layout>
</children>

<positioning type="absolute">2,14</positioning>
</stack-layout>

<flow-layout direction="vertical">
<children>
<checkbox id="ignore-damage-toggle">
<text>Ignore damage</text>
</checkbox>

<checkbox id="ignore-data-toggle">
<text>Ignore data</text>
</checkbox>

<checkbox id="invert-filter-toggle">
<text>Invert filter</text>
</checkbox>
</children>

<gap>5</gap>
</flow-layout>
</children>

<positioning type="absolute">0,0</positioning>

<horizontal-alignment>center</horizontal-alignment>
<vertical-alignment>center</vertical-alignment>

<sizing>
<horizontal method="fixed">176</horizontal>
<vertical method="fixed">102</vertical>
</sizing>

<allow-overflow>true</allow-overflow>
</flow-layout>
</children>

<allow-overflow>true</allow-overflow>
</flow-layout>
</children>

<vertical-alignment>center</vertical-alignment>
<horizontal-alignment>center</horizontal-alignment>

<surface>
<vanilla-translucent/>
</surface>
</flow-layout>
</components>
<owo-ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/wisp-forest/owo-lib/1.20.3/owo-ui.xsd">
<components>
<flow-layout direction="vertical">
<children>
<flow-layout direction="vertical">
<children>
<texture texture="affinity:textures/gui/item_transfer_node.png" region-width="176"
region-height="192"/>
<flow-layout direction="horizontal" id="content-container">
<children>
<flow-layout direction="horizontal" id="node-preview-anchor">
<children/>
<padding>
<bottom>50</bottom>
<horizontal>-25</horizontal>
</padding>
</flow-layout>
<stack-layout>
<!--
We wrap the node click area in a stack here since it overlaps with the
preview anchor, causing its tooltip not to show since the algorithm cannot
clearly determine whether it or the preview anchor is hovered. By creating a
new parent context we remove this ambiguity, making its tooltip render again
glisco, 5.4.2024
-->
<children>
<flow-layout direction="vertical" id="node-click-area">
<children/>
<sizing>
<horizontal method="fixed">75</horizontal>
<vertical method="fixed">75</vertical>
</sizing>
</flow-layout>
</children>
<positioning type="absolute">2,14</positioning>
</stack-layout>
<flow-layout direction="vertical">
<children>
<checkbox id="ignore-damage-toggle">
<text translate="true">gui.affinity.item_transfer_node.ignore_damage</text>
</checkbox>
<checkbox id="ignore-data-toggle">
<text translate="true">gui.affinity.item_transfer_node.ignore_data</text>
</checkbox>
<checkbox id="invert-filter-toggle">
<text translate="true">gui.affinity.item_transfer_node.invert_filter</text>
</checkbox>
</children>
<gap>5</gap>
</flow-layout>
</children>
<positioning type="absolute">0,0</positioning>
<horizontal-alignment>center</horizontal-alignment>
<vertical-alignment>center</vertical-alignment>
<sizing>
<horizontal method="fixed">176</horizontal>
<vertical method="fixed">102</vertical>
</sizing>
<allow-overflow>true</allow-overflow>
</flow-layout>
</children>
<allow-overflow>true</allow-overflow>
</flow-layout>
</children>
<vertical-alignment>center</vertical-alignment>
<horizontal-alignment>center</horizontal-alignment>
<surface>
<vanilla-translucent/>
</surface>
</flow-layout>
</components>
</owo-ui>