Skateboard test

data/json/items/tool/deployable.json

@@ -140,6 +140,29 @@
     },
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
+  {
+    "id": "folding_skateboard",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "skateboard" },
+    "description": "This is a skateboard.",
+    "weight": "2898 g",
+    "volume": "3750 ml",
+    "price": "350 USD",
+    "price_postapoc": "20 USD",
+    "to_hit": -5,
+    "bashing": 10,
+    "material": "aluminum",
+    "symbol": "0",
+    "color": "light_gray",
+    "use_action": {
+      "type": "unfold_vehicle",
+      "vehicle_name": "skateboard",
+      "unfold_msg": "You lay the skateboard down on the ground.",
+      "moves": 0
+    },
+    "flags": [ "ALLOWS_REMOTE_USE" ]
+  },
   {
     "id": "generic_folded_vehicle",
     "type": "TOOL",

data/json/items/vehicle/frames.json

@@ -120,5 +120,20 @@
     "price": "35 USD",
     "price_postapoc": "1 USD",
     "copy-from": "foldframe"
+  },
+  {
+    "type": "GENERIC",
+    "id": "frame_wood_deck",
+    "name": { "str": "skateboard deck" },
+    "symbol": "]",
+    "description": "A small skateboard frame made of thin layers of wood glued together.",
+    "weight": "1500 g",
+    "to_hit": -5,
+    "color": "brown",
+    "material": [ "wood" ],
+    "volume": "8750 ml",
+    "price": 1000,
+    "price_postapoc": 50,
+    "copy-from": "foldframe"
   }
 ]

data/json/items/vehicle/wheel.json

@@ -160,6 +160,39 @@
     "diameter": 4,
     "width": 1
   },
+  {
+    "id": "wheel_skateboard",
+    "category": "veh_parts",
+    "type": "WHEEL",
+    "name": { "str": "set of skateboard wheels", "str_pl": "sets of skateboard wheels" },
+    "description": "A set of skateboard wheels.",
+    "weight": "1500 g",
+    "volume": "1250 ml",
+    "price": "20 USD",
+    "price_postapoc": "1 USD",
+    "bashing": 6,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "]",
+    "color": "dark_gray",
+    "diameter": 2,
+    "width": 1
+  },
+  {
+    "id": "wheel_mount_skateboard",
+    "type": "GENERIC",
+    "category": "veh_parts",
+    "name": { "str": "pair of skateboard trucks", "str_pl": "pairs of skateboard trucks" },
+    "description": "A pair metal skateboard trucks, for attaching wheels to.",
+    "weight": "600 g",
+    "volume": "250 ml",
+    "price": 200,
+    "price_postapoc": 20,
+    "to_hit": -2,
+    "material": [ "steel" ],
+    "symbol": "]",
+    "color": "dark_gray"
+  },
   {
     "id": "wheel_10",
     "category": "veh_parts",

data/json/mapgen/park_skate.json

@@ -59,7 +59,9 @@
         { "vehicle": "bicycle", "x": 10, "y": 7, "chance": 3, "status": 0, "rotation": 270 },
         { "vehicle": "bicycle", "x": 17, "y": 8, "chance": 2, "status": 0, "rotation": 180 },
         { "vehicle": "scooter", "x": 16, "y": 12, "chance": 5 },
-        { "vehicle": "bicycle", "x": 16, "y": 19, "chance": 7 }
+        { "vehicle": "bicycle", "x": 16, "y": 19, "chance": 7 },
+        { "vehicle": "skateboard", "x": 12, "y": 6, "chance": 3, "status": 0 },
+        { "vehicle": "skateboard", "x": 19, "y": 10, "chance": 2, "status": 0 }
       ]
     }
   }

data/json/professions.json

