Merge pull request #9 from CleverRaven/master

Update to latest
CleverRaven · Sep 17, 2015 · 6f979cf · 6f979cf
2 parents 7c0a92c + 0c65263
commit 6f979cf
Show file tree

Hide file tree

Showing 140 changed files with 82,497 additions and 7,937 deletions.
diff --git a/Makefile b/Makefile
@@ -128,6 +128,8 @@ RC  = $(CROSS)windres
 
 # We don't need scientific precision for our math functions, this lets them run much faster.
 CXXFLAGS += -ffast-math
+LDFLAGS += $(PROFILE)
+
 # enable optimizations. slow to build
 ifdef RELEASE
   ifeq ($(NATIVE), osx)

diff --git a/data/credits/ko.credits b/data/credits/ko.credits
@@ -0,0 +1,18 @@
+# This message may be 21 lines long at maximum, but ideally will be less.
+# Max length of a line is 72 characters; the following line is for reference
+########################################################################
+원작자:              프로젝트 매니저:    웹사이트/포럼:
+Whales (중도하차)    KevinGranade        GlyphGryph
+
+현재 주 개발자/Github 매니저:
+KevinGranade, Rivet-the-Zombie, BevapDin, Coolthulu, i2amroy
+
+Special thanks to:
+Narc - 자동화 Jenkins 빌드봇을 설정.
+Acidia - 멋진 NPC, 퀘스트와 위치 기능을 만듬.
+Wuzzy and VlasovVitaly - 고된 번역 작업을 해줌.
+HuXTUS - 굉장한 양의 기발한 컨텐츠를 제공.
+
+전체 기여자 목록을 보려면 다음 사이트를 참고해주세요:
+https://github.com/CleverRaven/Cataclysm-DDA/contributors
+Cataclysm: Dark Days Ahead는 CC-BY-SA 3.0에 따라 이용할 수 있습니다.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1431,5 +1431,24 @@
         "//": "On roof of a vehicle, aiming a turret",
         "type": "effect_type",
         "id": "on_roof"
+    },
+    {
+        "type": "effect_type",
+        "id": "corroding",
+        "name": ["Corroding"],
+        "desc": ["You're covered in acid!  It hurts and further lowers your resistance to acid."],
+        "apply_message": "You're covered in acid!",
+        "rating": "bad",
+        "max_duration": 5,
+        "max_intensity": 5,
+        "int_dur_factor": 1,
+        "base_mods": {
+            "hurt_min": [1],
+            "hurt_chance": [1],
+            "hurt_chance_bot": [10]
+        },
+        "scaling_mods": {
+            "hurt_chance": [1]
+        }
     }
 ]
diff --git a/data/json/fish.json b/data/json/fish.json
@@ -284,7 +284,7 @@
     "special_freq"    : [0],
     "death_function"  : "NORMAL",
     "special_attack"  : ["NONE"],
-    "description"     : "A Smallmouth Bass.  Being intolerant to polution in the water, smallmouth bass are a good indicator of how clean it is.  Just becuase you see them though, doesnt mean you can drink the water without boiling it first.",
+    "description"     : "A Smallmouth bass.  Being intolerant to pollution in the water, smallmouth bass are a good indicator of how clean it is.  Just because you see them though, doesn't mean you can drink the water without boiling it first.",
     "flags"           : ["FISHABLE", "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC", "VIS30", "BONES"],
     "fear_triggers":["PLAYER_CLOSE", "SOUND"],
     "categories":["WILDLIFE"]

diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -2455,29 +2455,49 @@
         { "item": "rock", "count": [20, 30] }
       ]
     }
