Trickster 翻译更新

projects/1.21-fabric/assets/trickster/trickster/lang/en_us.json

@@ -72,7 +72,7 @@
   "trickster.trick.trickster.write_spell": "Notulist's Ploy",
   "trickster.trick.trickster.write_closed_spell": "Proprietary Notulist's Ploy",
   "trickster.trick.trickster.read_macro_ring": "Macro Delusion",
-  "trickster.trick.trickster.reveal": "Showcase Stratagem",
+  "trickster.trick.trickster.reveal": "Showcase Ploy",
   "trickster.trick.trickster.read_crow_mind": "Crow Mind Delusion",
   "trickster.trick.trickster.write_crow_mind": "Crow Mind Ploy",
   "trickster.trick.trickster.cost": "Cost Ploy",
@@ -111,14 +111,15 @@
   "trickster.trick.trickster.summon_tnt": "Demolitionist's Ploy",
   "trickster.trick.trickster.block_find_entity": "Embracing Ingress",
   "trickster.trick.trickster.range_find_entity": "Ingress of Shared Fate",
-  "trickster.trick.trickster.execute": "Grand Stratagem",
-  "trickster.trick.trickster.execute_same_scope": "Quiet Distortion",
-  "trickster.trick.trickster.fork": "Utensil Stratagem",
-  "trickster.trick.trickster.fold": "Folding Distortion",
-  "trickster.trick.trickster.try_catch": "Cautious Stratagem",
-  "trickster.trick.trickster.closure": "Closure Stratagem",
-  "trickster.trick.trickster.supplier": "Supply Distortion",
-  "trickster.trick.trickster.kill_thread": "Executioner's Ploy",
+  "trickster.trick.trickster.import": "Assistance Deviation",
+  "trickster.trick.trickster.import_hat": "Cranium Deviation",
+  "trickster.trick.trickster.execute": "Grand Deviation",
+  "trickster.trick.trickster.execute_same_scope": "Quiet Deviation",
+  "trickster.trick.trickster.fork": "Utensil Deviation",
+  "trickster.trick.trickster.fold": "Folding Deviation",
+  "trickster.trick.trickster.try_catch": "Cautious Deviation",
+  "trickster.trick.trickster.delay_execution": "Deviation of Suspension",
+  "trickster.trick.trickster.kill_thread": "Executioner's Deviation",
   "trickster.trick.trickster.current_thread": "Delusion of Order",
   "trickster.trick.trickster.load_argument_1": "Primary Delusion",
   "trickster.trick.trickster.load_argument_2": "Secondary Delusion",
@@ -140,6 +141,8 @@
   "trickster.trick.trickster.list_remove_element": "Eviction Stratagem",
   "trickster.trick.trickster.list_size": "Tally Distortion",
   "trickster.trick.trickster.create_number_range": "Interlude Distortion",
+  "trickster.trick.trickster.closure": "Closure Stratagem",
+  "trickster.trick.trickster.supplier": "Supply Distortion",
   "trickster.trick.trickster.locate_glyph": "Pinpoint Distortion",
   "trickster.trick.trickster.locate_glyphs": "Discovering Distortion",
   "trickster.trick.trickster.retrieve_glyph": "Retrieval Distortion",
@@ -169,8 +172,6 @@
   "trickster.trick.trickster.can_place_block": "Ingress of Suitability",
   "trickster.trick.trickster.check_resonator": "Ingress of Resonance",
   "trickster.trick.trickster.get_redstone_power": "Ingress of Logic",
-  "trickster.trick.trickster.import": "Assistance Stratagem",
-  "trickster.trick.trickster.import_hat": "Cranium Stratagem",
   "trickster.trick.trickster.check_hat": "Cranium Delusion",
   "trickster.trick.trickster.set_hat": "Cranial Shift Ploy",
   "trickster.trick.trickster.other_hand": "Juggling Delusion",
@@ -186,7 +187,6 @@
   "trickster.trick.trickster.item_from_block": "Pickup Distortion",
   "trickster.trick.trickster.type_fragment": "Argumentative Distortion",
   "trickster.trick.trickster.hash_values": "Decaying Distortion",
