Merge branch 'CleverRaven:master' into check-proficiencies-channeling

CleverRaven · May 23, 2024 · 134c47a · 134c47a
2 parents 6090845 + 9e4e759
commit 134c47a
Show file tree

Hide file tree

Showing 56 changed files with 1,939 additions and 322 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -26,16 +26,22 @@ body:
       placeholder: |
         Write N/A if not applicable.
 
-        - this bug report is unlikely to get resolved without a save file, unless it's trivially 
+        - This bug report is unlikely to get resolved without a save file, unless it's trivially
           reproducible or the reproduction steps are complete.
+        - Ideally, prepare the save so the reproduction steps can be followed immediately after
+          loading, so the person trying to reproduce this does not need to do unrelated manual
+          steps such as walking somewhere first.
     validations:
       required: true
 
   - type: textarea
     id: steps-to-reproduce
     attributes:
       label: Steps to reproduce
-      description: Steps to reproduce the behavior.
+      description: |
+        Steps to reproduce the behavior.
+        **Check your mods!** Make sure to test which mod (if any) is actually causing the issue.
+        The less unrelated mods involved in this, the easier to reproduce and confirm it.
       placeholder: |
         1. Make a player with a gun, magazine, and some ammo.
         2. Try to aim at a wall.

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,14 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Found typos?
+    url: https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files#editing-files-in-another-users-repository
+    about: They are trivial to fix, even for absolute beginners. Fixing them yourself is faster than reporting them. And you get credit for fixing them, too!
+  - name: Translations
+    url: https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/TRANSLATING.md
+    about: Typos or other non-technical errors in translations? Go here.
   - name: Tileset Issues
     url: https://github.com/I-am-Erk/CDDA-Tilesets/issues
     about: For issues concerning the built-in tilesets.
-  - name: Github Discussion
-    url: https://github.com/CleverRaven/Cataclysm-DDA/discussions
-    about: For nonspecific feature requests, balance concerns, and questions about the game, prefer opening a discussion to an issue.
   - name: Project Forums
     url: https://discourse.cataclysmdda.org/
     about: For even more general discussion with the community, consider posting on the forums.
diff --git a/data/changelog.txt b/data/changelog.txt
@@ -119,6 +119,7 @@ Unhardcode and limbify attack vectors
 Add new function follower_present for use in JSON
 Graphical construction preview
 Resume butchering
+The player can swap between defined outfits with the 'set of clothes' item
 
 
 ## Content:
@@ -244,6 +245,9 @@ Add XL and XS versions for french maid clothes/aprons/hats
 Fridges and freezers. What do you mean 'we already have some'?
 New portal monsters: unviable life forms
 Challenge start - hunted forever. Starts with the nemesis, but it comes back stronger everytime it dies
+Adds a new  globally unique special to spawn in the ocean : an Oil Platform !
+Overhaul and flesh out Barry Isherwood's rescue mission
+Prepper Militia Community
 
 
 ## Interface:
@@ -306,6 +310,7 @@ Show NEW! in List Items menu
 Adding spell name to the casting... widget
 Adding Classless as a supernatural category
 Mission UI migrated to imGUI
+Provide a visual UI for changing vehicle part shapes
 
 
 
@@ -460,6 +465,9 @@ Aftershock: New combat bionics
 Aftershock: Add a space station clothes store
 [MoM] Using psionics in or near the Nether is more powerful, but also more risky
 [No Hope] Adds a difficulty setting prompt to determine item spawn rates
+[MoM] Add triffid psions
+Aftershock: Add poison based bullets, grenades and 'toxic flamethrower'
+Give Liam opinions in XE
 
 
 ## Balance:
@@ -529,6 +537,7 @@ Unattended crops that are ready to harvest will die if not harvested before thei
 Make Quadcopter Drones Produce Sound
 Make most plastic and glass containers transparent
 Added limb blocking to bionic styles
+The average skill level of NPCs will rise over time
 
 
 ## Bugfixes:
@@ -692,6 +701,9 @@ Maybe prevent rare crater generation error
 AIM: Now moving all items will not move favourite items, if other items are present.
 Misc repair kit draws ammo from around player and inventory, opposed to an internal ammunition pocket.
 Fixed issue where Android gesture inputs were not recognized by ImGui windows
