Merge pull request #2 from CleverRaven/master

patch
cataclysmbnteam · Nov 1, 2016 · 8d1981a · 8d1981a
2 parents 794dade + 9dd4ec9
commit 8d1981a
Show file tree

Hide file tree

Showing 171 changed files with 383,372 additions and 401,697 deletions.
diff --git a/astyled_whitelist b/astyled_whitelist
@@ -1,4 +1,5 @@
 src/action.cpp
+src/activity_handlers.h
 src/active_item_cache.cpp
 src/activity_item_handling.cpp
 src/addiction.cpp
@@ -33,6 +34,7 @@ src/help.cpp
 src/input.cpp
 src/item_action.cpp
 src/item_location.cpp
+src/item_stack.cpp
 src/itype.cpp
 src/iuse_software.cpp
 src/live_view.cpp
@@ -151,6 +153,7 @@ src/lightmap.h
 src/line.h
 src/live_view.h
 src/lua_console.h
+src/main_menu.h
 src/map_iterator.h
 src/map_selector.h
 src/mapbuffer.h

diff --git a/data/credits/zh_CN.credits b/data/credits/zh_CN.credits
@@ -17,7 +17,7 @@ https://github.com/CleverRaven/Cataclysm-DDA/contributors
 《大灾变·劫后余生》是以 Creative Commons BY-SA 3.0 授权发布。
 
 <color_red>汉化说明：</color>
-可以在transifex网站上参加汉化：
+欢迎前往Transifex参加汉化：
 https://www.transifex.com/cataclysm-dda-translators/cataclysm-dda
 
 相关汉化人员名单（可考）：
@@ -27,12 +27,10 @@ https://www.transifex.com/cataclysm-dda-translators/cataclysm-dda
 
 模都精校：[email protected], Devil, Jagdparrot, Nightoon, Primer238, Seven Westie, baozite, cellxiecao, emusilent, hiro, nanodesu-u~, qude, tt9891, vipches, wangjie, zhoujian, 继续求财神
 
-transifex翻译：EdwardMeng, NEBULAS, Snonel, busizhe, cainiao, cellxiecao, dlaboratory, glacias3183, jakwings, mdonline2, miigon, startobira, takhiss, xcscsf, yyp, zeroomega93824
+transifex翻译：Arcadia H, cainiao, Dikai Li, Brett Dong, FanyiMeng, 孔令垚, Lin Shu, fei li, cellxiecao, Jak Wings, Hua Liang, Amans Tofu, 桂平 翟, wei liu, Miigon Anonymous, polar bear, startobira, takhiss pa, Jin Zhang, Yao YongPeng, zhang yz, 迅雷 Thunder, 扬 米
 
 目前模都汉化维护人员：newisle, 永远的五毛钱, CQC_S
 
-目前活跃transifex汉化维护人员: cainiaowu, glacias3183, dlaboratory
-
 以上人员不论多寡皆对此游戏的文本翻译作出了贡献。
 
 为CDDA汉化工作做出贡献的你们的名字不会被忘记！

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1615,5 +1615,13 @@
     {
         "type": "effect_type",
         "id": "cough_suppress"
+    },
+    {
+        "type": "effect_type",
+        "id": "haslight",
+        "name": [ "Lit up" ],
+        "desc": [ "You are carrying a light and can't hide well." ],
+        "max_duration": 1,
+        "rating": "bad"
     }
 ]
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -17,6 +17,12 @@
     "context": [ "ARMOR", "TOOL_ARMOR" ],
     "description": "This gear is equipped with an accurate barometer (which is used to measure atmospheric pressure)."
   },
+  {
+    "id": "BELT_CLIP",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "description": "This item can be clipped on to a <info>belt loop</info> of the appropriate size."
+  },
   {
     "id": "BELTED",
     "type": "json_flag",
@@ -165,6 +171,18 @@
     "context": [ "ARMOR", "TOOL_ARMOR" ],
     "description": "Prevents the player from wielding a weapon two-handed, forcing one-handed use if the weapon permits it."
   },