-  "trickster.trick.trickster.delay_execution": "Ploy of Suspension",
   "trickster.trick.trickster.pin_chunk": "Ploy of Celestial Pin",
   "trickster.trick.trickster.get_dimension": "Dimensional Delusion",
   "trickster.trick.trickster.show_bar": "Ploy of Clarity",
@@ -195,7 +195,7 @@
   "trickster.trick.trickster.draw_spell": "Marketer's Ploy",
   "trickster.trick.trickster.draw_line": "Artist's Ploy",
   "trickster.trick.trickster.get_flecks": "Observer's Ingress",
-  "trickster.trick.trickster.get_scale": "Distortion of Occupation",
+  "trickster.trick.trickster.get_scale": "Ingress of Occupation",
   "trickster.trick.trickster.set_scale": "Ploy of Occupation",
   "trickster.trick.trickster.transmog": "Ploy of Transmogrification",
   "trickster.trick.trickster.hidden_transmog": "Ploy of Subterfuge",
@@ -322,9 +322,14 @@
   "key.trickster.take_hat": "Take Hat",
   "key.trickster.modify_spell": "Modify Spell (Creative only)",
   "text.config.trickster-config.title": "Trickster Config",
+  "text.config.trickster-config.section.accessibility": "Accessibility",
   "text.config.trickster-config.section.client": "Client",
   "text.config.trickster-config.section.server": "Server",
   "text.config.trickster-config.section.aurora-client": "Aurora's Personal Client Tweaks",
+  "text.config.trickster-config.option.dotEmphasis": "Terminal dot emphasis",
+  "text.config.trickster-config.option.dotEmphasisColor": "Terminal dot color",
+  "text.config.trickster-config.option.whorlMaxMana": "Whorl maximum mana in kG",
+  "text.config.trickster-config.option.whorlRechargeRate": "Whorl recharge rate in kG",
   "text.config.trickster-config.option.topHatInterceptScrolling": "Offhand hat intercepts hotbar scrolling",
   "text.config.trickster-config.option.invertTopHatScrolling": "Invert hat scrolling",
   "text.config.trickster-config.option.revealToHotbar": "Write revealed values to action bar",
@@ -333,5 +338,6 @@
   "text.config.trickster-config.option.maxBlockBreakingHardness": "Max hardness for Ploy of Destruction",
   "text.config.trickster-config.option.dragDrawing": "Draw by dragging",
   "text.config.trickster-config.option.barsHorizontal": "Show spell-created bars horizontally",
-  "text.config.trickster-config.option.disableOffhandScrollOpening": "Require scroll in main hand to edit"
+  "text.config.trickster-config.option.disableOffhandScrollOpening": "Require scroll in main hand to edit",
+  "text.config.trickster-config.option.adjacentPixelCollisionOffset": "Offset factor of adjacent pixels"
 }

projects/1.21-fabric/assets/trickster/trickster/lang/en_us.yml

@@ -96,7 +96,7 @@ trickster:
     write_spell: Notulist's Ploy
     write_closed_spell: Proprietary Notulist's Ploy
     read_macro_ring: Macro Delusion
-    reveal: Showcase Stratagem
+    reveal: Showcase Ploy
     read_crow_mind: Crow Mind Delusion
     write_crow_mind: Crow Mind Ploy
     cost: Cost Ploy
@@ -141,14 +141,16 @@ trickster:
     block_find_entity: Embracing Ingress
     range_find_entity: Ingress of Shared Fate
 
-    execute: Grand Stratagem
-    execute_same_scope: Quiet Distortion
-    fork: Utensil Stratagem
-    fold: Folding Distortion
-    try_catch: Cautious Stratagem
-    closure: Closure Stratagem
-    supplier: Supply Distortion
-    kill_thread: Executioner's Ploy
+    import: Assistance Deviation
+    import_hat: Cranium Deviation
+
+    execute: Grand Deviation
+    execute_same_scope: Quiet Deviation
+    fork: Utensil Deviation
+    fold: Folding Deviation
+    try_catch: Cautious Deviation
+    delay_execution: Deviation of Suspension
+    kill_thread: Executioner's Deviation
     current_thread: Delusion of Order
     load_argument_1: Primary Delusion
     load_argument_2: Secondary Delusion
@@ -172,6 +174,8 @@ trickster:
     list_size: Tally Distortion
     create_number_range: Interlude Distortion
 
