Merge pull request #32 from CleverRaven/master

Merge pull request CleverRaven#36424 from captnblood/retrodays+
fengjixuchui · Dec 31, 2019 · 398741a · 398741a
2 parents 68a7b4e + 51b0689
commit 398741a
Show file tree

Hide file tree

Showing 26 changed files with 10,688 additions and 2,598 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,7 @@ option(USE_HOME_DIR "Use user's home directory for save files."   "ON")
 option(LOCALIZE     "Support for language localizations. Also enable UTF support."   "ON")
 option(LANGUAGES    "Compile localization files for specified languages."   "")
 option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead."   "ON")
+option(JSON_FORMAT  "Build JSON formatter" "OFF")
 option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF")
 set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING "Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)")
 set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests")
@@ -354,6 +355,9 @@ if (NOT MSVC)
     add_subdirectory(src/chkjson)
 endif()
 add_subdirectory(tests)
+if (JSON_FORMAT)
+    add_subdirectory(tools/format)
+endif()
 if (CATA_CLANG_TIDY_PLUGIN)
     add_subdirectory(tools/clang-tidy-plugin)
 endif()

diff --git a/Makefile b/Makefile
@@ -101,6 +101,9 @@ DEBUGSYMS = -g
 #OTHERS = -O3
 #DEFINES = -DNDEBUG
 
+# Tells ccache to keep comments, as they can be meaningful to the compiler (as to suppress warnings).
+export CCACHE_COMMENTS=1
+
 # Disable debug. Comment this out to get logging.
 #DEFINES = -DENABLE_LOGGING
 

diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
@@ -152,6 +152,23 @@
     "diameter": 4,
     "width": 1
   },
+  {
+    "id": "wheel_10",
+    "category": "veh_parts",
+    "type": "WHEEL",
+    "name": { "str": "set of wheels", "str_pl": "sets of wheels" },
+    "description": "A set of four small wheels with tough rubber tires.",
+    "weight": "4 kg",
+    "volume": "4 L",
+    "price": 14000,
+    "bashing": 6,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "]",
+    "color": "dark_gray",
+    "diameter": 10,
+    "width": 4
+  },
   {
     "id": "wheel_metal",
     "category": "veh_parts",

diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json
@@ -237,7 +237,7 @@
   {
     "type": "recipe",
     "result": "brew_vinegar",
-    "result_mult": 7,
+    "result_mult": 10,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_BREW",
     "skill_used": "cooking",
@@ -246,8 +246,8 @@
     "batch_time_factors": [ 50, 4 ],
     "autolearn": true,
     "components": [
-      [ [ "water", 7 ], [ "water_clean", 7 ] ],
-      [ [ "juice", 14 ], [ "apple_cider", 7 ], [ "cheap_wine", 21, "LIST" ], [ "worthy_wine", 15, "LIST" ] ]
+      [ [ "water", 2 ], [ "water_clean", 2 ] ],
+      [ [ "juice", 2 ], [ "apple_cider", 4 ], [ "cheap_wine", 2, "LIST" ], [ "worthy_wine", 1, "LIST" ] ]
     ]
   }
 ]
diff --git a/data/json/snippets/graffiti.json b/data/json/snippets/graffiti.json
@@ -22,7 +22,7 @@
       { "id": "general_graffiti_13", "text": "I <3 <full_name>." },
       { "id": "general_graffiti_14", "text": "<given_name> fucked <full_name>." },
       { "id": "general_graffiti_15", "text": "This is a spraypainted drawing of an angel with wings made of vines." },
