Merge branch 'master' into cannibalism_as_a_vitamin

.github/pull_request_template.md

@@ -1,13 +1,13 @@
 <!-- HOW TO USE: Under each "#### Heading" below, enter information relevant to your pull request.
 Leave the headings unless they don't apply to your PR.
 
-Please read carefully and don't delete the comments delimited by "< !--" and "-- >"
+Please read carefully.
 Once a pull request is submitted, automatic stylistic and consistency checks will be performed on the PR's changes.
-The results of these can be either seen under the "Files changed" section of a PR or in the check's details.
+The results can be either seen under the "Files changed" section of a PR or in the check's details.
 
 Rules for suggested pull requests:
 - If possible, limit yourself to small changes, 500 strings at max. Exceptions are adding or changing maps, and changes, that won't work unless they are done in a single run (even then there can be ways) - violating it puts a lot of unnecessary work on our merge team.
-- Do not scope creep. If you make a pull request "Add new gun", please do not make anything more than adding the gun and following changes, like changing the stats of the gun, removing another guns from itemgroups or tweaking zombie horse stats - violating it makes future search and debugging stuff much harder, since PR name is not related to what is changed in the game. "Who the hell removed the quest item from drop in location X in PR, that adds a new plushie" - may be a quote from a person who was affected by scope creep
+- Do not scope creep. If you make a pull request "Add new gun", please do not make anything more than adding the gun and following changes, like changing the stats of the gun, removing other guns from itemgroups or tweaking zombie horse stats - violating it makes future search and debugging stuff much harder, since PR name is not related to what is changed in the game. "Who the hell removed the quest item from drop in location X in PR, that adds a new plushie" - this may be a quote from a person who was affected by scope creep
 - Do not make omnibus PRs. Meaning do not make a single PR, that fixes ten different, not related issues, at once, even if they are all one string - same as previously mentioned scope creep, it doesn't help to search the changes when debugging, despite all power of git blame tool
 
 NOTE: Please grant permission for repository maintainers to edit your PR.  It is EXTREMELY common for PRs to be held up due to trivial changes being requested and the author being unavailable to make them. -->
@@ -18,6 +18,12 @@ Category "Brief description"
 1. Replace the word "Category" with one of these words: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.
 2. Replace the text inside the quotes with a brief description of your changes.
 Or if you don't want a changelog entry, replace the whole line with just the word "None" (with no quotes).
+Examples:
+1. None
+2. Features "In-game Armor sprite change"
+3. Interface "Show crafting failure chances in the crafting interface"
+4. Infrastructure "JSON-ize slot machines"
+5. Bugfixes "Crafting GUI: show how much recipe makes for non-charge items"
 For more on the meaning of each category, see:
 https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md
 If approved and merged, your summary will be added to the project changelog:
@@ -41,14 +47,14 @@ If there is no related issue, explain here what issue, feature, or other concern
 
 #### Testing
 
-<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also include testing suggestions for reviewers and maintainers. See TESTING_YOUR_CHANGES.md -->
+<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also, include testing suggestions for reviewers and maintainers. See TESTING_YOUR_CHANGES.md -->
 
 #### Additional context
 
 <!-- Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here. -->
 
 
 <!--README: Cataclysm: Dark Days Ahead is released under the Creative Commons Attribution ShareAlike 3.0 license.
-The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever.
-By contributing to the project you agree to the term of the license and that any contribution you make will also be covered by the same license.
+The code and content of the game are free to use, modify, and redistribute for any purpose whatsoever.
+By contributing to the project you agree to the terms of the license and that any contribution you make will also be covered by the same license.
 See http://creativecommons.org/licenses/by-sa/3.0/ for details. -->

README.md

@@ -57,8 +57,6 @@ We also have the following build guides:
 Cataclysm: Dark Days Ahead is the result of contributions from over 1000 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See https://creativecommons.org/licenses/by-sa/3.0/ for details.
 Some code distributed with the project is not part of the project and is released under different software licenses; the files covered by different software licenses have their own license notices.
 