+    closure: Closure Stratagem
+    supplier: Supply Distortion
     locate_glyph: Pinpoint Distortion
     locate_glyphs: Discovering Distortion
     retrieve_glyph: Retrieval Distortion
@@ -205,8 +209,6 @@ trickster:
     check_resonator: Ingress of Resonance
     get_redstone_power: Ingress of Logic
 
-    import: Assistance Stratagem
-    import_hat: Cranium Stratagem
     check_hat: Cranium Delusion
     set_hat: Cranial Shift Ploy
     other_hand: Juggling Delusion
@@ -223,7 +225,6 @@ trickster:
 
     type_fragment: Argumentative Distortion
     hash_values: Decaying Distortion
-    delay_execution: Ploy of Suspension
     pin_chunk: Ploy of Celestial Pin
     get_dimension: Dimensional Delusion
     show_bar: Ploy of Clarity
@@ -235,7 +236,7 @@ trickster:
     draw_line: Artist's Ploy
     get_flecks: Observer's Ingress
 
-    get_scale: Distortion of Occupation
+    get_scale: Ingress of Occupation
     set_scale: Ploy of Occupation
 
     transmog: Ploy of Transmogrification
@@ -394,10 +395,15 @@ key:
 text.config.trickster-config:
   title: Trickster Config
   section:
+    accessibility: Accessibility
     client: Client
     server: Server
     aurora-client: Aurora's Personal Client Tweaks
   option:
+    dotEmphasis: Terminal dot emphasis
+    dotEmphasisColor: Terminal dot color
+    whorlMaxMana: Whorl maximum mana in kG
+    whorlRechargeRate: Whorl recharge rate in kG
     topHatInterceptScrolling: Offhand hat intercepts hotbar scrolling
     invertTopHatScrolling: Invert hat scrolling
     revealToHotbar: Write revealed values to action bar
@@ -408,3 +414,4 @@ text.config.trickster-config:
     dragDrawing: Draw by dragging
     barsHorizontal: Show spell-created bars horizontally
     disableOffhandScrollOpening: Require scroll in main hand to edit
+    adjacentPixelCollisionOffset: Offset factor of adjacent pixels

projects/1.21-fabric/assets/trickster/trickster/lang/zh_cn.json

@@ -72,7 +72,7 @@
   "trickster.trick.trickster.write_spell": "记事员之技巧",
   "trickster.trick.trickster.write_closed_spell": "禁文记事员之技巧",
   "trickster.trick.trickster.read_macro_ring": "宏之错觉",
-  "trickster.trick.trickster.reveal": "展示之谋略",
+  "trickster.trick.trickster.reveal": "展示之技巧",
   "trickster.trick.trickster.read_crow_mind": "乌鸦灵思之错觉",
   "trickster.trick.trickster.write_crow_mind": "乌鸦灵思之技巧",
   "trickster.trick.trickster.cost": "消耗之技巧",
@@ -111,14 +111,15 @@
   "trickster.trick.trickster.summon_tnt": "爆破师之技巧",
   "trickster.trick.trickster.block_find_entity": "怀抱之辑流",
   "trickster.trick.trickster.range_find_entity": "同命之辑流",
-  "trickster.trick.trickster.execute": "宏伟之谋略",
-  "trickster.trick.trickster.execute_same_scope": "静默之曲变",
-  "trickster.trick.trickster.fork": "器具之谋略",
-  "trickster.trick.trickster.fold": "折叠之曲变",
-  "trickster.trick.trickster.try_catch": "谨慎之谋略",
-  "trickster.trick.trickster.closure": "闭包之谋略",
-  "trickster.trick.trickster.supplier": "供给之曲变",
-  "trickster.trick.trickster.kill_thread": "行刑者之技巧",
+  "trickster.trick.trickster.import": "协助之转离",
+  "trickster.trick.trickster.import_hat": "颅骨之转离",
+  "trickster.trick.trickster.execute": "宏伟之转离",
+  "trickster.trick.trickster.execute_same_scope": "静默之转离",
+  "trickster.trick.trickster.fork": "器具之转离",
+  "trickster.trick.trickster.fold": "折叠之转离",
+  "trickster.trick.trickster.try_catch": "谨慎之转离",
+  "trickster.trick.trickster.delay_execution": "挂起之转离",
+  "trickster.trick.trickster.kill_thread": "行刑者之转离",
   "trickster.trick.trickster.current_thread": "序数之错觉",
   "trickster.trick.trickster.load_argument_1": "甲参之错觉",
   "trickster.trick.trickster.load_argument_2": "乙参之错觉",
