Skip to content

Commit

Permalink
An assortment of small fixes in several files (CleverRaven#20053)
Browse files Browse the repository at this point in the history
* Added plural names for pouches

* Added plural name for purse, also capitalisation.

* Grammar and missing period fix

* Added plural name

* Typo fix
  • Loading branch information
Night-Pryanik authored and kevingranade committed Feb 5, 2017
1 parent d968835 commit e7ae539
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions data/json/items/armor/bandolier.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"id": "flintlock_pouch",
"type": "ARMOR",
"name": "paper cartridge pouch",
"name_plural": "paper cartridge pouches",
"description": "A covered leather pouch, worn at the waist to store and protect prepared blackpowder cartridges.",
"weight": 160,
"volume": 2,
Expand Down Expand Up @@ -113,6 +114,7 @@
"id": "grenade_pouch",
"type": "ARMOR",
"name": "grenade pouch",
"name_plural": "grenade pouches",
"description" : "A small pouch for storing cartridge grenades with straps for attaching it to your belt or other webbing.",
"weight": 90,
"volume": 1,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@
"msg": "You activate the flashlight app.",
"active": true,
"need_charges": 1,
"need_charges_msg": "The cellphones's batteries are dead.",
"need_charges_msg": "The cellphone's batteries are dead.",
"type": "transform"
},
"flags": [ "WATCH", "ALARMCLOCK" ]
Expand Down Expand Up @@ -7118,7 +7118,7 @@
"type": "TOOL",
"category": "weapons",
"name": "ANFO charge",
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. Use this item to light the fuse. You will then have twenty turns before it explodes and creates a large fireball",
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. Use this item to light the fuse. You will then have twenty turns before it explodes and creates a large fireball.",
"weight": 77800,
"volume": 200,
"price": 75000,
Expand Down
3 changes: 2 additions & 1 deletion data/mods/PKs_Rebalance/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@
"type": "TOOL_ARMOR",
"category": "food",
"name": "sealed purse of clean water",
"description": "A sealed purse of water. activate to consume its contents.",
"name_plural": "sealed purses of clean water",
"description": "A sealed purse of water. Activate to consume its contents.",
"weight": 265,
"volume": 1,
"price": 7500,
Expand Down
1 change: 1 addition & 0 deletions data/mods/blazemod/blaze_test.json
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@
"id": "spiral_matrix",
"type": "TOOL",
"name": "diamond matrix",
"name_plural": "diamond matrices",
"description": "A sparkling diamond with a dazzling spiral pattern. Small pieces of glittering crystal form on the edges as you hold it.",
"weight": 250,
"volume": 1,
Expand Down
2 changes: 1 addition & 1 deletion src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9576,7 +9576,7 @@ game::vmenu_ret game::list_monsters( const std::vector<Creature *> &monster_list
mvwputch(w_monsters_border, TERMY - iInfoHeight - 1 - VIEW_OFFSET_Y * 2,
i, BORDER_COLOR, LINE_OXOX); // -
}
std::string sSafemode = _("<A>dd do safemode Blacklist");
std::string sSafemode = _("<A>dd to safemode Blacklist");
const std::string monName = (type_npc) ? get_safemode().npc_type_name() : m->name();
if ( get_safemode().has_rule(monName, Creature::A_ANY) ) {
sSafemode = _("<R>emove from safemode Blacklist");
Expand Down

0 comments on commit e7ae539

Please sign in to comment.