Skip to content

Commit

Permalink
Merge pull request CleverRaven#54836 from NetSysFire/mission-typo
Browse files Browse the repository at this point in the history
NPC grammar fixes
  • Loading branch information
Rivet-the-Zombie authored Jan 27, 2022
2 parents 582b193 + 107799c commit 761fb51
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "npc",
"id": "isherwood_chris",
"//": "Part of Isherwood family.",
"//": "Part of the Isherwood family.",
"name_unique": "Chris Isherwood",
"gender": "male",
"class": "NC_ISHERWOOD_CHRIS",
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "npc",
"id": "isherwood_eddie",
"//": "Dairy farmer the Isherwood family.",
"//": "Dairy farmer of the Isherwood family.",
"name_unique": "Eddie Isherwood",
"gender": "male",
"class": "NC_ISHERWOOD_EDDIE",
Expand Down Expand Up @@ -188,7 +188,7 @@
{
"id": "MISSION_ISHERWOOD_EDDIE_1",
"type": "mission_definition",
"name": { "str": "Gather 120 Rocks" },
"name": { "str": "Gather 120 rocks" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "Hi, this is a nice farm, your family live here?",
"text": "Hi, this is a nice farm, your family lives here?",
"topic": "TALK_ISHERWOOD_LISA_TALK1",
"condition": { "not": { "u_is_wearing": "badge_marshal" } }
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
{
"id": "MISSION_ARSONIST_1_AMMONIUM_NITRATE",
"type": "mission_definition",
"name": { "str": "Supply the arsonist." },
"name": { "str": "Supply the arsonist" },
"description": "Bring the arsonist 42 kg of commercial fertilizer",
"difficulty": 1,
"value": 500,
Expand Down
30 changes: 15 additions & 15 deletions data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
{
"id": "MISSION_RANCH_FOREMAN_2",
"type": "mission_definition",
"name": { "str": "Find 25 Blankets" },
"name": { "str": "Find 25 blankets" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -200,7 +200,7 @@
{
"id": "MISSION_RANCH_FOREMAN_3",
"type": "mission_definition",
"name": { "str": "Gather 2500 Nails" },
"name": { "str": "Gather 2500 nails" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -258,7 +258,7 @@
{
"id": "MISSION_RANCH_FOREMAN_4",
"type": "mission_definition",
"name": { "str": "Gather 300 Salt" },
"name": { "str": "Gather 300 salt" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -322,7 +322,7 @@
{
"id": "MISSION_RANCH_FOREMAN_5",
"type": "mission_definition",
"name": { "str": "30 Liquid Fertilizer" },
"name": { "str": "Gather 30 liquid fertilizer" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -367,7 +367,7 @@
{
"id": "MISSION_RANCH_FOREMAN_6",
"type": "mission_definition",
"name": { "str": "Gather 75 Rocks" },
"name": { "str": "Gather 75 rocks" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -414,7 +414,7 @@
{
"id": "MISSION_RANCH_FOREMAN_7",
"type": "mission_definition",
"name": { "str": "Gather 50 Pipes" },
"name": { "str": "Gather 50 pipes" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -464,7 +464,7 @@
{
"id": "MISSION_RANCH_FOREMAN_8",
"type": "mission_definition",
"name": { "str": "Gather 2 Electric Motors" },
"name": { "str": "Gather 2 electric motors" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -524,7 +524,7 @@
{
"id": "MISSION_RANCH_FOREMAN_9",
"type": "mission_definition",
"name": { "str": "Gather 150 Bleach" },
"name": { "str": "Gather 150 bleach" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -617,7 +617,7 @@
{
"id": "MISSION_RANCH_FOREMAN_11",
"type": "mission_definition",
"name": { "str": "Find 2 Arc Welders" },
"name": { "str": "Find 2 arc welders" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -667,7 +667,7 @@
{
"id": "MISSION_RANCH_FOREMAN_12",
"type": "mission_definition",
"name": { "str": "Find 12 Car Batteries" },
"name": { "str": "Find 12 car batteries" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -704,7 +704,7 @@
{
"id": "MISSION_RANCH_FOREMAN_13",
"type": "mission_definition",
"name": { "str": "Find 2 Two-Way Radios" },
"name": { "str": "Find 2 two-way radios" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -738,7 +738,7 @@
{
"id": "MISSION_RANCH_FOREMAN_14",
"type": "mission_definition",
"name": { "str": "Gather 5 Backpacks" },
"name": { "str": "Gather 5 backpacks" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -778,7 +778,7 @@
{
"id": "MISSION_RANCH_FOREMAN_15",
"type": "mission_definition",
"name": { "str": "Find Homebrewer's Bible" },
"name": { "str": "Find a copy of Homebrewer's Bible" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand All @@ -804,7 +804,7 @@
{
"id": "MISSION_RANCH_FOREMAN_16",
"type": "mission_definition",
"name": { "str": "Gather 80 Sugar" },
"name": { "str": "Gather 80 sugar" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down Expand Up @@ -836,7 +836,7 @@
{
"id": "MISSION_RANCH_FOREMAN_17",
"type": "mission_definition",
"name": { "str": "Collect 30 Glass Sheets" },
"name": { "str": "Collect 30 glass sheets" },
"goal": "MGOAL_FIND_ITEM",
"difficulty": 5,
"value": 50000,
Expand Down

0 comments on commit 761fb51

Please sign in to comment.