@@ -140,6 +141,8 @@
   "trickster.trick.trickster.list_remove_element": "放逐之谋略",
   "trickster.trick.trickster.list_size": "计量之曲变",
   "trickster.trick.trickster.create_number_range": "间奏之曲变",
+  "trickster.trick.trickster.closure": "闭包之谋略",
+  "trickster.trick.trickster.supplier": "供给之曲变",
   "trickster.trick.trickster.locate_glyph": "定址之曲变",
   "trickster.trick.trickster.locate_glyphs": "发现之曲变",
   "trickster.trick.trickster.retrieve_glyph": "检索之曲变",
@@ -169,8 +172,6 @@
   "trickster.trick.trickster.can_place_block": "适用之辑流",
   "trickster.trick.trickster.check_resonator": "谐振之辑流",
   "trickster.trick.trickster.get_redstone_power": "逻辑之辑流",
-  "trickster.trick.trickster.import": "协助之谋略",
-  "trickster.trick.trickster.import_hat": "颅骨之谋略",
   "trickster.trick.trickster.check_hat": "颅骨之错觉",
   "trickster.trick.trickster.set_hat": "颅骨挪移之技巧",
   "trickster.trick.trickster.other_hand": "杂耍之错觉",
@@ -186,7 +187,6 @@
   "trickster.trick.trickster.item_from_block": "拾取之曲变",
   "trickster.trick.trickster.type_fragment": "参量之曲变",
   "trickster.trick.trickster.hash_values": "衰朽之曲变",
-  "trickster.trick.trickster.delay_execution": "挂起之技巧",
   "trickster.trick.trickster.pin_chunk": "天钉之技巧",
   "trickster.trick.trickster.get_dimension": "维度之错觉",
   "trickster.trick.trickster.show_bar": "清晰之技巧",
@@ -195,7 +195,7 @@
   "trickster.trick.trickster.draw_spell": "营销员之技巧",
   "trickster.trick.trickster.draw_line": "艺术家之技巧",
   "trickster.trick.trickster.get_flecks": "观察者之辑流",
-  "trickster.trick.trickster.get_scale": "居形之曲变",
+  "trickster.trick.trickster.get_scale": "居形之辑流",
   "trickster.trick.trickster.set_scale": "居形之技巧",
   "trickster.trick.trickster.transmog": "幻化之技巧",
   "trickster.trick.trickster.hidden_transmog": "诡谋之技巧",
@@ -322,9 +322,14 @@
   "key.trickster.take_hat": "取下帽子",
   "key.trickster.modify_spell": "修改法术（仅创造）",
   "text.config.trickster-config.title": "戏法师（Trickster）配置",
+  "text.config.trickster-config.section.accessibility": "辅助功能",
   "text.config.trickster-config.section.client": "客户端",
   "text.config.trickster-config.section.server": "服务端",
   "text.config.trickster-config.section.aurora-client": "Aurora的专属客户端微调",
+  "text.config.trickster-config.option.dotEmphasis": "界面中着重强调点",
+  "text.config.trickster-config.option.dotEmphasisColor": "界面中点的强调色",
+  "text.config.trickster-config.option.whorlMaxMana": "螺坠最大魔力，以kG计",
+  "text.config.trickster-config.option.whorlRechargeRate": "螺坠充能速度，以kG计",
   "text.config.trickster-config.option.topHatInterceptScrolling": "副手持帽子时拦截快捷栏滚选",
   "text.config.trickster-config.option.invertTopHatScrolling": "反转帽子滚选方向",
   "text.config.trickster-config.option.revealToHotbar": "展示的值显示到动作栏中",
@@ -333,5 +338,6 @@
   "text.config.trickster-config.option.maxBlockBreakingHardness": "摧毁之技巧可摧毁方块的最大硬度",
   "text.config.trickster-config.option.dragDrawing": "拖动绘制",
   "text.config.trickster-config.option.barsHorizontal": "条栏水平显示",
