Latest

android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -1844,7 +1844,9 @@ public boolean onKey(View  v, int keyCode, KeyEvent event) {
 
         if (source == InputDevice.SOURCE_UNKNOWN) {
             InputDevice device = InputDevice.getDevice(deviceId);
-            source = device.getSources();
+            if (device != null) {
+                source = device.getSources();
+            }
         }
 
         if ((source & InputDevice.SOURCE_KEYBOARD) != 0) {
@@ -2137,7 +2139,7 @@ public boolean onKeyPreIme (int keyCode, KeyEvent event) {
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         ic = new SDLInputConnection(this, true);
 
-        outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
                 | EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
 

data/json/bionics.json

@@ -565,7 +565,7 @@
   {
     "id": "bio_lighter",
     "type": "bionic",
-    "name": "Mini-Flamethrower",
+    "name": "Finger Lighter",
     "description": "The index fingers of both hands have powerful fire starters which extend from the tip.",
     "occupied_bodyparts": [ [ "HAND_L", 1 ], [ "HAND_R", 1 ] ],
     "fake_item": "fake_firestarter",
@@ -583,7 +583,7 @@
     "id": "bio_magnet",
     "type": "bionic",
     "name": "Electromagnetic Unit",
-    "description": "Surgically embedded in your right hand is a powerful electromagnet, allowing you to indiscriminately pull all nearby magnetic objects towards you.  Unlucky bystanders might be injured or killed by flying objects.",
+    "description": "Surgically embedded in your right hand is a powerful electromagnet, allowing you to use your own strength to pull all nearby magnetic objects towards you.  Unlucky bystanders might be injured or killed by flying objects.",
     "occupied_bodyparts": [ [ "HAND_R", 3 ] ],
     "act_cost": "10 kJ"
   },

data/json/furniture_and_terrain/terrain-windows.json

@@ -136,7 +136,16 @@
     "move_cost": 4,
     "coverage": 60,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE",
+      "NOITEM",
+      "OPENCLOSE_INSIDE",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "close": "t_window_no_curtains",
     "bash": {
       "str_min": 3,
@@ -211,7 +220,16 @@
     "move_cost": 4,
     "coverage": 60,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE",
+      "NOITEM",
+      "OPENCLOSE_INSIDE",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "examine_action": "curtains",
     "close": "t_window_domestic",
     "bash": {
@@ -337,7 +355,16 @@
     "symbol": "0",
     "color": "yellow",
     "move_cost": 4,
-    "flags": [ "TRANSPARENT", "NOITEM", "FLAMMABLE", "SUPPORTS_ROOF", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "NOITEM",
+      "FLAMMABLE",
+      "SUPPORTS_ROOF",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "bash": {
       "str_min": 10,
       "str_max": 70,
@@ -371,7 +398,7 @@
       "ter_set": "t_window_empty",
       "items": [ { "item": "glass_shard", "count": [ 6, 10 ] } ]
     },
-    "flags": [ "TRANSPARENT", "SHARP", "FLAMMABLE", "NOITEM", "MOUNTABLE", "CONNECT_TO_WALL" ]
+    "flags": [ "TRANSPARENT", "SHARP", "FLAMMABLE", "NOITEM", "MOUNTABLE", "CONNECT_TO_WALL", "SMALL_PASSAGE" ]
   },
   {
     "type": "terrain",

data/json/harvest.json

@@ -506,7 +506,7 @@
     "entries": [
       { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 },
       { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 },
       { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
       { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 }
@@ -519,7 +519,7 @@
       { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.18 },
       { "drop": "meat", "type": "flesh", "mass_ratio": 0.4 },
       { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "human_fat", "type": "flesh", "mass_ratio": 0.1 },
       { "drop": "bone_human", "type": "bone", "mass_ratio": 0.12 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
       { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.01 },

data/json/item_category.json

@@ -3,54 +3,63 @@
     "id": "guns",
     "type": "ITEM_CATEGORY",
     "name": "GUNS",
+    "zone": "LOOT_GUNS",
     "sort_rank": -23
   },
   {
     "id": "magazines",
     "type": "ITEM_CATEGORY",
     "name": "MAGAZINES",
+    "zone": "LOOT_MAGAZINES",
     "sort_rank": -22
   },
   {
     "id": "ammo",
     "type": "ITEM_CATEGORY",
     "name": "AMMO",
+    "zone": "LOOT_AMMO",
     "sort_rank": -21
   },
   {
     "id": "weapons",
     "type": "ITEM_CATEGORY",
     "name": "WEAPONS",
+    "zone": "LOOT_WEAPONS",
     "sort_rank": -20
   },
   {
     "id": "tools",
     "type": "ITEM_CATEGORY",
     "name": "TOOLS",
+    "zone": "LOOT_TOOLS",
     "sort_rank": -19
   },
   {
     "id": "clothing",
     "type": "ITEM_CATEGORY",
     "name": "CLOTHING",
+    "//": "zone is hardcoded due to filthy clothing",
     "sort_rank": -18
   },
   {
     "id": "food",
     "type": "ITEM_CATEGORY",
     "name": "FOOD",
+    "//": "zone is hardcoded",
     "sort_rank": -17
   },
   {
     "id": "drugs",
     "type": "ITEM_CATEGORY",
     "name": "DRUGS",
+    "zone": "LOOT_DRUGS",
     "sort_rank": -16
   },
   {
     "id": "books",
     "type": "ITEM_CATEGORY",
     "name": "BOOKS",
+    "zone": "LOOT_BOOKS",
     "sort_rank": -15
   },
   {
@@ -63,66 +72,77 @@
     "id": "mods",
     "type": "ITEM_CATEGORY",
     "name": "MODS",
+    "zone": "LOOT_MODS",
     "sort_rank": -13
   },
   {
     "id": "mutagen",
     "type": "ITEM_CATEGORY",
     "name": "MUTAGENS",
+    "zone": "LOOT_MUTAGENS",
     "sort_rank": -12
   },
   {
     "id": "bionics",
     "type": "ITEM_CATEGORY",
     "name": "BIONICS",
+    "zone": "LOOT_BIONICS",
     "sort_rank": -12
   },
   {
     "id": "veh_parts",
     "type": "ITEM_CATEGORY",
     "name": "VEHICLE PARTS",
+    "zone": "LOOT_VEHICLE_PARTS",
     "sort_rank": -10
   },
   {
     "id": "other",
     "type": "ITEM_CATEGORY",
     "name": "OTHER",
+    "zone": "LOOT_OTHER",
     "sort_rank": -9
   },
   {
     "id": "fuel",
     "type": "ITEM_CATEGORY",
     "name": "FUEL",
+    "zone": "LOOT_FUEL",
     "sort_rank": -8
   },
   {
     "id": "seeds",
     "type": "ITEM_CATEGORY",
     "name": "SEEDS",
+    "zone": "LOOT_SEEDS",
     "sort_rank": -7
   },
   {
     "id": "chems",
     "type": "ITEM_CATEGORY",
     "name": "CHEMICAL STUFF",
+    "zone": "LOOT_CHEMICAL",
     "sort_rank": 5
   },
   {
     "id": "spare_parts",
     "type": "ITEM_CATEGORY",
     "name": "SPARE PARTS",
+    "zone": "LOOT_SPARE_PARTS",
     "sort_rank": 8
   },
   {
     "id": "artifacts",
     "type": "ITEM_CATEGORY",
     "name": "ARTIFACTS",
+    "zone": "LOOT_ARTIFACTS",
     "sort_rank": 10
   },
   {
     "id": "armor",
     "type": "ITEM_CATEGORY",
     "name": "ARMOR",
+    "//": "zone is hardcoded due to filthy clothing",
     "sort_rank": 20
   },
   {

data/json/itemgroups/clothing.json

@@ -1939,7 +1939,7 @@
   {
     "type": "item_group",
     "id": "museum_armor_feet",
-    "items": [ [ "boots_plate", 60 ], [ "boots_larmor", 40 ] ]
+    "items": [ [ "boots_plate", 60 ], [ "boots_larmor", 40 ], [ "chainmail_feet", 40 ] ]
   },
   {
     "type": "item_group",
@@ -1962,7 +1962,8 @@
       [ "armguard_larmor", 40 ],
       [ "vambrace_larmor", 20 ],
       [ "gloves_plate", 60 ],
-      [ "chainmail_arms", 30 ]
+      [ "chainmail_arms", 30 ],
+      [ "chainmail_hands", 30 ]
     ]
   },
   {

data/json/itemgroups/food_service.json

@@ -1056,7 +1056,8 @@
       [ "tongs", 10 ],
       [ "carver_off", 5 ],
       [ "meat", 1 ],
-      [ "hacksaw", 10 ]
+      [ "hacksaw", 10 ],
+      [ "gloves_cut_resistant", 10 ]
     ]
   }
 ]

data/json/itemgroups/item_groups.json

@@ -3616,6 +3616,8 @@
       [ "chainmail_vest", 3 ],
       [ "chainmail_arms", 3 ],
       [ "chainmail_legs", 3 ],
+      [ "chainmail_feet", 3 ],
+      [ "chainmail_hands", 3 ],
       [ "legguard_metal", 1 ],
       [ "textbook_weapwest", 5 ],
       [ "textbook_weapeast", 5 ],
@@ -4029,6 +4031,8 @@
       [ "chainmail_vest", 2 ],
       [ "chainmail_arms", 2 ],
       [ "chainmail_legs", 2 ],
+      [ "chainmail_feet", 2 ],
+      [ "chainmail_hands", 2 ],
       [ "motorbike_armor", 2 ],
       [ "motorbike_pants", 2 ],
       [ "motorbike_boots", 2 ],

data/json/items/armor.json

@@ -1700,6 +1700,65 @@
     "material_thickness": 4,
     "flags": [ "VARSIZE", "STURDY" ]
   },
+  {
+    "id": "chainmail_feet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "pair of chainmail chausses",
+    "name_plural": "pairs of chainmail chausses",
+    "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
+    "weight": "2006 g",
+    "volume": "500 ml",
+    "price": 5012,
+    "to_hit": -1,
+    "material": [ "iron", "cotton" ],
+    "symbol": "[",
+    "color": "light_red",
+    "covers": [ "FEET" ],
+    "coverage": 100,
+    "encumbrance": 20,
+    "material_thickness": 4,
+    "flags": [ "VARSIZE", "STURDY" ]
+  },
+  {
+    "id": "chainmail_hands",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "pair of chainmail gloves",
+    "name_plural": "pairs of chainmail gloves",
+    "description": "Customized chainmail gloves.  They fully enclose the fingers and provide excellent protection, but are somewhat cumbersome.",
+    "weight": "2006 g",
+    "volume": "500 ml",
+    "price": 5012,
+    "to_hit": -1,
+    "material": [ "iron", "cotton" ],
+    "symbol": "[",
+    "color": "light_red",
+    "covers": [ "HANDS" ],
+    "coverage": 100,
+    "encumbrance": 30,
+    "material_thickness": 4,
+    "flags": [ "VARSIZE", "STURDY" ]
+  },
+  {
+    "id": "chainmail_suit_faraday",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "faraday chainmail suit",
+    "description": "A fully customized chainmail suit that can be worn over your normal clothing.  The suit is conductively interconnected, protecting against electricity.",
+    "weight": "23335 g",
+    "volume": "3500 ml",
+    "price": 35000,
+    "to_hit": -1,
+    "material": [ "iron", "cotton" ],
+    "symbol": "[",
+    "color": "light_red",
+    "covers": [ "TORSO", "HEAD", "ARMS", "HANDS", "LEGS", "FEET" ],
+    "coverage": 100,
+    "encumbrance": 30,
+    "material_thickness": 4,
+    "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "ELECTRIC_IMMUNE", "OUTER" ]
+  },
   {
     "id": "chaps_leather",
     "type": "ARMOR",