Merge pull request #20 from CleverRaven/master

Update to pockets

.clang-tidy

@@ -52,6 +52,7 @@ readability-*,\
 -readability-magic-numbers,\
 -readability-named-parameter,\
 -readability-redundant-control-flow,\
+-clang-analyzer-optin.performance.Padding,\
 "
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test|tools).*'

.github/pull_request_template.md

@@ -1,62 +1,54 @@
-<!--
-### How to use
-Leave the headings unless they don't apply to your PR, replace commented out text (surrounded with <!–– and ––>) with text describing your PR.
-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.
+<!-- 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, and remove the comment blocks (surrounded with <!–– and ––>) when you are done.
+
+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.
 -->
 
 #### Summary
-<!--
-A one-line description of your change that will be extracted and added to the [project changelog](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt).
 
-The format is (ignore the square brackets): ```SUMMARY: [Category] "[description]"```
+<!-- This section should consist of exactly one line, formatted like this:
+
+SUMMARY: [Category] "[Briefly describe the change in these quotation marks]"
 
-The categories to choose from are:
+Do not enter the square brackets [].  Category must be one of these:
 
-* Features
-* Content
-* Interface
-* Mods
-* Balance
-* Bugfixes
-* Performance
-* Infrastructure
-* Build
-* I18N
+- Features
+- Content
+- Interface
+- Mods
+- Balance
+- Bugfixes
+- Performance
+- Infrastructure
+- Build
+- I18N
 
-Example: ```SUMMARY: Content "Adds new mutation category 'Mouse'"```
+For more on the meaning of each category, see:
+https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md
 
-See the [Changelog Guidelines](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md) for explanations of the categories.
+If approved and merged, your summary will be added to the project changelog:
+https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
 -->
 
 #### Purpose of change
-<!--
-If there's an existing issue describing the problem this PR addresses or the feature it adds, please link it like: ```#1234```
-If it *fully* resolves an issue, link it like: Fixes #1234
-Even if the issue describes the problem, please provide a few-sentence summary here.
-Example: Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.
-If there is no related issue, please describe the issue you are addressing, including how to trigger a bug if this is a bugfix.
-Don't put the backticks around the `#` and issue or pull request number to allow the GitHub automatically reference to it.
+
+<!-- With a few sentences, describe your reasons for making this change.  If it relates to an existing issue, you can link it with a # followed by the Github issue number, like #1234.  If your pull request *fully* resolves an issue, include the word "Fix" or "Fixes" before the issue number, like: Fixes #1234.
+
+If there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified.
 -->
 
 #### Describe the solution
-<!--
-How does the feature work, or how does this fix a bug?
-The easier you make your solution to understand, the faster it can get merged.
--->
+
+<!-- How does the feature work, or how does this fix a bug?  The easier you make your solution to understand, the faster it can get merged.  -->
 
 #### Describe alternatives you've considered
-<!--
-A clear and concise description of any alternative solutions or features you've considered.
--->
+
+<!-- Explain any alternative solutions, different approaches, or possibilities you've considered using to solve the same problem. -->
 
 #### 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.
--->
+
+<!-- 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.  -->
 
 #### Additional context
-<!--
-Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.
--->
+
+<!-- Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.  -->

.lgtm.yml

@@ -1,4 +1,5 @@
 # Disable FIXME query, in DDA it is as likely to be a future feature as a bug.
+# Disable "potentially dangerous function" warning like localtime, there is no good alternative and we aren't multithreaded.
 queries:
-  - exclude: cpp/fixme-comment
-
+    - exclude: cpp/fixme-comment
+    - exclude: cpp/potentially-dangerous-function

Makefile

@@ -976,21 +976,21 @@ appclean:
 	rm -f data/auto_pickup.txt
 	rm -f data/fontlist.txt
 
-data/osx/AppIcon.icns: data/osx/AppIcon.iconset
+build-data/osx/AppIcon.icns: build-data/osx/AppIcon.iconset
 	iconutil -c icns $<
 
 ifdef OSXCROSS
 app: appclean version $(APPTARGET)
 else
-app: appclean version data/osx/AppIcon.icns $(APPTARGET)
+app: appclean version build-data/osx/AppIcon.icns $(APPTARGET)
 endif
 	mkdir -p $(APPTARGETDIR)/Contents
-	cp data/osx/Info.plist $(APPTARGETDIR)/Contents/
+	cp build-data/osx/Info.plist $(APPTARGETDIR)/Contents/
 	mkdir -p $(APPTARGETDIR)/Contents/MacOS
-	cp data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
+	cp build-data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
 	mkdir -p $(APPRESOURCESDIR)
 	cp $(APPTARGET) $(APPRESOURCESDIR)/
