Merge branch 'cataclysmbnteam:main' into implement_global_unique

.gitignore

@@ -42,6 +42,8 @@ cata_test
 cata_test-tiles
 cataclysm
 cataclysm-tiles
+cataclysm-bn-tiles
+json_formatter
 *.exe.manifest
 cataclysm-vcpkg
 cataclysmdda-*

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -708,7 +708,7 @@
     "type": "terrain",
     "id": "t_plut_generator",
     "name": "plutonium generator",
-    "description": "This imposing apparatus harnesses the power of the atom, configured to provide nearly limitless backup power from the nuclear fuel installed in it.  It's not doing much good here though.  It has a complicated security system that is dangerous and difficult to bypass without the code.",
+    "description": "This imposing apparatus harnesses the power of the atom, configured to provide nearly limitless backup power from the nuclear fuel installed in it.  It's not doing much good here though.  It has a complicated security system that is dangerous and difficult to bypass without authorization; a small slot suggests that it can accept some form of ID card.",
     "symbol": "0",
     "color": "light_green",
     "looks_like": "t_machinery_electronic",
@@ -729,7 +729,8 @@
       ],
       "//": "Variable reduction, destroy_threshold equal to str_min instead of str_max due to delicate electronics",
       "ranged": { "reduction": [ 25, 50 ], "destroy_threshold": 50, "block_unaimed_chance": "50%" }
