edit a little bit of the lore because i feel kind of bad about it

This commit is contained in:
petrak@ 2023-05-15 11:54:51 -05:00
parent 2ccede6a5e
commit ac2a938119
14 changed files with 50 additions and 50 deletions

View file

@ -1,16 +1,16 @@
// 1.19.2 2022-11-29T13:33:14.877218824 Advancements
// 1.19.2 2023-05-15T11:51:03.305683454 Advancements
b21f0b7f0cda29a7e84693df8139f2fecfeea960 data/hexcasting/advancements/aaa_wasteful_cast.json
9d8b41dd8ddfccdf2cd19433d8d7d3cf934e64db data/hexcasting/advancements/aab_big_cast.json
425b42f6da5fd6498053f565dce1f171997dbb8b data/hexcasting/advancements/enlightenment.json
8f97205fa79270eab688aa3019d6fe7dd8c8b0d3 data/hexcasting/advancements/lore.json
fcce2d31886ec60aa23f8b4ba799c17672735b59 data/hexcasting/advancements/lore/cardamom1.json
a69a7cb1948868efdf0efc79b17a89545b21b000 data/hexcasting/advancements/lore/cardamom2.json
cfd1f38e41803259b776f1a69d0e8d520b201a02 data/hexcasting/advancements/lore/cardamom3.json
b4617dbc021e22cfa43d1f086b1651c503e6ccb5 data/hexcasting/advancements/lore/cardamom4.json
3863835e510506b96e23953cd6d29407ca158738 data/hexcasting/advancements/lore/cardamom5.json
2f5ad49936d58c7097ac7f8fbbf3f66f9f90fd2c data/hexcasting/advancements/lore/experiment1.json
9a4eba1c9d7868906e8ea1b4ec287f54a2c379b5 data/hexcasting/advancements/lore/experiment2.json
dea2c9b5682b246820fcf2d71bbc1580a19bd8a5 data/hexcasting/advancements/lore/inventory.json
34a73d4ec63bce883e2b4f5d6ae84493b61b775c data/hexcasting/advancements/lore/terabithia1.json
ef06ae5bd79e2c52291fbfb3c69bc2f74a604477 data/hexcasting/advancements/lore/terabithia2.json
74fbb1ce0e3acf982325b9e9205f774a67956c3c data/hexcasting/advancements/lore/terabithia3.json
861374b7c144ccdbbd031a3f5042af6718ba42bf data/hexcasting/advancements/lore/terabithia4.json
e26db8dfa825b7ac572d59a548b610db7c7bf736 data/hexcasting/advancements/lore/terabithia5.json
bf319d71d9e706f9131c9484be1bc83ca2b8b6a3 data/hexcasting/advancements/opened_eyes.json
d19039a73324eb7532d035d08442f3b68bb13bcb data/hexcasting/advancements/root.json
b1b82068d65d6872c258d905d4f78499e8227ccf data/hexcasting/advancements/y_u_no_cast_angy.json

View file