-	cp data/osx/AppIcon.icns $(APPRESOURCESDIR)/
+	cp build-data/osx/AppIcon.icns $(APPRESOURCESDIR)/
 	mkdir -p $(APPDATADIR)
 	cp data/fontdata.json $(APPDATADIR)
 	cp -R data/core $(APPDATADIR)
@@ -1047,14 +1047,14 @@ dmgdist: dmgdistclean $(L10N) app
 ifdef OSXCROSS
 	mkdir Cataclysm
 	cp -a $(APPTARGETDIR) Cataclysm/$(APPTARGETDIR)
-	cp data/osx/DS_Store Cataclysm/.DS_Store
-	cp data/osx/dmgback.png Cataclysm/.background.png
+	cp build-data/osx/DS_Store Cataclysm/.DS_Store
+	cp build-data/osx/dmgback.png Cataclysm/.background.png
 	ln -s /Applications Cataclysm/Applications
 	genisoimage -quiet -D -V "Cataclysm DDA" -no-pad -r -apple -o Cataclysm-uncompressed.dmg Cataclysm/
 	dmg dmg Cataclysm-uncompressed.dmg Cataclysm.dmg
 	rm Cataclysm-uncompressed.dmg
 else
-	dmgbuild -s data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
+	dmgbuild -s build-data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
 endif
 
 endif  # ifeq ($(NATIVE), osx)

android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -40,6 +40,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 
     public static boolean mIsResumedCalled, mHasFocus;
     public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24);
+    public static boolean mAllowSDLOrientationChanges = false;
 
     // Cursor types
     private static final int SDL_SYSTEM_CURSOR_NONE = -1;
@@ -892,7 +893,9 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
         }
 
         Log.v("SDL", "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint);
-        mSingleton.setRequestedOrientation(req);
+        if (mAllowSDLOrientationChanges && req != -1) {
+            mSingleton.setRequestedOrientation(req);
+        }
     }
 
     /**
@@ -1826,7 +1829,7 @@ public void surfaceChanged(SurfaceHolder holder,
         // Prevent a screen distortion glitch,
         // for instance when the device is in Landscape and a Portrait App is resumed.
         boolean skip = false;
-        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+        int requestedOrientation = SDLActivity.mAllowSDLOrientationChanges ? SDLActivity.mSingleton.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
 
         if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
         {

data/json/achievements.json

@@ -12,13 +12,63 @@
     "time_constraint": { "since": "game_start", "is": "<=", "target": "1 minute" },
     "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 1 } ]
   },
+  {
+    "id": "achievement_kill_10_monsters",
+    "type": "achievement",
+    "name": "Decamate",
+    "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 10 } ]
+  },
+  {
+    "id": "achievement_kill_100_monsters",
+    "type": "achievement",
+    "name": "Centinel",
+    "hidden_by": [ "achievement_kill_10_monsters" ],
+    "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 100 } ]
+  },
   {
     "id": "achievement_survive_one_day",
     "type": "achievement",
     "name": "The first day of the rest of their unlives",
+    "description": "Survive for a day and find a safe place to sleep",
     "time_constraint": { "since": "game_start", "is": ">=", "target": "1 day" },
     "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
   },
+  {
+    "id": "achievement_survive_7_days",
+    "type": "achievement",
+    "name": "Thank God it's Friday",
+    "description": "Survive for a week",
+    "hidden_by": [ "achievement_survive_one_day" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "7 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_28_days",
+    "type": "achievement",
+    "name": "28 days later",
+    "description": "Survive for a month",
+    "hidden_by": [ "achievement_survive_7_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "28 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_91_days",
+    "type": "achievement",
+    "name": "A time to every purpose under heaven",
+    "description": "Survive for a season",
+    "hidden_by": [ "achievement_survive_28_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "91 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_365_days",
+    "type": "achievement",
+    "name": "Brighter days ahead?",
+    "description": "Survive for a year",
+    "hidden_by": [ "achievement_survive_91_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "365 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
   {
     "id": "achievement_marathon",
     "type": "achievement",

data/json/ammo_effects.json

@@ -97,6 +97,11 @@
     "aoe": { "field_type": "fd_plasma", "intensity_min": 2, "intensity_max": 3, "chance": 50 },
     "trail": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 2, "chance": 50 }
   },
+  {
+    "id": "PLASMA_BUBBLE",
+    "type": "ammo_effect",
+    "aoe": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 3, "radius": 1, "chance": 10 }
+  },
   {
     "id": "EXPLOSIVE_HUGE",
     "type": "ammo_effect",