From 75d7010a0a3c97a2822f717d0517cd79c0dcbaac Mon Sep 17 00:00:00 2001 From: TelluriumElement <70762136+IwasConfused@users.noreply.github.com> Date: Sat, 10 May 2025 20:55:36 +0800 Subject: [PATCH 1/4] Change the text to a translatable string. --- .../affinity/owo_ui/item_transfer_node.xml | 178 +++++++++--------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/src/main/resources/assets/affinity/owo_ui/item_transfer_node.xml b/src/main/resources/assets/affinity/owo_ui/item_transfer_node.xml index 4ee8639c..e3af1efb 100644 --- a/src/main/resources/assets/affinity/owo_ui/item_transfer_node.xml +++ b/src/main/resources/assets/affinity/owo_ui/item_transfer_node.xml @@ -1,90 +1,90 @@ - - - - - - - - - - - - - - - 50 - -25 - - - - - - - - - - - 75 - 75 - - - - - 2,14 - - - - - - Ignore damage - - - - Ignore data - - - - Invert filter - - - - 5 - - - - 0,0 - - center - center - - - 176 - 102 - - - true - - - - true - - - - center - center - - - - - - + + + + + + + + + + + + + + + 50 + -25 + + + + + + + + + + + 75 + 75 + + + + + 2,14 + + + + + + gui.affinity.item_transfer_node.ignore_damage + + + + gui.affinity.item_transfer_node.ignore_data + + + + gui.affinity.item_transfer_node.invert_filter + + + + 5 + + + + 0,0 + + center + center + + + 176 + 102 + + + true + + + + true + + + + center + center + + + + + + \ No newline at end of file From 60a7da859fdb60c79bb51bb2c9083a0743ca9e87 Mon Sep 17 00:00:00 2001 From: TelluriumElement <70762136+IwasConfused@users.noreply.github.com> Date: Sat, 10 May 2025 20:57:19 +0800 Subject: [PATCH 2/4] Added 3 strings for item transfer node gui. --- src/main/resources/assets/affinity/lang/en_us.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/assets/affinity/lang/en_us.json b/src/main/resources/assets/affinity/lang/en_us.json index 89d760a0..d5e90446 100644 --- a/src/main/resources/assets/affinity/lang/en_us.json +++ b/src/main/resources/assets/affinity/lang/en_us.json @@ -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", From 52023b2ddf7eee357a2fdf9a70a4c3bf4617a748 Mon Sep 17 00:00:00 2001 From: TelluriumElement <70762136+IwasConfused@users.noreply.github.com> Date: Sat, 10 May 2025 21:01:29 +0800 Subject: [PATCH 3/4] Fix some readability issues. Fixed some invalid internal links. Put the recipe for the Uncanny Rod in the entry for Wand of Iridescence. --- .../affinity/lavender/entries/wispen_testament/aethum.md | 2 +- .../lavender/entries/wispen_testament/aethum_flux.md | 2 +- .../affinity/lavender/entries/wispen_testament/inquiry.md | 2 +- .../entries/wispen_testament/wand_of_iridescence.md | 7 +++++++ .../lavender/entries/wispen_testament/wisp_forest.md | 2 +- .../affinity/lavender/entries/wispen_testament/wisps.md | 8 ++++---- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum.md index 072c6232..2df4d298 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum.md @@ -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{}. --- diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum_flux.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum_flux.md index 4300a836..4011a0a1 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum_flux.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/aethum_flux.md @@ -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. diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/inquiry.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/inquiry.md index 63a8b04c..0776120a 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/inquiry.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/inquiry.md @@ -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. ;;;;; diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wand_of_iridescence.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wand_of_iridescence.md index 6cbc188b..7eeeaa6c 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wand_of_iridescence.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wand_of_iridescence.md @@ -22,11 +22,18 @@ form networks like those employed to create, transport and process [Aethum Flux] ;;;;; + + + +@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 + diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisp_forest.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisp_forest.md index 0dd56389..b7ebc8e5 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisp_forest.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisp_forest.md @@ -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 diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisps.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisps.md index 2b88a21f..3bc94067 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisps.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/wisps.md @@ -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. @@ -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. @@ -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. @@ -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. From 98b9b405fb8dc01eee11362d651c2922e0601f48 Mon Sep 17 00:00:00 2001 From: TelluriumElement <70762136+IwasConfused@users.noreply.github.com> Date: Sat, 10 May 2025 21:35:35 +0800 Subject: [PATCH 4/4] Added recipe and removed blank. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Put the recipe for Infused Stone in the entry of Wispen Testament where it need to be used(So that players can continue the game process through books alone).  Deleted a blank page in the crystallization experience entry. --- .../wispen_testament/crystallized_experience.md | 3 --- .../entries/wispen_testament/socle_composition.md | 14 ++++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/crystallized_experience.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/crystallized_experience.md index f19c99fb..81306fd1 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/crystallized_experience.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/crystallized_experience.md @@ -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. diff --git a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/socle_composition.md b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/socle_composition.md index 451c8dd1..ee3d2e51 100644 --- a/src/main/resources/assets/affinity/lavender/entries/wispen_testament/socle_composition.md +++ b/src/main/resources/assets/affinity/lavender/entries/wispen_testament/socle_composition.md @@ -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{}. - + ;;;;; @@ -30,14 +30,16 @@ Eerily similar in appearance and function to a {item}Stonecutter{}, the {item}Ri @next-page + + + + At this time, the following three materials are known to produce admissible {concept}socle ornaments{}: +;;;;; + -;;;;; - -They provide, in the order listed, an {concept}increasing boost to the stability{} of a ritual's flux-field. - -@entry-end \ No newline at end of file +They provide, in the order listed, an {concept}increasing boost to the stability{} of a ritual's flux-field. \ No newline at end of file