From bd40202cf03a8fe8f94e2d36a4207559f3fee617 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 25 Nov 2013 15:32:42 -0800 Subject: [PATCH] Add more descriptions to books and tooltips --- resources/assets/tinker/lang/en_US.lang | 22 ++++--- resources/assets/tinker/manuals/firstday.xml | 56 ++++++++++++++---- resources/assets/tinker/manuals/materials.xml | 16 ++++- resources/assets/tinker/manuals/smeltery.xml | 38 ++++++++++++ .../textures/items/materials/cast_nugget.png | Bin 0 -> 539 bytes src/tconstruct/client/TProxyClient.java | 13 ++++ src/tconstruct/common/TContent.java | 5 +- src/tconstruct/items/GoldenHead.java | 4 +- src/tconstruct/items/Manual.java | 10 ++-- src/tconstruct/items/StrangeFood.java | 4 +- .../items/blocks/HamboneItemBlock.java | 2 +- .../items/blocks/SmelteryItemBlock.java | 29 +++++++++ 12 files changed, 164 insertions(+), 35 deletions(-) create mode 100644 resources/assets/tinker/textures/items/materials/cast_nugget.png diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index d7b95f1a..c15ef361 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -389,6 +389,7 @@ item.tconstruct.Fletching.blueslime.name=Slime Fletching item.tconstruct.manual.beginner.name=Materials and You item.tconstruct.manual.toolstation.name=Materials and You item.tconstruct.manual.smeltery.name=Mighty Smelting +item.tconstruct.manual.diary.name=Diary of a Tinker item.tconstruct.bucket.Iron.name=Molten Iron Bucket item.tconstruct.bucket.Gold.name=Molten Gold Bucket @@ -594,9 +595,9 @@ achievement.tconstruct.enemySlayer.desc=Slay a mob achievement.tconstruct.dualConvenience.desc=Kill a mob with a frying pan, and then cook their meat in it knapsack.tooltip=A Knapsack to hold your things. -strangefood1.tooltip=\u00a7b\u00a7oIt smells terrible, but if you= -strangefood2.tooltip=\u00a7b\u00a7ohave nothing else to eat...= -hambone1.tooltip=\u00A74Hambone! +strangefood1.tooltip=It smells terrible, but if you +strangefood2.tooltip=have nothing else to eat... +hambone1.tooltip=Hambone! hambone2.tooltip=Usable for Beacon bases metalblock.tooltip=Usable for Beacon bases craftedsoil1.tooltip=Heals Undead @@ -617,9 +618,9 @@ speedblock1.tooltip=You run pretty fast on it speedblock2.tooltip=You run a bit faster on it speedblock.slab1.tooltip=You run pretty fast on it speedblock.slab2.tooltip=You run a bit faster on it -manual1.tooltip=\u00a7oBy: Skyla -manual2.tooltip=\u00a7oBy: Skyla -manual3.tooltip=\u00a7oBy: Thruul M'gon +manual1.tooltip=By: Skyla +manual2.tooltip=By: Skyla +manual3.tooltip=By: Thruul M'gon searedtank1.tooltip=Contains searedtank2.tooltip=Keeps any fluids it has when harvested oreberries1.tooltip=Sweet Irony @@ -637,8 +638,8 @@ landmine1.tooltip=everything landmine2.tooltip=mobs, players and redstone landmine3.tooltip=players and redstone landmine4.tooltip=redstone only -goldenhead1.tooltip=\u00a75\u00a7oSome say consuming the head of a -goldenhead2.tooltip=\u00a75\u00a7ofallen foe strengthens the blood +goldenhead1.tooltip=Some say consuming the head of a +goldenhead2.tooltip=fallen foe strengthens the blood oreberrybush1.tooltip=Sweet Irony oreberrybush2.tooltip=Pure Luster oreberrybush3.tooltip=Tastes like metal @@ -649,3 +650,8 @@ barricade.tooltip=Stacks up to 4 times pattern1.tooltip=Material Cost: pattern2.tooltip=Material Cost: potionlauncher.tooltip=Test Item +smeltery.controller.tooltip=Brain of the Smeltery +smeltery.drain.tooltip1=Works both as input and output for +smeltery.drain.tooltip2=fluids in the Smeltery +smeltery.brick.tooltip1=Smeltery structure block +smeltery.brick.tooltip2=(Safe for decoration) diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/firstday.xml index 5f069fa4..c7055513 100644 --- a/resources/assets/tinker/manuals/firstday.xml +++ b/resources/assets/tinker/manuals/firstday.xml @@ -37,19 +37,6 @@ You can then shape a material in a part builder with the pattern, then combine p Together these make the Tool Workshop. It is recommended you keep all of these nearby when using any of them. - -Oreberry Bushes - -Sometime in your travels you will happen upon the bush known as the Oreberry. They grow underground in dark areas, and require close to complete darkness to produce anything. - -The berries can be melted down into nuggets and ingots, making them an invaluable source of metals. - - - -Oreberries in their natural environment -tinker:manuals/oreberries.png - - Blank Pattern @@ -98,6 +85,49 @@ The berries can be melted down into nuggets and ingots, making them an invaluabl + +Drying Rack + + dryingrack + three + + + + +Oreberry Bushes + +Sometime in your travels you will happen upon the bush known as the Oreberry. They grow underground in dark areas, and require close to complete darkness to produce anything. + +The berries can be melted down into nuggets and ingots, making them an invaluable source of metals. + + + +Oreberries in their natural environment +tinker:manuals/oreberries.png + + + +Slime Channels + +Slime channels are useful for moving items or entities around. They are used as a sort of easily placeable water and can be paired with bounce pads for best effect. + + + +Slime Channel + + slimechannel + two + + + + +Bounce Pad + + bouncepad + two + + + A few traps or blockades may help with your early survival experience diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index 24f65b00..b2bf4097 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -673,13 +673,27 @@ Class: Ranged Projectile Launcher Steel steelsword -An Iron alloy. The method for obtaining this is unknown. Enemy chainmail seems to be made of it. +An Iron alloy. The method for obtaining this is unknown. - Requires the Smeltery
steelingot
+ +Pig Iron +pigironsword +PigIron +An Iron alloy. It seems to be made of blood, iron, and emeralds. +- Requires the Smeltery + +
pigironingot
+
+
+ + + + Diamond Adding a diamond to the edge of a tool seems to make it more resilient. diff --git a/resources/assets/tinker/manuals/smeltery.xml b/resources/assets/tinker/manuals/smeltery.xml index 17af75c5..6137ea9c 100644 --- a/resources/assets/tinker/manuals/smeltery.xml +++ b/resources/assets/tinker/manuals/smeltery.xml @@ -48,6 +48,10 @@ The main structure for melting metals is called the Smeltery. It is larger than When working with the Smeltery, there are a few things to keep in mind: +* The Smeltery functions as a large liquid tank. It is capable of melting metals and mixing various things. + +* Drains function as input/output for the tank. If you need to get liquids back into the structure, simply pour them into a drain. + * Ores naturally have more material than processed versions, such as ingots. The Smeltery will preserve the full value of the ores - roughly twice as much as a regular furnace would provide. * Mixing two or more metals in the Smeltery may result in an alloy. The process happens automatically. @@ -127,6 +131,34 @@ Other liquid removal objects will work, but are frowned upon. An example picture Alumite, made from Aluminum(5), Iron(2), and Obsidian(2) alumiteingot + + Pig Iron, made from Iron(1), Blood(1), and Emeralds(1) + pigironingot + + + + +There exist a few liquids that are gained through strange means. Currently known liquids are: + + Blood, damaging entities in the Smeltery + bloodbucket + + + Liquified Emeralds, melting down emeralds or villagers + emeraldbucket + + + Glue, melting down horses in the Smeltery + gluebucket + + + Slime, found on slime islands. It functions as a spawner + slimebucket + + + Ender, either melting down ender pearls or endermen + enderbucket + @@ -253,4 +285,10 @@ Part casts must be created by pouring metal around existing parts, like a pickax endstone + +Glueball +glueball + + + diff --git a/resources/assets/tinker/textures/items/materials/cast_nugget.png b/resources/assets/tinker/textures/items/materials/cast_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..6a00ef4fe41b65fdea5c508092463adae42c0aa6 GIT binary patch literal 539 zcmV+$0_6RPP)Px#24YJ`L;&CbzyMGyQ@a!Z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*%9 z7Bwp_lW1W800EmxL_t(I%cYY+a?~&sMBkSzdprr14Y1|{+<}X6C+-3ZiUkXXsuU?8 zBvfX`w)C5Y#vV_xjFy)C)ZM=Y&s+vDetj>OBRP_Q0zk<-qAc@1{4hzD}2q9o*sK7LeQVQ-f9L$WnAKw9JfJ&y2r+U!c0l4a~LBdN}z##-; zjP#q$88A&F?oN!6loDo!nc36dCt{534@dQV&!%e$A)IXFGoasg__RUNEY;kdo0}Wl zov!Qb{?CJQo=#bWOTaLU48u@8`T`-3g{EmpDe?N%OZ)ZvUj22CRKr~W?u9%~i@%f- zAq3jCrIbR>nQ_b@=WwXDN|{z6S`DYd9M!mOzuzzOJ`R)G)YS2wpbH>|DpS&FR9a-t z=^uxQrfF!~1i)rJh51nJ#ChHlOR!*+l9{UVO9jPeN#~*fdU)Kw1-<~owriO!0K{5i zmL|FvB+VVDo54P27r|_)@jRh%9M=}O_;FV8;%d8mU++n}%;0wSnV)yx{(EUbm$$AJ du7S^5{{T`t6Y&;6-q`>E002ovPDHLkV1gEV=@