Add AUTO_PICKUP_SMALL_ITEMS option.

COMPILING.md

@@ -343,6 +343,27 @@ For MacPorts:
    sudo port install gettext ncurses
    hash -r

### gcc

The version of gcc/g++ installed with the [Command Line Tools for Xcode](https://developer.apple.com/downloads/) is actually just a front end for the same Apple LLVM as clang.  This doesn't necessarily cause issues, but this version of gcc/g++ will have clang error messages and essentially produce the same results as if using clang. To compile with the "real" gcc/g++, install it with homebrew:

    brew install gcc

However, homebrew installs gcc as gcc-6 (where 6 is the version) to avoid conflicts. The simplest way to use the homebrew version at `/usr/local/bin/gcc-6` instead of the Apple LLVM version at `/usr/bin/gcc` is to symlink the necessary.

    cd /usr/local/bin
    ln -s gcc-6 gcc
    ln -s g++-6 g++
    ln -s c++-6 c++

Or, to do this for everything in `/usr/local/bin/` ending with `-6`, 

    find /usr/local/bin -name "*-6" -exec sh -c 'ln -s "$1" $(echo "$1" | sed "s/..$//")' _ {} \;
    
Also, you need to make sure that `/usr/local/bin` appears before `/usr/bin` in your `$PATH`, or else this will not work.

Check that `gcc -v` shows the homebrew version you installed.

### Compiling

The Cataclysm source is compiled using `make`.

CataclysmWin.cbp

@@ -316,9 +316,9 @@
			</Target>
		</Build>
		<Compiler>
			<Add option="-std=c++11" />
			<Add option="-Wextra" />
			<Add option="-Wall" />
			<Add option="-std=c++11" />
			<Add option="-DCB_BUILD" />
			<Add option="-D_WINDOWS -D_MINGW -D_WIN32 -DWIN32 -D__MINGW__" />
		</Compiler>
@@ -335,10 +335,7 @@
			<Add before="cmd /c del version.tmp" />
			<Mode after="always" />
		</ExtraCommands>
		<UnitsGlob directory="src" recursive="0" />
		<Unit filename="src/resource.rc">
			<Option compilerVar="WINDRES" />
		</Unit>
		<UnitsGlob directory="src" recursive="0" wildcard="" />
		<Extensions>
			<code_completion />
			<debugger />

Makefile

@@ -740,7 +740,6 @@ install: version $(TARGET)
	cp -R --no-preserve=ownership data/mods $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/names $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/raw $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/recycling $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
	cp -R --no-preserve=ownership data/title $(DATA_PREFIX)

data/CMakeLists.txt

@@ -7,7 +7,6 @@ SET(CATACLYSM_DATA_DIRS
	${CMAKE_SOURCE_DIR}/data/mods
	${CMAKE_SOURCE_DIR}/data/names
	${CMAKE_SOURCE_DIR}/data/raw
	${CMAKE_SOURCE_DIR}/data/recycling
	${CMAKE_SOURCE_DIR}/data/motd
	${CMAKE_SOURCE_DIR}/data/credits
	${CMAKE_SOURCE_DIR}/data/title

data/json/construction.json

@@ -173,7 +173,7 @@
            [ [ "nail", 4 ], [ "pointy_stick", 2 ], [ "spike", 2 ] ],
            [ [ "sheet", 2 ] ],
            [ [ "stick", 1 ] ],
            [ [ "string_36", 1 ] ]
            [ [ "withered", 12 ], [ "straw_pile", 12 ], [ "string_36", 1 ] ]
        ],
        "pre_special" : "check_empty",
        "post_terrain" : "t_door_curtain_c"
@@ -188,7 +188,7 @@
        ] ],
        "components" : [
            [ [ "2x4", 6 ], [ "stick", 6 ] ],
            [ [ "rope_6", 2 ] ]
            [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ]
        ],
        "pre_terrain" : "t_door_frame",
        "post_terrain" : "t_door_makeshift_c"