-  },{
-   "type" : "furniture",
-   "id" : "f_clay_kiln",
-   "name": "clay kiln",
-   "symbol": "^",
-   "color": "ltred",
-   "move_cost_mod": -1,
-   "required_str": -1,
-   "crafting_pseudo_item": "brick_kiln",
-   "flags": [ "SEALED", "CONTAINER", "NOITEM"],
-   "deconstruct": {
-     "items": [
-       { "item": "rock", "count": 40 }
-     ]
-   },
-   "examine_action": "reload_furniture",
-   "bash": {
-     "str_min": 18, "str_max": 50,
-     "sound": "crunch!",
-     "sound_fail": "whump.",
-     "items": [
-       { "item": "rock", "count": [20, 30] }
-     ]
-   }
-}
+    },{
+        "type" : "furniture",
+        "id" : "f_clay_kiln",
+        "name": "clay kiln",
+        "symbol": "^",
+        "color": "ltred",
+        "move_cost_mod": -1,
+        "required_str": -1,
+        "crafting_pseudo_item": "brick_kiln",
+        "flags": [ "SEALED", "CONTAINER", "NOITEM"],
+        "deconstruct": {
+            "items": [
+                { "item": "rock", "count": 40 }
+            ]
+        },
+        "examine_action": "reload_furniture",
+        "bash": {
+            "str_min": 18, "str_max": 50,
+            "sound": "crunch!",
+            "sound_fail": "whump.",
+            "items": [
+                { "item": "rock", "count": [20, 30] }
+            ]
+        }
+    },{
+        "type" : "furniture",
+        "id" : "f_ladder",
+        "name": "stepladder",
+        "symbol": "H",
+        "color": "brown",
+        "move_cost_mod": 3,
+        "required_str": 6,
+        "flags": [ "LADDER", "TRANSPARENT", "SEEN_FROM_ABOVE" ],
+        "examine_action": "portable_structure",
+        "bash": {
+            "str_min": 6, "str_max": 40,
+            "sound": "smash!",
+            "sound_fail": "whump.",
+            "items": [
+                { "item": "2x4", "count": [4, 10] },
+                { "item": "nail", "charges": [10, 30] },
+                { "item": "splinter", "count": [5, 10] }
+            ]
+        }
+    }
 ]
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -54,7 +54,7 @@
     },{
         "type" : "item_action",
         "id" : "MISC_REPAIR",
-        "name" : "Repair wood/bone/chitin"
+        "name" : "Repair wood/paper/bone/chitin"
     },{
         "type" : "item_action",
         "id" : "GUN_REPAIR",

diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -79,6 +79,8 @@
       ["pine_bough", 20],
       ["acorns", 15],
       ["pinecone", 5],
+      ["hickory_root", 3],
+      ["hickory_nut", 5],
       ["one_year_old_newspaper", 2],
       ["months_old_newspaper", 3],
       ["weeks_old_newspaper", 4],
@@ -496,6 +498,7 @@
       ["pudding", 10],
       ["vinegar", 15],
       ["jar_veggy_pickled", 8],
+      ["jar_sauerkraut_pickled", 5],
       ["jar_meat_pickled", 4],
       ["jar_fish_pickled", 6],
       ["lutefisk", 1],
@@ -562,6 +565,7 @@
       ["crispycran", 20],
       ["colamdew", 35],
       ["milk", 50],
+      { "item": "egg_bird", "prob": 65, "count-min": 1, "count-max": 12},
       ["yoghurt", 50],
       ["pudding", 60],
       ["veggy_salad", 25],
@@ -581,6 +585,8 @@
       ["irradiated_strawberries", 1],
       ["lettuce", 11],
       ["irradiated_lettuce", 5],
+      ["cabbage", 10],
+      ["irradiated_cabbage", 5],
       ["tomato", 9],
       ["irradiated_tomato", 4],
       ["cucumber", 10],
@@ -682,6 +688,7 @@
       ["pickle", 40],
       ["vinegar", 15],
       ["jar_veggy_pickled", 8],
+      ["jar_sauerkraut_pickled", 5],
       ["bacon", 25],
       ["lunchmeat", 45],
       ["bologna", 45],
@@ -1755,6 +1762,7 @@
       ["vinegar", 15],
       ["cooking_oil", 30],
       ["jar_veggy_pickled", 8],
+      ["jar_sauerkraut_pickled", 5],
       ["sports_drink", 10],
       ["protein_shake", 10],
       ["dogfood", 5],
@@ -2228,7 +2236,8 @@
       ["fencing_epee", 8],
       ["survnote", 1],
       ["halter_top", 30],
-      ["linuxtshirt", 10]
+      ["linuxtshirt", 10],
+      ["iceaxe", 30]
     ]
   },{
     "type" : "item_group",
@@ -2563,7 +2572,8 @@
       ["fencing_epee", 10],
       ["survnote", 1],
       ["slingshot", 10],
-      ["wristrocket", 5]
+      ["wristrocket", 5],
+      ["iceaxe", 30]
     ]
   },{
     "type" : "item_group",
@@ -6200,6 +6210,7 @@
       ["seed_barley", 1],
       ["seed_sugar_beet", 1],
       ["seed_lettuce", 1],
+      ["seed_cabbage", 1],
       ["seed_onion", 1],
       ["seed_carrot", 1],
       ["seed_corn", 1],
@@ -8476,6 +8487,7 @@
       ["seasoning_salt", 5],
       ["vinegar", 10],
       ["jar_veggy_pickled", 30],
+      ["jar_sauerkraut_pickled", 20],
       ["con_milk", 20],
       ["jar_fish_pickled", 26],
       ["lutefisk", 1],
@@ -9444,6 +9456,8 @@
       ["ceramic_shard", 5],
       ["stick", 5],
       ["pine_bough", 2],
+      ["hickory_root", 2],
+      ["hickory_nut", 3],
       ["acorns", 2],
       ["pinecone", 3],
       ["flyer", 1],
@@ -9755,6 +9769,7 @@
       ["seed_barley", 60],
       ["seed_sugar_beet", 60],
       ["seed_lettuce", 60],
+      ["seed_cabbage", 60],
       ["seed_onion", 60],
       ["seed_carrot", 60],
       ["seed_corn", 60],