@@ -4320,10 +4320,10 @@
   {
     "type": "profession",
     "id": "skaterkid",
-    "name": { "male": "Skater Boy", "female": "Skater Girl" },
+    "name": { "male": "Skater Boy (Rollerblades)", "female": "Skater Girl (Rollerblades)" },
     "description": "You love to skate!  At least now the grown-ups aren't telling you where you can't roll.",
     "points": 1,
-    "skills": [ { "level": 1, "name": "dodge" } ],
+    "skills": [ { "level": 1, "name": "dodge" }, { "level": 2, "name": "swimming" } ],
     "traits": [ "PROF_SKATER" ],
     "items": {
       "both": {
@@ -4346,6 +4346,35 @@
       "female": [ "boy_shorts" ]
     }
   },
+  {
+    "type": "profession",
+    "id": "skaterkid_board",
+    "name": { "male": "Skater Boy (Skateboard)", "female": "Skater Girl (Skateboard)" },
+    "description": "You love to skate!  You've probably spent more time on a skateboard than off.  Things have gotten pretty bad, but at least the grown-ups aren't telling you where you can't roll.",
+    "points": 1,
+    "skills": [ { "level": 2, "name": "driving" }, { "level": 2, "name": "swimming" } ],
+    "traits": [ "PROF_SKATER" ],
+    "items": {
+      "both": {
+        "items": [
+          "hoodie",
+          "jeans",
+          "socks",
+          "elbow_pads",
+          "knee_pads",
+          "gloves_fingerless",
+          "helmet_skid",
+          "sneakers",
+          "folding_skateboard",
+          "wristwatch",
+          "smart_phone",
+          "sports_drink"
+        ]
+      },
+      "male": [ "briefs" ],
+      "female": [ "boy_shorts" ]
+    }
+  },
   {
     "type": "profession",
     "id": "jdelinquent",

data/json/vehicleparts/frames.json

@@ -173,6 +173,40 @@
     "flags": [ "MOUNTABLE" ],
     "damage_reduction": { "all": 84 }
   },
+  {
+    "id": "frame_wood_deck",
+    "type": "vehicle_part",
+    "name": { "str": "skateboard deck" },
+    "copy-from": "frame_wood_light",
+    "item": "frame_wood_deck",
+    "symbol": "]",
+    "looks_like": "frame_wood",
+    "durability": 100,
+    "fuel_type": "muscle",
+    "power": 140,
+    "muscle_power_factor": 30,
+    "m2c": 45,
+    "description": "A light wooden skateboard deck.  Other skateboard components can be mounted on it.",
+    "breaks_into": [ { "item": "splinter", "count": [ 3, 5 ] } ],
+    "requirements": {
+      "install": { "skills": [ [ "fabrication", 0 ] ], "time": "0 m" },
+      "removal": { "skills": [ [ "fabrication", 0 ] ], "time": "0 m" },
+      "repair": { "skills": [ [ "fabrication", 0 ] ], "time": "5 m", "using": [ [ "adhesive", 1 ] ] }
+    },
+    "flags": [
+      "MOUNTABLE",
+      "INITIAL_PART",
+      "SEAT",
+      "ENGINE",
+      "E_STARTS_INSTANTLY",
+      "NONBELTABLE",
+      "MUSCLE_LEGS",
+      "SEAT_REQUIRES_BALANCE",
+      "BOARDABLE",
+      "CONTROLS"
+    ],
+    "damage_reduction": { "all": 2 }
+  },
   {
     "id": "frame_cover",
     "copy-from": "frame",

data/json/vehicleparts/vp_flags.json

@@ -240,5 +240,21 @@
     "type": "json_flag",
     "context": [ "vehicle_part" ],
     "requires_flag": "ROOF"
+  },
+  {
+    "id": "SEAT_REQUIRES_BALANCE",
+    "context": [ "vehicle_part" ],
+    "type": "json_flag"
+  },
+  {
+    "id": "WHEEL_MOUNT_SKATEBOARD",
+    "context": [ "vehicle_part" ],
+    "type": "json_flag"
+  },
+  {
+    "id": "NEEDS_WHEEL_MOUNT_SKATEBOARD",
+    "context": [ "vehicle_part" ],
+    "type": "json_flag",
+    "requires_flag": "WHEEL_MOUNT_SKATEBOARD"
   }
 ]

data/json/vehicleparts/wheel.json

@@ -350,6 +350,55 @@
     },
     "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "FOLDABLE", "STEERABLE" ]
   },