+  {
+    "id": "SHEATH_KNIFE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "description": "This item can be stored in a sheath of the appropriate size."
+  },
+  {
+    "id": "SHEATH_SWORD",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "description": "This item can be stored in a scabbard of the appropriate size."
+  },
   {
     "id": "SKINTIGHT",
     "type": "json_flag",

diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -1865,7 +1865,10 @@
         "move_cost_mod": 1,
         "required_str": -1,
         "flags": ["TRANSPARENT", "TINY", "FLAMMABLE_ASH"],
-        "examine_action": "flower_datura",
+        "examine_action": "harvest_furn_nectar",
+        "harvest_by_season" : [
+            { "seasons": [ "spring", "summer", "autumn" ], "harvest": { "drop": "datura_seed", "base_num": [ 2, 6 ] } }
+        ],
         "bash": {
             "str_min": 2, "str_max": 6,
             "sound": "crunch.",
@@ -1895,7 +1898,10 @@
         "move_cost_mod": 0,
         "required_str": -1,
         "flags": ["TRANSPARENT", "TINY", "FLAMMABLE_ASH"],
-        "examine_action": "flower_dandelion",
+        "examine_action": "harvest_furn_nectar",
+        "harvest_by_season" : [
+            { "seasons": [ "spring", "summer", "autumn" ], "harvest": { "drop": "raw_dandelion", "base_num": [ 1, 4 ] } }
+        ],
         "bash": {
             "str_min": 2, "str_max": 6,
             "sound": "crunch.",
@@ -1924,7 +1930,11 @@
         "move_cost_mod": 1,
         "required_str": -1,
         "flags": ["TRANSPARENT", "TINY", "FLAMMABLE_ASH"],
-        "examine_action": "examine_cattails",
+        "examine_action": "harvest_furn",
+        "harvest_by_season" : [
+            { "seasons": [ "spring", "summer", "autumn", "winter" ], "harvest": { "drop": "cattail_rhizome" } },
+            { "seasons": [ "spring", "summer", "autumn" ], "harvest": { "drop": "cattail_stalk", "base_num": [ 1, 4 ] } }
+        ],
         "bash": {
             "str_min": 2, "str_max": 6,
             "sound": "crunch.",

diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
@@ -372,5 +372,31 @@
       [ "556", 10 ],
       [ "shot_slug", 20 ]
     ]
+  },
+  {
+    "id": "ammo_casings",
+    "type": "item_group",
+    "items": [
+      { "item": "223_casing", "prob": 100, "count": 20 },
+      { "item": "300_casing", "prob": 80, "count": 20 },
+      { "item": "3006_casing", "prob": 80, "count": 20 },
+      { "item": "308_casing", "prob": 80, "count": 20 },
+      { "item": "32_casing", "prob": 80, "count": 20 },
+      { "item": "38_casing", "prob": 80, "count": 20 },
+      { "item": "40_casing", "prob": 80, "count": 20 },
+      { "item": "44_casing", "prob": 80, "count": 20 },
+      { "item": "45_casing", "prob": 80, "count": 20 },
+      { "item": "454_casing", "prob": 60, "count": 5 },
+      { "item": "46mm_casing", "prob": 60, "count": 20 },
+      { "item": "50_casing", "prob": 60, "count": 5 },
+      { "item": "500_casing", "prob": 60, "count": 20 },
+      { "item": "57mm_casing", "prob": 60, "count": 5 },
+      { "item": "5x50_hull", "prob": 60, "count": 20 },
+      { "item": "700nx_casing", "prob": 40, "count": 5 },
+      { "item": "762_casing", "prob": 80, "count": 20 },
+      { "item": "9mm_casing", "prob": 100, "count": 20 },
+      { "item": "9x18mm_casing", "prob": 80, "count": 20 },
+      { "item": "shot_hull", "prob": 100, "count": 20 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -162,34 +162,6 @@
       ["36navy", 50],
       ["44army", 50]
     ]
-  },{
-    "type" : "item_group",
-    "id" : "ammo_casings",
-    "items":[
-      ["700nx_casing", 0],
-      ["22_casing", 0],
-      ["22_casing_new", 100],
-      ["shot_hull", 100],
-      ["9mm_casing", 100],
-      ["9x18mm_casing", 30],
-      ["38_casing", 40],
-      ["40_casing", 50],
-      ["44_casing", 50],
-      ["45_casing", 60],
-      ["454_casing", 30],
-      ["500_casing", 30],
-      ["57mm_casing", 50],
-      ["46mm_casing", 50],
-      ["762_casing", 50],
-      ["223_casing", 75],
-      ["3006_casing", 40],
-      ["308_casing", 75],
-      ["32_casing", 20],
-      ["300_casing", 30],
-      ["50_casing", 40],
-      ["40mm_casing", 20],
-      ["5x50_hull", 10]
-    ]
   },{
     "type" : "item_group",
     "id" : "archery",

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -56,6 +56,7 @@
     "type": "item_group",
     "//": "Spare parts for crafting or mending vehicle parts",
     "items": [
+      [ "bb", 40 ],
       [ "drivebelt", 200 ],
       [ "filter_air", 60 ],
       [ "filter_liquid", 60 ],