Merge pull request #3 from CleverRaven/master

Bring me up to speed

.travis.yml

@@ -167,7 +167,9 @@ before_script:
   - CXX="$COMPILER"
   - source build-scripts/requirements.sh
 
-script: make -j3 RELEASE=1 CROSS="$CROSS_COMPILATION" && $WINE ./tests/cata_test $MODS
+script:
+  - make -j3 RELEASE=1 BACKTRACE=1 DEBUG_SYMBOLS=1 CROSS="$CROSS_COMPILATION"
+  - $WINE ./tests/cata_test -r cata --rng-seed `shuf -i 0-1000000000 -n 1` $MODS
 
 after_success:
   - if [ -n "${CODE_COVERAGE}" ]; then coveralls -b . -i src -e tests --gcov /usr/bin/gcov-4.8; fi

CMakeLists.txt

@@ -14,6 +14,7 @@ option(TILES        "Build graphical tileset version."						"OFF")
 option(CURSES       "Build curses version."							"ON" )
 option(SOUND        "Support for in-game sounds & music."					"OFF")
 option(RELEASE      "Disable debug. Use it for user-ready buils."				"OFF")
+option(BACKTRACE    "Support for printing stack backtraces on crash"			"OFF" )
 option(USE_HOME_DIR "Use user's home directory for save files."					"ON" )
 option(LOCALIZE     "Support for language localizations. Also enable UTF support."		"ON" )
 option(LANGUAGES    "Compile localization files for specified languages."			""   )
@@ -244,6 +245,7 @@ ENDIF (LUA)
 	MESSAGE(STATUS "CURSES                        : ${CURSES}")
 	MESSAGE(STATUS "SOUND                         : ${SOUND}")
 	MESSAGE(STATUS "RELEASE                       : ${RELEASE}")
+	MESSAGE(STATUS "BACKTRACE                     : ${BACKTRACE}")
 	MESSAGE(STATUS "LOCALIZE                      : ${LOCALIZE}")
 	MESSAGE(STATUS "USE_HOME_DIR                  : ${USE_HOME_DIR}\n")
 
@@ -345,6 +347,10 @@ IF(LUA)
 	ADD_DEFINITIONS(-DLUA)
 ENDIF(LUA)
 
+IF(BACKTRACE)
+	ADD_DEFINITIONS(-DBACKTRACE)
+ENDIF(BACKTRACE)
+
 # Ok. Now create build and install recipes
 IF(LOCALIZE)
 	IF(WIN32)

data/changelog.txt

@@ -128,7 +128,8 @@ Fixed deafening noise from collapsing buildings.
 Optimized mapgen when generating homogeneous tiles (empty air or all rock).
 Shadowcasting optimizations for ~10% performance speedup.
 
-Infrastructure:
+## Infrastructure:
+
 Allow multifunctions containing both iuse_actor and cpp iuse_method.
 Overhauled mapgen to allow more flexible specification of map features.
 Windows build cleanup.

data/core/tips.json

@@ -288,5 +288,40 @@
     "type": "snippet",
     "category": "tip",
     "text": [ "Don't be afraid to make the game easier on yourself.  Worlds can be made to spawn with more resources." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Don't get caught with your pants down.  There's no toilet paper anymore anyway." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Impaired movement speed through difficult terrain can be used as an advantage." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "When the whole town is one big supermarket a shopping cart becomes your best friend." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Trying out different characters, professions, and scenarios can spice up your game.  Roleplay!" ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Survivor saved is a friend earned.  Most of the time..." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Learning how to play?  Visit keybindings menu and learn your ropes." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Expect the unexpected, even if it's the Spanish Inquisition." ]
   }
 ]

data/json/body_parts.json

@@ -65,6 +65,7 @@
     "id": "arm_l",
     "type": "body_part",
     "name": "left arm",
+    "name_plural": "arms",
     "heading_singular": "L. Arm",
     "heading_plural": "Arms",
     "encumbrance_text": "Melee and ranged combat is hampered.",
@@ -81,6 +82,7 @@
     "id": "arm_r",
     "type": "body_part",
     "name": "right arm",
+    "name_plural": "arms",
     "heading_singular": "R. Arm",
     "heading_plural": "Arms",
     "hp_bar_ui_text": "R ARM",
@@ -97,6 +99,7 @@
     "id": "hand_l",
     "type": "body_part",
     "name": "left hand",
+    "name_plural": "hands",
     "heading_singular": "L. Hand",
     "heading_plural": "Hands",
     "encumbrance_text": "Manual tasks are slowed.",
@@ -112,6 +115,7 @@
     "id": "hand_r",
     "type": "body_part",
     "name": "right hand",
+    "name_plural": "hands",
     "heading_singular": "R. Hand",
     "heading_plural": "Hands",
     "encumbrance_text": "Manual tasks are slowed.",
@@ -127,6 +131,7 @@
     "id": "leg_l",
     "type": "body_part",
     "name": "left leg",
+    "name_plural": "legs",
     "heading_singular": "L. Leg",
     "heading_plural": "Legs",
     "hp_bar_ui_text": "L LEG",