-[<img src="https://www.bountysource.com/badge/tracker?tracker_id=146201" alt="Bountysource" align="right">](https://www.bountysource.com/trackers/146201-clever-raven-cataclysm-dda?utm_source=146201&utm_medium=shield&utm_campaign=TRACKER_BADGE)
-
 Please see [CONTRIBUTING.md](doc/CONTRIBUTING.md) for details.
 
 Special thanks to the contributors, including but not limited to, people below:

android/app/jni/src/Android.mk

@@ -10,7 +10,7 @@ LOCAL_CPP_FEATURES := exceptions rtti
 CATA_SRCS := $(sort $(wildcard $(LOCAL_PATH)/*.cpp))
 LOCAL_SRC_FILES := $(sort $(CATA_SRCS:$(LOCAL_PATH)/%=%))
 
-LOCAL_STATIC_LIBRARIES := third-party
+LOCAL_STATIC_LIBRARIES := third-party imgui
 
 LOCAL_SHARED_LIBRARIES := libhidapi SDL2 SDL2_mixer SDL2_image SDL2_ttf mpg123
 
@@ -28,3 +28,4 @@ endif
 include $(BUILD_SHARED_LIBRARY)
 
 include $(LOCAL_PATH)/../android/app/jni/src/third-party/Android.mk
+include $(LOCAL_PATH)/../android/app/jni/src/third-party/imgui/Android.mk

android/app/jni/src/third-party/Android.mk

@@ -1,17 +1,15 @@
-LOCAL_PATH := $(call my-dir)/../../../../../src/third-party
-
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/..
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/third-party $(LOCAL_PATH)
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/third-party
 
 LOCAL_MODULE := third-party
 
 LOCAL_CPP_FEATURES := exceptions rtti
 
 # Add your application source files here...
-FLATBUFFERS_SRCS := $(sort $(wildcard $(LOCAL_PATH)/flatbuffers/*.cpp))
+FLATBUFFERS_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/flatbuffers/*.cpp))
 LOCAL_SRC_FILES := $(sort $(FLATBUFFERS_SRCS:$(LOCAL_PATH)/%=%))
 
 LOCAL_CFLAGS += -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char

android/app/jni/src/third-party/imgui/Android.mk

@@ -0,0 +1,24 @@
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/third-party
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_MODULE := imgui
+
+LOCAL_CPP_FEATURES := exceptions rtti
+
+LOCAL_SHARED_LIBRARIES := SDL2
+
+# Add your application source files here...
+IMGUI_SRCS := $(sort $(wildcard $(LOCAL_PATH)/third-party/imgui/*.cpp))
+LOCAL_SRC_FILES := $(sort $(IMGUI_SRCS:$(LOCAL_PATH)/%=%))
+
+LOCAL_CFLAGS += -DBACKTRACE=1 -DLOCALIZE=1 -fsigned-char
+
+ifeq ($(OS),Windows_NT)
+    # needed to bypass 8191 character limit on Windows command line
+	LOCAL_SHORT_COMMANDS = true
+endif
+
+include $(BUILD_STATIC_LIBRARY)

data/json/construction.json

@@ -1760,7 +1760,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
     "time": "15 m",
-    "components": [ [ [ "wire", 2 ] ] ],
+    "components": [ [ [ "lc_wire", 2 ] ] ],
     "pre_terrain": "t_fence_post",
     "post_terrain": "t_fence_wire"
   },
@@ -1797,7 +1797,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "120 m",
-    "components": [ [ [ "wire", 20 ] ] ],
+    "components": [ [ [ "lc_wire", 20 ] ] ],
     "pre_terrain": "t_chainfence_posts",
     "post_terrain": "t_chainfence"
   },
@@ -1808,7 +1808,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
-    "components": [ [ [ "wire", 20 ] ], [ [ "steel_chunk", 3 ], [ "scrap", 12 ] ], [ [ "pipe", 20 ] ] ],
+    "components": [ [ [ "lc_wire", 20 ] ], [ [ "steel_chunk", 3 ], [ "scrap", 12 ] ], [ [ "pipe", 20 ] ] ],
     "pre_note": "Needs to be supported on both sides by fencing, walls, etc.",
     "pre_special": "check_empty",
     "post_terrain": "t_chaingate_c"
@@ -1861,7 +1861,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
-    "components": [ [ [ "wire", 10 ] ] ],
+    "components": [ [ [ "lc_wire", 10 ] ] ],
     "pre_terrain": "t_chickenwire_fence_post",
     "post_terrain": "t_chickenwire_fence"
   },
@@ -1872,7 +1872,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "45 m",
-    "components": [ [ [ "wire", 10 ] ], [ [ "2x4", 5 ] ], [ [ "nails", 20, "LIST" ] ], [ [ "hinge", 2 ] ] ],
+    "components": [ [ [ "lc_wire", 10 ] ], [ [ "2x4", 5 ] ], [ [ "nails", 20, "LIST" ] ], [ [ "hinge", 2 ] ] ],
     "pre_note": "Needs to be supported on both sides by fencing, walls, etc.",
     "pre_special": "check_empty",
     "post_terrain": "t_chickenwire_gate_c"