@ -17,7 +17,7 @@
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/terabithia1"
"translate": "advancement.hexcasting:lore/cardamom1"
}
},
"requirements": [

View file

@ -17,7 +17,7 @@
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/terabithia2"
"translate": "advancement.hexcasting:lore/cardamom2"
}
},
"requirements": [

View file

@ -17,7 +17,7 @@
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/terabithia3"
"translate": "advancement.hexcasting:lore/cardamom3"
}
},
"requirements": [

View file

@ -17,7 +17,7 @@
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/terabithia4"
"translate": "advancement.hexcasting:lore/cardamom4"
}
},
"requirements": [

View file

@ -0,0 +1,28 @@
{
"parent": "hexcasting:lore",
"criteria": {
"grant": {
"trigger": "minecraft:impossible"
}
},
"display": {
"announce_to_chat": true,
"description": {
"text": ""
},
"frame": "task",
"hidden": true,
"icon": {
"item": "hexcasting:lore_fragment"
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/cardamom5"
}
},
"requirements": [
[
"grant"
]
]
}

View file

@ -1,28 +0,0 @@
{
"parent": "hexcasting:lore",
"criteria": {
"grant": {
"trigger": "minecraft:impossible"
}
},
"display": {
"announce_to_chat": true,
"description": {
"text": ""
},
"frame": "task",
"hidden": true,
"icon": {
"item": "hexcasting:lore_fragment"
},
"show_toast": true,
"title": {
"translate": "advancement.hexcasting:lore/terabithia5"
}
},
"requirements": [
[
"grant"
]
]
}

View file

@ -23,11 +23,11 @@ import static at.petrak.hexcasting.api.HexAPI.modLoc;
public class ItemLoreFragment extends Item {
public static final List<ResourceLocation> NAMES = List.of(new ResourceLocation[]{
modLoc("lore/terabithia1"),
modLoc("lore/terabithia2"),
modLoc("lore/terabithia3"),
modLoc("lore/terabithia4"),
modLoc("lore/terabithia5"),
modLoc("lore/cardamom1"),
modLoc("lore/cardamom2"),
modLoc("lore/cardamom3"),
modLoc("lore/cardamom4"),
modLoc("lore/cardamom5"),
modLoc("lore/experiment1"),
modLoc("lore/experiment2"),
modLoc("lore/inventory"),

View file

@ -1465,8 +1465,8 @@
"lore.experiment2.1": "$(italic)These documents were heavily redacted. I have copied the readable text from them here./$$(br2)Subject #1 \"A.E.\"$(br)Stopped struggling immediately after procedure. Facial expression and limbs slack, but can stand unassisted. When left unattended, absently pantomimes actions commonly done in previous profession (groundskeeping).",
"lore.experiment2.2": "Heartrate was very high immediately after procedure, but this is inconclusive due to state of fear immediately before. Resulting bud produced 35 uθ/min.$(br)...$(br)Subject #4 \"P.I.\"$(br)Psychological tests run on P.I. Subject has object permanence, spatial awareness, basic numerical reasoning. Difficulty learning new tasks. $(br2) ...",
"lore.experiment2.3": "Subject #7 \"T.C.\"$(br)Consented to procedure. Similar results several hours after the procedure to other subjects: able to stand, perform simple tasks. $(br2) ...$(br2)Subject #11 \"R.S.\"$(br)Sedated before procedure; dosage such that subject would wake up as procedure occurred...$(br2) ...",
"lore.experiment2.2": "Heartrate high immediately after procedure, but this is inconclusive due to state of fear immediately before. Resulting bud produced 35 uθ/min.$(br)...$(br)Subject #4 \"P.I.\"$(br)Psychological tests run on P.I. Subject has object permanence, spatial awareness, basic numerical reasoning. Difficulty learning new tasks. $(br2) ...",
"lore.experiment2.3": "Subject #7 \"T.C.\"$(br)Similar results several hours after the procedure to other subjects: able to stand, perform simple tasks... $(br2)Subject #11 \"R.S.\"$(br)Sedated before procedure...$(br2) ...",
"lore.experiment2.4": "Subject #23 \"A.L.\"$(br)Ability to speak retained to a greater degree than most subjects; dwindled to broken sentences, then a single word \"card\" over the course of several hours.$(br2)For further testing: how does the procedure affect previous Hexcasters vs. non-Hexcasters?$(br2) ...",

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-04-27T15:20:55.590037388 Tags for minecraft:item
// 1.19.2 2023-05-15T11:53:35.150137932 Tags for minecraft:item
b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/items/impeti.json
5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json
fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-04-27T15:20:55.574863232 LootTables
// 1.19.2 2023-05-15T11:53:35.151604475 LootTables
dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json
2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json
cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-04-27T15:20:55.581099109 Tags for minecraft:block
// 1.19.2 2023-05-15T11:53:35.15100543 Tags for minecraft:block
c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/blocks/brainswept_circle_components.json
357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json
20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/buttons.json

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-04-27T15:20:55.580610935 Tags for hexcasting:action
// 1.19.2 2023-05-15T11:53:35.150772984 Tags for hexcasting:action
e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/per_world_pattern.json
e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/requires_enlightenment.json
e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/can_start_enlighten.json

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-04-27T15:20:55.583735897 Recipes
// 1.19.2 2023-05-15T11:53:35.140657884 Recipes
9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json
04569ccadfd99f203b0485d0c3e877209290f2b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json
2a9d4a0f3618abf9e9b8699b318a984d2c836913 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json