@@ -143,6 +148,7 @@
     "id": "leg_r",
     "type": "body_part",
     "name": "right leg",
+    "name_plural": "legs",
     "heading_singular": "R. Leg",
     "heading_plural": "Legs",
     "hp_bar_ui_text": "R LEG",
@@ -159,6 +165,7 @@
     "id": "foot_l",
     "type": "body_part",
     "name": "left foot",
+    "name_plural": "feet",
     "heading_singular": "L. Foot",
     "heading_plural": "Feet",
     "encumbrance_text": "Running is slowed.",
@@ -174,6 +181,7 @@
     "id": "foot_r",
     "type": "body_part",
     "name": "right foot",
+    "name_plural": "feet",
     "heading_singular": "R. Foot",
     "heading_plural": "Feet",
     "encumbrance_text": "Running is slowed.",

data/json/game_balance.json

@@ -11,7 +11,7 @@
     "name": "GUN_DISPERSION_DIVIDER",
     "info": "Value that divides total weapon dipsersion. 15 means that weapons became 15 times more acurate than default.",
     "stype": "float",
-    "value": 15
+    "value": 18
   },
   {
     "type": "EXTERNAL_OPTION",

data/json/item_groups.json

@@ -317,7 +317,7 @@
       ["belgian_ale", 10],
       ["imperial_stout", 4],
       ["cell_phone", 15],
-      ["smart_phone", 25],  
+      ["smart_phone", 25],
       ["wristwatch", 15],
       ["pocketwatch", 5],
       ["umbrella", 50],
@@ -954,7 +954,7 @@
       ["atomic_light", 2],
       ["atomic_lamp", 2],
       ["cell_phone", 15],
-      ["smart_phone", 30],  
+      ["smart_phone", 30],
       ["eink_tablet_pc", 2],
       ["mobile_memory_card", 8],
       ["lighter", 60],
@@ -1056,7 +1056,8 @@
       ["magnifying_glass", 2],
       ["holy_symbol", 5],
       ["pet_carrier", 3],
-      ["eclipse_glasses", 1]
+      ["eclipse_glasses", 1],
+      ["bodypillow", 2]
     ]
   },{
     "type" : "item_group",
@@ -1364,7 +1365,7 @@
       ["pie_meat", 18],
       ["pie_maple", 9]
     ]
