Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use class translation for faction description and other translation updates #44691

Merged
merged 4 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"looks_like": "optical_cloak",
"type": "TOOL_ARMOR",
"name": { "str": "FB51 optical cloak (on)", "str_pl": "FB51 optical cloaks (on)" },
"description": "A plastic cloak embedded with cameras and LEDs that will render you fully invisible to normal vision when powered and worn. It is turned on, and continually draining power from an UPS. Use it to turn it off. ",
"description": "A plastic cloak embedded with cameras and LEDs that will render you fully invisible to normal vision when powered and worn. It is turned on, and continually draining power from an UPS. Use it to turn it off.",
"flags": [ "USE_UPS", "OVERSIZE", "HOOD", "WATERPROOF", "OUTER", "VARSIZE", "ACTIVE_CLOAKING", "TRADER_AVOID" ],
"power_draw": 20000000,
"revert_to": "optical_cloak",
Expand Down
5 changes: 1 addition & 4 deletions data/json/items/book/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,7 @@
{
"id": "distilling_cookbook",
"type": "BOOK",
"name": {
"str": "Out of the Holler and into the Home: A guide to home distillation. ",
"str_pl": "copies of Out of the Holler"
},
"name": { "str": "Out of the Holler and into the Home: A guide to home distillation", "str_pl": "copies of Out of the Holler" },
"description": "A book describing the history of at home distillation by liquor. Each chapter contains a complete recipe for its namesake.",
"weight": "454 g",
"volume": "619 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"id": "paperback_romance_grue",
"type": "BOOK",
"name": { "str": "Tall, Dark, and Gruesome", "str_pl": "copies of Tall, Dark, and Gruesome" },
"description": "Fatima's obsession with the dead threatens to consume her when she falls in love with a restless ghost. In this provocative romp celebrated author Kea Dekker gently lifts the thin veil separating cold bodies from warm. ",
"description": "Fatima's obsession with the dead threatens to consume her when she falls in love with a restless ghost. In this provocative romp celebrated author Kea Dekker gently lifts the thin veil separating cold bodies from warm.",
"copy-from": "paperback_romance_lnl"
},
{
Expand Down
12 changes: 8 additions & 4 deletions data/json/items/book/misc_pulp.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
"id": "book_fict_soft_pulp_nogod",
"type": "BOOK",
"name": { "str": "No God From a Corpse", "str_pl": "copies of No God" },
"description": "This is a weatherworn paperback written by some skirt named \"Lee Racket.\" It tells how rage and jealousy can turn a man, or a woman, into a monster. This story is hard-boiled enough to break a spoon.",
"//translator": "'Hard-boiled enough to break a spoon' means melodramatic, exaggerated, emotional but simple, and possessing a general lack of literary pretense. Weatherworn means damaged by age. Skirt means woman.",
"description": {
"str": "This is a weatherworn paperback written by some skirt named \"Lee Racket.\" It tells how rage and jealousy can turn a man, or a woman, into a monster. This story is hard-boiled enough to break a spoon.",
"//~": "'Hard-boiled enough to break a spoon' means melodramatic, exaggerated, emotional but simple, and possessing a general lack of literary pretense. Weatherworn means damaged by age. Skirt means woman."
},
"//isbn13": 9781627551144,
"weight": "225 g",
"volume": "408 ml",
Expand All @@ -45,8 +47,10 @@
"id": "book_fict_soft_pulp_ddive",
"type": "BOOK",
"name": { "str": "The Deep Dive", "str_pl": "copies of Deep Dive" },
"description": "This dimestore short story about space travel is written by a broad named \"Lee Racket.\"",
"//translator": "Broad is a dismissive and outdated term that simply means \"woman.\" The term is used because it evokes the (decidedly misogynistic) era in which the pulp genre gained popularity within the United States.",
"description": {
"str": "This dimestore short story about space travel is written by a broad named \"Lee Racket.\"",
"//~": "Broad is a dismissive and outdated term that simply means \"woman.\" The term is used because it evokes the (decidedly misogynistic) era in which the pulp genre gained popularity within the United States."
},
"//isbn13": 9781612420530,
"//genre": "this is also scifi",
"weight": "154 g",
Expand Down
6 changes: 4 additions & 2 deletions data/json/items/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -1509,8 +1509,10 @@
"id": "wrapper_pr",
"type": "GENERIC",
"name": { "str": "wrapper" },
"//desc": "Daizu is Japanese for soy, hence DaiZoom",
"description": "\"DaiZoom Protein Bar, brought to you by SoyPelusa\" is emblazoned proudly upon this greaseproof wrapper.",
"description": {
"//~": "Daizu is Japanese for soy, hence DaiZoom",
"str": "\"DaiZoom Protein Bar, brought to you by SoyPelusa\" is emblazoned proudly upon this greaseproof wrapper."
},
"copy-from": "wrapper",
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "225 ml", "max_contains_weight": "1 kg" } ]
},
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/tool/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@
"category": "weapons",
"name": { "str": "small bootleg frag device" },
"looks_like": "tool_black_powder_charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, equipped with a delayed fuse. Use this item to pull the pin. Once you do it should explode in about 20 seconds. ",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, equipped with a delayed fuse. Use this item to pull the pin. Once you do it should explode in about 20 seconds.",
"weight": "6500 g",
"volume": "4 L",
"price": 20000,
Expand Down Expand Up @@ -1429,7 +1429,7 @@
"category": "weapons",
"name": { "str": "small improvised frag device" },
"looks_like": "tool_black_powder_charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with stable explosives and scrap metal, equipped with a long fuse. Use this item to light the fuse. Once you do it should explode in about 20 seconds. ",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with stable explosives and scrap metal, equipped with a long fuse. Use this item to light the fuse. Once you do it should explode in about 20 seconds.",
"weight": "6500 g",
"volume": "4 L",
"price": 20000,
Expand Down Expand Up @@ -1484,7 +1484,7 @@
"category": "weapons",
"name": { "str": "small primitive frag device" },
"looks_like": "tool_black_powder_charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with volatile explosives and scrap metal, equipped with a long fuse. Use this item to light the fuse. Once you do it should explode in about 20 seconds. ",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with volatile explosives and scrap metal, equipped with a long fuse. Use this item to light the fuse. Once you do it should explode in about 20 seconds.",
"weight": "6500 g",
"volume": "4 L",
"price": 20000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/Backgrounds/gung_ho_3.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"id": "BGSS_GUNG_HO_3_FEMA1",
"type": "talk_topic",
"dynamic_line": "Lord no. I'll be fucked if I let a kid in a too-big uniform tell me what the hell to do. I had my Hummer loaded out and ready to go offroading, I had a ton of gas, and I even had as many rifles as the border was gonna let me bring over. I didn't know what I was supposed to be running from, but I sure as shit didn't run. ",
"dynamic_line": "Lord no. I'll be fucked if I let a kid in a too-big uniform tell me what the hell to do. I had my Hummer loaded out and ready to go offroading, I had a ton of gas, and I even had as many rifles as the border was gonna let me bring over. I didn't know what I was supposed to be running from, but I sure as shit didn't run.",
"responses": [
{ "text": "Where did you go then?", "topic": "BGSS_GUNG_HO_3_STORY2" },
{ "text": "Tell me about your son.", "topic": "BGSS_GUNG_HO_3_SON1" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/Kindred/NPC_Brigitte_LaCroix.json
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
{
"id": "TALK_MISSION_OFFER_SEER",
"type": "talk_topic",
"dynamic_line": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song. Go out, butcher an untainted creature and feel the power between your fingertips. Then bring me the bones and I shall carve them for you. ",
"dynamic_line": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song. Go out, butcher an untainted creature and feel the power between your fingertips. Then bring me the bones and I shall carve them for you.",
"responses": [
{
"text": "Well, I guess I oughta see where this goes. I'm in.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_BARRY_TOWER",
"dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet. Let me reclaim my life for a while. " ],
"dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet. Let me reclaim my life for a while." ],
"responses": [ { "text": "Sounds good, Barry.", "topic": "TALK_DONE" } ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/missiondef.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"dialogue": {
"describe": "St. Michael the archangel defend me in battle…",
"offer": "I have another task if you are feeling up to it. There is a prisoner that the priest made special mention of. I was wondering if you could see what may have happened to him or if he left anything in his cell. The priest admits the individual is rather unstable, to put it lightly, but the priest personally believed the man was some kind of repentant visionary. I'm not in a position to cast out the account just yet… it seems the man has prophesied events accurately before concerning the Church of Starry Wisdom.",
"accepted": "I wish you the best of luck, may whatever god you please guide your path… I can only imagine that the prison will be a little slice of hell. I'm not sure what they would have decided to do with the inmates when they knew death was almost certain. ",
"accepted": "I wish you the best of luck, may whatever god you please guide your path… I can only imagine that the prison will be a little slice of hell. I'm not sure what they would have decided to do with the inmates when they knew death was almost certain.",
"rejected": "Ya, I guess the stress may just be getting to me…",
"advice": "The worst case scenario will probably be that the prisoners have escaped their cells and turned the building into their own little fortress. Best case, the building went into lock-down and secured the prisoners in their cells. Either way, navigating the building will pose its own difficulties.",
"inquire": "Any luck?",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/necropolis/NPC_Old_Guard_Captain.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
"describe": "We need help…",
"offer": "Your assistance is greatly appreciated, we need to clear out the more ruthless monsters that are wandering up from the lower levels. If you could cull twenty or so of what we refer to as 'nightmares' my men would be much safer. If you've cleared out most of this floor then the lower levels should be your next target. ",
"offer": "Your assistance is greatly appreciated, we need to clear out the more ruthless monsters that are wandering up from the lower levels. If you could cull twenty or so of what we refer to as 'nightmares' my men would be much safer. If you've cleared out most of this floor then the lower levels should be your next target.",
"accepted": "Good luck, finding a clear passage to the second level may be tricky.",
"rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…",
"advice": "These creatures can swing their appendages surprisingly far.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/necropolis/NPC_Old_Guard_Commo.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"followup": "MISSION_OLD_GUARD_NEC_COMMO_3",
"dialogue": {
"describe": "We need help…",
"offer": "I guess I could use your skills once again. There are small transmitters located in the nearby evacuation shelters; if we don't separate them from the power grid their power systems will rapidly deteriorate over the next few weeks. The task is rather simple but the shelters offer us a place to redirect refugees until this vault can be secured. ",
"offer": "I guess I could use your skills once again. There are small transmitters located in the nearby evacuation shelters; if we don't separate them from the power grid their power systems will rapidly deteriorate over the next few weeks. The task is rather simple but the shelters offer us a place to redirect refugees until this vault can be secured.",
"accepted": "Thanks, I should be ready for you to install the radio repeater mods by the time you get back.",
"rejected": "I don't know why you would bother wasting your time down here if you can't handle a few small tasks…",
"advice": "Try searching on the outskirts of towns.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
{
"id": "TALK_ROBOFAC_MERC_1_COINS",
"type": "talk_topic",
"dynamic_line": "Have you noticed they pay us in tiny little gold coins, it's bizarre I say. One would think they have a gold mine in there, but no, they don't, so they make me cross the damned world grabbing gold bars. ",
"dynamic_line": "Have you noticed they pay us in tiny little gold coins, it's bizarre I say. One would think they have a gold mine in there, but no, they don't, so they make me cross the damned world grabbing gold bars.",
"responses": [
{ "text": "I guess I could help with that…", "topic": "TALK_ROBOFAC_MERC_1_GOLD_MISSION" },
{ "text": "Now that you mention it, it does seem rather strange.", "topic": "TALK_ROBOFAC_MERC_1_MAIN" }
Expand Down
10 changes: 5 additions & 5 deletions data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"followup": "MISSION_RANCH_FOREMAN_2",
"dialogue": {
"describe": "We need help…",
"offer": "Our first project is to enclose the barn so that new refugees have a safe place to sleep. Before we can begin serious improvements we need lumber to work with. Enclosing the four barn entrances will take nearly 400 2x4's… if you could provide half of that we should be able to take care of the other half and construction. If you don't have a truck, I'd make finding one your first priority. ",
"offer": "Our first project is to enclose the barn so that new refugees have a safe place to sleep. Before we can begin serious improvements we need lumber to work with. Enclosing the four barn entrances will take nearly 400 2x4's… if you could provide half of that we should be able to take care of the other half and construction. If you don't have a truck, I'd make finding one your first priority.",
"accepted": "The more men we can bring to the camp the quicker improvements can be made.",
"rejected": "Come back when you get a chance. We need skilled survivors.",
"advice": "Avoid destroying the furniture, we'll be needing it.",
Expand Down Expand Up @@ -269,7 +269,7 @@
"dialogue": {
"describe": "We need help…",
"offer": "I'm sure you've noticed the new workers that have started trickling in. The Free Merchant counsel is demanding that we immediately begin projects to become self-sufficient due to limited supplies. We are going to need to rapidly setup an agricultural industry before winter and starvation catches us unprepared and unsupported. In order to get a half dozen shovels and a couple of bags of seeds, we are going to have to trade for it. I've already got the deal lined up but the only thing they are willing to trade it for is salt. I negotiated them down from 500 units to 300… we were hoping you might have access to a source.",
"accepted": "Salt is key to preserving meat and other perishables… without any excess food it wouldn't do us much good now but I imagine we'll need to send you out to get more in the future. ",
"accepted": "Salt is key to preserving meat and other perishables… without any excess food it wouldn't do us much good now but I imagine we'll need to send you out to get more in the future.",
"rejected": "Come back when you get a chance. We need skilled survivors.",
"advice": "If you can find a source of salt water you should be able to boil it down.",
"inquire": "Do you have the salt?",
Expand Down Expand Up @@ -332,7 +332,7 @@
"followup": "MISSION_RANCH_FOREMAN_6",
"dialogue": {
"describe": "We need help…",
"offer": "Well, our first crop will be planted shortly but I'm starting to suspect that our profit margin is going to be much smaller than we expect. With limited seed for our original crop our next course of action is to increase the soil's fertility. Is there any way you could find or produce a basic liquid fertilizer for us? We'd need at least 30 units to make a significant improvement in our output. ",
"offer": "Well, our first crop will be planted shortly but I'm starting to suspect that our profit margin is going to be much smaller than we expect. With limited seed for our original crop our next course of action is to increase the soil's fertility. Is there any way you could find or produce a basic liquid fertilizer for us? We'd need at least 30 units to make a significant improvement in our output.",
"accepted": "I don't know the exact recipe but I'm sure you could make it from a commercial fertilizer or produce it from bonemeal.",
"rejected": "Come back when you get a chance. We need skilled survivors.",
"advice": "I'd look through a few basic chemistry books to find a simple recipe.",
Expand Down Expand Up @@ -377,7 +377,7 @@
"followup": "MISSION_RANCH_FOREMAN_7",
"dialogue": {
"describe": "We need help…",
"offer": "Our current assessment for survivability has increased significantly thanks to your efforts. The next priority issue is securing a cleaner water source. Drinking from the pond on the back end of the ranch has led to an outbreak of dysentery. As quickly as possible we need to improve the sanitary conditions in the camp. To do so the first step is to dig a well and construct stone fireplaces in the barn for the migrants to boil water. We are going to need at least 75 rocks from you if we hope to accomplish the task before we all get sick. After we have them installed you will have free access to them, guaranteed. ",
"offer": "Our current assessment for survivability has increased significantly thanks to your efforts. The next priority issue is securing a cleaner water source. Drinking from the pond on the back end of the ranch has led to an outbreak of dysentery. As quickly as possible we need to improve the sanitary conditions in the camp. To do so the first step is to dig a well and construct stone fireplaces in the barn for the migrants to boil water. We are going to need at least 75 rocks from you if we hope to accomplish the task before we all get sick. After we have them installed you will have free access to them, guaranteed.",
"accepted": "If you take a shovel to a pile of rubble you should be able to pull out structural grade stone.",
"rejected": "Come back when you get a chance. We need skilled survivors.",
"advice": "Mining would always be an option if you had the resources.",
Expand Down Expand Up @@ -475,7 +475,7 @@
"dialogue": {
"describe": "We need help…",
"offer": "With the well's completion we are rapidly closing the sustainability gap. In order to expand from here we will need massive quantities of lumber to construct fortifications and new buildings. We have already begun work on a manually operated sawmill but we will need two motors to control the actual blades. We were hoping you might be able to secure the motors for us.",
"accepted": "Power for the motors will be provided by a salvaged truck battery, you need not bring additional mechanical components. ",
"accepted": "Power for the motors will be provided by a salvaged truck battery, you need not bring additional mechanical components.",
"rejected": "Come back when you get a chance. We need skilled survivors.",
"advice": "Mining would always be an option if you had the resources.",
"inquire": "Do you have the motors?",
Expand Down
Loading