Merge pull request #10 from CleverRaven/master

Update

Makefile

@@ -652,7 +652,7 @@ ifeq ($(TARGETSYSTEM),WINDOWS)
   RSRC = $(wildcard $(SRC_DIR)/*.rc)
   _OBJS += $(RSRC:$(SRC_DIR)/%.rc=%.o)
 endif
-OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
+OBJS = $(sort $(patsubst %,$(ODIR)/%,$(_OBJS)))
 
 ifdef LANGUAGES
   L10N = localization

astyle_blacklist

@@ -25,10 +25,6 @@ src/inventory.cpp
 src/inventory_ui.cpp
 src/item.cpp
 src/item_factory.cpp
-src/iuse_actor.cpp
-src/iuse.cpp
-src/iuse_software_kitten.cpp
-src/iuse_software_minesweeper.cpp
 src/json.cpp
 src/lightmap.cpp
 src/line.cpp
@@ -73,7 +69,6 @@ src/field.h
 src/io.h
 src/item.h
 src/itype.h
-src/iuse.h
 src/json.h
 src/mapdata.h
 src/mapgen_functions.h

data/json/construction.json

@@ -126,7 +126,7 @@
         "required_skills" : [ [ "survival", 2 ] ],
         "time" : 60,
         "qualities": [ [
-            { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 2 }
+            { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 }
         ] ],
         "pre_terrain" : "t_trunk",
         "post_terrain" : "t_dirt",

data/json/effects.json

@@ -1487,6 +1487,10 @@
         "rating": "neutral",
         "max_intensity": 24
     },
+    {
+        "type": "effect_type",
+        "id": "narcosis"
+    },
     {
         "type": "effect_type",
         "id": "alarm_clock"

data/json/flags.json

@@ -64,6 +64,13 @@
     "info": "This item has a <good>diamond coating</good> improving it's <info>cutting damage</info>.",
     "inherit": false
   },
+  {
+    "id": "DURABLE_MELEE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "As a weapon, this item is <good>well-made</good> and will <info>withstand the punishment of combat</info>.",
+    "conflicts": [ "FRAGILE_MELEE" ]
+  },
   {
     "id": "ELECTRIC_IMMUNE",
     "type": "json_flag",
@@ -104,6 +111,13 @@
     "info": "This gear is <bad>fragile</bad> and <info>won't protect you for long</info>.",
     "conflicts": [ "STURDY" ]
   },
+  {
+    "id": "FRAGILE_MELEE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "As a weapon, this item is <bad>flimsy</bad> and <info>won't last long in combat</info> before breaking apart.",
+    "conflicts": [ "DURABLE_MELEE" ]
+  },
   {
     "id": "GAS_PROOF",
     "type": "json_flag",

data/json/harvest.json

@@ -77,5 +77,16 @@
       { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.3, 0.6 ], "max": 10 },
       { "drop": "fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18 }
     ]
+  },
+  {
+    "id": "fungaloid_mass",
+    "type": "harvest",
+    "message": "You laboriously hack and dig through the remains of the fungal mass.",
+    "entries": [
+      { "drop": "veggy", "base_num": [ 6, 10 ], "scale_num": [ 0.6, 0.8 ], "max": 20 },
+      { "drop": "veggy_tainted", "base_num": [ 16, 25 ], "scale_num": [ 0.6, 0.8 ], "max": 50 },
+      { "drop": "plant_sac", "base_num": [ 3, 6 ], "scale_num": [ 0.7, 0.9 ], "max": 10 },
+      { "drop": "plant_fibre", "base_num": [ 4, 8 ], "scale_num": [ 0.5, 0.7 ], "max": 10 }
+    ]
   }
 ]

data/json/item_actions.json

@@ -459,6 +459,10 @@
         "type" : "item_action",
         "id" : "MP3_ON",
         "name" : "Turn off"
+    },{
+        "type" : "item_action",
+        "id" : "GASMASK",
+        "name" : "Prepare to use"
     },{
         "type" : "item_action",
         "id" : "MULTICOOKER",

data/json/items/ammo.json

@@ -298,7 +298,7 @@
         "name" : "feather",
         "symbol" : "=",
         "color" : "brown",
-        "description" : "Feathers from a bird.  Useful for fletching arrows",
+        "description" : "Feathers from a bird.  Useful for fletching arrows.",
         "material" : "cotton",
         "volume" : 1,
         "weight" : 1,
@@ -749,6 +749,48 @@
         "ammo_type" : "rebreather_filter",
         "count" : 30
     },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_s",
+        "category": "spare_parts",
+        "price": 2500,
+        "name": "filter mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Small replacement filter cartridge for air filtration masks.",
+        "volume": 1,
+        "weight": 1,
+        "ammo_type": "gasfilter_s",
+        "count": 100
+    },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_m",
+        "category": "spare_parts",  
+        "price": 2500,
+        "name": "gas mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Medium replacement filter cartridge for air filtration masks.",
+        "volume": 1,
+        "weight": 2,
+        "ammo_type": "gasfilter_m",
+        "count": 100
+    },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_l",
+        "category": "spare_parts",
+        "price": 2500,
+        "name": "hazmat mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Heavy replacement filter cartridge for air filtration masks.",
+        "volume": 1,
+        "weight": 3,
+        "ammo_type": "gasfilter_l",
+        "count": 100
+    },
     {   "type" : "AMMO",
         "id" : "nicotine_liquid",
         "category" : "spare_parts",

data/json/items/ammo_types.json

@@ -371,6 +371,24 @@
         "name" : "rebreather filter",
         "default" : "rebreather_filter"
     },
+    {
+        "type": "ammunition_type",
+        "id": "gasfilter_s",
+        "name": "filter mask cartridge",
+        "default": "gasfilter_s"
+   },
+   {
+        "type": "ammunition_type",
+        "id": "gasfilter_m",
+        "name": "gas mask cartridge",
+        "default": "gasfilter_m"
+    },
+    {
+        "type": "ammunition_type",
+        "id": "gasfilter_l",
+        "name": "hazmat mask cartridge",
+        "default": "gasfilter_l"
+    },
     {
         "type" : "ammunition_type",
         "id" : "300",