@@ -1061,6 +1061,7 @@
        "components" : [
            [ [ "steel_plate", 2] ]
        ],
        "pre_note" : "Must be supported on at least two sides.",
        "pre_special" : "check_support",
        "post_terrain" : "t_scrap_floor"
    },{
@@ -1153,7 +1154,7 @@
        "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
        "components" : [
            [ [ "log", 3 ] ],
            [ [ "wire", 6 ], [ "wire_barbed", 4 ], [ "rope_6", 2 ], [ "chain", 1 ], [ "vine_30", 1 ] ]
            [ [ "wire", 6 ], [ "wire_barbed", 4 ], [ "rope_6", 2 ], [ "rope_makeshift_6", 2 ], [ "chain", 1 ], [ "vine_30", 1 ] ]
        ],
        "pre_terrain" : "t_pit",
        "post_terrain" : "t_palisade"
@@ -1200,6 +1201,7 @@
            [ [ "2x4", 8 ] ],
            [ [ "nail", 40 ] ]
        ],
        "pre_note" : "Must be supported on at least two sides.",
        "pre_special" : "check_support",
        "post_terrain" : "t_floor"
    },{
@@ -1213,6 +1215,7 @@
            [ [ "log", 2 ] ],
            [ [ "stick", 4 ], [ "2x4", 8 ] ]
        ],
        "pre_note" : "Must be supported on at least two sides.",
        "pre_special" : "check_support",
        "post_terrain" : "t_floor"
    },{
@@ -1225,7 +1228,7 @@
        ],
        "time" : 60,
        "components" : [
            [ [ "rope_30", 1 ], [ "vine_30", 1 ] ],
            [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ],
            [ [ "stick", 8 ], [ "2x4", 8 ] ]
        ],
        "pre_note" : "Must be adjacent to a palisade wall that is itself adjacent to a palisade gate in order to open said gate.",
@@ -1244,7 +1247,7 @@
        "components" : [
            [ [ "log", 2 ] ],
            [ [ "2x4", 3 ] ],
            [ [ "rope_6", 2 ], [ "vine_30", 1 ] ]
            [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ], [ "vine_30", 1 ] ]
        ],
        "pre_note" : "Must be between palisade walls to function, and at least one wall must have an adjacent rope & pulley system.",
        "pre_terrain" : "t_pit",