-      { "id": "general_graffiti_16", "text": "Mr. <last_name> is a vampire!" },
+      { "id": "general_graffiti_16", "text": "Mr. <family_name> is a vampire!" },
       { "id": "general_graffiti_17", "text": "Their hiding the truth" },
       { "id": "general_graffiti_18", "text": "FOLLOW THE CHEMTRAILS" },
       {

diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
@@ -5,16 +5,15 @@
     "vehicles": [
       [ "car", 2000 ],
       [ "car_anmlcmpt", 250 ],
+      [ "car_hatch", 1000 ],
       [ "electric_car", 500 ],
       [ "car_sports", 300 ],
-      [ "car_sports_atomic", 15 ],
       [ "car_sports_electric", 60 ],
       [ "suv", 800 ],
       [ "suv_electric", 200 ],
       [ "suv_electric", 120 ],
-      [ "car_mini", 800 ],
+      [ "car_mini", 400 ],
       [ "beetle", 500 ],
-      [ "bubble_car", 20 ],
       [ "bicycle", 400 ],
       [ "bicycle_electric", 100 ],
       [ "motorcycle", 200 ],
@@ -77,12 +76,13 @@
     "vehicles": [
       [ "car", 7000 ],
       [ "car_anmlcmpt", 600 ],
+      [ "car_hatch", 3500 ],
       [ "electric_car", 1000 ],
       [ "car_sports", 500 ],
       [ "suv", 1000 ],
       [ "suv_electric", 300 ],
       [ "suv_electric", 150 ],
-      [ "car_mini", 1000 ],
+      [ "car_mini", 500 ],
       [ "beetle", 500 ],
       [ "pickup", 2000 ],
       [ "flatbed_truck", 1000 ],
@@ -103,6 +103,7 @@
     "vehicles": [
       [ "car", 3000 ],
       [ "car_anmlcmpt", 250 ],
+      [ "car_hatch", 1000 ],
       [ "electric_car", 500 ],
       [ "car_sports", 1000 ],
       [ "car_sports_electric", 300 ],
@@ -145,7 +146,8 @@
     "vehicles": [
       [ "car", 1000 ],
       [ "car_anmlcmpt", 150 ],
-      [ "car_mini", 500 ],
+      [ "car_hatch", 500 ],
+      [ "car_mini", 250 ],
       [ "electric_car", 500 ],
       [ "beetle", 300 ],
       [ "car_sports", 100 ],
@@ -185,7 +187,6 @@
       [ "apc-gl", 50 ],
       [ "aapc-mg", 50 ],
       [ "aapc-gl", 25 ],
-      [ "bubble_car", 50 ],
       [ "rv", 200 ],
       [ "limousine", 100 ],
       [ "schoolbus", 200 ],
@@ -201,10 +202,11 @@
       [ "semi_truck", 500 ],
       [ "cube_van", 1000 ],
       [ "flatbed_truck", 1000 ],
-      [ "car_mini", 750 ],
+      [ "car_mini", 375 ],
       [ "beetle", 750 ],
       [ "car", 1000 ],
       [ "car_anmlcmpt", 100 ],
+      [ "car_hatch", 500 ],
       [ "electric_car", 750 ],
       [ "hippie_van", 750 ],
       [ "golf_cart", 300 ],
@@ -227,7 +229,8 @@
     "id": "garage",
     "type": "vehicle_group",
     "vehicles": [
-      [ "car", 10 ],
+      [ "car", 5 ],
+      [ "car_hatch", 2 ],
       [ "car_chassis", 20 ],
       [ "engine_crane", 40 ],
       [ "motorcycle", 10 ],
@@ -302,6 +305,7 @@
     "id": "junkyard_vehicles",
     "vehicles": [
       [ "car", 1500 ],
+      [ "car_hatch", 750 ],
       [ "car_chassis", 2000 ],
       [ "electric_car", 400 ],
       [ "car_sports", 400 ],
@@ -310,7 +314,7 @@
       [ "suv", 500 ],
       [ "suv_electric", 200 ],
       [ "suv_electric", 120 ],
-      [ "car_mini", 600 ],
+      [ "car_mini", 300 ],
       [ "beetle", 500 ],
       [ "bubble_car", 20 ],
       [ "pickup", 600 ],
@@ -323,10 +327,11 @@
     "id": "dumpsite_vehicles",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_hatch", 500 ],
       [ "car_chassis", 1200 ],
       [ "car_sports", 200 ],
       [ "suv", 400 ],
-      [ "car_mini", 500 ],
+      [ "car_mini", 250 ],
       [ "rv", 250 ],
       [ "meth_lab", 50 ],
       [ "beetle", 400 ],
@@ -343,13 +348,14 @@
     "id": "campground_vehicles",
     "vehicles": [
       [ "car", 950 ],
+      [ "car_hatch", 475 ],
       [ "car_anmlcmpt", 150 ],
       [ "electric_car", 100 ],
       [ "suv", 800 ],
       [ "suv_electric", 100 ],
       [ "suv_electric_rack", 100 ],
       [ "bicycle_dirt", 50 ],
-      [ "car_mini", 200 ],
+      [ "car_mini", 100 ],
       [ "beetle", 200 ],
       [ "pickup", 700 ],
       [ "hippie_van", 800 ],
@@ -361,6 +367,7 @@
     "id": "forgotten_vehicles",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_hatch", 500 ],
       [ "car_anmlcmpt", 100 ],
       [ "suv", 400 ],
       [ "rv", 200 ],
@@ -377,9 +384,10 @@
       [ "bubble_car", 50 ],
       [ "car_sports_electric", 100 ],
       [ "cube_van", 1000 ],
-      [ "car_mini", 750 ],
+      [ "car_mini", 375 ],
       [ "beetle", 750 ],
       [ "car", 1000 ],
+      [ "car_hatch", 500 ],
       [ "car_anmlcmpt", 150 ],
       [ "electric_car", 750 ],
       [ "hippie_van", 750 ],
@@ -437,8 +445,7 @@
       [ "bubble_car", 60 ],
       [ "rara_x", 40 ],
       [ "car_sports", 30 ],
-      [ "car_sports_electric", 20 ],
-      [ "car_sports_atomic", 5 ]
+      [ "car_sports_electric", 20 ]
     ]
   },
   {
@@ -477,10 +484,11 @@
     "//": "for cs_car_dealership",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_hatch", 1000 ],
       [ "electric_car", 500 ],
       [ "suv", 800 ],
       [ "suv_electric", 200 ],
-      [ "car_mini", 800 ],
+      [ "car_mini", 400 ],
       [ "beetle", 500 ],
       [ "motorcycle", 200 ],
       [ "motorcycle_sidecart", 100 ],
@@ -508,9 +516,10 @@
       [ "bubble_car", 200 ],
       [ "4x4_car", 200 ],
       [ "car_sports_electric", 100 ],
-      [ "car_mini", 750 ],
+      [ "car_mini", 375 ],
       [ "beetle", 750 ],
       [ "car", 1500 ],
+      [ "car_hatch", 750 ],
       [ "suv", 800 ],
       [ "suv_electric", 100 ],
       [ "suv_electric_rack", 100 ],
@@ -522,8 +531,7 @@
       [ "motorcycle_enduro", 50 ],
       [ "superbike", 50 ],
       [ "motorcycle_sidecart", 50 ],
-      [ "car_sports", 30 ],
-      [ "car_sports_atomic", 5 ]
+      [ "car_sports", 30 ]
     ]
   },
   {
@@ -537,10 +545,11 @@
     "//": "for ws_regional_dump",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_hatch", 500 ],
       [ "electric_car", 500 ],
       [ "suv", 800 ],
       [ "suv_electric", 200 ],
-      [ "car_mini", 800 ],
+      [ "car_mini", 400 ],
       [ "beetle", 500 ],
       [ "motorcycle", 200 ],
       [ "motorcycle_sidecart", 100 ],
@@ -572,10 +581,11 @@
     "id": "oa_vg_ts_vehicles",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_hatch", 1000 ],
       [ "electric_car", 500 ],
       [ "suv", 800 ],
       [ "suv_electric", 200 ],
-      [ "car_mini", 800 ],
+      [ "car_mini", 400 ],
       [ "beetle", 500 ],
       [ "motorcycle", 200 ],
       [ "motorcycle_cross", 50 ],
@@ -597,8 +607,9 @@
     "type": "vehicle_group",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_hatch", 1000 ],
       [ "electric_car", 500 ],
-      [ "car_mini", 500 ],
+      [ "car_mini", 250 ],
       [ "suv", 800 ],
       [ "suv_electric", 200 ],
       [ "suv_electric", 50 ],

diff --git a/data/json/vehicleparts/wheel.json b/data/json/vehicleparts/wheel.json
@@ -318,6 +318,34 @@
     },
     "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "FOLDABLE", "STEERABLE" ]
   },
+  {
+    "id": "wheel_10",
+    "type": "vehicle_part",
+    "name": "wheels",
+    "item": "wheel_10",
+    "location": "under",
+    "symbol": "o",
+    "broken_symbol": "x",
+    "color": "dark_gray",
+    "durability": 120,
+    "description": "A set of 10\" wheels with tough rubber tires.",
+    "folded_volume": 10,
+    "breaks_into": [
+      { "item": "steel_lump", "prob": 50 },
+      { "item": "steel_chunk", "count": [ 1, 5 ] },
+      { "item": "scrap", "count": [ 1, 5 ] },
+      { "item": "plastic_chunk", "count": [ 1, 5 ] }
+    ],
+    "rolling_resistance": 29,
+    "wheel_type": "off-road",
+    "contact_area": 4,
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "welding_standard", 5 ] ] }
+    },
+    "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "FOLDABLE", "STEERABLE" ]
+  },
   {
     "id": "wheel_motorbike",
     "type": "vehicle_part",