+  {
+    "id": "wheel_skateboard",
+    "type": "vehicle_part",
+    "name": { "str": "skateboard wheels" },
+    "item": "wheel_skateboard",
+    "location": "under",
+    "color": "dark_gray",
+    "symbol": "o",
+    "broken_symbol": "x",
+    "durability": 70,
+    "description": "A set of four small wheels, for a skateboard.",
+    "damage_modifier": 50,
+    "folded_volume": "1250 ml",
+    "wheel_type": "standard",
+    "contact_area": 4,
+    "requirements": {
+      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "1 m", "qualities": [ { "id": "WRENCH", "level": 2 } ] },
+      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "1 m", "qualities": [ { "id": "WRENCH", "level": 2 } ] }
+    },
+    "flags": [ "WHEEL", "NEEDS_WHEEL_MOUNT_SKATEBOARD", "STABLE", "STEERABLE" ]
+  },
+  {
+    "id": "wheel_mount_skateboard",
+    "type": "vehicle_part",
+    "name": { "str": "skateboard trucks" },
+    "item": "wheel_mount_skateboard",
+    "location": "axle",
+    "symbol": "-",
+    "broken_symbol": "x",
+    "damage_modifier": 80,
+    "folded_volume": "200 ml",
+    "durability": 120,
+    "description": "A pair of skateboard trucks, for attaching wheels to.",
+    "flags": [ "WHEEL_MOUNT_SKATEBOARD" ],
+    "requirements": {
+      "removal": {
+        "skills": [ [ "mechanics", 0 ] ],
+        "time": "3 m",
+        "qualities": [ { "id": "WRENCH", "level": 2 }, { "id": "SCREW", "level": 1 } ]
+      },
+      "install": {
+        "skills": [ [ "mechanics", 0 ] ],
+        "time": "3 m",
+        "qualities": [ { "id": "WRENCH", "level": 2 }, { "id": "SCREW", "level": 1 } ]
+      }
+    },
+    "breaks_into": [ { "item": "scrap", "count": [ 0, 1 ] } ],
+    "damage_reduction": { "all": 10 }
+  },
   {
     "id": "wheel_10",
     "type": "vehicle_part",

data/json/vehicles/bikes.json

@@ -292,5 +292,12 @@
         "parts": [ "frame_carbon_vertical", "wheel_mount_light", "wheel_bicycle_rear", "basketsm_bike_rear" ]
       }
     ]
+  },
+  {
+    "id": "skateboard",
+    "type": "vehicle",
+    "name": "Skateboard",
+    "blueprint": [ "$" ],
+    "parts": [ { "x": 0, "y": 0, "parts": [ "frame_wood_deck", "wheel_mount_skateboard", "wheel_skateboard" ] } ]
   }
 ]

data/json/vehicles/carts.json

@@ -296,7 +296,7 @@
   {
     "id": "wheelchair",
     "type": "vehicle",
-    "name": "Foldable wheelchair",
+    "name": "Wheelchair",
     "blueprint": [ "#" ],
     "parts": [
       { "x": 0, "y": 0, "part": "folding_frame" },

msvc-full-features/Cataclysm-lib-vcpkg-static.vcxproj

@@ -39,10 +39,9 @@
     <VcpkgAdditionalInstallOptions>--clean-after-build</VcpkgAdditionalInstallOptions>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -52,7 +51,6 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
@@ -134,15 +132,17 @@
   <ItemGroup>
     <ClCompile Include="..\src\lua\*.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles></ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
     </ClCompile>
     <ClInclude Include="..\src\lua\*.h">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles></ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\*.h" Exclude ="..src\message.h" />
+    <ClInclude Include="..\src\*.h" Exclude="..src\message.h" />
     <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
@@ -154,4 +154,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

msvc-full-features/Cataclysm-test-vcpkg-static.vcxproj

@@ -41,7 +41,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -148,4 +148,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

msvc-full-features/Cataclysm-vcpkg-static.vcxproj

@@ -41,7 +41,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -165,4 +165,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

msvc-full-features/JsonFormatter-vcpkg-static.vcxproj

@@ -41,7 +41,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -161,4 +161,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>