@@ -1373,6 +1376,7 @@
            [ [ "steel_chunk", 3 ], [ "scrap", 12 ] ],
            [ [ "pipe", 20 ] ]
        ],
        "pre_note" : "Needs to be supported on both sides by fencing, walls, etc.",
        "pre_special" : "check_support",
        "post_terrain" : "t_chaingate_c"
    },{
@@ -2030,14 +2034,14 @@
        "time" : 420,
        "qualities": [ [ { "id": "AXE", "level": 2 } ],
                       [ { "id": "HAMMER", "level": 2 } ],
                       [ { "id": "DIG", "level": 3 } ]
                       [ { "id": "DIG", "level": 2 } ]
                       ],
        "tools" : [
            [ "pickaxe" ]
            [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ]
        ],
        "components" : [
            [ [ "2x4", 8 ] , [ "log", 8 ] ],
            [ [ "rope_30", 1 ], [ "vine_30", 1 ] ]
            [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ]
        ],
        "pre_flags" : "DIGGABLE",
        "post_special" : "done_dig_stair"
@@ -2049,15 +2053,14 @@
        "time" : 480,
        "qualities": [ [ { "id": "AXE", "level": 2 } ],
                       [ { "id": "HAMMER", "level": 2 } ],
                       [ { "id": "DIG", "level": 3 } ],
                       [ { "id": "PRY", "level": 2 } ]
                       [ { "id": "DIG", "level": 2 } ]
                       ],
        "tools" : [
            [ [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ]
            [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ]
        ],
        "components" : [
            [ [ "2x4", 12 ] , [ "log", 12 ] ],
            [ [ "rope_30", 1 ], [ "vine_30", 1 ] ]
            [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ]
        ],
        "pre_special" : "check_down_OK",
        "pre_terrain" : "t_rock_floor",
@@ -2070,19 +2073,18 @@
        "time" : 480,
        "qualities": [ [ { "id": "AXE", "level": 2 } ],
                       [ { "id": "HAMMER", "level": 2 } ],
                       [ { "id": "DIG", "level": 3 } ],
                       [ { "id": "PRY", "level": 2 } ]
                       [ { "id": "DIG", "level": 2 } ]
                       ],
        "tools" : [
            [ [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ],
            [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ],
            [ "miner_hat", "hat_hard", "firehelmet", "helmet_ball",
            "helmet_army", "helmet_lobster", "helmet_riot", "tac_helmet",
            "helmet_hsurvivor", "helmet_survivor", "helmet_xlsurvivor", "miner_hat_on"]
        ],
        "note" : "Helmets are essential because you're digging up and things may fall on you.",
        "components" : [
            [ [ "2x4", 12 ] , [ "log", 12 ] ],
            [ [ "rope_30", 1 ], [ "vine_30", 1 ] ]
            [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ]
        ],
        "pre_special" : "check_up_OK",
        "pre_terrain" : "t_rock",
@@ -2123,7 +2125,7 @@
        ] ],
        "components" : [
            [ [ "2x4",   8 ] ],
            [ [ "rope_30", 1 ], [ "vine_30", 1 ] ],
            [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ],
            [ [ "55gal_drum", 2 ], [ "30gal_drum", 2 ], [ "wooden_barrel", 2 ] ]
        ],
        "pre_terrain" : "t_water_dp",

data/json/effects.json

@@ -602,6 +602,7 @@
        "main_parts_only": true,
        "rating": "bad",
        "int_dur_factor": 1800,
        "max_intensity": 2,
        "scaling_mods": {
            "dex_mod": [-1, 0],
            "pain_chance_bot": [200],
@@ -626,6 +627,7 @@
        "main_parts_only": true,
        "rating": "bad",
        "int_dur_factor": 4800,
        "max_intensity": 3,
        "base_mods": {
            "pain_chance": [2, 1],
            "pain_chance_bot": [200],
@@ -885,6 +887,7 @@
        "part_descs": true,
        "speed_name": "Frostbite",
        "dur_add_perc": 0,
        "max_intensity": 2,
        "scaling_mods": {
            "speed_mod": [-5]
        }

data/json/flags.json

@@ -78,6 +78,19 @@
    "info": "This piece of clothing is <info>fancy</info>.",
    "conflicts": [ "SUPER_FANCY" ]
  },
  {
    "id": "FILTHY",
    "type": "json_flag",
    "context": [ "ARMOR", "TOOL_ARMOR" ],
    "description": "Zombie-dropped clothing giving various penalties if Filthy mod is active.",
    "info": "This piece of clothing is <bad>filthy</bad>."
  },
  {
    "id": "FLASH_PROTECTION",
    "type": "json_flag",
    "context": [ "ARMOR", "TOOL_ARMOR" ],
    "description": "Used for eyes protection from flashbang."
  },
  {
    "id": "FLOTATION",
    "type": "json_flag",
@@ -91,6 +104,12 @@
    "info": "This gear is <bad>fragile</bad> and <info>won't protect you for long</info>.",
    "conflicts": [ "STURDY" ]
  },
  {
    "id": "GAS_PROOF",
    "type": "json_flag",
    "context": [ "ARMOR", "TOOL_ARMOR" ],
    "info": "This gear <good>completely protects</good> you from <info>any gas</info>."
  },
  {
    "id": "HOOD",
    "type": "json_flag",
@@ -259,7 +278,8 @@
    "id": "WATCH",
    "type": "json_flag",
    "context": [ "ARMOR", "TOOL_ARMOR" ],
    "description": "Acts as a watch and allows the player to see actual time."
    "description": "Acts as a watch and allows the player to see actual time.",
    "info": "This gear allows to see <info>actual time</info>."
  },
  {
    "id": "WATERPROOF",

data/json/items/archery.json

@@ -924,7 +924,10 @@
        "volume" : 1,
        "weight" : 268,
        "bashing" : 1,
        "cutting" : 12,
        "cutting" : 10,
        "thrown_damage" : [
            { "damage_type": "cut", "amount": 14 }
        ],
        "ammo_type" : "thrown",
        "count" : 5
    },
@@ -942,6 +945,10 @@
        "weight" : 792,
        "bashing" : 6,
        "cutting" : 16,
        "thrown_damage" : [
            { "damage_type": "bash", "amount": 6 },
            { "damage_type": "cut", "amount": 16 }
        ],
        "ammo_type" : "thrown",
        "count" : 3
    },
@@ -957,8 +964,11 @@
        "material" : ["plastic", "iron"],
        "volume" : 2,
        "weight" : 175,
        "cutting" : 16,
        "to_hit" : -1,
        "cutting" : 8,
        "thrown_damage" : [
            { "damage_type": "stab", "amount": 16 }
        ],
        "ammo_type" : "thrown",
        "count" : 2
    },