-  },{    
+  },{
     "type" : "item_group",
     "id" : "dessert",
     "items":[
@@ -2087,7 +2088,7 @@
       ["recipe_augs", 4],
       ["cable", 60],
       ["vac_sealer", 10],
-      ["smart_phone", 50],  
+      ["smart_phone", 50],
       ["eink_tablet_pc", 15],
       ["mobile_memory_card", 40],
       ["camera", 15],
@@ -3570,7 +3571,7 @@
       ["mag_traps", 10],
       ["mp3", 9],
       ["cell_phone", 20],
-      ["smart_phone", 20],  
+      ["smart_phone", 20],
       ["eink_tablet_pc", 5],
       ["camera", 3],
       ["camera_pro", 1],
@@ -4492,7 +4493,6 @@
       ["lemat_revolver", 1],
       ["m1911", 5],
       ["mn_ebr_kit", 1],
-      ["tuned_mechanism", 2],
       ["match_trigger", 3],
       ["geiger_off", 8],
       ["rad_monitor", 1],
@@ -4864,7 +4864,7 @@
       ["jerrycan", 10],
       ["rucksack", 20],
       ["heatpack", 60],
-      ["sleeping_bag", 10],
+      ["sleeping_bag_roll", 10],
       ["emer_blanket", 20],
       ["flyer", 10],
       ["helmet_liner", 20],
@@ -5025,7 +5025,8 @@
       ["sheath", 5],
       ["bootsheath", 5],
       ["holster", 4],
-      ["survnote", 2]
+      ["survnote", 2],
+      ["bodypillow", 1]
     ]
   },{
     "type" : "item_group",
@@ -5456,7 +5457,7 @@
       ["double_plutonium_core", 2],
       ["battery_ups", 15],
       ["cell_phone", 15],
-      ["smart_phone", 20],  
+      ["smart_phone", 20],
       ["eink_tablet_pc", 8],
       ["mobile_memory_card", 20],
       ["camera", 5],
@@ -5641,7 +5642,8 @@
       ["thermometer", 3],
       ["hygrometer", 3],
       ["barometer", 3],
-      ["dnd_handbook", 2]
+      ["dnd_handbook", 2],
+      ["bodypillow", 1]
     ]
   },{
     "type" : "item_group",
@@ -6628,7 +6630,7 @@
       ["eink_tablet_pc", 1],
       ["mobile_memory_card", 5],
       ["cell_phone", 10],
-      ["smart_phone", 30],  
+      ["smart_phone", 30],
       ["rag", 1],
       ["crowbar", 18],
       ["halligan", 1],
@@ -7335,7 +7337,6 @@
       ["halligan", 10],
       ["fire_ax", 5],
       ["antiparasitic", 2],
-      ["tuned_mechanism", 1],
       ["match_trigger", 2],
       ["grapnel", 1],
       ["bucket", 4],
@@ -7654,7 +7655,6 @@
       ["pocketwatch", 2],
       ["gold_dental_grill", 2],
       ["diamond_dental_grill", 1],
-      ["tuned_mechanism", 2],
       ["match_trigger", 3],
       ["pocketwatch", 2],
       ["wakizashi", 1],
@@ -7920,7 +7920,7 @@
       ["hammer_sledge", 15],
       ["shovel", 20],
       ["cell_phone", 10],
-      ["smart_phone", 10],  
+      ["smart_phone", 10],
       ["airhorn", 5],
       ["boltcutters", 5],
       ["chestrig", 10],
@@ -8885,7 +8885,7 @@
       ["camelbak", 10],
       ["rucksack", 30],
       ["heatpack", 30],
-      ["sleeping_bag", 20],
+      ["sleeping_bag_roll", 20],
       ["duffelbag", 25],
       ["mil_mess_kit", 50],
       ["flashlight", 50],
@@ -9021,7 +9021,7 @@
       ["crackpipe", 10],
       ["weed", 10],
       ["joint", 10],
-      ["smart_phone", 20],  
+      ["smart_phone", 20],
       ["camera", 20]
     ]
   },{

data/json/itemgroups/faction_camps.json

@@ -213,5 +213,66 @@
       [ "straw_pile", 50 ],
       [ "vine_30", 5 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "foraging_faction_camp_spring",
+    "items": [
+      { "item": "datura_seed", "count": [ 2, 5 ], "prob": 5 },
+      { "item": "raw_dandelion", "count": [ 1, 4 ], "prob": 20 },
+      { "item": "cattail_stalk", "count": [ 1, 4 ], "prob": 20 },
+      { "group": "forage_spring", "prob": 55 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "foraging_faction_camp_summer",
+    "items": [
+      { "item": "datura_seed", "count": [ 2, 5 ], "prob": 5 },
+      { "item": "raw_dandelion", "count": [ 1, 4 ], "prob": 20 },
+      { "item": "cattail_stalk", "count": [ 1, 4 ], "prob": 20 },
+      { "item": "sunflower", "count": [ 1, 2 ], "prob": 20 },
+      { "item": "cherries", "count": [ 3, 9 ], "prob": 30 },
+      { "item": "pear", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "apricot", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "plums", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "mulberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "elderberries", "count": [ 4, 10 ], "prob": 30 },
+      { "item": "blueberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "strawberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "blackberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "huckleberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "raspberries", "count": [ 1, 3 ], "prob": 30 },
+      { "item": "grapes", "count": [ 1, 3 ], "prob": 25 },
+      { "group": "forage_summer", "prob": 250 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "foraging_faction_camp_autumn",
+    "items": [
+      { "item": "datura_seed", "count": [ 2, 5 ], "prob": 5 },
+      { "item": "raw_dandelion", "count": [ 1, 4 ], "prob": 20 },
+      { "item": "cattail_stalk", "count": [ 1, 4 ], "prob": 20 },
+      { "item": "walnut", "count": [ 2, 6 ], "prob": 20 },
+      { "item": "chestnut", "count": [ 2, 6 ], "prob": 20 },
+      { "item": "beech_nuts", "count": [ 2, 6 ], "prob": 20 },
+      { "item": "hazelnut", "count": [ 2, 6 ], "prob": 20 },
+      { "item": "acorns", "count": [ 2, 6 ], "prob": 20 },
+      { "item": "apple", "count": [ 1, 3 ], "prob": 20 },
+      { "item": "pear", "count": [ 1, 3 ], "prob": 20 },
+      { "item": "coffee_pod", "count": [ 2, 5 ], "prob": 15 },
+      { "item": "hickory_nut", "count": [ 3, 6 ], "prob": 20 },
+      { "item": "pistachio", "count": [ 3, 6 ], "prob": 20 },
+      { "item": "almond", "count": [ 3, 6 ], "prob": 20 },
+      { "item": "pecan", "count": [ 3, 6 ], "prob": 20 },
+      { "item": "peanut", "count": [ 3, 6 ], "prob": 20 },
+      { "group": "forage_autumn", "prob": 200 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "foraging_faction_camp_winter",
+    "items": [ { "item": "cattail_rhizome", "count": [ 1, 4 ], "prob": 25 }, { "group": "forage_winter", "prob": 75 } ]
   }
 ]

data/json/itemgroups/gunmod.json

@@ -38,7 +38,6 @@
       [ "red_dot_sight", 70 ],
       [ "recoil_stock", 60 ],
       [ "shot_suppressor", 10 ],
-      [ "tuned_mechanism", 20 ],
       [ "u_shotgun", 60 ],
       [ "waterproof_gunmod", 40 ]
     ]

data/json/items/ammo/308.json

@@ -28,7 +28,7 @@
     "name": "7.62x51mm M80",
     "casing": "762_51_casing",
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
-    "relative": { "damage": -2, "pierce": 4, "dispersion": 10 },
+    "relative": { "damage": -2, "pierce": 4, "dispersion": -10 },
     "proportional": { "recoil": 1.1 },
     "extend": { "effects": [ "NEVER_MISFIRES" ] }
   },