diff --git a/CHANGELOG.md b/CHANGELOG.md index 05841ebf12..a5ae692c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -593,3 +593,4 @@ * v6.4.22 版本更新 - 2024/04/03 10:00 * v6.4.3 版本更新 - 2024/05/01 21:00 * v6.4.4 版本更新 - 2024/06/04 21:00 +* v6.4.5 版本更新 - 2024/08/03 10:00 diff --git a/translations/others/_metadata b/translations/others/_metadata index e74d5aff4b..ac1b3a9808 100644 --- a/translations/others/_metadata +++ b/translations/others/_metadata @@ -1,6 +1,6 @@ { "author": "Sky", - "description": "当前版本 v6.4.4", + "description": "当前版本 v6.4.5", "friendlyName": "Fu Schinese Mod", "includes": [ "FrackinUniverse" @@ -8,5 +8,5 @@ "link": "https://zomboid.cn/blog", "name": "Fu Schinese", "steamContentId": "754350883", - "version": "6.4.4" + "version": "6.4.5" } \ No newline at end of file diff --git a/translations/substitutions.json b/translations/substitutions.json index d4fb071b17..7604a18a4f 100644 --- a/translations/substitutions.json +++ b/translations/substitutions.json @@ -1,7 +1,79 @@ { + "bees/frames/antimite.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/antimite2.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/antimite3.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/arctic.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/armored.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, "bees/frames/basic.item": { "/shortdescription": "texts/wide_spread_fields.json" }, + "bees/frames/copper.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/densealloy.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/durasteel.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/eclipse.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/entropic.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/iron.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/irradiated.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/protective.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/radioactive.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/scented.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/scented2.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/solar.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/solarium.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/sweet.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/titanium.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/tungsten.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/universal.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/uranium.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, + "bees/frames/volcanic.item": { + "/description": "texts/bees/frames/shared_.item.json" + }, "bees/interface/apiary/largeapiary.config": { "/gui/labelinput/value": "texts/wide_spread_fields.json", "/gui/labeloutput/value": "texts/wide_spread_fields.json" @@ -3644,15 +3716,6 @@ "items/active/weapons/melee/broadsword/slimebroadsword/slimepersonbroadsword.activeitem": { "/description": "texts/items/active/weapons/melee/broadsword/slimebroadsword/shared_broadsword.activeitem.json" }, - "items/active/weapons/melee/broadsword/slimesword.activeitem": { - "/description": "texts/items/active/weapons/melee/broadsword/shared_.activeitem.json" - }, - "items/active/weapons/melee/broadsword/slimesword2.activeitem": { - "/description": "texts/items/active/weapons/melee/broadsword/shared_.activeitem.json" - }, - "items/active/weapons/melee/broadsword/slimesword3.activeitem": { - "/description": "texts/items/active/weapons/melee/broadsword/shared_.activeitem.json" - }, "items/active/weapons/melee/broadsword/stonebroadsword.activeitem": { "/description": "texts/items/active/weapons/melee/shared_.activeitem.json" }, @@ -3692,9 +3755,7 @@ "/shortdescription": "texts/items/active/weapons/melee/dagger/shared_dagger.activeitem.json" }, "items/active/weapons/melee/dagger/nightardagger.activeitem": { - "/upgradeParameters/shortdescription": "texts/items/active/weapons/melee/shared_.activeitem.json", - "/upgradeParameters2/description": "texts/items/active/weapons.json", - "/upgradeParameters2/shortdescription": "texts/items/active/weapons/melee/shared_.activeitem.json" + "/upgradeParameters2/description": "texts/items/active/weapons.json" }, "items/active/weapons/melee/dagger/quietusknave.activeitem": { "/description": "texts/items/active/weapons/melee/dagger/shared_e.activeitem.json" @@ -3915,13 +3976,6 @@ "items/active/weapons/melee/shortsword/fuatropusshortsword.activeitem": { "/description": "texts/items/active/weapons/melee/shared_.activeitem.json" }, - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": { - "/improvedParameters/description": "texts/items/active/weapons.json", - "/upgradeParameters/description": "texts/items/active/weapons.json", - "/upgradeParameters/shortdescription": "texts/items/active/weapons/melee/shared_.activeitem.json", - "/upgradeParameters2/description": "texts/items/active/weapons.json", - "/upgradeParameters2/shortdescription": "texts/items/active/weapons/melee/shared_.activeitem.json" - }, "items/active/weapons/melee/shortsword/stoneshortsword.activeitem": { "/description": "texts/items/active/weapons/melee/shared_.activeitem.json" }, @@ -3982,8 +4036,6 @@ "/description": "texts/items/active/weapons/melee/spear/shared_.activeitem.json" }, "items/active/weapons/nightar/nightarsaber.activeitem": { - "/improvedParameters/description": "texts/items/active/weapons.json", - "/upgradeParameters/description": "texts/items/active/weapons.json", "/upgradeParameters2/description": "texts/items/active/weapons.json" }, "items/active/weapons/novakid/durasteelmachinepistol.activeitem": { @@ -8699,6 +8751,9 @@ "/novakidDescription": "texts/materials/shared_shingles.mat.json", "/shortdescription": "texts/materials/shared_shingles.mat.json" }, + "items/materials/shojilattice.matitem": { + "/shortdescription": "texts/materials/shared_shojilattice.mat.json" + }, "items/materials/shroomblockglow.matitem": { "/shortdescription": "texts/materials/shared_shroomblockglow.mat.json" }, @@ -28583,7 +28638,7 @@ "/description": "texts/objects/shared_shiphatch.json", "/drodenDescription": "texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json", "/floranDescription": "texts/objects/shared_shiphatch.json", - "/fukirhosDescription": "texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json", + "/fukirhosDescription": "texts/objects/ship/shared_osship/shared_osshiphatch.json", "/fumantiziDescription": "texts/objects/ship/shared_ship/shared_shiphatch.json", "/glitchDescription/glitchEmote": "texts/glitchEmotes.json", "/glitchDescription/glitchEmotedText": "texts/objects/shared_shiphatch.json", @@ -28628,7 +28683,7 @@ "/avikanDescription": "texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json", "/description": "texts/objects/shared_shiphatch.json", "/drodenDescription": "texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json", - "/fukirhosDescription": "texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json", + "/fukirhosDescription": "texts/objects/ship/shared_osship/shared_osshiphatch.json", "/fumantiziDescription": "texts/objects/ship/shared_ship/shared_shiphatch.json", "/glitchDescription/glitchEmote": "texts/glitchEmotes.json", "/glitchDescription/glitchEmotedText": "texts/objects/ship/fu_byosshiphatchbroken/fu_byosshiphatchBroken.object.json", @@ -29916,6 +29971,19 @@ "/novakidDescription": "texts/objects/shared_door/shared_door.object.json", "/shortdescription": "texts/objects/ship/shared_kirhosshipdoor/shared_kirhosshipdoor.json" }, + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": { + "/apexDescription": "texts/objects/shared_shiphatch.json", + "/avianDescription": "texts/objects/shared_shiphatch.json", + "/description": "texts/objects/shared_shiphatch.json", + "/floranDescription": "texts/objects/shared_shiphatch.json", + "/fukirhosDescription": "texts/objects/ship/shared_osship/shared_osshiphatch.json", + "/glitchDescription/glitchEmote": "texts/glitchEmotes.json", + "/glitchDescription/glitchEmotedText": "texts/objects/shared_shiphatch.json", + "/humanDescription": "texts/objects/shared_shiphatch.json", + "/hylotlDescription": "texts/objects/shared_shiphatch.json", + "/kirhosDescription": "texts/objects/ship/shared_osship/shared_osshiphatch.json", + "/novakidDescription": "texts/objects/shared_shiphatch.json" + }, "objects/ship/kirhosshipdoorbroken/kirhosshipdoorbroken.object": { "/avianDescription": "texts/objects/ship/shared_shipdoor/shared_shipdoor.json", "/description": "texts/objects/ship/shared_shipdoor/shared_shipdoor.json", @@ -40470,6 +40538,7 @@ "/shortdescription": "texts/materials/shared_deadearth.mat.json" }, "tiles/materials/dollhouse/dollhousecrosshatch.material": { + "/description": "texts/tiles/materials.json", "/floranDescription": "texts/materials.json", "/glitchDescription/glitchEmote": "texts/glitchEmotes.json", "/glitchDescription/glitchEmotedText": "texts/materials.json", @@ -41897,6 +41966,14 @@ "/novakidDescription": "texts/materials/shared_shingles.mat.json", "/shortdescription": "texts/materials/shared_shingles.mat.json" }, + "tiles/materials/shojilattice.material": { + "/description": "texts/tiles/materials.json", + "/floranDescription": "texts/materials.json", + "/glitchDescription/glitchEmote": "texts/glitchEmotes.json", + "/glitchDescription/glitchEmotedText": "texts/materials.json", + "/novakidDescription": "texts/materials.json", + "/shortdescription": "texts/materials/shared_shojilattice.mat.json" + }, "tiles/materials/shroomblockglow.material": { "/shortdescription": "texts/materials/shared_shroomblockglow.mat.json" }, diff --git a/translations/texts/bees/frames/shared_.item.json b/translations/texts/bees/frames/shared_.item.json new file mode 100644 index 0000000000..83158c6119 --- /dev/null +++ b/translations/texts/bees/frames/shared_.item.json @@ -0,0 +1,82 @@ +[ + { + "DeniedAlternatives": [], + "Files": { + "bees/frames/antimite.item": [ + "/description" + ], + "bees/frames/antimite2.item": [ + "/description" + ], + "bees/frames/antimite3.item": [ + "/description" + ], + "bees/frames/arctic.item": [ + "/description" + ], + "bees/frames/armored.item": [ + "/description" + ], + "bees/frames/copper.item": [ + "/description" + ], + "bees/frames/densealloy.item": [ + "/description" + ], + "bees/frames/durasteel.item": [ + "/description" + ], + "bees/frames/eclipse.item": [ + "/description" + ], + "bees/frames/entropic.item": [ + "/description" + ], + "bees/frames/iron.item": [ + "/description" + ], + "bees/frames/irradiated.item": [ + "/description" + ], + "bees/frames/protective.item": [ + "/description" + ], + "bees/frames/radioactive.item": [ + "/description" + ], + "bees/frames/scented.item": [ + "/description" + ], + "bees/frames/scented2.item": [ + "/description" + ], + "bees/frames/solar.item": [ + "/description" + ], + "bees/frames/solarium.item": [ + "/description" + ], + "bees/frames/sweet.item": [ + "/description" + ], + "bees/frames/titanium.item": [ + "/description" + ], + "bees/frames/tungsten.item": [ + "/description" + ], + "bees/frames/universal.item": [ + "/description" + ], + "bees/frames/uranium.item": [ + "/description" + ], + "bees/frames/volcanic.item": [ + "/description" + ] + }, + "Texts": { + "Eng": "" + } + } +] \ No newline at end of file diff --git a/translations/texts/frackinship/configs/ships.config.json b/translations/texts/frackinship/configs/ships.config.json index 6cd88a02cc..8846bd93dd 100644 --- a/translations/texts/frackinship/configs/ships.config.json +++ b/translations/texts/frackinship/configs/ships.config.json @@ -35,6 +35,17 @@ "Eng": "Avian BYOS Ship" } }, + { + "DeniedAlternatives": [], + "Files": { + "frackinship/configs/ships.config": [ + "/fu_byosFenerox/name" + ] + }, + "Texts": { + "Eng": "Fenerox BYOS Ship" + } + }, { "DeniedAlternatives": [], "Files": { @@ -107,6 +118,17 @@ "Eng": "Kevin's Flesher (tm)" } }, + { + "DeniedAlternatives": [], + "Files": { + "frackinship/configs/ships.config": [ + "/fu_byosKirhos/name" + ] + }, + "Texts": { + "Eng": "Kirhosi BYOS Ship" + } + }, { "DeniedAlternatives": [], "Files": { @@ -131,6 +153,17 @@ "Eng": "Miniship BYOS Ship" } }, + { + "DeniedAlternatives": [], + "Files": { + "frackinship/configs/ships.config": [ + "/fu_byosNightar/name" + ] + }, + "Texts": { + "Eng": "Nightar BYOS Ship" + } + }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/glitchEmotes.json b/translations/texts/glitchEmotes.json index 886fd73a4c..700d2b6490 100644 --- a/translations/texts/glitchEmotes.json +++ b/translations/texts/glitchEmotes.json @@ -6416,6 +6416,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/glitchDescription/glitchEmote" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/glitchDescription/glitchEmote" + ], "objects/ship/other/protectorateshiphatch/ppprotectorateshiphatch.object": [ "/glitchDescription/glitchEmote" ], @@ -6604,6 +6607,9 @@ "tiles/materials/lightwood/fulightcrosshatch.material": [ "/glitchDescription/glitchEmote" ], + "tiles/materials/shojilattice.material": [ + "/glitchDescription/glitchEmote" + ], "tiles/materials/treatedwood/futreatedcrosshatch.material": [ "/glitchDescription/glitchEmote" ], diff --git a/translations/texts/items/active/weapons.json b/translations/texts/items/active/weapons.json index 9d79828bf0..2f055243cf 100644 --- a/translations/texts/items/active/weapons.json +++ b/translations/texts/items/active/weapons.json @@ -1,19 +1,4 @@ [ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/improvedParameters/description" - ], - "items/active/weapons/nightar/nightarsaber.activeitem": [ - "/improvedParameters/description" - ] - }, - "Texts": { - "Chs": "剑刃锋利。", - "Eng": "A fine, lethal edge." - } - }, { "DeniedAlternatives": [], "Files": { @@ -77,30 +62,12 @@ "Eng": "The bane of flocks of space birds throughout the galaxy (among other things)." } }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/upgradeParameters/description" - ], - "items/active/weapons/nightar/nightarsaber.activeitem": [ - "/upgradeParameters/description" - ] - }, - "Texts": { - "Chs": "它的刀刃拥有无与伦比的锋利度。", - "Eng": "The edge is superior to nearly any other." - } - }, { "DeniedAlternatives": [], "Files": { "items/active/weapons/melee/dagger/nightardagger.activeitem": [ "/upgradeParameters2/description" ], - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/upgradeParameters2/description" - ], "items/active/weapons/nightar/nightarsaber.activeitem": [ "/upgradeParameters2/description" ] diff --git a/translations/texts/items/active/weapons/melee/broadsword/energyblade2.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/energyblade2.activeitem.json index 14e35c8e85..a2fb91f1ad 100644 --- a/translations/texts/items/active/weapons/melee/broadsword/energyblade2.activeitem.json +++ b/translations/texts/items/active/weapons/melee/broadsword/energyblade2.activeitem.json @@ -19,8 +19,7 @@ ] }, "Texts": { - "Chs": "极具破坏性。不要戳到你的眼睛。\n^yellow;次要攻击：史诗级的回旋斩^reset;", - "Eng": "Highly destructive. Don't poke your eye out.\n^cyan;Epic Swooshy Alt^reset;" + "Eng": "Highly destructive. Don't poke your eye out.\n^blue;Inflicts Electrified^reset;\n^cyan;Epic Swooshy Alt^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/broadsword/fugoldenblade.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/fugoldenblade.activeitem.json index e306f90825..0b36942169 100644 --- a/translations/texts/items/active/weapons/melee/broadsword/fugoldenblade.activeitem.json +++ b/translations/texts/items/active/weapons/melee/broadsword/fugoldenblade.activeitem.json @@ -19,8 +19,7 @@ ] }, "Texts": { - "Chs": "咦？怎么可能，把蜂蜜武器化了？", - "Eng": "Impossible. Weaponized honey." + "Eng": "Impossible. Weaponized honey.\nNormal Strikes deal ^red;Physical Damage^reset; and inflict ^red;Bee Stings^reset; and ^orange;Burning^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/broadsword/shared_.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/shared_.activeitem.json index 3e7f9c6a43..d8861532e0 100644 --- a/translations/texts/items/active/weapons/melee/broadsword/shared_.activeitem.json +++ b/translations/texts/items/active/weapons/melee/broadsword/shared_.activeitem.json @@ -1,22 +1,4 @@ [ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/broadsword/slimesword.activeitem": [ - "/description" - ], - "items/active/weapons/melee/broadsword/slimesword2.activeitem": [ - "/description" - ], - "items/active/weapons/melee/broadsword/slimesword3.activeitem": [ - "/description" - ] - }, - "Texts": { - "Chs": "一把用黏液打造的宽剑。很奇怪，但非常有效。", - "Eng": "A sword made out of slime. Strange, but effective." - } - }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/items/active/weapons/melee/broadsword/slimesword.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/slimesword.activeitem.json deleted file mode 100644 index 5bc43816fb..0000000000 --- a/translations/texts/items/active/weapons/melee/broadsword/slimesword.activeitem.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/broadsword/slimesword.activeitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "黏液剑", - "Eng": "Slime Sword" - } - } -] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/broadsword/slimesword2.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/slimesword2.activeitem.json deleted file mode 100644 index 128dfe1077..0000000000 --- a/translations/texts/items/active/weapons/melee/broadsword/slimesword2.activeitem.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/broadsword/slimesword2.activeitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "黏液剑 II", - "Eng": "Slime Sword II" - } - } -] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/broadsword/slimesword3.activeitem.json b/translations/texts/items/active/weapons/melee/broadsword/slimesword3.activeitem.json deleted file mode 100644 index d914db688d..0000000000 --- a/translations/texts/items/active/weapons/melee/broadsword/slimesword3.activeitem.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/broadsword/slimesword3.activeitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "黏液剑 III", - "Eng": "Slime Sword III" - } - } -] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/dagger/nightardagger.activeitem.json b/translations/texts/items/active/weapons/melee/dagger/nightardagger.activeitem.json index b92af334b5..626e17dbc9 100644 --- a/translations/texts/items/active/weapons/melee/dagger/nightardagger.activeitem.json +++ b/translations/texts/items/active/weapons/melee/dagger/nightardagger.activeitem.json @@ -35,6 +35,18 @@ "Eng": "Honed Nightar Knife" } }, + { + "DeniedAlternatives": [], + "Files": { + "items/active/weapons/melee/dagger/nightardagger.activeitem": [ + "/upgradeParameters2/shortdescription" + ] + }, + "Texts": { + "Chs": "传说的夜之刃", + "Eng": "Legendary Nightar Blade" + } + }, { "DeniedAlternatives": [], "Files": { @@ -47,6 +59,18 @@ "Eng": "Nightarian Knife" } }, + { + "DeniedAlternatives": [], + "Files": { + "items/active/weapons/melee/dagger/nightardagger.activeitem": [ + "/upgradeParameters/shortdescription" + ] + }, + "Texts": { + "Chs": "卓越的夜之刃", + "Eng": "Peerless Nightar Blade" + } + }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/items/active/weapons/melee/greataxe/lunarigreataxe.activeitem.json b/translations/texts/items/active/weapons/melee/greataxe/lunarigreataxe.activeitem.json index 501bd04d03..0fc52e437e 100644 --- a/translations/texts/items/active/weapons/melee/greataxe/lunarigreataxe.activeitem.json +++ b/translations/texts/items/active/weapons/melee/greataxe/lunarigreataxe.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "晶莹剔透的美丽。\n^cyan;+12%眩晕几率^reset;", - "Eng": "Glistening with crystalline beauty.\n^cyan;+12% Stun chance^reset;" + "Eng": "Glistening with crystalline beauty.\n^blue;Slows Enemies^reset;\n^cyan;+12% Stun chance^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/hammer/fuquantumhammer.activeitem.json b/translations/texts/items/active/weapons/melee/hammer/fuquantumhammer.activeitem.json index 8c00e00ddb..5bb0c0eb2f 100644 --- a/translations/texts/items/active/weapons/melee/hammer/fuquantumhammer.activeitem.json +++ b/translations/texts/items/active/weapons/melee/hammer/fuquantumhammer.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "横跨了两个宇宙，真是太棒了。", - "Eng": "Straddles two universes. Amazing." + "Eng": "Straddles two universes. Amazing.\n^red;Deals Physical Damage^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/hammer/mystichammer.activeitem.json b/translations/texts/items/active/weapons/melee/hammer/mystichammer.activeitem.json index 1ca77ff733..3054ace2fe 100644 --- a/translations/texts/items/active/weapons/melee/hammer/mystichammer.activeitem.json +++ b/translations/texts/items/active/weapons/melee/hammer/mystichammer.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "神必壬", - "Eng": "Mystichammer" + "Eng": "Mystichammer\n^red;Deals Physical Damage^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/longsword/yinyang.activeitem.json b/translations/texts/items/active/weapons/melee/longsword/yinyang.activeitem.json index d938bf35a8..81a575ee4c 100644 --- a/translations/texts/items/active/weapons/melee/longsword/yinyang.activeitem.json +++ b/translations/texts/items/active/weapons/melee/longsword/yinyang.activeitem.json @@ -19,8 +19,7 @@ ] }, "Texts": { - "Chs": "阴阳", - "Eng": "Yin Yang" + "Eng": "Yin Yang" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/mace/aetheriummace.activeitem.json b/translations/texts/items/active/weapons/melee/mace/aetheriummace.activeitem.json deleted file mode 100644 index 2b48e6e549..0000000000 --- a/translations/texts/items/active/weapons/melee/mace/aetheriummace.activeitem.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/mace/aetheriummace.activeitem": [ - "/upgradeParameters/shortdescription" - ] - }, - "Texts": { - "Chs": "阳清弑君者", - "Eng": "Aetherium Lordcrusher" - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/mace/aetheriummace.activeitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "阳清钉头锤", - "Eng": "Aetherium Mace" - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/mace/aetheriummace.activeitem": [ - "/description" - ] - }, - "Texts": { - "Chs": "闪闪发光，极为致命。由Ashey设计。", - "Eng": "Sparkling and deadly. Design by Ashey." - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/mace/aetheriummace.activeitem": [ - "/upgradeParameters/description" - ] - }, - "Texts": { - "Chs": "汝心甚勇。 由Ashey设计。", - "Eng": "Valiant be thy heart. Original design by Ashey." - } - } -] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/quarterstaff/fucultistquarterstaff.activeitem.json b/translations/texts/items/active/weapons/melee/quarterstaff/fucultistquarterstaff.activeitem.json index 4f5fc3eb46..08be43d254 100644 --- a/translations/texts/items/active/weapons/melee/quarterstaff/fucultistquarterstaff.activeitem.json +++ b/translations/texts/items/active/weapons/melee/quarterstaff/fucultistquarterstaff.activeitem.json @@ -19,8 +19,7 @@ ] }, "Texts": { - "Chs": "装满了美味的眼球。\n^cyan;附加出血效果^reset;", - "Eng": "Loaded full of delicious eyeballs\n^cyan;Inflicts bleeding^reset;" + "Eng": "Loaded full of delicious eyeballs\n^cyan;Inflicts bleeding^reset;\n^red;Deals Physical Damage^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/scythe/honeyscythe.activeitem.json b/translations/texts/items/active/weapons/melee/scythe/honeyscythe.activeitem.json index a6f6b52da9..572224157a 100644 --- a/translations/texts/items/active/weapons/melee/scythe/honeyscythe.activeitem.json +++ b/translations/texts/items/active/weapons/melee/scythe/honeyscythe.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "蜂窝的巧妙用途。", - "Eng": "A clever use of honeycombs." + "Eng": "A clever use of honeycombs.\n^red;Inflicts Bee Stings^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/shared_.activeitem.json b/translations/texts/items/active/weapons/melee/shared_.activeitem.json index 87fdfb8030..62937149b5 100644 --- a/translations/texts/items/active/weapons/melee/shared_.activeitem.json +++ b/translations/texts/items/active/weapons/melee/shared_.activeitem.json @@ -74,36 +74,6 @@ "Eng": "Great for early meat and hide gathering." } }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/dagger/nightardagger.activeitem": [ - "/upgradeParameters2/shortdescription" - ], - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/upgradeParameters2/shortdescription" - ] - }, - "Texts": { - "Chs": "传说的夜之刃", - "Eng": "Legendary Nightar Blade" - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/dagger/nightardagger.activeitem": [ - "/upgradeParameters/shortdescription" - ], - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/upgradeParameters/shortdescription" - ] - }, - "Texts": { - "Chs": "卓越的夜之刃", - "Eng": "Peerless Nightar Blade" - } - }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/items/active/weapons/melee/shortsword/fusavethequeen.activeitem.json b/translations/texts/items/active/weapons/melee/shortsword/fusavethequeen.activeitem.json index b053ae16da..0570404641 100644 --- a/translations/texts/items/active/weapons/melee/shortsword/fusavethequeen.activeitem.json +++ b/translations/texts/items/active/weapons/melee/shortsword/fusavethequeen.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "粉色的外观，但并不是看上去这么脆弱。", - "Eng": "Pink, but not wimpy." + "Eng": "Pink, but not wimpy.\n^green;Inflicts Poison^reset;\n^red;Inflicts Bee Stings^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/shortsword/goldenseascion.activeitem.json b/translations/texts/items/active/weapons/melee/shortsword/goldenseascion.activeitem.json index 194e7d1050..073fe64d80 100644 --- a/translations/texts/items/active/weapons/melee/shortsword/goldenseascion.activeitem.json +++ b/translations/texts/items/active/weapons/melee/shortsword/goldenseascion.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "一把优雅而致命的武器。", - "Eng": "A classy and deadly-looking weapon." + "Eng": "A classy and deadly-looking weapon.\n^green;Inflicts Poison^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/shortsword/nightarshortsword.activeitem.json b/translations/texts/items/active/weapons/melee/shortsword/nightarshortsword.activeitem.json deleted file mode 100644 index be3fe51475..0000000000 --- a/translations/texts/items/active/weapons/melee/shortsword/nightarshortsword.activeitem.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/improvedParameters/shortdescription" - ] - }, - "Texts": { - "Chs": "打磨过的夜之刃", - "Eng": "Honed Nightar Blade" - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "夜之短剑", - "Eng": "Nightarian Shortsword" - } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/active/weapons/melee/shortsword/nightarshortsword.activeitem": [ - "/description" - ] - }, - "Texts": { - "Chs": "平衡性差，但是刀刃相当锋利。升级以变得更加致命。", - "Eng": "Poor balance, but holds a sharp edge. Upgrade for lethality." - } - } -] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/shortsword/shadowburst.activeitem.json b/translations/texts/items/active/weapons/melee/shortsword/shadowburst.activeitem.json index 62dc244b50..502a1a7696 100644 --- a/translations/texts/items/active/weapons/melee/shortsword/shadowburst.activeitem.json +++ b/translations/texts/items/active/weapons/melee/shortsword/shadowburst.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "于暗影中收割生命，以未知材料制成。", - "Eng": "A soul-cleaver of ageless, unknown materials." + "Eng": "A soul-cleaver of ageless, unknown materials.\n^red;Inflicts Bleeding^reset;" } }, { diff --git a/translations/texts/items/active/weapons/melee/spear/kirhosispear.activeitem.json b/translations/texts/items/active/weapons/melee/spear/kirhosispear.activeitem.json index 6ddece53cd..4dabfeca06 100644 --- a/translations/texts/items/active/weapons/melee/spear/kirhosispear.activeitem.json +++ b/translations/texts/items/active/weapons/melee/spear/kirhosispear.activeitem.json @@ -19,8 +19,7 @@ ] }, "Texts": { - "Chs": "用来烧穿船体，进行深空登舰。\n^cyan;狩猎武器^reset;", - "Eng": "Used to burn through ship hulls for deep-space boarding.\n^cyan;Hunting weapon^reset;" + "Eng": "Used to burn through ship hulls for deep-space boarding.\n^cyan;Hunting weapon^reset;\n^red;Inflicts Bleeding^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/melee/spear/shovelspear.activeitem.json b/translations/texts/items/active/weapons/melee/spear/shovelspear.activeitem.json index 3717b2cdfd..39157af3e6 100644 --- a/translations/texts/items/active/weapons/melee/spear/shovelspear.activeitem.json +++ b/translations/texts/items/active/weapons/melee/spear/shovelspear.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "识铲骑士的杀戮利器。\n^cyan;狩猎武器^reset;", - "Eng": "A dangerous shovel for the discerning knight.\n^cyan;Hunting weapon^reset;" + "Eng": "A dangerous shovel for the discerning knight.\n^cyan;Hunting weapon^reset;\n^red;Inflicts Bleeding^reset;" } }, { @@ -43,8 +42,7 @@ ] }, "Texts": { - "Chs": "是全宇宙数一数二的铲铲。\n^yellow;毋须质疑^reset;", - "Eng": "The greatest shovel in the universe. ^yellow;It's true.^reset;" + "Eng": "The greatest shovel in the universe. ^yellow;It's true.^reset;\n^cyan;Hunting weapon^reset;\n^red;Inflicts Bleeding^reset;" } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/nightar/nightarsaber.activeitem.json b/translations/texts/items/active/weapons/nightar/nightarsaber.activeitem.json index 185f573b6a..47212ff937 100644 --- a/translations/texts/items/active/weapons/nightar/nightarsaber.activeitem.json +++ b/translations/texts/items/active/weapons/nightar/nightarsaber.activeitem.json @@ -1,4 +1,16 @@ [ + { + "DeniedAlternatives": [], + "Files": { + "items/active/weapons/nightar/nightarsaber.activeitem": [ + "/improvedParameters/description" + ] + }, + "Texts": { + "Chs": "剑刃锋利。", + "Eng": "A fine, lethal edge." + } + }, { "DeniedAlternatives": [], "Files": { @@ -58,5 +70,17 @@ "Chs": "据说曾被一位传奇夜族剑客所使用。", "Eng": "Said to be wielded by a legendary Nightar swordsman." } + }, + { + "DeniedAlternatives": [], + "Files": { + "items/active/weapons/nightar/nightarsaber.activeitem": [ + "/upgradeParameters/description" + ] + }, + "Texts": { + "Chs": "它的刀刃拥有无与伦比的锋利度。", + "Eng": "The edge is superior to nearly any other." + } } ] \ No newline at end of file diff --git a/translations/texts/items/active/weapons/ranged/unique/fucellgun.activeitem.json b/translations/texts/items/active/weapons/ranged/unique/fucellgun.activeitem.json index d44e20b86a..7b1144e693 100644 --- a/translations/texts/items/active/weapons/ranged/unique/fucellgun.activeitem.json +++ b/translations/texts/items/active/weapons/ranged/unique/fucellgun.activeitem.json @@ -7,8 +7,7 @@ ] }, "Texts": { - "Chs": "一把独特的远程步枪，可发射出冻结身体的细胞结构弹药。", - "Eng": "A truly unique long-ranged rifle, firing freezing blasts of cellular matter." + "Eng": "A truly unique long-ranged rifle, firing ^cyan;freezing^reset;, ^green;poisonous^reset; blasts of cellular matter." } }, { diff --git a/translations/texts/items/active/weapons/ranged/unique/miners/weaponminer/weaponminer.activeitem.json b/translations/texts/items/active/weapons/ranged/unique/miners/weaponminer/weaponminer.activeitem.json index 068db03125..345033d0c2 100644 --- a/translations/texts/items/active/weapons/ranged/unique/miners/weaponminer/weaponminer.activeitem.json +++ b/translations/texts/items/active/weapons/ranged/unique/miners/weaponminer/weaponminer.activeitem.json @@ -11,6 +11,17 @@ "Eng": "A trusty beam weapon." } }, + { + "DeniedAlternatives": [], + "Files": { + "items/active/weapons/ranged/unique/miners/weaponminer/weaponminer.activeitem": [ + "/upgradeParameters3/description" + ] + }, + "Texts": { + "Eng": "A trusty beam weapon.\n^cyan;Inflicts Frostburn^reset;" + } + }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/items/generic/produce/crystalplant.consumable.json b/translations/texts/items/generic/produce/crystalplantedible.consumable.json similarity index 61% rename from translations/texts/items/generic/produce/crystalplant.consumable.json rename to translations/texts/items/generic/produce/crystalplantedible.consumable.json index cb3efb1bc0..1c9e75dd0c 100644 --- a/translations/texts/items/generic/produce/crystalplant.consumable.json +++ b/translations/texts/items/generic/produce/crystalplantedible.consumable.json @@ -2,24 +2,22 @@ { "DeniedAlternatives": [], "Files": { - "items/generic/produce/crystalplant.consumable": [ + "items/generic/produce/crystalplantedible.consumable": [ "/shortdescription" ] }, "Texts": { - "Chs": "晶化西兰花", "Eng": "Crystal Broccoli" } }, { "DeniedAlternatives": [], "Files": { - "items/generic/produce/crystalplant.consumable": [ + "items/generic/produce/crystalplantedible.consumable": [ "/description" ] }, "Texts": { - "Chs": "^yellow;^reset;^cyan;免疫^reset;: 中毒, 硫酸: 90s", "Eng": "^yellow;^reset;^cyan;Immune^reset;: Poison, Sulphuric Acid: 90s" } } diff --git a/translations/texts/items/materials/shojilattice.matitem.json b/translations/texts/items/materials/shojilattice.matitem.json index 2ea42fe1bf..ef50718e68 100644 --- a/translations/texts/items/materials/shojilattice.matitem.json +++ b/translations/texts/items/materials/shojilattice.matitem.json @@ -10,17 +10,5 @@ "Chs": "一种用木材做成的精致窗棂。", "Eng": "A delicate lattice made of wood." } - }, - { - "DeniedAlternatives": [], - "Files": { - "items/materials/shojilattice.matitem": [ - "/shortdescription" - ] - }, - "Texts": { - "Chs": "木质窗格", - "Eng": "Shoji Window Lattice" - } } ] \ No newline at end of file diff --git a/translations/texts/materials.json b/translations/texts/materials.json index d898eee577..05a915e12c 100644 --- a/translations/texts/materials.json +++ b/translations/texts/materials.json @@ -449,6 +449,9 @@ "tiles/materials/lightwood/fulightcrosshatch.material": [ "/floranDescription" ], + "tiles/materials/shojilattice.material": [ + "/floranDescription" + ], "tiles/materials/treatedwood/futreatedcrosshatch.material": [ "/floranDescription" ], @@ -1475,6 +1478,9 @@ "tiles/materials/lightwood/fulightcrosshatch.material": [ "/novakidDescription" ], + "tiles/materials/shojilattice.material": [ + "/novakidDescription" + ], "tiles/materials/treatedwood/futreatedcrosshatch.material": [ "/novakidDescription" ], @@ -1580,6 +1586,9 @@ "tiles/materials/lightwood/fulightcrosshatch.material": [ "/glitchDescription/glitchEmotedText" ], + "tiles/materials/shojilattice.material": [ + "/glitchDescription/glitchEmotedText" + ], "tiles/materials/treatedwood/futreatedcrosshatch.material": [ "/glitchDescription/glitchEmotedText" ], diff --git a/translations/texts/materials/shared_shojilattice.mat.json b/translations/texts/materials/shared_shojilattice.mat.json new file mode 100644 index 0000000000..25fd513ee9 --- /dev/null +++ b/translations/texts/materials/shared_shojilattice.mat.json @@ -0,0 +1,17 @@ +[ + { + "DeniedAlternatives": [], + "Files": { + "items/materials/shojilattice.matitem": [ + "/shortdescription" + ], + "tiles/materials/shojilattice.material": [ + "/shortdescription" + ] + }, + "Texts": { + "Chs": "木质窗格", + "Eng": "Shoji Window Lattice" + } + } +] \ No newline at end of file diff --git a/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrolldesk.object.json b/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrolldesk.object.json index 9492c352c0..9e3cb982a9 100644 --- a/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrolldesk.object.json +++ b/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrolldesk.object.json @@ -15,7 +15,6 @@ "DeniedAlternatives": [], "Files": { "objects/minibiome/elder/elderscrolldesk/elderscrolldesk.object": [ - "/interactData/paneLayoutOverride/windowtitle/title", "/shortdescription" ] }, diff --git a/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrollmetal.object.json b/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrollmetal.object.json index 7863bb57ba..08cc123180 100644 --- a/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrollmetal.object.json +++ b/translations/texts/objects/minibiome/elder/elderscrolldesk/elderscrollmetal.object.json @@ -3,6 +3,7 @@ "DeniedAlternatives": [], "Files": { "objects/minibiome/elder/elderscrolldesk/elderscrollmetal.object": [ + "/interactData/paneLayoutOverride/windowtitle/title", "/shortdescription" ] }, diff --git a/translations/texts/objects/shared_shiphatch.json b/translations/texts/objects/shared_shiphatch.json index 9bd4d47a1e..27766661e1 100644 --- a/translations/texts/objects/shared_shiphatch.json +++ b/translations/texts/objects/shared_shiphatch.json @@ -17,6 +17,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/hylotlDescription" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/hylotlDescription" + ], "objects/ship/mantizishipdoor/mantizishiphatch.object": [ "/hylotlDescription" ], @@ -65,6 +68,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/description" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/description" + ], "objects/ship/mantizishipdoor/mantizishiphatch.object": [ "/description" ], @@ -107,6 +113,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/novakidDescription" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/novakidDescription" + ], "objects/ship/other/protectorateshiphatch/ppprotectorateshiphatch.object": [ "/novakidDescription" ], @@ -144,6 +153,10 @@ "/avianDescription", "/humanDescription" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/avianDescription", + "/humanDescription" + ], "objects/ship/mantizishipdoor/mantizishiphatch.object": [ "/avianDescription" ], @@ -190,6 +203,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/glitchDescription/glitchEmotedText" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/glitchDescription/glitchEmotedText" + ], "objects/ship/other/protectorateshiphatch/ppprotectorateshiphatch.object": [ "/glitchDescription/glitchEmotedText" ], @@ -220,6 +236,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/apexDescription" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/apexDescription" + ], "objects/ship/other/protectorateshiphatch/ppprotectorateshiphatch.object": [ "/apexDescription" ], @@ -271,6 +290,9 @@ "objects/ship/juuxshipdoor/juuxshiphatch.object": [ "/floranDescription" ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/floranDescription" + ], "objects/ship/mantizishipdoor/mantizishiphatch.object": [ "/floranDescription" ], diff --git a/translations/texts/objects/ship/kirhosshipdoor/kirhosshiphatch.object.json b/translations/texts/objects/ship/kirhosshipdoor/kirhosshiphatch.object.json new file mode 100644 index 0000000000..126e572fa3 --- /dev/null +++ b/translations/texts/objects/ship/kirhosshipdoor/kirhosshiphatch.object.json @@ -0,0 +1,13 @@ +[ + { + "DeniedAlternatives": [], + "Files": { + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/shortdescription" + ] + }, + "Texts": { + "Eng": "Kirhos Ship Hatch" + } + } +] \ No newline at end of file diff --git a/translations/texts/objects/ship/kirhosshipparts/SIV_shipKirhosGunDeco/SIV_shipKirhosGunDeco.object.json b/translations/texts/objects/ship/kirhosshipparts/SIV_shipKirhosGunDeco/SIV_shipKirhosGunDeco.object.json new file mode 100644 index 0000000000..a93e4e98db --- /dev/null +++ b/translations/texts/objects/ship/kirhosshipparts/SIV_shipKirhosGunDeco/SIV_shipKirhosGunDeco.object.json @@ -0,0 +1,24 @@ +[ + { + "DeniedAlternatives": [], + "Files": { + "objects/ship/kirhosshipparts/SIV_shipKirhosGunDeco/SIV_shipKirhosGunDeco.object": [ + "/description" + ] + }, + "Texts": { + "Eng": "A small Gun Decoration for a Kirhosi spaceship." + } + }, + { + "DeniedAlternatives": [], + "Files": { + "objects/ship/kirhosshipparts/SIV_shipKirhosGunDeco/SIV_shipKirhosGunDeco.object": [ + "/shortdescription" + ] + }, + "Texts": { + "Eng": "Kirhos Ship Gun Deco" + } + } +] \ No newline at end of file diff --git a/translations/texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json b/translations/texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json index fd8c61c71b..e75a80e6c1 100644 --- a/translations/texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json +++ b/translations/texts/objects/ship/shared_fu_byosship/shared_fu_byosshiphatch.json @@ -28,20 +28,5 @@ "Chs": "检测到舱口。分析：船舶模型。", "Eng": "Detected hatch. Analysis: Ship model." } - }, - { - "DeniedAlternatives": [], - "Files": { - "objects/ship/fu_byosshipdoor/fu_byosshiphatch.object": [ - "/fukirhosDescription" - ], - "objects/ship/fu_byosshiphatchbroken/fu_byosshiphatchBroken.object": [ - "/fukirhosDescription" - ] - }, - "Texts": { - "Chs": "太酷了！最先进的双滑动舱口！", - "Eng": "Radicool! A state-of-the-art dual-sliding hatch!" - } } ] \ No newline at end of file diff --git a/translations/texts/objects/ship/shared_osship/shared_osshiphatch.json b/translations/texts/objects/ship/shared_osship/shared_osshiphatch.json new file mode 100644 index 0000000000..c998d5a714 --- /dev/null +++ b/translations/texts/objects/ship/shared_osship/shared_osshiphatch.json @@ -0,0 +1,21 @@ +[ + { + "DeniedAlternatives": [], + "Files": { + "objects/ship/fu_byosshipdoor/fu_byosshiphatch.object": [ + "/fukirhosDescription" + ], + "objects/ship/fu_byosshiphatchbroken/fu_byosshiphatchBroken.object": [ + "/fukirhosDescription" + ], + "objects/ship/kirhosshipdoor/kirhosshiphatch.object": [ + "/fukirhosDescription", + "/kirhosDescription" + ] + }, + "Texts": { + "Chs": "太酷了！最先进的双滑动舱口！", + "Eng": "Radicool! A state-of-the-art dual-sliding hatch!" + } + } +] \ No newline at end of file diff --git a/translations/texts/tiles/materials.json b/translations/texts/tiles/materials.json index 29fd532001..6e391b470a 100644 --- a/translations/texts/tiles/materials.json +++ b/translations/texts/tiles/materials.json @@ -1,4 +1,19 @@ [ + { + "DeniedAlternatives": [], + "Files": { + "tiles/materials/dollhouse/dollhousecrosshatch.material": [ + "/description" + ], + "tiles/materials/shojilattice.material": [ + "/description" + ] + }, + "Texts": { + "Chs": "一种用木材做成的简单窗棂。", + "Eng": "A simple lattice made of wood." + } + }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/texts/tiles/materials/dollhouse/dollhousecrosshatch.material.json b/translations/texts/tiles/materials/dollhouse/dollhousecrosshatch.material.json index 15609747bc..a1a3f1fc03 100644 --- a/translations/texts/tiles/materials/dollhouse/dollhousecrosshatch.material.json +++ b/translations/texts/tiles/materials/dollhouse/dollhousecrosshatch.material.json @@ -1,16 +1,4 @@ [ - { - "DeniedAlternatives": [], - "Files": { - "tiles/materials/dollhouse/dollhousecrosshatch.material": [ - "/description" - ] - }, - "Texts": { - "Chs": "一种用木材做成的简单窗棂。", - "Eng": "A simple lattice made of wood." - } - }, { "DeniedAlternatives": [], "Files": { diff --git a/translations/totallabels.json b/translations/totallabels.json index 96b2f70f4c..ec58d8cbd7 100644 --- a/translations/totallabels.json +++ b/translations/totallabels.json @@ -2931,7 +2931,7 @@ "frackinship": { "configs": { "misc.config.json": 5, - "ships.config.json": 22 + "ships.config.json": 25 }, "items": { "shipunlocks": { @@ -3969,16 +3969,13 @@ "quietusemperor.activeitem.json": 2, "quietusknight.activeitem.json": 3, "radienbroadsword.activeitem.json": 2, - "shared_.activeitem.json": 3, + "shared_.activeitem.json": 2, "shared_wavyslimesword.json": 1, "slimebroadsword": { "shared_broadsword.activeitem.json": 1, "slimenpcbroadsword.activeitem.json": 1, "slimepersonbroadsword.activeitem.json": 1 }, - "slimesword.activeitem.json": 1, - "slimesword2.activeitem.json": 1, - "slimesword3.activeitem.json": 1, "spikesword.activeitem.json": 2, "stonebroadsword.activeitem.json": 1, "telebriumbroadsword.activeitem.json": 2, @@ -4009,7 +4006,7 @@ "irradiumdagger.activeitem.json": 2, "isogendagger.activeitem.json": 2, "lunaridagger.activeitem.json": 2, - "nightardagger.activeitem.json": 5, + "nightardagger.activeitem.json": 7, "penumbriredagger.activeitem.json": 2, "pyreitedagger.activeitem.json": 2, "quietusknave.activeitem.json": 1, @@ -4180,7 +4177,6 @@ }, "mace": { "aegisaltmace.activeitem.json": 2, - "aetheriummace.activeitem.json": 4, "ballmace.activeitem.json": 2, "bonemace.activeitem.json": 2, "cutemace.activeitem.json": 2, @@ -4301,7 +4297,7 @@ "xithricitescythe.activeitem.json": 2, "zerchesiumscythe.activeitem.json": 2 }, - "shared_.activeitem.json": 6, + "shared_.activeitem.json": 4, "shared_r.activeitem.json": 1, "shared_spear": { "shared_spear.activeitem.json": 2 @@ -4380,7 +4376,6 @@ "isogenshortsword.activeitem.json": 2, "moltenblade.activeitem.json": 2, "murdermachete.activeitem.json": 2, - "nightarshortsword.activeitem.json": 3, "obsidianblade.activeitem.json": 2, "penumbriteshortsword.activeitem.json": 2, "pyreiteshortsword.activeitem.json": 2, @@ -4489,7 +4484,7 @@ "nightar": { "brokennightarsaber.activeitem.json": 2, "fubrokennightarblade.activeitem.json": 2, - "nightarsaber.activeitem.json": 5 + "nightarsaber.activeitem.json": 7 }, "novakid": { "durasteelassaultrifle2.activeitem.json": 2, @@ -4965,7 +4960,7 @@ "basicminertest.activeitem.json": 10 }, "weaponminer": { - "weaponminer.activeitem.json": 5 + "weaponminer.activeitem.json": 6 } }, "minirocketlauncher.activeitem.json": 2, @@ -5412,7 +5407,7 @@ "zerchesiumwhip.activeitem.json": 2 } }, - "weapons.json": 6, + "weapons.json": 4, "xcodex": { "logbook": { "logbook.activeitem.json": 2 @@ -8467,7 +8462,7 @@ "cellpods.consumable.json": 2, "cherry.consumable.json": 2, "corvex.consumable.json": 2, - "crystalplant.consumable.json": 2, + "crystalplantedible.consumable.json": 2, "diodiahybrid.consumable.json": 2, "dragonsbeard.consumable.json": 2, "dunestalk.item.json": 2, @@ -8922,7 +8917,7 @@ "shared_unrefined.json": 1, "shared_woodenplatform.matitem.json": 4, "shared_woodenwindow1.matitem.json": 1, - "shojilattice.matitem.json": 2, + "shojilattice.matitem.json": 1, "shroomblockglow.matitem.json": 1, "shroomblockmaterial.matitem.json": 1, "skathhazard.matitem.json": 1, @@ -9333,6 +9328,7 @@ "shared_sandpillar.json": 2, "shared_sandstone.json": 2, "shared_shingles.mat.json": 5, + "shared_shojilattice.mat.json": 1, "shared_shroomblock.json": 1, "shared_shroomblockglow.mat.json": 1, "shared_silversloppedpanel.mat.json": 2, @@ -17953,7 +17949,8 @@ "kirhosfuelhatch.object.json": 1 }, "kirhosshipdoor": { - "kirhosshipdoor.object.json": 1 + "kirhosshipdoor.object.json": 1, + "kirhosshiphatch.object.json": 1 }, "kirhosshipdoorbroken": { "kirhosshipdoorbroken.object.json": 2 @@ -17965,6 +17962,9 @@ "kirhosshiplockertier0.object.json": 3 }, "kirhosshipparts": { + "SIV_shipKirhosGunDeco": { + "SIV_shipKirhosGunDeco.object.json": 2 + }, "kirhos_eye.object.json": 2, "kirhos_smalleye.object.json": 2 }, @@ -18114,7 +18114,7 @@ }, "shared_fu_byosship": { "shared_fu_byosship.json": 1, - "shared_fu_byosshiphatch.json": 3 + "shared_fu_byosshiphatch.json": 2 }, "shared_fu_byosshipdoor": { "shared_fu_byosshipdoor.json": 3 @@ -18167,6 +18167,9 @@ "shared_oscaptainschair": { "shared_oscaptainschair.json": 1 }, + "shared_osship": { + "shared_osshiphatch.json": 1 + }, "shared_osshipdoor": { "shared_osshipdoor.json": 1 }, @@ -23128,7 +23131,7 @@ "darkstone.material.json": 2, "deadearth.material.json": 1, "dollhouse": { - "dollhousecrosshatch.material.json": 2, + "dollhousecrosshatch.material.json": 1, "dollhouseflooring.material.json": 5, "dollhousepillar.material.json": 5, "dollhousetiles.material.json": 3, @@ -23411,7 +23414,7 @@ }, "whitemeteorite.material.json": 2 }, - "materials.json": 1, + "materials.json": 2, "mods": { "algaeore.matmod.json": 1, "avalitilled.matmod.json": 1, diff --git a/translations/translatedlabels.json b/translations/translatedlabels.json index bc5d7082e3..d41e48c36b 100644 --- a/translations/translatedlabels.json +++ b/translations/translatedlabels.json @@ -1888,7 +1888,7 @@ "scyphojel.species.json": 0, "sergal.species.json": 1, "shade.species.json": 0, - "shadow.species.json": 1, + "shadow.species.json": 2, "shared_.species.json": 1, "shared_avali.species.json": 1, "shared_ed.species.json": 0, @@ -2142,7 +2142,7 @@ "radioactive.item.json": 1, "scented.item.json": 1, "scented2.item.json": 1, - "shared_.item.json": 1, + "shared_.item.json": 0, "solar.item.json": 1, "solarium.item.json": 1, "sweet.item.json": 1, @@ -2513,12 +2513,12 @@ "epsteinbook.codex.json": 2, "ffguide.codex.json": 2, "ffguide2.codex.json": 2, - "ffguide3.codex.json": 2, + "ffguide3.codex.json": 3, "ffguide4.codex.json": 1, "ffguide5.codex.json": 3, "ffguide6.codex.json": 2, - "ffguidebattle.codex.json": 3, - "ffguidepower.codex.json": 2, + "ffguidebattle.codex.json": 4, + "ffguidepower.codex.json": 6, "fleshweave.codex.json": 3, "foodprep.codex.json": 3, "lotus1.codex.json": 8, @@ -3945,10 +3945,10 @@ "effigiumbroadsword.activeitem.json": 1, "elderbroadsword.activeitem.json": 3, "energyblade.activeitem.json": 2, - "energyblade2.activeitem.json": 2, + "energyblade2.activeitem.json": 1, "fuatropusbroadsword.activeitem.json": 1, "fucultistbroadsword.activeitem.json": 2, - "fugoldenblade.activeitem.json": 2, + "fugoldenblade.activeitem.json": 1, "hellfireblade.activeitem.json": 2, "hylotlgreatscion.activeitem.json": 2, "irradiumsword.activeitem.json": 1, @@ -3969,16 +3969,13 @@ "quietusemperor.activeitem.json": 2, "quietusknight.activeitem.json": 3, "radienbroadsword.activeitem.json": 2, - "shared_.activeitem.json": 3, + "shared_.activeitem.json": 2, "shared_wavyslimesword.json": 1, "slimebroadsword": { "shared_broadsword.activeitem.json": 1, "slimenpcbroadsword.activeitem.json": 1, "slimepersonbroadsword.activeitem.json": 1 }, - "slimesword.activeitem.json": 1, - "slimesword2.activeitem.json": 1, - "slimesword3.activeitem.json": 1, "spikesword.activeitem.json": 2, "stonebroadsword.activeitem.json": 1, "telebriumbroadsword.activeitem.json": 2, @@ -4009,7 +4006,7 @@ "irradiumdagger.activeitem.json": 1, "isogendagger.activeitem.json": 2, "lunaridagger.activeitem.json": 2, - "nightardagger.activeitem.json": 5, + "nightardagger.activeitem.json": 7, "penumbriredagger.activeitem.json": 2, "pyreitedagger.activeitem.json": 2, "quietusknave.activeitem.json": 1, @@ -4053,7 +4050,7 @@ "fuuncommongreataxe.activeitem.json": 1, "irongreataxe.activeitem.json": 2, "irradiumgreataxe.activeitem.json": 1, - "lunarigreataxe.activeitem.json": 2, + "lunarigreataxe.activeitem.json": 1, "nightarwarblade.activeitem.json": 1, "penumbritegreataxe.activeitem.json": 2, "quietusgreataxe.activeitem.json": 1, @@ -4083,7 +4080,7 @@ "fucarbonhammer.activeitem.json": 2, "fuhoneyhammer.activeitem.json": 2, "fumegahoneyhammer.activeitem.json": 2, - "fuquantumhammer.activeitem.json": 1, + "fuquantumhammer.activeitem.json": 0, "irradiumhammer.activeitem.json": 1, "isogenhammer.activeitem.json": 2, "kelpsteelhatchet.activeitem.json": 2, @@ -4091,7 +4088,7 @@ "meathammer.activeitem.json": 2 }, "metallichammer.activeitem.json": 2, - "mystichammer.activeitem.json": 2, + "mystichammer.activeitem.json": 1, "penumbritehammer.activeitem.json": 2, "pyreitehammer.activeitem.json": 2, "quietushammer.activeitem.json": 2, @@ -4175,12 +4172,11 @@ "veluulongsword.activeitem.json": 1, "violiumlongsword.activeitem.json": 2, "xithricitelongsword.activeitem.json": 1, - "yinyang.activeitem.json": 2, + "yinyang.activeitem.json": 1, "zerchesiumlongsword.activeitem.json": 2 }, "mace": { "aegisaltmace.activeitem.json": 2, - "aetheriummace.activeitem.json": 4, "ballmace.activeitem.json": 2, "bonemace.activeitem.json": 2, "cutemace.activeitem.json": 2, @@ -4231,7 +4227,7 @@ "deadbeatquarterstaff.activeitem.json": 2, "densiniumquarterstaff.activeitem.json": 1, "diamondquarterstaff.activeitem.json": 2, - "fucultistquarterstaff.activeitem.json": 2, + "fucultistquarterstaff.activeitem.json": 1, "goldquarterstaff.activeitem.json": 2, "ironquarterstaff.activeitem.json": 1, "irradiumquarterstaff.activeitem.json": 1, @@ -4286,7 +4282,7 @@ "fubonescythe.activeitem.json": 2, "fucultistscythe.activeitem.json": 2, "goldscythe.activeitem.json": 2, - "honeyscythe.activeitem.json": 2, + "honeyscythe.activeitem.json": 1, "ironscythe.activeitem.json": 2, "irradiumscythe.activeitem.json": 1, "kirhosscythe.activeitem.json": 2, @@ -4301,7 +4297,7 @@ "xithricitescythe.activeitem.json": 2, "zerchesiumscythe.activeitem.json": 2 }, - "shared_.activeitem.json": 6, + "shared_.activeitem.json": 4, "shared_r.activeitem.json": 1, "shared_spear": { "shared_spear.activeitem.json": 2 @@ -4368,9 +4364,9 @@ "fuchainsword.activeitem.json": 3 }, "fucultistshortsword.activeitem.json": 2, - "fusavethequeen.activeitem.json": 2, + "fusavethequeen.activeitem.json": 1, "fushroomsword.activeitem.json": 2, - "goldenseascion.activeitem.json": 2, + "goldenseascion.activeitem.json": 1, "greenedge.activeitem.json": 2, "hardenedsteelblade.activeitem.json": 2, "heliosblade.activeitem.json": 2, @@ -4380,7 +4376,6 @@ "isogenshortsword.activeitem.json": 2, "moltenblade.activeitem.json": 2, "murdermachete.activeitem.json": 2, - "nightarshortsword.activeitem.json": 3, "obsidianblade.activeitem.json": 2, "penumbriteshortsword.activeitem.json": 2, "pyreiteshortsword.activeitem.json": 2, @@ -4389,7 +4384,7 @@ "quietusmercenary.activeitem.json": 2, "redwaxsword.activeitem.json": 2, "shadowblade.activeitem.json": 2, - "shadowburst.activeitem.json": 2, + "shadowburst.activeitem.json": 1, "shared_.activeitem.json": 0, "solariblade.activeitem.json": 2, "stoneshortsword.activeitem.json": 1, @@ -4457,7 +4452,7 @@ "injectorbio.activeitem.json": 1, "irradiumspear.activeitem.json": 1, "isogenspear.activeitem.json": 2, - "kirhosispear.activeitem.json": 2, + "kirhosispear.activeitem.json": 1, "lavaspear.activeitem.json": 3, "mantizispear.activeitem.json": 3, "marinerspear.activeitem.json": 2, @@ -4473,7 +4468,7 @@ "radienspear.activeitem.json": 5, "shared_.activeitem.json": 3, "shared_spear.activeitem.json": 2, - "shovelspear.activeitem.json": 4, + "shovelspear.activeitem.json": 2, "siliconspear.activeitem.json": 2, "solarispear.activeitem.json": 2, "stonespear.activeitem.json": 2, @@ -4489,7 +4484,7 @@ "nightar": { "brokennightarsaber.activeitem.json": 2, "fubrokennightarblade.activeitem.json": 2, - "nightarsaber.activeitem.json": 5 + "nightarsaber.activeitem.json": 7 }, "novakid": { "durasteelassaultrifle2.activeitem.json": 2, @@ -4885,7 +4880,7 @@ }, "fualienlaser.activeitem.json": 2, "fucarbonhandcannon.activeitem.json": 2, - "fucellgun.activeitem.json": 2, + "fucellgun.activeitem.json": 1, "fucyclone.activeitem.json": 2, "fugaussmachinegun.activeitem.json": 1, "fugausspistol.activeitem.json": 1, @@ -5412,7 +5407,7 @@ "zerchesiumwhip.activeitem.json": 2 } }, - "weapons.json": 6, + "weapons.json": 4, "xcodex": { "logbook": { "logbook.activeitem.json": 2 @@ -8467,7 +8462,7 @@ "cellpods.consumable.json": 2, "cherry.consumable.json": 2, "corvex.consumable.json": 2, - "crystalplant.consumable.json": 2, + "crystalplantedible.consumable.json": 0, "diodiahybrid.consumable.json": 2, "dragonsbeard.consumable.json": 2, "dunestalk.item.json": 2, @@ -8922,7 +8917,7 @@ "shared_unrefined.json": 1, "shared_woodenplatform.matitem.json": 4, "shared_woodenwindow1.matitem.json": 1, - "shojilattice.matitem.json": 2, + "shojilattice.matitem.json": 1, "shroomblockglow.matitem.json": 1, "shroomblockmaterial.matitem.json": 1, "skathhazard.matitem.json": 1, @@ -9333,6 +9328,7 @@ "shared_sandpillar.json": 2, "shared_sandstone.json": 2, "shared_shingles.mat.json": 5, + "shared_shojilattice.mat.json": 1, "shared_shroomblock.json": 1, "shared_shroomblockglow.mat.json": 1, "shared_silversloppedpanel.mat.json": 0, @@ -17953,7 +17949,8 @@ "kirhosfuelhatch.object.json": 1 }, "kirhosshipdoor": { - "kirhosshipdoor.object.json": 1 + "kirhosshipdoor.object.json": 1, + "kirhosshiphatch.object.json": 0 }, "kirhosshipdoorbroken": { "kirhosshipdoorbroken.object.json": 2 @@ -17965,6 +17962,9 @@ "kirhosshiplockertier0.object.json": 3 }, "kirhosshipparts": { + "SIV_shipKirhosGunDeco": { + "SIV_shipKirhosGunDeco.object.json": 0 + }, "kirhos_eye.object.json": 2, "kirhos_smalleye.object.json": 2 }, @@ -18114,7 +18114,7 @@ }, "shared_fu_byosship": { "shared_fu_byosship.json": 1, - "shared_fu_byosshiphatch.json": 3 + "shared_fu_byosshiphatch.json": 2 }, "shared_fu_byosshipdoor": { "shared_fu_byosshipdoor.json": 3 @@ -18167,6 +18167,9 @@ "shared_oscaptainschair": { "shared_oscaptainschair.json": 1 }, + "shared_osship": { + "shared_osshiphatch.json": 1 + }, "shared_osshipdoor": { "shared_osshipdoor.json": 1 }, @@ -23128,7 +23131,7 @@ "darkstone.material.json": 2, "deadearth.material.json": 1, "dollhouse": { - "dollhousecrosshatch.material.json": 2, + "dollhousecrosshatch.material.json": 1, "dollhouseflooring.material.json": 5, "dollhousepillar.material.json": 5, "dollhousetiles.material.json": 3, @@ -23411,7 +23414,7 @@ }, "whitemeteorite.material.json": 2 }, - "materials.json": 1, + "materials.json": 2, "mods": { "algaeore.matmod.json": 1, "avalitilled.matmod.json": 1,