Merge branch 'master' into you-dont-know-recipes

README.md

@@ -31,6 +31,12 @@ Ncurses and tiles version available in [official repos](https://src.fedoraprojec
 
 `sudo dnf install cataclysm-dda`
 
+### Debian / Ubuntu
+
+Ncurses and tiles version available in [official repos](https://tracker.debian.org/pkg/cataclysm-dda)
+
+`sudo apt install cataclysm-dda-curses cataclysm-dda-sdl`
+
 ## Compile
 
 Please read [COMPILING.md](doc/COMPILING/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [COMPILER_SUPPORT.md](doc/COMPILING/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).

data/json/body_parts.json

@@ -3,8 +3,9 @@
     "id": "torso",
     "type": "body_part",
     "name": "torso",
-    "heading_singular": "Torso",
-    "heading_plural": "Torso",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "torso" },
+    "heading": "Torso",
+    "heading_multiple": "Torso",
     "hp_bar_ui_text": "TORSO",
     "encumbrance_text": "Dodging and melee is hampered.",
     "main_part": "torso",
@@ -20,8 +21,9 @@
     "id": "head",
     "type": "body_part",
     "name": "head",
-    "heading_singular": "Head",
-    "heading_plural": "Head",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "head" },
+    "heading": "Head",
+    "heading_multiple": "Head",
     "hp_bar_ui_text": "HEAD",
     "encumbrance_text": "",
     "main_part": "head",
@@ -37,8 +39,9 @@
     "id": "eyes",
     "type": "body_part",
     "name": "eyes",
-    "heading_singular": "Eyes",
-    "heading_plural": "Eyes",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "eyes" },
+    "heading": "Eyes",
+    "heading_multiple": "Eyes",
     "encumbrance_text": "Ranged combat is hampered.",
     "main_part": "head",
     "opposite_part": "eyes",
@@ -53,8 +56,9 @@
     "id": "mouth",
     "type": "body_part",
     "name": "mouth",
-    "heading_singular": "Mouth",
-    "heading_plural": "Mouth",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "mouth" },
+    "heading": "Mouth",
+    "heading_multiple": "Mouth",
     "encumbrance_text": "Running is slowed.",
     "main_part": "head",
     "opposite_part": "mouth",
@@ -68,10 +72,13 @@
   {
     "id": "arm_l",
     "type": "body_part",
+    "//": "See comments in `body_part_struct::load` of bodypart.cpp about why xxx and xxx_multiple are not inside a single translation object.",
     "name": "left arm",
-    "name_plural": "arms",
-    "heading_singular": "L. Arm",
-    "heading_plural": "Arms",
+    "name_multiple": "arms",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "left arm" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "arms" },
+    "heading": "L. Arm",
+    "heading_multiple": "Arms",
     "encumbrance_text": "Melee and ranged combat is hampered.",
     "hp_bar_ui_text": "L ARM",
     "main_part": "arm_l",
@@ -87,9 +94,11 @@
     "id": "arm_r",
     "type": "body_part",
     "name": "right arm",
-    "name_plural": "arms",
-    "heading_singular": "R. Arm",
-    "heading_plural": "Arms",
+    "name_multiple": "arms",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "right arm" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "arms" },
+    "heading": "R. Arm",
+    "heading_multiple": "Arms",
     "hp_bar_ui_text": "R ARM",
     "encumbrance_text": "Melee and ranged combat is hampered.",
     "main_part": "arm_r",
@@ -105,9 +114,11 @@
     "id": "hand_l",
     "type": "body_part",
     "name": "left hand",
-    "name_plural": "hands",
-    "heading_singular": "L. Hand",
-    "heading_plural": "Hands",
+    "name_multiple": "hands",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "left hand" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "hands" },
+    "heading": "L. Hand",
+    "heading_multiple": "Hands",
     "encumbrance_text": "Manual tasks are slowed.",
     "main_part": "arm_l",
     "opposite_part": "hand_r",
@@ -122,9 +133,11 @@
     "id": "hand_r",
     "type": "body_part",
     "name": "right hand",
-    "name_plural": "hands",
-    "heading_singular": "R. Hand",
-    "heading_plural": "Hands",
+    "name_multiple": "hands",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "right hand" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "hands" },
+    "heading": "R. Hand",
+    "heading_multiple": "Hands",
     "encumbrance_text": "Manual tasks are slowed.",
     "main_part": "arm_r",
     "opposite_part": "hand_l",
@@ -139,9 +152,11 @@
     "id": "leg_l",
     "type": "body_part",
     "name": "left leg",
-    "name_plural": "legs",
-    "heading_singular": "L. Leg",
-    "heading_plural": "Legs",
+    "name_multiple": "legs",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "left leg" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "legs" },
+    "heading": "L. Leg",
+    "heading_multiple": "Legs",
     "hp_bar_ui_text": "L LEG",
     "encumbrance_text": "Running and swimming are slowed.",
     "main_part": "leg_l",
@@ -157,9 +172,11 @@
     "id": "leg_r",
     "type": "body_part",
     "name": "right leg",
-    "name_plural": "legs",
-    "heading_singular": "R. Leg",
-    "heading_plural": "Legs",
+    "name_multiple": "legs",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "right leg" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "legs" },
+    "heading": "R. Leg",
+    "heading_multiple": "Legs",
     "hp_bar_ui_text": "R LEG",
     "encumbrance_text": "Running and swimming are slowed.",
     "main_part": "leg_r",
@@ -175,9 +192,11 @@
     "id": "foot_l",
     "type": "body_part",
     "name": "left foot",
-    "name_plural": "feet",
-    "heading_singular": "L. Foot",
-    "heading_plural": "Feet",
+    "name_multiple": "feet",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "left foot" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "feet" },
+    "heading": "L. Foot",
+    "heading_multiple": "Feet",
     "encumbrance_text": "Running is slowed.",
     "main_part": "leg_l",
     "opposite_part": "foot_r",
@@ -192,9 +211,11 @@
     "id": "foot_r",
     "type": "body_part",
     "name": "right foot",
-    "name_plural": "feet",
-    "heading_singular": "R. Foot",
-    "heading_plural": "Feet",
+    "name_multiple": "feet",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "right foot" },
+    "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "feet" },
+    "heading": "R. Foot",
+    "heading_multiple": "Feet",
     "encumbrance_text": "Running is slowed.",
     "main_part": "leg_r",
     "opposite_part": "foot_l",
@@ -209,8 +230,9 @@
     "id": "num_bp",
     "type": "body_part",
     "name": "appendix",
-    "heading_singular": "appendix",
-    "heading_plural": "Appendices",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "appendix" },
+    "heading": "appendix",
+    "heading_multiple": "Appendices",
     "encumbrance_text": "It's inflamed.",
     "main_part": "num_bp",
     "opposite_part": "num_bp",