+Fixed arrows disappearing when unwielded
+Fix for massive slowdown when NPC crafting speed drops below 0.0
+Pseudo terrain appearing in fields when using mods is fixed (won't affect existing fields)
 
 
 ## Performance:
@@ -719,6 +731,7 @@ Skip MGOAL_Find_Item if the player is busy.
 Avoid wasteful loop in map special road connections
 Decrease memory overhead by about 200MB or about 15% by slimming down mapgen data structure.
 Faster ascii overmap drawing
+Optimize item::stacks as well as allocation patterns in item and elsewhere
 
 
 ## Infrastructure:
@@ -793,6 +806,7 @@ CMake: Add LLVM build for Windows and other linker fixes
 Use one precompiled header
 Fix zlib old-style-cast build breakage
 Fix crash with imgui and CMake
+Update Flatpak manifest to use clang and include the default soundpack
 
 
 ## I18N and A11Y:

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -15,8 +15,6 @@
       { "item": "cigar_punch", "prob": 8 },
       { "item": "sponge", "prob": 10 },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
-      { "item": "rm103a_pistol", "prob": 1 },
-      { "item": "rm228", "prob": 2 },
       { "item": "vibrator", "prob": 3, "charges": [ 0, 100 ] },
       { "item": "condom", "prob": 5, "count": [ 1, 3 ] },
       { "item": "mag_porn", "prob": 20 },

diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
@@ -1639,6 +1639,7 @@
     "type": "GENERIC",
     "id": "sketch",
     "copy-from": "paper",
+    "category": "other",
     "name": { "str_sp": "sketch" },
     "description": "A piece of graphite-based artwork someone has drawn on a spare sheet of paper.",
     "price": "0 cent",
@@ -1680,6 +1681,7 @@
     "type": "GENERIC",
     "id": "painting",
     "copy-from": "sheet_canvas",
+    "category": "other",
     "name": { "str_sp": "painting" },
     "description": "A painting that someone has made.",
     "price": "100 USD",
@@ -1719,7 +1721,6 @@
     "color": "light_gray",
     "name": { "str": "stone sculpture" },
     "description": "A medium-sized stone sculpture.",
-    "category": "spare_parts",
     "material": "stone",
     "weight": "7884 g",
     "volume": "20813 ml",
@@ -1769,8 +1770,7 @@
     "symbol": ";",
     "color": "brown",
     "name": { "str": "clay sculpture" },
-    "description": "A medium-sized clay sculpture.",
-    "category": "spare_parts",
+    "description": "A small clay sculpture.",
     "material": "clay",
     "weight": "150 g",
     "volume": "94 ml",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -3403,6 +3403,7 @@
     "description": "A rather outdated light bulb used in all sorts of lighting equipment.",
     "symbol": ",",
     "color": "white",
+    "category": "spare_parts",
     "material": [ "glass" ],
     "weight": "10 g",
     "volume": "250 ml",

diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json
@@ -289,7 +289,7 @@
         "πππππππππππππππππ-1111111111118111111311111111111111-πππππππππππππππππππ",
         "πππππππππππππππππ-1111111111113111111311111111111111-πππππππππππππππππππ",
         "πππππππππππππππππ-1111111111113111111811111111111111-πππππππππππππππππππ",
-        "πππππππππππππππππ-1111111111118111111811111111111111-πππππππππππππππππππ",
+        "πππππππππππππππππ-111111111111811111181111111111111--πππππππππππππππππππ",
         "πππππππππππππππππ-111111111118111111131111111111111-ππππππππππππππππππππ",
         "πππππππππππππππππ-111111111113111111131111111111111-ππππππππππππππππππππ",
         "πππππππππππππππππ-111111111113111111181111111111111-ππππππππππππππππππππ",

diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z4.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "aircraft_carrier_1a_4" ], [ "aircraft_carrier_2a_4" ] ],
+    "object": {
+      "fill_ter": "t_metal_roof",
+      "rows": [
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππππππππππππππππππ",
+        "ππππππππööööööööππππππππ",
+        "πππππππööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööoöööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööÄöööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "ππππππöööööööööööπππππππ",
+        "πππππöööööööööööööππππππ",
+        "πππöööööööööööööööööππππ",
+        "πππöööööööööööööööööππππ",
+        "πππöööööööööööööööööππππ",
+        "ππππöööööööoööööööööππππ",
+        "ππππöööööööööööööööπππππ",
+        "ππππöööööööööööööööπππππ",
+        "ππππöööööööööööööööπππππ",
+        "ππππöööööööööööööööπππππ",
+        "πππππöööööööööööööππππππ",
+        "πππππöööööööööööööππππππ",
+        "πππππöööööööööööööππππππ",
+        "ππππππööÖÖÖÖÖÖÖööπππππππ",
+        "πππππππööööööööööπππππππ"
+      ],
+      "palettes": [ "aircraft_carrier_palette" ]
+    }
+  }
+]
diff --git a/data/json/mapgen/airport/s_airport_private.json b/data/json/mapgen/airport/s_airport_private.json
@@ -291,5 +291,40 @@
       "furniture": { "f": "f_console_broken", "e": "f_table", "E": "f_chair" },
       "place_loot": [ { "group": "office_mess", "chance": 80, "repeat": [ 5 ], "x": [ 10, 13 ], "y": [ 2, 5 ] } ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "s_air_atc_4" ],
+    "object": {
+      "fill_ter": "t_flat_roof",
+      "rows": [
+        "        --------        ",
+        "        -......-        ",
+        "        -......-        ",
+        "        -..X...-        ",
+        "        -...:..-        ",
+        "        -..A...-        ",
+        "        -......-        ",
+        "        --------        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ]
+    }
   }
 ]