-  "text.config.trickster-config.option.disableOffhandScrollOpening": "主手持有卷轴才可修改"
+  "text.config.trickster-config.option.disableOffhandScrollOpening": "主手持有卷轴才可修改",
+  "text.config.trickster-config.option.adjacentPixelCollisionOffset": "相邻像素的偏移因数"
 }

projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/distortions.md

@@ -1,11 +1,14 @@
 ```json
 {
-  "title": "Distortions",
+  "title": "Distortions & Stratagems",
   "icon": "trickster:scroll_and_quill",
   "ordinal": 2,
   "parent": "trickster:tricks"
 }
 ```
 
-Distortions are tricks that purely manipulate data. 
-When given the same set of inputs, these will always give the same output.
+Distortions tricks purely manipulate data. 
+When given the same set of inputs, these will always give the same output.
+
+
+Stratagem tricks are distortions which take a variable amount of inputs.

projects/1.21-fabric/assets/trickster/trickster/lavender/categories/tome_of_tomfoolery/zh_cn/distortions.md

@@ -1,10 +1,13 @@
 ```json
 {
-  "title": "曲变术",
+  "title": "曲变术与谋略术",
   "icon": "trickster:scroll_and_quill",
   "ordinal": 2,
   "parent": "trickster:tricks"
 }
 ```
 
-曲变术是仅对数据进行操作的戏法。给定相同的输入，必定得出同样的输出。
+曲变术是仅对数据进行操作的戏法。给定相同的输入，必定得出同样的输出。
+
+
+谋略术是输入参数的数目可变的曲变术。

projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/concepts/tricks_explanation.md

@@ -8,15 +8,16 @@
 
 All tricks fit in the following categories:
 
-- Delusion: no-input value-generating tricks
-- Distortion: fixed-input pure tricks
+- Delusion: tricks that gather information purely from context
 - Ingress: tricks that gather information based on input
-- Ploy: input-only and/or mana-consuming tricks
+- Distortion: fixed-input pure tricks
+- Stratagem: variable-input pure tricks
 
 ;;;;;
 
+- Ploy: world-manipulating and/or mana-consuming tricks
+- Deviation: tricks which modify the state of the spell itself
 - Revision: scribing patterns
-- Stratagem: any trick that operates on a variable amount of inputs
 
 These categories are roughly followed, but in many cases, 
 tricks will be sorted based more on intention than rigid definition.

projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/caster_tricks.md

@@ -83,11 +83,11 @@ Returns the maximum amount of mana that *could be* available to the spell.
 
 <|glyph@trickster:templates|trick-id=trickster:current_thread,title=Delusion of Order|>
 
--> number
+-> number | void
 
 ---
 
-Returns the slot running this spell, or -1 if slots are not supported.
+Returns the spell slot running this spell, or void if spell slots are not supported.
 
 ;;;;;
 

projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/entity.md

@@ -17,7 +17,7 @@
     "Vigor Ingress",
     "Fettle Ingress",
     "Bulwark Ingress",
-    "Distortion of Occupation",
+    "Ingress of Occupation",
     "Observer's Ingress"
   ]
 }
@@ -157,7 +157,7 @@ Given an entity, returns its total armor value.
 
 ;;;;;
 
-<|glyph@trickster:templates|trick-id=trickster:get_scale,title=Distortion of Occupation|>
+<|glyph@trickster:templates|trick-id=trickster:get_scale,title=Ingress of Occupation|>
 
 entity -> number
 

projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/list.md

@@ -22,7 +22,7 @@
 Within spells, it is possible to create lists of an arbitrary amount of fragments merged into a single value.
 
 
-Lists are zero indexed.
+Lists are zero indexed. To acquire an empty list constant, see the relevant [revision](^trickster:constants#3).
 
 ;;;;;
 

projects/1.21-fabric/assets/trickster/trickster/lavender/entries/tome_of_tomfoolery/distortions/map.md

@@ -17,6 +17,8 @@ Maps allow for an association between one fragment and another,
 similarly to how a dictionary associates a word to a definition.
 
 
+To acquire an empty map constant, see the relevant [revision](^trickster:constants#4).
+
 ;;;;;
 
 <|glyph@trickster:templates|trick-id=trickster:map_insert,title=Charting Stratagem|>