-    }
+    },
+    "examine_action": "cardreader_plutgen"
   },
   {
     "type": "terrain",

data/json/items/fuel.json

@@ -246,7 +246,7 @@
     "type": "AMMO",
     "name": { "str_sp": "gelled gasoline" },
     "copy-from": "gasoline",
-    "description": "A flammable gel composed of gasoline and dissolved shavings of polystyrene, roughly similar in properties to napalm b.  It's meant to be used with a flamethrower.",
+    "description": "A flammable gel composed of gasoline and a chemical that renders it to a gel, it is roughly similar in properties to napalm b.  It's meant to be used with a flamethrower.",
     "price": "4 USD",
     "price_postapoc": "5 USD",
     "ammo_type": "flammable",
@@ -257,7 +257,7 @@
     "id": "flamethrower_fuel",
     "type": "AMMO",
     "name": { "str_sp": "flamethrower fuel" },
-    "copy-from": "gasoline",
+    "copy-from": "napalm",
     "description": "A mixture of gasoline and diesel oil in equal parts.  Its combustion properties make it unfit for applications where you would use any of them separately, but it can be used to feed a flamethrower.",
     "price": "4 USD",
     "price_postapoc": "5 USD",

data/json/items/gun/20x66mm.json

@@ -80,7 +80,6 @@
     "material": [ "superalloy", "ceramic" ],
     "color": "dark_gray",
     "ammo": "20x66mm",
-    "skill": "pistol",
     "dispersion": 400,
     "durability": 9,
     "default_mods": [ "pistol_stock" ],

data/json/items/gun/shot.json

@@ -331,7 +331,6 @@
     "ascii_picture": "remington870mcs",
     "material": [ "steel", "plastic" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -3 },
-    "skill": "pistol",
     "modes": [ [ "DEFAULT", "single", 1 ] ],
     "//": "dispersion should be 300 moa, but CDDA exaggerates dispersion.",
     "sight_dispersion": 750,
@@ -655,7 +654,6 @@
     "durability": 6,
     "clip_size": 6,
     "reload": 120,
-    "skill": "pistol",
     "modes": [ [ "DEFAULT", "single", 1 ] ],
     "valid_mod_locations": [
       [ "accessories", 2 ],

data/json/items/ranged/slings.json

@@ -6,16 +6,16 @@
     "type": "GUN",
     "color": "brown",
     "name": { "ctxt": "weapon", "str": "sling" },
-    "description": "A leather sling, easy to use and accurate.  It uses pebbles as ammunition.",
+    "description": "A leather sling, easy to use and accurate.  It uses pebbles or rocks as ammunition.",
     "price": "150 cent",
-    "//": "It's little more than a piece of slightly shaped leather",
     "material": "leather",
     "extend": { "flags": [ "BELT_CLIP" ] },
     "ammo": [ "pebble", "rock" ],
     "weight": "100 g",
     "volume": "250 ml",
     "price_postapoc": "250 cent",
     "to_hit": -2,
+    "//": "Gets more damage and range based on throwing skill and strength",
     "ranged_damage": { "damage_type": "bash", "amount": 6 },
     "range": 8,
     "dispersion": 150,
@@ -30,7 +30,6 @@
     "name": { "str": "staff sling" },
     "description": "A leather sling attached to a staff, easy to use and accurate.  It uses rocks as ammunition.",
     "price": "150 cent",
-    "//": "The staff sling,consists of a staff with a short sling at one end. ",
     "material": [ "wood", "leather" ],
     "weapon_category": [ "QUARTERSTAVES" ],
     "extend": { "flags": [ "BELTED", "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ] },
@@ -40,6 +39,7 @@
     "volume": "2 L",
     "price_postapoc": "250 cent",
     "to_hit": 1,
+    "//": "Gets more damage and range based on throwing skill and strength",
     "ranged_damage": { "damage_type": "bash", "amount": 10 },
     "bashing": 18,
     "range": 10,
@@ -102,9 +102,9 @@
     "weight": "8 kg",
     "volume": "4 L",
     "skill": "launcher",
-    "ranged_damage": { "damage_type": "bash", "amount": 20 },
+    "ranged_damage": { "damage_type": "bash", "amount": 25 },
     "dispersion": 60,
-    "range": 24,
+    "range": 30,
     "reload": 800,
     "durability": 6,
     "clip_size": 1,

data/json/recipes/ammo/launcher.json

@@ -251,8 +251,80 @@
     "time": "20 m",
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2, "Stuff THE MAN doesn't want you to know" ] ],
-    "components": [ [ [ "gasoline", 100 ] ], [ [ "plastic_chunk", 1 ] ] ],
+    "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2 ] ],
+    "components": [ [ [ "gasoline", 100 ] ], [ [ "plastic_chunk", 5 ] ] ],
+    "delete_flags": [ "FILTHY" ],
+    "flags": [ "ALLOW_FILTHY" ]
+  },
+  {
+    "type": "recipe",
+    "result": "gelled_gasoline",
+    "id_suffix": "detergent",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "10 m",
+    "batch_time_factors": [ 80, 5 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "components": [ [ [ "gasoline", 100 ] ], [ [ "detergent", 30 ] ], [ [ "chem_ethanol", 1 ] ] ],
+    "delete_flags": [ "FILTHY" ],
+    "flags": [ "ALLOW_FILTHY" ]
+  },
+  {
+    "type": "recipe",
+    "result": "gelled_gasoline",
+    "id_suffix": "beeswax",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "10 m",
+    "batch_time_factors": [ 80, 5 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "components": [ [ [ "gasoline", 100 ] ], [ [ "wax", 30 ] ] ],
+    "delete_flags": [ "FILTHY" ],
+    "flags": [ "ALLOW_FILTHY" ]
+  },
+  {
+    "type": "recipe",
+    "result": "gelled_gasoline",
+    "id_suffix": "animal blood",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "10 m",
+    "batch_time_factors": [ 80, 5 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "components": [
+      [ [ "gasoline", 100 ] ],
+      [ [ "animal_blood", 30 ] ],
+      [ [ "salt", 3 ], [ "coffee", 3 ], [ "tea_raw", 3 ], [ "sugar", 3 ], [ "material_quicklime", 3 ] ]
+    ],
+    "delete_flags": [ "FILTHY" ],
+    "flags": [ "ALLOW_FILTHY" ]
+  },
+  {
+    "type": "recipe",
+    "result": "gelled_gasoline",
+    "id_suffix": "egg powder",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "10 m",
+    "batch_time_factors": [ 80, 5 ],
+    "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "components": [
+      [ [ "gasoline", 100 ] ],
+      [ [ "powder_eggs", 12 ] ],
+      [ [ "salt", 3 ], [ "coffee", 3 ], [ "tea_raw", 3 ], [ "sugar", 3 ], [ "material_quicklime", 3 ] ]
+    ],
     "delete_flags": [ "FILTHY" ],
     "flags": [ "ALLOW_FILTHY" ]
   },
@@ -266,11 +338,7 @@
     "time": "3 m",
     "batch_time_factors": [ 80, 5 ],
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
-    "book_learn": [
-      [ "textbook_gaswarfare", 2 ],
-      [ "textbook_anarch", 2, "Stuff THE MAN doesn't want you to know" ],
-      [ "manual_launcher", 2 ]
-    ],
+    "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2 ], [ "manual_launcher", 2 ] ],
     "components": [ [ [ "gasoline", 125 ] ], [ [ "diesel", 125 ], [ "biodiesel", 125 ] ] ]
   },
   {

lang/po/ar.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cataclysm-bn\n"
-"POT-Creation-Date: 2024-11-30 01:19+0000\n"
+"POT-Creation-Date: 2024-12-07 01:21+0000\n"
 "Last-Translator: Coolthulhu <[email protected]>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/bn-team/teams/113585/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -37499,7 +37499,8 @@ msgid ""
 "This imposing apparatus harnesses the power of the atom, configured to "
 "provide nearly limitless backup power from the nuclear fuel installed in it."
 "  It's not doing much good here though.  It has a complicated security "
-"system that is dangerous and difficult to bypass without the code."
+"system that is dangerous and difficult to bypass without authorization; a "
+"small slot suggests that it can accept some form of ID card."
 msgstr ""
 
 #: data/json/furniture_and_terrain/terrain-manufactured.json
@@ -83144,8 +83145,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #: data/json/items/classes/gun.json data/json/items/classes/range.json
-#: data/json/items/gun/20x66mm.json data/json/items/gun/bio.json
-#: data/json/items/gun/monster_gun.json data/json/items/gun/shot.json
+#: data/json/items/gun/bio.json data/json/items/gun/monster_gun.json
 #: data/json/obsoletion/items.json data/mods/CRT_EXPANSION/items/crt_gun.json
 msgctxt "gun_type_type"
 msgid "pistol"
@@ -123651,7 +123651,8 @@ msgstr[5] ""
 
 #: data/json/items/ranged/slings.json
 msgid ""
-"A leather sling, easy to use and accurate.  It uses pebbles as ammunition."
+"A leather sling, easy to use and accurate.  It uses pebbles or rocks as "
+"ammunition."
 msgstr ""
 
 #: data/json/items/ranged/slings.json
@@ -201613,20 +201614,32 @@ msgstr ""
 #: data/json/vehicleparts/combustion.json
 msgid ""
 "A combustion engine.  Burns diesel fuel from a tank in the vehicle.  Can "
-"also burn biodiesel or lamp oil, though somewhat less efficiently."
+"also burn biodiesel or oil, though somewhat less efficiently."
 msgstr ""
 
 #: data/json/vehicleparts/combustion.json
-msgid "A combustion engine.  Burns gasoline fuel from a tank in the vehicle."
+msgid ""
+"A combustion engine.  Burns gasoline fuel from a tank in the vehicle.  Can "
+"also burn concentrated alcohol, though somewhat less efficiently."
 msgstr ""
 
 #: data/json/vehicleparts/combustion.json
 msgid ""
 "An advanced combustion engine.  Burns gasoline or diesel or aviation fuel "
-"from a tank in the vehicle.  Can also burn lamp oil, though somewhat less "
-"efficiently.  Better power-to-weight ratio than a traditional engine but "
-"consumes more fuel, its power will not diminish even when multiple of them "
-"are installed."
+"from a tank in the vehicle.  Can also burn biodiesel, oil, or concentrated "
+"alcohol; though somewhat less efficiently.  Better power-to-weight ratio "
+"than a traditional engine but consumes more fuel, its power will not "
+"diminish even when multiple of them are installed."
+msgstr ""
+
+#: data/json/vehicleparts/combustion.json
+msgid ""
+"A combustion engine.  Burns diesel fuel from a tank in the vehicle.  Can "
+"also burn biodiesel, though somewhat less efficiently."
+msgstr ""
+
+#: data/json/vehicleparts/combustion.json
+msgid "A combustion engine.  Burns gasoline fuel from a tank in the vehicle."
 msgstr ""
 
 #: data/json/vehicleparts/combustion.json
@@ -274752,6 +274765,18 @@ msgstr ""
 msgid "You grab hold of a sinewy tendril and wrench it loose!"
 msgstr ""
 
+#: src/iexamine.cpp
+msgid ""
+"The plutonium generator beeps twice, then disengages from the surrounding "
+"conduits with a series of mechanical clunks."
+msgstr ""
+
+#: src/iexamine.cpp
+msgid ""
+"The plutonium generator has significant security measures in place. Without "
+"the necessary ID, you'll have to remove it by hand."
+msgstr ""
+
 #: src/iexamine_elevator.cpp
 msgid " (this floor)"
 msgstr ""
@@ -275996,6 +276021,10 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+#: src/item.cpp
+msgid "Damage/range will vary with <info>throwing skill and ammo.</info>"
+msgstr ""
+
 #: src/item.cpp
 msgid "<bold>Base aim speed</bold>: "
 msgstr ""
@@ -276302,7 +276331,7 @@ msgstr ""
 
 #: src/item.cpp
 #, c-format
-msgid "Can bring your <info>%s skill to</info> <num>."
+msgid "Can bring <info>%s skill to</info> <num>."
 msgstr ""
 
 #: src/item.cpp