data/json/items/generic/string.json

@@ -64,5 +64,32 @@
    "description": "A sturdy 30-foot long vine.  Could easily be used as a rope, but can't be disassembled.",
    "material": "veggy",
    "color": "light_green"
  },
  {
    "id": "rope_makeshift_6",
    "copy-from": "rope_6",
    "type": "GENERIC",
    "name": "short makeshift rope",
    "description": "A six-foot long piece of rough rope, woven from natural cordage.  Useful for some purposes, but not as strong or flexible as proper rope.",
    "material": "veggy"
  },
  {
    "id": "rope_makeshift_30",
    "copy-from": "rope_makeshift_6",
    "type": "GENERIC",
    "name": "long makeshift rope",
    "description": "A 30-foot long rough rope, woven from natural cordage.  Not strong enough to hold up to falls, but still useful for some things.",
    "armor_data": {
      "covers": [ "TORSO" ],
      "coverage": 12,
      "encumbrance": 14,
      "material_thickness": 6
    },
    "proportional": {
      "weight": 5,
      "volume": 5,
      "price": 5
    },
    "extend": { "flags": [ "BELTED" ] }
  }
]

data/json/items/gun/12mm.json

@@ -4,7 +4,7 @@
    "copy-from": "gun_base",
    "type": "GUN",
    "name": "H&K G80 Railgun",
    "description": "Developed by Heckler & Koch in 2033, the railgun magnetically propels a ferromagnetic projectile using an alternating current.  This makes it silent while still deadly.  Powered by UPS.",
    "description": "Developed by Heckler & Koch in 2033, the railgun magnetically propels a ferromagnetic projectile using an alternating current.  Powered by UPS.",
    "weight": 3914,
    "volume": 11,
    "price": 1920000,

data/json/items/gunmod/underbarrel.json

@@ -250,7 +250,7 @@
    "description": "A makeshift version of a bayonet that consists of a mere spike with some string.",
    "gunmod_data": {
      "location": "underbarrel",
      "mod_targets": [ "shotgun", "rifle" ],
      "mod_targets": [ "shotgun", "rifle", "smg", "crossbow" ],
      "dispersion_modifier": 10,
      "mode_modifier": [ [ "REACH", "bayonet", 2, [ "MELEE" ] ] ],
      "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ]

data/json/items/melee.json

@@ -953,6 +953,10 @@
        "volume" : 4,
        "bashing" : 5,
        "cutting" : 11,
        "thrown_damage" : [
            { "damage_type": "bash", "amount": 5 },
            { "damage_type": "stab", "amount": 11 }
        ],
        "flags" : ["SPEAR"],
        "price" : 4000,
        "qualities": [["COOK", 1]]
@@ -971,6 +975,10 @@
        "volume" : 4,
        "bashing" : 5,
        "cutting" : 17,
        "thrown_damage" : [
            { "damage_type": "bash", "amount": 5 },
            { "damage_type": "stab", "amount": 17 }
        ],
        "flags" : ["SPEAR", "NONCONDUCTIVE"],
        "price" : 9000,
        "qualities": [["COOK", 1]]