Merge pull request #7 from CleverRaven/master

Update
CleverRaven · Jul 6, 2014 · 4b36438 · 4b36438
2 parents 81280f7 + d11c735
commit 4b36438
Show file tree

Hide file tree

Showing 28 changed files with 641 additions and 250 deletions.
diff --git a/data/json/bionics.json b/data/json/bionics.json
diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -645,7 +645,7 @@
     "symbol": "[",
     "color": "dark_gray",
     "name" : "rebreather mask",
-    "description": "A mask worn over your mouth which, when powered by standard batteries, recycles your exhaled breath for rebreathing while underwater. Use it to turn it on.",
+    "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. Use it to turn it on.",
     "flags" : ["WATER_FRIENDLY"],
     "price": 25000,
     "material": ["plastic", "aluminum"],
@@ -685,7 +685,7 @@
     "color": "dark_gray",
     "name": "rebreather mask (on)",
     "name_plural": "rebreather masks (on)",
-    "description": "A mask worn over your mouth which, when powered by standard batteries, recycles your exhaled breath for rebreathing while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.",
+    "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.",
     "flags" : ["WATER_FRIENDLY", "REBREATHER"],
     "price": 25000,
     "material": ["plastic", "aluminum"],
@@ -721,7 +721,7 @@
     "symbol": "[",
     "color": "dark_gray",
     "name" : "XL rebreather mask",
-    "description": "A mask worn over your mouth which, when powered by standard batteries, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. Use it to turn it on.",
+    "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. Use it to turn it on.",
     "flags" : ["WATER_FRIENDLY", "OVERSIZE"],
     "price": 25000,
     "material": ["plastic", "aluminum"],
@@ -761,7 +761,7 @@
     "color": "dark_gray",
     "name": "XL rebreather mask (on)",
     "name_plural": "XL rebreather masks (on)",
-    "description": "A mask worn over your mouth which, when powered by standard batteries, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. It is turned on, and continually consuming its filter. Use it to turn it off.",
+    "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. It is turned on, and continually consuming its filter. Use it to turn it off.",
     "flags" : ["WATER_FRIENDLY", "REBREATHER", "OVERSIZE"],
     "price": 25000,
     "material": ["plastic", "aluminum"],

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -5649,7 +5649,7 @@
     "color": "light_gray",
     "name": "used heat pack",
     "description": "This is a chemical heat pack. It's used to treat sports injuries and heat food. This one has been used and is chemically inert, rendering it useless.",
-    "price": 1000,
+    "price": 0,
     "material": "plastic",
     "weight": 226,
     "volume": 0,
@@ -5661,6 +5661,7 @@
     "charges_per_use": 0,
     "turns_per_charge": 0,
     "ammo": "NULL",
+    "category": "other",
     "revert_to": "null"
   },
 

diff --git a/data/json/mapgen/evac_center.json b/data/json/mapgen/evac_center.json
@@ -836,9 +836,9 @@
 				"  # L##          ##L #  ",
 				"  #####          #####  ",
 				"     ##2        2##     ",
-				"     +            0     ",
-				"     +            0     ",
-				"     ##          ##     ",
+				"     +          bL0     ",
+				"     +          hL0     ",
+				"     ##         b##     ",
 				"##=####      zz  #######",
 				"     ##      zz  #######",
 				"     ###        ########",
@@ -1346,7 +1346,6 @@
                 { "item": "cannedfood", "chance": 90, "x": [ 2, 20 ], "y": [ 8, 8 ]}
 			],
             "place_specials": [
-                { "type": "npc", "class": "evac_merchant", "x": 23, "y": 23 },
                 { "type": "npc", "class": "evac_guard1", "x": 9, "y": 21 },
                 { "type": "npc", "class": "guard", "x": 14, "y": 21 }
             ],
@@ -1419,9 +1418,9 @@
 		"object": {
 			"fill_ter": "t_floor",
 			"rows": [
-				"  #c   #####..........ss",
-				"  #S 2 +t##..........sss",
-				"  #c   ####...sssssssss_",
+				"LL#c   #####..........ss",
+				"bh#S 2 +t##..........sss",
+				"h #c   ####...sssssssss_",
 				"  #S D +t##..sssssssss__",
 				"  ##+######..sss________",
 				"  #  #~#~##..ss_________",
@@ -1832,7 +1831,8 @@
 				".........ssssss........."
             ],
             "place_specials": [
-                { "type": "npc", "class": "arsonist", "x": 5, "y": 2 }
+                { "type": "npc", "class": "arsonist", "x": 5, "y": 2 },
+                { "type": "npc", "class": "evac_merchant", "x": 23, "y": 0 }
             ],
 			"terrain": {
 				"~": "t_floor",

diff --git a/data/json/overmap_terrain.json b/data/json/overmap_terrain.json
@@ -3884,7 +3884,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_7",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3894,7 +3894,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_8",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3904,7 +3904,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_9",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3934,7 +3934,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_12",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3944,7 +3944,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_13",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3954,7 +3954,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_14",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3984,7 +3984,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_17",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -3994,7 +3994,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_18",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",
@@ -4004,7 +4004,7 @@
     },{
         "type" : "overmap_terrain",
         "id" : "evac_center_19",
-        "name" : "Refguee Center",
+        "name" : "Refugee Center",
         "sym" : 4194414,
         "color" : "white",
         "extras" : "build",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -10,7 +10,6 @@
                 "bio_power_storage",
                 "bio_tools",
                 "bio_sunglasses"
-
             ],
             "skills": [
                 {
@@ -43,7 +42,6 @@
                     "pockknife",
                     "rope_30",
                     "canteen"
-
                 ],
                 "male": [
                     "boxer_shorts"
@@ -2131,7 +2129,7 @@
         "type": "profession",
         "ident": "archaeologist",
         "name": "Archaeologist",
-        "description": "While on your way to a long-lost temple following a clue from your dead grandfather's journal, the ground started to shake uncontrollably. Getting a bad feeling about the situation, you head to the nearest shelter.",
+        "description": "While on your way to a long-lost temple following a clue from your dead grandfather\'s journal, the ground started to shake uncontrollably. Getting a bad feeling about the situation, you head to the nearest shelter.",
         "points": 5,
 		"skills": [
             {
@@ -2198,52 +2196,5 @@
                 "panties"
             ]
         }
-    },
-
-    {
-      "type": "profession",
-      "ident": "patriot",
-      "name": "Patriot",
-      "description": "It's Independence Day, and you're fully prepared to celebrate the end of the world in style.",
-      "points": 0,
-      "items": {
-           "both": [
-           "jeans",
-           "flag_shirt",
-           "backpack",
-           "sneakers",
-           "wine_noir",
-           "wine_riesling",
-           "beer",
-           "beer",
-           "beer",
-           "beer",
-           "beer",
-           "beer",
-           "firecracker_pack",
-           "firecracker_pack",
-           "firecracker_pack",
-           "firecracker_pack",
-           "firecracker_pack",
-           "firecracker",
-           "firecracker",
-           "firecracker",
-           "firecracker",
-           "firecracker",
-           "mininuke",
-           "c4",
-           "dynamite",
-           "LAW_Packed",
-           "american_flag",
-           "ref_lighter"
-           ],
-           "male": [
-                "boxer_shorts"
-            ],
-            "female": [
-                "bra",
-                "boy_shorts"
-            ]
-      }
- }
+    }
 ]