Combine the two arrays into one. The can't be changed independently anyway (adding more messages than sound levels does not have any effect and less messages will cause UB).
Make the array static (the strings are only marked for translation, but translation happens when they get actually used).
This calls Creature::add_msg_if_player, so the message is only displayed when called on the player character, so the replaced "%s" is always the name of the player character.
Now this will read as "Your Name-Of-Character disappears!" - which is quite different from all other messages involving the player character. They usually use second person, which is what the message does now.
A few lines down, the code add a note to the point cursp_after, but never to cursp_before. The makes the check pretty much pointless and obviously wrong.
This checks instead for a note at the point that would get the auto note instead.
Fixed new submap inserting on correct z-level.
Removed grid initialization for all z-levels.
Ensured that new submap on generation will not overwrite existing one.
Setsubmap to null in grid after deletion.](https://github.com/CleverRaven/Cataclysm-DDA/commit/28028a57ba470d6977565be6ff93eba15875f0cd) by ipcyborg
:hammer_and_wrench: [Remove two unused members of class monster (#34265) * Remove unused member monster::last_baby
platform_win.h needs to be included before SDL stuff, otherwise
you get seemingly unrelated errors. This happened to work in VS
solution because it force-includes stdafx.h everywhere. However
stdafx.h should only be used as an optimization measure, and not
to guarantee correctness
The binary currently does not use SDL2main helper, and instead
defines all initialization in WinMain itself. I didn't try searching
for the specific commit, but according to comments in Makefile,
this is a deliberate change.
VS solution defines USE_WINMAIN unconditionally, so let's use it
in cmake as well.
WinMain, as defined currently, has its arguments unused, which
makes g++ complain, and fail due to -Werror.
Removed the comments
Mostly unrelated, and not strictly necessary: the "idiomatic"
way to require a C++ standard in cmake is
SET(CMAKE_CXX_STANDARD 14), which is very slightly preferred over
SET(CMAKE_CXX_FLAGS -std=c++14) due to cross-platform
considerations.
The option is present since at least CMake 3.1.3, released
in february 2015. This is only 3 months later than C++14 release,
so the version bump should not be problematic.](https://github.com/CleverRaven/Cataclysm-DDA/commit/01c03990fac4be71d0db602dbd429de2eaba3075) by moxian
:hammer_and_wrench: Blackpowder loads, part 2 (#34054) by Rail-Runner
:hammer_and_wrench: [Trigger pr summary validation on edits (#34219) * Trigger pr summary validation on open, edit and synchronize
Those functions will use the implicitly given this object now.
Always using the main game map is redundant at best (as the function will typically be called on the main game map anyway, so this == &g->m).
But it may in fact be wrong: e.g. when the functions are called on a temporary map (e.g. during mapgen).
Change more references to g->m to use the local map object instead.
Here's the Weekly Digest for CleverRaven/Cataclysm-DDA:
ISSUES
Last week 151 issues were created. Of these, 105 issues have been closed and 46 issues are still open.
OPEN ISSUES
:green_heart: #34311 Fix tiny electric motor crafting recipe., by NeviNovat :green_heart: #34310 Magic sound effects and AEA_NOISE, by KorGgenT :green_heart: #34309 Reworking makeshift explosives part 1, by NeviNovat :green_heart: #34307 Steel Mills have nothing in them whatsoever., by fluffe9911 :green_heart: #34306 Gas Pumps Take Forever, by SageB :green_heart: #34302 Item that have a charge does duplicated by pickup action., by Ezsk :green_heart: #34300 Refactor placing monsters:, by BevapDin :green_heart: #34299 [WIP] [DO NOT MERGE] tilesets: add tools to automatically create tilesheets, by mlangsdorf :green_heart: #34293 Tables are way too small., by Xion350 :green_heart: #34291 Granularize curing recipies, by moxian :green_heart: #34289 [WIP]NPC jobs at camps, by davidpwbrown :green_heart: #34288 Uses the units::energy infrastructure for bionic power, by Fris0uman :green_heart: #34276 Crashing when trying to read a solo NPC's faction, by FirebrandCoding :green_heart: #34272 auto travel suggestions, by AllSystemsGo :green_heart: #34269 Encapsulate overmap terrains better:, by BevapDin :green_heart: #34267 Fix Schizophrenia, by zachary-kaelan :green_heart: #34264 Add some more vehicle-mounted guns, by Rail-Runner :green_heart: #34263 "pike" is ambiguous, by Aloxaf :green_heart: #34255 Preparation for NPC jobs - add data to categorize job roles and duties, by davidpwbrown :green_heart: #34247 Allow tile flags for different postures, by I-am-Erk :green_heart: #34246 [WIP] NPC and player auto-crafting from workbench bills, by davidpwbrown :green_heart: #34244 Add overlay indicators for dead zombies that can still revive, by Azumgi :green_heart: #34240 realistic gun maintenance, by misterprimus :green_heart: #34236 2 new weapons for caliber 50, by RickyVanz :green_heart: #34231 A debug menu command to make a CSV file with all missing graphics., by I-am-Erk :green_heart: #34230 Make looks_like a mandatory entry for in-game objects, by I-am-Erk :green_heart: #34229 Heavy mining mod added. Add a mining car., by Ckpyt :green_heart: #34225 About the effect of the forest on the body against temperature and sun glare, by ThomasLinkin :green_heart: #34217 Rewrite ownership to use faction_id to avoid pointer crashes, by davidpwbrown :green_heart: #34213 slight adjustments to certain gun modifications, by shotgunfrenzy :green_heart: #34212 Looting a dead npc causes a crash, by shotgunfrenzy :green_heart: #34211 Beaded jewelry can be used for meditation, by sick-trigger :green_heart: #34209 Fake targeting NPC causes segfaults in unowned vehicles, by DeeUnderscore :green_heart: #34205 [Organization] Magiclysm Items Checklist, by LaVeyanFiend :green_heart: #34204 Explosives and tanks guns overhaul, by zachary-kaelan :green_heart: #34202 [CR] Allow auto targeting mode for turrets only with installed turret control unit, by Night-Pryanik :green_heart: #34191 "using" field doesn't work as intended for construction recipe, by Fris0uman :green_heart: #34189 Item repairing tools and materials rework, by Rail-Runner :green_heart: #34187 Autosave failure then crash, by Dunkhan :green_heart: #34181 Add fire station basecamp, by curstwist :green_heart: #34178 featreq new traits for resisting temperature, by FONZACUS :green_heart: #34173 NPC engagement rules invalid, will attack every nearby enemies., by SaltGin :green_heart: #34171 Smoke from burned down building persists and slows the game down, by ZoolookCDDA :green_heart: #34168 Proposal for new nether faction: The Color, by John-Candlebury :green_heart: #34167 Turret monsters wont fire past 32 tiles regardless of expected range, by ymber :green_heart: #34164 Zombies won't follow player up/down stairs., by Myobu1
CLOSED ISSUES
:heart: #34312 Update Cakes so They Spoil, by TheMurderUnicorn :heart: #34308 Adds weighting description for martial arts techniques, by Hymore246 :heart: #34305 Add looks_like to wood ash and sheet metal, by snipercup :heart: #34304 AEA_FLASH and AEA_FIREBALL, by KorGgenT :heart: #34303 spinach is a vegetable, by nornagon :heart: #34301 spell level inheritance for fake_spell, by KorGgenT :heart: #34298 Recalculate when swapping panels (vehicle <-> ground)., by ipcyborg :heart: #34297 Fixed "Item duplication on pick up to wield", by ipcyborg :heart: #34296 Fixed error handling in "waiting for stamina regain", by ipcyborg :heart: #34295 Clearing rubble makes creature under it free., by ipcyborg :heart: #34294 Fixed wrong gun mode after closing targeting UI., by ipcyborg :heart: #34292 Prevent players from trying to upgrade Weight, by Aloxaf :heart: #34290 Fixes quivers not consuming charges., by BevapDin :heart: #34287 Fix horses making engine sounds., by BevapDin :heart: #34286 Add name for the toggle_thief_mode action., by BevapDin :heart: #34285 Translate some strings., by BevapDin :heart: #34284 Fix auto notes overwriting existing notes, by BevapDin :heart: #34283 Revert "Fix bionic power loading from corrupted savegames", by kevingranade :heart: #34282 Make setting vehicle headlight direction simpler, by BevapDin :heart: #34281 Magiclysm typo Fix, by free-coffee :heart: #34280 Fix fuel storage for cbms, by Fris0uman :heart: #34279 Replaced text mentioning shelter in starting dialogue with a generic text, by Night-Pryanik :heart: #34278 Add Tactical Reload, by ThomasLinkin :heart: #34277 Add deconstruction for tourist table and move camp chair to uncraft, by snipercup :heart: #34275 Added looks_like to tourist table, by snipercup :heart: #34274 Fix items lying in furniture get damaged if one is throwing something at them, by Night-Pryanik :heart: #34273 Fixed: Items piled up beyond a tile's limit can pass through walls, by ipcyborg :heart: #34271 Unable to clone wiki on windows due to invalid character in filename, by snipercup :heart: #34270 Fuel cell bionic weird consumption behavior [Can be solved quickly], by VoidForge :heart: #34268 Routine i18n updates on 27 Sep 2019, by BrettDong :heart: #34266 Sort books in read menu, by OzoneH3 :heart: #34265 Remove two unused members of class monster, by BevapDin :heart: #34262 Make magic projectiles impossible to dodge, by fungusakafungus :heart: #34261 fix skin and field dress, by KorGgenT :heart: #34260 a fairly large 2 seat rowboat, by bobchaos :heart: #34259 Auto safe mode turn increase, by Skrassh :heart: #34258 Added more descriptions to martial arts help menu, by Hymore246 :heart: #34257 Added looks_like to long stick, by snipercup :heart: #34256 Suggestion for experimental branch: safe mode auto reactivate adjustment, by AllSystemsGo :heart: #34254 Update MAPGEN.md paragraph 1.1.0 , by snipercup :heart: #34253 Fixes crash when using multicooker, by ZhilkinSerg :heart: #34252 Martial Arts Rebalance for Pankration, by Hymore246 :heart: #34251 change seismic stomp to target_attack, by KorGgenT :heart: #34250 Fix crashes when firing ranged weapon with EMP ammo effect, by ZhilkinSerg :heart: #34249 Fixed lucern hammer spelling, by DanteTorn :heart: #34248 Loading round into chamber before fire the firearm, by SaltGin :heart: #34245 Fancy clothing affects NPC opinions, by zachary-kaelan :heart: #34243 Check translator comments with clang-tidy, by Qrox :heart: #34242 Amend #34234 - floating point, by AMurkin :heart: #34241 Fixed H&K G80 requires zero charges with effective emitter gunmod, by Night-Pryanik :heart: #34239 Obsolete the money traits., by kevingranade :heart: #34238 Rename "hub assembly" to "wheel hub assembly" for easier discovery., by moxian :heart: #34237 Fix message when NPC doesn't find book to read, by Aloxaf :heart: #34235 show aoe for ter_transform, by KorGgenT :heart: #34234 Reduce liquid volume per turn by a factor of 6, by ZhilkinSerg :heart: #34233 Change messages when trying to sleep in vehicle, by ZhilkinSerg :heart: #34232 move mutation functions' scope from player to Character, by KorGgenT :heart: #34228 Heavy mining mod added. Add a mining car., by Ckpyt :heart: #34227 clamp calc_ray_end angle properly, by KorGgenT :heart: #34226 Fields are not spreading north-west when they shouldn't anymore, by ZhilkinSerg :heart: #34224 use named constant for clang-tidy, by KorGgenT :heart: #34223 Grocery cart "collides with errors in the movement code", by Proxiehunter :heart: #34222 Silence some clang-tidy warnings, by kevingranade :heart: #34221 Can't skin skinless, by KorGgenT :heart: #34220 Some guns have a "X mount" slot instead of a "X" slot., by Hatfish :heart: #34219 Trigger pr summary validation on edits, by kevingranade :heart: #34218 AS-50: SWAT only, by tenmillimaster :heart: #34216 Fix out of bounds access in cata_tiles::draw, by Qrox :heart: #34215 Android version have an issue with the keyboard function., by ThomasLinkin :heart: #34214 Fix cmake build on windows., by moxian :heart: #34210 Makes army winter jacket waterproof, by Beneficial-Insurance :heart: #34208 Aikido only allows specific unarmed weapons, by Hymore246 :heart: #34207 Replace one light battery in radio car box with one ultralight, by Night-Pryanik :heart: #34206 Replaced spawn of free-floating battery charge with light battery cell, by Night-Pryanik :heart: #34203 When NPC leaves your followers, form appropiate dynamic faction., by davidpwbrown :heart: #34201 Crash when looking around (x), by moxian :heart: #34200 Add 2 new weapon to 50.json, by RickyVanz :heart: #34199 Enable serialization for mission::kill_count_to_reach, by BevapDin :heart: #34198 Don't access the main game map from mapgen code., by BevapDin :heart: #34197 Remove reference to g->m from map functions, by BevapDin :heart: #34196 Remove all MShock derived tilesets., by kevingranade :heart: #34195 Refactor loops over x and y into one loop over tripoint., by BevapDin :heart: #34194 Make mapgen code a bit simpler:, by BevapDin :heart: #34193 add more AEA spells, by KorGgenT :heart: #34192 Allow player to use more multi-zone activities, by davidpwbrown :heart: #34190 Fix typo: cracling -> crackling, by fndelacruz :heart: #34188 NPCs: uncache weapon value on weapon removal, by mlangsdorf :heart: #34186 Fix pulped Z raising anyway, by Fris0uman :heart: #34185 Fix tec_counter not working correctly, by Hymore246 :heart: #34184 basecamps: Basecamps anywhere, by mlangsdorf :heart: #34183 Add position marker to some format strings, by Qrox :heart: #34182 Martial Arts Rebalance for Niten Ichi-Ryu, by Hymore246 :heart: #34180 WONDER spell flag error handling, by KorGgenT :heart: #34179 Fix vehicle accessing the main map during mapgen:, by BevapDin :heart: #34177 Add missing return to function, by Fris0uman :heart: #34176 Can use string to specify price, by Fris0uman :heart: #34175 Fix crash in vehicle display window, by BevapDin :heart: #34174 Changing the the weight of RDX and HMTD units to 1g, by NeviNovat :heart: #34172 Translate stat name outside enum_to_string, by Fris0uman :heart: #34170 Chopping tree down breaks walls in underground z-levels, by DanteTorn :heart: #34169 Allow fire to be used for crafting biodiesel, by sick-trigger :heart: #34166 fix mutations overriding spell level, by KorGgenT :heart: #34165 AEA_BUGS, by KorGgenT :heart: #34163 String error instead of volume and weight inventory, by dissociativity :heart: #34162 Teleportation rework/unification, by John-Candlebury
LIKED ISSUE
:+1: #34181 Add fire station basecamp, by curstwist It received :+1: x8, :smile: x0, :tada: x0 and :heart: x5.
NOISY ISSUE
:speaker: #34240 realistic gun maintenance, by misterprimus It received 17 comments.
PULL REQUESTS
Last week, 120 pull requests were created, updated or merged.
UPDATED PULL REQUEST
Last week, 23 pull requests were updated. :yellow_heart: #34289 [WIP]NPC jobs at camps, by davidpwbrown :yellow_heart: #34288 Uses the units::energy infrastructure for bionic power, by Fris0uman :yellow_heart: #34269 Encapsulate overmap terrains better:, by BevapDin :yellow_heart: #34267 Fix Schizophrenia, by zachary-kaelan :yellow_heart: #34264 Add some more vehicle-mounted guns, by Rail-Runner :yellow_heart: #34255 Preparation for NPC jobs - add data to categorize job roles and duties, by davidpwbrown :yellow_heart: #34246 [WIP] NPC and player auto-crafting from workbench bills, by davidpwbrown :yellow_heart: #34217 Rewrite ownership to use faction_id to avoid pointer crashes, by davidpwbrown :yellow_heart: #34211 Beaded jewelry can be used for meditation, by sick-trigger :yellow_heart: #34202 [CR] Allow auto targeting mode for turrets only with installed turret control unit, by Night-Pryanik :yellow_heart: #34189 Item repairing tools and materials rework, by Rail-Runner :yellow_heart: #34181 Add fire station basecamp, by curstwist :yellow_heart: #34158 Enchantment values - REGEN_MANA and MAX_MANA, by KorGgenT :yellow_heart: #34136 WIP Modular saltworks, by Maleclypse :yellow_heart: #34110 Krav Maga's Bone Breaker now targets all humanoids, by jeremyshannon :yellow_heart: #34106 Magiclysm - Dragon Mutation Add-On, by animethecat :yellow_heart: #34089 JSONify range_with_even_chance_of_good_hit, by SlackingSleeper :yellow_heart: #34057 WIP:The dissoluted devourer zombie, by free-coffee :yellow_heart: #34053 Expand and improve randomly-generated music descriptions, by nornagon :yellow_heart: #33829 [WIP]Flyable Helicopters, by davidpwbrown :yellow_heart: #33828 New semi-dynamic NPC, by SirPiecemaker :yellow_heart: #33806 Total tailoring overhaul, attempt 2, by Rail-Runner :yellow_heart: #33304 Eat menu, by akozhevn
MERGED PULL REQUEST
Last week, 97 pull requests were merged. :purple_heart: #34297 Fixed "Item duplication on pick up to wield", by ipcyborg :purple_heart: #34296 Fixed error handling in "waiting for stamina regain", by ipcyborg :purple_heart: #34295 Clearing rubble makes creature under it free., by ipcyborg :purple_heart: #34294 Fixed wrong gun mode after closing targeting UI., by ipcyborg :purple_heart: #34292 Prevent players from trying to upgrade Weight, by Aloxaf :purple_heart: #34290 Fixes quivers not consuming charges., by BevapDin :purple_heart: #34287 Fix horses making engine sounds., by BevapDin :purple_heart: #34286 Add name for the toggle_thief_mode action., by BevapDin :purple_heart: #34285 Translate some strings., by BevapDin :purple_heart: #34284 Fix auto notes overwriting existing notes, by BevapDin :purple_heart: #34283 Revert "Fix bionic power loading from corrupted savegames", by kevingranade :purple_heart: #34282 Make setting vehicle headlight direction simpler, by BevapDin :purple_heart: #34281 Magiclysm typo Fix, by free-coffee :purple_heart: #34280 Fix fuel storage for cbms, by Fris0uman :purple_heart: #34279 Replaced text mentioning shelter in starting dialogue with a generic text, by Night-Pryanik :purple_heart: #34277 Add deconstruction for tourist table and move camp chair to uncraft, by snipercup :purple_heart: #34275 Added looks_like to tourist table, by snipercup :purple_heart: #34274 Fix items lying in furniture get damaged if one is throwing something at them, by Night-Pryanik :purple_heart: #34273 Fixed: Items piled up beyond a tile's limit can pass through walls, by ipcyborg :purple_heart: #34268 Routine i18n updates on 27 Sep 2019, by BrettDong :purple_heart: #34266 Sort books in read menu, by OzoneH3 :purple_heart: #34265 Remove two unused members of class monster, by BevapDin :purple_heart: #34262 Make magic projectiles impossible to dodge, by fungusakafungus :purple_heart: #34261 fix skin and field dress, by KorGgenT :purple_heart: #34260 a fairly large 2 seat rowboat, by bobchaos :purple_heart: #34259 Auto safe mode turn increase, by Skrassh :purple_heart: #34258 Added more descriptions to martial arts help menu, by Hymore246 :purple_heart: #34257 Added looks_like to long stick, by snipercup :purple_heart: #34254 Update MAPGEN.md paragraph 1.1.0 , by snipercup :purple_heart: #34253 Fixes crash when using multicooker, by ZhilkinSerg :purple_heart: #34251 change seismic stomp to target_attack, by KorGgenT :purple_heart: #34250 Fix crashes when firing ranged weapon with EMP ammo effect, by ZhilkinSerg :purple_heart: #34249 Fixed lucern hammer spelling, by DanteTorn :purple_heart: #34243 Check translator comments with clang-tidy, by Qrox :purple_heart: #34242 Amend #34234 - floating point, by AMurkin :purple_heart: #34241 Fixed H&K G80 requires zero charges with effective emitter gunmod, by Night-Pryanik :purple_heart: #34239 Obsolete the money traits., by kevingranade :purple_heart: #34238 Rename "hub assembly" to "wheel hub assembly" for easier discovery., by moxian :purple_heart: #34237 Fix message when NPC doesn't find book to read, by Aloxaf :purple_heart: #34235 show aoe for ter_transform, by KorGgenT :purple_heart: #34234 Reduce liquid volume per turn by a factor of 6, by ZhilkinSerg :purple_heart: #34233 Change messages when trying to sleep in vehicle, by ZhilkinSerg :purple_heart: #34232 move mutation functions' scope from player to Character, by KorGgenT :purple_heart: #34227 clamp calc_ray_end angle properly, by KorGgenT :purple_heart: #34226 Fields are not spreading north-west when they shouldn't anymore, by ZhilkinSerg :purple_heart: #34224 use named constant for clang-tidy, by KorGgenT :purple_heart: #34222 Silence some clang-tidy warnings, by kevingranade :purple_heart: #34221 Can't skin skinless, by KorGgenT :purple_heart: #34219 Trigger pr summary validation on edits, by kevingranade :purple_heart: #34218 AS-50: SWAT only, by tenmillimaster :purple_heart: #34216 Fix out of bounds access in cata_tiles::draw, by Qrox :purple_heart: #34214 Fix cmake build on windows., by moxian :purple_heart: #34210 Makes army winter jacket waterproof, by Beneficial-Insurance :purple_heart: #34208 Aikido only allows specific unarmed weapons, by Hymore246 :purple_heart: #34207 Replace one light battery in radio car box with one ultralight, by Night-Pryanik :purple_heart: #34206 Replaced spawn of free-floating battery charge with light battery cell, by Night-Pryanik :purple_heart: #34203 When NPC leaves your followers, form appropiate dynamic faction., by davidpwbrown :purple_heart: #34199 Enable serialization for mission::kill_count_to_reach, by BevapDin :purple_heart: #34198 Don't access the main game map from mapgen code., by BevapDin :purple_heart: #34197 Remove reference to g->m from map functions, by BevapDin :purple_heart: #34196 Remove all MShock derived tilesets., by kevingranade :purple_heart: #34195 Refactor loops over x and y into one loop over tripoint., by BevapDin :purple_heart: #34194 Make mapgen code a bit simpler:, by BevapDin :purple_heart: #34193 add more AEA spells, by KorGgenT :purple_heart: #34192 Allow player to use more multi-zone activities, by davidpwbrown :purple_heart: #34190 Fix typo: cracling -> crackling, by fndelacruz :purple_heart: #34188 NPCs: uncache weapon value on weapon removal, by mlangsdorf :purple_heart: #34186 Fix pulped Z raising anyway, by Fris0uman :purple_heart: #34185 Fix tec_counter not working correctly, by Hymore246 :purple_heart: #34184 basecamps: Basecamps anywhere, by mlangsdorf :purple_heart: #34183 Add position marker to some format strings, by Qrox :purple_heart: #34182 Martial Arts Rebalance for Niten Ichi-Ryu, by Hymore246 :purple_heart: #34180 WONDER spell flag error handling, by KorGgenT :purple_heart: #34179 Fix vehicle accessing the main map during mapgen:, by BevapDin :purple_heart: #34177 Add missing return to function, by Fris0uman :purple_heart: #34176 Can use string to specify price, by Fris0uman :purple_heart: #34175 Fix crash in vehicle display window, by BevapDin :purple_heart: #34174 Changing the the weight of RDX and HMTD units to 1g, by NeviNovat :purple_heart: #34172 Translate stat name outside enum_to_string, by Fris0uman :purple_heart: #34169 Allow fire to be used for crafting biodiesel, by sick-trigger :purple_heart: #34166 fix mutations overriding spell level, by KorGgenT :purple_heart: #34165 AEA_BUGS, by KorGgenT :purple_heart: #34162 Teleportation rework/unification, by John-Candlebury :purple_heart: #34161 reorganize basecamp livestock expansion files, by curstwist :purple_heart: #34156 basecamps: adds a new modular workshop expansion, by curstwist :purple_heart: #34152 Move "faulty" prefix to the correct fault names, by Qrox :purple_heart: #34148 Fixed crash when generating map, by ipcyborg :purple_heart: #34145 Enchantment cache, by KorGgenT :purple_heart: #34140 AEA_DIM and AEA_LIGHT, by KorGgenT :purple_heart: #34137 Added new anti-material rifle "Accuracy International AS50", by RickyVanz :purple_heart: #34135 Martial Arts Rebalance for Ninjutsu, by Hymore246 :purple_heart: #34132 Added significant stab thrown damage to combat knife and RM42 knife, by Night-Pryanik :purple_heart: #34108 Allow NPCs to repair vehicles, by davidpwbrown :purple_heart: #34101 Allow NPCs to read books, by davidpwbrown :purple_heart: #34054 Blackpowder loads, part 2, by Rail-Runner :purple_heart: #33966 Removed money-related perks and millionaire profession, by l29ah :purple_heart: #31802 Add FOV_3D_Z_RANGE option to limit the vertical range of 3D vision, by AnthonBerg
COMMITS
Last week there were 188 commits. :hammer_and_wrench: remove unused variable by KorGgenT :hammer_and_wrench: spell level inheritance for fake_spell by KorGgenT :hammer_and_wrench: Merge pull request #34297 from ipcyborg/fix-33646-pickup-item-duplicate Fixed "Item duplication on pick up to wield" by ZhilkinSerg :hammer_and_wrench: Merge pull request #34296 from ipcyborg/fix-32873-stamina-waiting Fixed error handling in "waiting for stamina regain" by ZhilkinSerg :hammer_and_wrench: [Clearing rubble makes creature under it free. (#34295) * Clearing rubble makes creature under it free.
Removed redundant check.](https://github.com/CleverRaven/Cataclysm-DDA/commit/5397a70d0fdc02c1c976bb4e35bb60ef37f71617) by ipcyborg :hammer_and_wrench: Merge pull request #34294 from ipcyborg/fix-33594-fire-mode Fixed wrong gun mode after closing targeting UI. by ZhilkinSerg :hammer_and_wrench: Adjust picked up item charges. by ipcyborg :hammer_and_wrench: Fixed stamina waiting error handling: remember initial stamina and don't report debug message if not required. by ipcyborg :hammer_and_wrench: Fixed wrong gun mode after closing targeting UI. by ipcyborg :hammer_and_wrench: Merge pull request #34273 from ipcyborg/fix-33815-items-overflow Fixed: Items piled up beyond a tile's limit can pass through walls by kevingranade :hammer_and_wrench: Merge pull request #34195 from BevapDin/meh Refactor loops over x and y into one loop over tripoint. by kevingranade :hammer_and_wrench: Merge branch 'master' into meh by kevingranade :hammer_and_wrench: Allow player to use more multi-zone activities (#34192) by davidpwbrown :hammer_and_wrench: Merge pull request #34145 from KorGgenT/enchantment-cache Enchantment cache by kevingranade :hammer_and_wrench: Sort books in read menu (#34266) by OzoneH3 :hammer_and_wrench: [Add deconstruction for tourist table and move camp chair to uncraft (#34277) * Added folder and file for deconstruction recipes for deployable tools
The file only contains deconstruction recipes for camping chair and tourist table for now
Moved camp chair out of the deconstruction file and into its own file](https://github.com/CleverRaven/Cataclysm-DDA/commit/98978f8fe7be22ffc2814f446a734e465aabee19) by snipercup :hammer_and_wrench: Merge pull request #34274 from Night-Pryanik/throwing-items-fix Fix items lying in furniture get damaged if one is throwing something at them by ZhilkinSerg :hammer_and_wrench: Merge pull request #34275 from snipercup/Add-looks_like-to-tourist-tab Added looks_like to tourist table by ZhilkinSerg :hammer_and_wrench: Merge pull request #34279 from Night-Pryanik/starting-text-fix Replaced text mentioning shelter in starting dialogue with a generic text by ZhilkinSerg :hammer_and_wrench: Merge pull request #34280 from Fris0uman/fueld_cbm_polish Fix fuel storage for cbms by ZhilkinSerg :hammer_and_wrench: Magiclysm typo Fix (#34281) by free-coffee :hammer_and_wrench: Merge pull request #34268 from BrettDong/i18n Routine i18n updates on 27 Sep 2019 by Rivet-the-Zombie :hammer_and_wrench: Merge pull request #34283 from CleverRaven/revert-31635-fix-bionic-power-savegame-loading Revert "Fix bionic power loading from corrupted savegames" by ZhilkinSerg :hammer_and_wrench: [Fix horses making engine sounds. (#34287) * Remove commented out code.
Fix generating engine noise:
Combine the two arrays into one. The can't be changed independently anyway (adding more messages than sound levels does not have any effect and less messages will cause UB).
Make the array static (the strings are only marked for translation, but translation happens when they get actually used).
Emit smoke and noise only for combustion engines.](https://github.com/CleverRaven/Cataclysm-DDA/commit/832c578497f41ab40ddc80c295b0b072c3d9f430) by BevapDin :hammer_and_wrench: [Translate some strings. (#34285) * Replace pointless insertion of player character name
This calls
Creature::add_msg_if_player
, so the message is only displayed when called on the player character, so the replaced "%s" is always the name of the player character.Now this will read as "Your Name-Of-Character disappears!" - which is quite different from all other messages involving the player character. They usually use second person, which is what the message does now.
Properly translate a string.](https://github.com/CleverRaven/Cataclysm-DDA/commit/f11949752c165b605f805c432e62c1f63460b027) by BevapDin :hammer_and_wrench: Merge pull request #34290 from BevapDin/guh Fixes quivers not consuming charges. by ZhilkinSerg :hammer_and_wrench: [Make setting vehicle headlight direction simpler (#34282) * Fix usage of untranslated string.
Neither "overhead light" nor "headlight" had been translated. This now uses the name of the vehicle part itself (which is already translated).
Use tripoints and points instead of separate x and y values.
Ensure the user gives a valid direction when installing a vehicle light
Adds a loop around the input code that queries the user again when they did not enter anything valid.
Changes the popup text slightly to indicate that they need to press space first and than have to choose the direction.](https://github.com/CleverRaven/Cataclysm-DDA/commit/31b43bfe875a02428a8fdc356895b26534c6814f) by BevapDin :hammer_and_wrench: [Fix auto notes overwriting existing notes (#34284) * Fix check for exiting note on wrong point.
A few lines down, the code add a note to the point
cursp_after
, but never tocursp_before
. The makes the check pretty much pointless and obviously wrong.This checks instead for a note at the point that would get the auto note instead.
Remove redundant emptiness check.
The string is created using
string_format
in the line above. It can never be empty.](https://github.com/CleverRaven/Cataclysm-DDA/commit/a3416ef9285510c153fabb07a8ae2a1c35998a47) by BevapDin :hammer_and_wrench: Merge pull request #34286 from BevapDin/pxh Add name for the toggle_thief_mode action. by ZhilkinSerg :hammer_and_wrench: Merge pull request #34292 from Aloxaf/fix_stats_through_kills Prevent players from trying to upgrade Weight by ZhilkinSerg :hammer_and_wrench: Prevent players from upgrading weight by Aloxaf :hammer_and_wrench: Merge pull request #34262 from fungusakafungus/no-dodging-magic Make magic projectiles impossible to dodge by KorGgenT :hammer_and_wrench: Fix using ammo from favorite location even when it's far away. by BevapDin :hammer_and_wrench: Add name for the toggle_thief_mode action. So it has a nice and translatable name in the main action menu. by BevapDin :hammer_and_wrench: Revert "Fix bionic power loading from corrupted savegames" This reverts commit 44e5bb185e591c94a63eb8ee4ad73f6c95361904. by kevingranade :hammer_and_wrench: fix fuel storage by Fris0uman :hammer_and_wrench: Fix clang-tidy warning. by BevapDin :hammer_and_wrench: Replaced mentioning shelter in starting dialogue with a generic text by Night-Pryanik :hammer_and_wrench: Added looks_like to tourist table It now looks like f_table, aka a normal table. This only has an effect if you use a tileset that does not have a sprite for tourist table. by snipercup :hammer_and_wrench: Projectiles with NO_ITEM_DAMAGE flag won't damage items at all, no matter if they are lying on the floor or in some container by Night-Pryanik :hammer_and_wrench: Fixed crash on starting new game: using route on empty map. by ipcyborg :hammer_and_wrench: Added check for items overflow: there is a path to destination. by ipcyborg :hammer_and_wrench: Routine i18n updates on 27 Sep 2019 by BrettDong :hammer_and_wrench: [Fixed crash when generating map (#34148) * Added submap grid initialization for z-levels.Fixed new submap inserting on correct z-level. Removed grid initialization for all z-levels. Ensured that new submap on generation will not overwrite existing one. Setsubmap to null in grid after deletion.](https://github.com/CleverRaven/Cataclysm-DDA/commit/28028a57ba470d6977565be6ff93eba15875f0cd) by ipcyborg :hammer_and_wrench: [Remove two unused members of class monster (#34265) * Remove unused member monster::last_baby
It's actually never read.
Remove unused member monster::last_biosig
It's actually never read.](https://github.com/CleverRaven/Cataclysm-DDA/commit/449bf4f45ae78a3304ffa9188bfeeab25dd07db1) by BevapDin :hammer_and_wrench: Merge pull request #34260 from bobchaos/wood_rowboat a fairly large 2 seat rowboat by ZhilkinSerg :hammer_and_wrench: Update vehicle_groups.json by ZhilkinSerg :hammer_and_wrench: Merge pull request #34254 from snipercup/Update-doc-MAPGEN.MD-1.1.0-embedded Update MAPGEN.md paragraph 1.1.0 by ZhilkinSerg :hammer_and_wrench: Added more descriptions to martial arts help menu (#34258) * Added more descriptions to martial arts help menu by Hymore246 :hammer_and_wrench: Merge pull request #34243 from Qrox/translator-comments-check Check translator comments with clang-tidy by ZhilkinSerg :hammer_and_wrench: [Add FOV_3D_Z_RANGE option to limit the vertical range of 3D vision (#31802) add FOV_3D_Z_RANGE option. Minimum 0, maximum OVERMAP_LAYERS, default 4.
add logic to cast_zlight_segment that allows us to stop casting light segments beyond FOV_3D_Z_RANGE levels. Decent speedup!](https://github.com/CleverRaven/Cataclysm-DDA/commit/f561e51eb2b4b7b9339f78156794b84b3a4b9cac) by AnthonBerg :hammer_and_wrench: fix skin and field dress (#34261) by KorGgenT :hammer_and_wrench: [Auto safe mode turn increase (#34259) * Adjusted AUTOSAFEMODETURNS max to reflect turn time change as well as default value to maintain the save time, also updated SAFEMODEINGORETURNS with the same time change
Rolled back default increases](https://github.com/CleverRaven/Cataclysm-DDA/commit/a05eeb857b7c87f36758abd3a12aeb88f7cc06f0) by Skrassh :hammer_and_wrench: Update wood.json Added looks_like to long stick. looks_like entry has description: hint to tilesets if this part has no tile, use the looks_like tile by snipercup :hammer_and_wrench: Use power_draw instead of turns_per_charge for multicooker by ZhilkinSerg :hammer_and_wrench: change seismic stomp to target_attack by KorGgenT :hammer_and_wrench: Check for EMP ammo effect just as for LASER and PLASMA by ZhilkinSerg :hammer_and_wrench: Merge pull request #34210 from Beneficial-Insurance/fix_winter_jacket Makes army winter jacket waterproof by Rivet-the-Zombie :hammer_and_wrench: Update bludgeons.json by DanteTorn :hammer_and_wrench: a fairly large 2 seat rowboat by bobchaos :hammer_and_wrench: Update MAPGEN.md Updated paragraph 1.1.0 because it is out of date. the mapgen entry is only present in 5 overmap json files and they are hardcoded locations. by snipercup :hammer_and_wrench: Make magic projectiles impossible to dodge by fungusakafungus :hammer_and_wrench: Martial Arts Rebalance for Pankration by Hymore246 :hammer_and_wrench: buff ice gliders slightly by KorGgenT :hammer_and_wrench: move cost enchantment value by KorGgenT :hammer_and_wrench: enchantment cache by KorGgenT :hammer_and_wrench: [Fixed H&K G80 requires zero charges with effective emitter gunmod (#34241) * Changed fixed modifier to multiplier
Changed gunmods to use new multiplier
Removed exact date from description
Removed emitter gunmod from G80
Remove emitter gunmod slot from coilgun as well](https://github.com/CleverRaven/Cataclysm-DDA/commit/9a54879542142df76a7d01bc9d67c6b965db5da6) by Night-Pryanik :hammer_and_wrench: Amend #34234 - floating point (#34242) by AMurkin :hammer_and_wrench: Check translator comments with clang-tidy by Qrox :hammer_and_wrench: Merge pull request #34182 from Hymore246/rebalance-niten Martial Arts Rebalance for Niten Ichi-Ryu by Rivet-the-Zombie :hammer_and_wrench: Merge pull request #34239 from kevingranade/obsolete-money-traits Obsolete the money traits. by ZhilkinSerg :hammer_and_wrench: Reduce liquid volume per turn by a factor of 6 (#34234) by ZhilkinSerg :hammer_and_wrench: Rename "hub assembly" to "wheel hub assembly" for easier discovery. (#34238) * Rename "hub assembly" to "wheel hub assembly" for easier discovery. by moxian :hammer_and_wrench: show aoe for ter_transform (#34235) * show aoe for ter_transform by KorGgenT :hammer_and_wrench: Merge pull request #34237 from Aloxaf/fix_npc_read_msg Fix message when NPC doesn't find book to read by ZhilkinSerg :hammer_and_wrench: [move mutation functions' scope from player to Character (#34232) * change scope of mutation functions to Character
move Character functions from player.cpp
remove auto](https://github.com/CleverRaven/Cataclysm-DDA/commit/c81ca75392c3924b9ae12cec6a0d5778e1bc5204) by KorGgenT :hammer_and_wrench: Fix message when NPC doesn't find book to read by Aloxaf :hammer_and_wrench: Obsolete the money traits. by kevingranade :hammer_and_wrench: Change messages when trying to sleep in vehicle (#34233) by ZhilkinSerg :hammer_and_wrench: clamp calc_ray_end angle properly (#34227) by KorGgenT :hammer_and_wrench: Fields are not spreading north-west when they shouldn't anymore (#34226) by ZhilkinSerg :hammer_and_wrench: Can't skin skinless (#34221) by KorGgenT :hammer_and_wrench: use named constant (#34224) by KorGgenT :hammer_and_wrench: Fix too large iteration range:
map::build_obstacle_cache
requires start (inclusive) and end (exclusive). But note thattripoint_range
exposes minimum and maximum points (both inclusive). by BevapDin :hammer_and_wrench: Merge pull request #34218 from tenmillimaster/AS50 AS-50: SWAT only by Rivet-the-Zombie :hammer_and_wrench: add more AEA spells (#34193) by KorGgenT :hammer_and_wrench: Allow NPCs to repair vehicles (#34108) by davidpwbrown :hammer_and_wrench: Removed money-related perks and millionaire profession (#33966) by l29ah :hammer_and_wrench: Allow NPCs to read books (#34101) by davidpwbrown :hammer_and_wrench: [Silence some clang-tidy warnings (#34222) * Silence some clang-tidy warningsUpdate src/teleport.cpp
Co-Authored-By: Jianxiang Wang (王健翔) qrox@sina.com
Assert that p is not null to shut clang tidy up](https://github.com/CleverRaven/Cataclysm-DDA/commit/6af0db3a84b9834e8ad67092c89ee8c397dabd81) by kevingranade :hammer_and_wrench: Fix out of bound access in cata_tiles::draw (#34216) by Qrox :hammer_and_wrench: [Fix cmake build on windows. (#34214) This fixes several minor issues:
platform_win.h needs to be included before SDL stuff, otherwise you get seemingly unrelated errors. This happened to work in VS solution because it force-includes stdafx.h everywhere. However stdafx.h should only be used as an optimization measure, and not to guarantee correctness
The binary currently does not use SDL2main helper, and instead defines all initialization in WinMain itself. I didn't try searching for the specific commit, but according to comments in Makefile, this is a deliberate change. VS solution defines USE_WINMAIN unconditionally, so let's use it in cmake as well.
WinMain, as defined currently, has its arguments unused, which makes g++ complain, and fail due to -Werror. Removed the comments
Mostly unrelated, and not strictly necessary: the "idiomatic" way to require a C++ standard in cmake is
SET(CMAKE_CXX_STANDARD 14)
, which is very slightly preferred overSET(CMAKE_CXX_FLAGS -std=c++14)
due to cross-platform considerations. The option is present since at least CMake 3.1.3, released in february 2015. This is only 3 months later than C++14 release, so the version bump should not be problematic.](https://github.com/CleverRaven/Cataclysm-DDA/commit/01c03990fac4be71d0db602dbd429de2eaba3075) by moxian :hammer_and_wrench: Blackpowder loads, part 2 (#34054) by Rail-Runner :hammer_and_wrench: [Trigger pr summary validation on edits (#34219) * Trigger pr summary validation on open, edit and synchronizeMake regex matching case insensitive](https://github.com/CleverRaven/Cataclysm-DDA/commit/922037acf6950d422acf2c9c0e997979087f2e70) by kevingranade :hammer_and_wrench: Re-weight by tenmillimaster :hammer_and_wrench: more faction fixes - when telling an NPC to stop being a follower, form new faction properly by davidpwbrown :hammer_and_wrench: Merge pull request #34184 from mlangsdorf/basecamps_anywhere basecamps: Basecamps anywhere by kevingranade :hammer_and_wrench: Can use string to specify price (#34176) by Fris0uman :hammer_and_wrench: Merge pull request #34162 from John-Candlebury/teleportation Teleportation rework/unification by kevingranade :hammer_and_wrench: Merge pull request #34208 from Hymore246/aikido-weapons Aikido only allows specific unarmed weapons by Rivet-the-Zombie :hammer_and_wrench: Add namespace comment by John-Candlebury :hammer_and_wrench: Apply suggestions from code review Co-Authored-By: Anton Burmistrov Night_Pryanik@mail.ru by John-Candlebury :hammer_and_wrench: Update player.cpp by John-Candlebury :hammer_and_wrench: Adjust code according to suggestions. by John-Candlebury :hammer_and_wrench: Apply suggestions from code review Co-Authored-By: BevapDin tho_ki@gmx.de by John-Candlebury :hammer_and_wrench: Replace old teleporting code. by John-Candlebury :hammer_and_wrench: Apply reviewed changes by John-Candlebury :hammer_and_wrench: Add legacy artifact teleport spell by John-Candlebury :hammer_and_wrench: Style code by John-Candlebury :hammer_and_wrench: Rework and unify teleporting by John-Candlebury :hammer_and_wrench: Makes army winter jacket waterproof by Beneficial-Insurance :hammer_and_wrench: Aikido only allows specific unarmed weapons by Hymore246 :hammer_and_wrench: Merge pull request #34207 from Night-Pryanik/radio-car-box Replace one light battery in radio car box with one ultralight by ZhilkinSerg :hammer_and_wrench: Replace one light battery in radio car box with one ultralight by Night-Pryanik :hammer_and_wrench: Merge pull request #34206 from Night-Pryanik/remove-free-floating-battery-charge Replaced spawn of free-floating battery charge with light battery cell by ZhilkinSerg :hammer_and_wrench: Replaced spawn of free-floating battery charge with light battery cell by Night-Pryanik :hammer_and_wrench: [Added significant stab thrown damage to combat knife and RM42 knife (#34132) * Added stab thrown damage to most knives
Also changed damage type for throwing knife and added several flags to it.
Removed thrown damage from most knives](https://github.com/CleverRaven/Cataclysm-DDA/commit/1b8f58d1aabe4d8d38b1a9823107f4593a42b9a6) by Night-Pryanik :hammer_and_wrench: Merge pull request #34140 from KorGgenT/AEA_DIM AEA_DIM and AEA_LIGHT by ZhilkinSerg :hammer_and_wrench: [Add position marker to some format strings (#34183) * Allow changing parameter position in cash card name translation
Add position marker to several format strings
Fix comment location and change another string
Fully allow changing parameter order in requirement format strings](https://github.com/CleverRaven/Cataclysm-DDA/commit/fe55636ed2c7392ef72a44fe06d027c8d43328ff) by Qrox :hammer_and_wrench: [Remove reference to g->m from map functions (#34197) * Remove reference to g->m from map functions
Those functions will use the implicitly given
this
object now.Always using the main game map is redundant at best (as the function will typically be called on the main game map anyway, so
this == &g->m
). But it may in fact be wrong: e.g. when the functions are called on a temporary map (e.g. during mapgen).Change more references to g->m to use the local map object instead.
Add todo comments when accessing reality bubble from within mapgen.](https://github.com/CleverRaven/Cataclysm-DDA/commit/858ae21bb82212461b0460b31b4640b5984a0bdb) by ZhilkinSerg :hammer_and_wrench: Merge pull request #34198 from BevapDin/bpl Don't access the main game map from mapgen code. by ZhilkinSerg :hammer_and_wrench: Merge pull request #34199 from BevapDin/rls Enable serialization for mission::kill_count_to_reach by ZhilkinSerg :hammer_and_wrench: description update by Hymore246 :hammer_and_wrench: oter_id: add and use some directional utility functions Add some functions to parse oter_id and return the base string without any directional suffixes, or the rotation int for the the suffix, or the directional suffix itself. Use these functions to make some code in recipe_groups, conditions, and mapgen a little more correct. by mlangsdorf :hammer_and_wrench: basecamps: Deprecate initial construction of the primitive camp The modular field camp does everything that the primitive field camp does, but is a better design. Remove the "Old Camp" from the list of available camps. Existing camps will not be affected, but people will not be able to start new camps using the Old Camp mapgen. by mlangsdorf :hammer_and_wrench: faction camps: let players build at any z0 location, not just fields Adjust the faction camp start dialogue to appear if the NPC, not the player, is standing at a valid location and allow the valid locations to be places other than fields. Update the tutorial text to reflect this change. by mlangsdorf :hammer_and_wrench: faction camps: simplify restrictions for starting camps Remove the confusing and unnecessary check for swamps, and convert the check for nearby fields to be a warning, instead of a failure, so that players can build camps in cities if that's something they want to do. by mlangsdorf :hammer_and_wrench: recipe_groups: get_recipes_by_id matches on terrain basename Strip any suffix off of an overmap terrain id before attempting to find it in the list of terrains that are valid for a recipe. by mlangsdorf :hammer_and_wrench: dialogue conditions: add FACTION_CAMP_START to at_om_location Add the special return string "FACTION_CAMP_START" to the at_om_location condition, which returns true if the player or NPC is standing on an overmap tile where a basecamp can be built. by mlangsdorf :hammer_and_wrench: Enable serialization for mission::kill_count_to_reach by BevapDin :hammer_and_wrench: Add todo comments when accessing reality bubble from within mapgen. by BevapDin :hammer_and_wrench: Change more references to g->m to use the local map object instead. by BevapDin :hammer_and_wrench: Remove reference to g->m from map functions Those functions will use the implicitly given
this
object now. Always using the main game map is redundant at best (as the function will typically be called on the main game map anyway, sothis == &g->m
). But it may in fact be wrong: e.g. when the functions are called on a temporary map (e.g. during mapgen). by BevapDin :hammer_and_wrench: Remove unused variable by BevapDin :hammer_and_wrench: Don't access the main game map from mapgen code. by BevapDin :hammer_and_wrench: Merge pull request #34194 from BevapDin/rvg Make mapgen code a bit simpler: by kevingranade :hammer_and_wrench: Merge pull request #34196 from kevingranade/mshockectomy Remove all MShock derived tilesets. by ZhilkinSerg :hammer_and_wrench: Merge pull request #34137 from RickyVanz/RickyVanz-patch-1 Added new anti-material rifle "Accuracy International AS50" by Rivet-the-Zombie :hammer_and_wrench: Remove all MShock derived tilesets because they contain tiles that violate licenses from other tilesets by kevingranade :hammer_and_wrench: Add and use a free functionpoints_in_radius
It works much likemap::points_in_radius
. by BevapDin :hammer_and_wrench: Add and use a functionmap::points_on_zlevel
It returns all points on a given (or default) z-level. by BevapDin :hammer_and_wrench: Iterator via tripoint_range instead of manually iterating over x and y. by BevapDin :hammer_and_wrench: Call map::points_in_radius instead of manually iterating over x and y. by BevapDin :hammer_and_wrench: Use the z-level from the tinymap instead of passing it as parameter explicitly. by BevapDin :hammer_and_wrench: Use cata::optional instead of comparing with a magic value. by BevapDin :hammer_and_wrench: Refactor map::translate_radius: Usetripoint
functions (e.g.trig_dist
andgetabs
) - the z-component will be the same for all points, so it cancels out. Store the calculated values instead of recalculating them each loop. by BevapDin :hammer_and_wrench: Fix accessing items on blue floor via computer: Instead of iteration over the points of the top most, left most submap ((0,0) to (SEEX-1, SEEY-1)) - iterate over the points around the player (which should be lactated right next to the computer). by BevapDin :hammer_and_wrench: Remove include of mapgen_functions.h from mapgen.h Not needed there. by BevapDin :hammer_and_wrench: Remove include of point.h from mapgen_functions.h Not needed in the header. by BevapDin :hammer_and_wrench: Move include of mapgendata.h into the cpp files that actually need it. It's not needed in any of the header files that used to include it. Those files need at most a forward declaration. by BevapDin :hammer_and_wrench: Make mapgendata::zlevel private. by BevapDin :hammer_and_wrench: Move misc mapgen parameters into mapgendata. The parameters are: - when (time_point
) - mission (mission *
) - monster spawn density (float
) - overmap terrain type (oter_id
) - map to generate on (map &
) Those parameters are forwarded to many mapgen function, but are actually rarely used. Moving them into themapgendata
class allows simpler function declarations. by BevapDin :hammer_and_wrench: Change map::draw to take a mapgendata reference Instead of passing forward all the values that the function uses to construct such an object on its own. by BevapDin :hammer_and_wrench: Remove comment out code. by BevapDin :hammer_and_wrench: Add constructor for mapgendata to avoid repeating that piece of code. by BevapDin :hammer_and_wrench: Use only non-const reference to mapgendata Some function take a parameter of that type and modify it via non-const member calls. At least this creates a consistent interface. by BevapDin :hammer_and_wrench: Move struct mapgendata into separate header and source file Also convert it into a class for consistency. And add some preliminary documentation. by BevapDin :hammer_and_wrench: Fix typo: cracling -> crackling (#34190) by fndelacruz :hammer_and_wrench: Merge pull request #34188 from mlangsdorf/npc_wield_fix NPCs: uncache weapon value on weapon removal by ZhilkinSerg :hammer_and_wrench: NPCs: uncache weapon value on weapon removal Fixes #32613 The trade interface allowed you to remove an NPC's weapon without removing the cached value of the weapon. Invalided the weapon value cache entry when a weapon is removed. by mlangsdorf :hammer_and_wrench: astyle fix by Hymore246 :hammer_and_wrench: add PULPED flag and check for can_revive() in necromancer attack by Fris0uman :hammer_and_wrench: Astyle fix by kevingranade :hammer_and_wrench: AEA_DIM and AEA_LIGHT by KorGgenT :hammer_and_wrench: Merge pull request #34179 from BevapDin/avr Fix vehicle accessing the main map during mapgen: by ZhilkinSerg :hammer_and_wrench: [Changing the the weight of RDX and HMTD units to 1g (#34174) * Make RDX and HMTD be 1 g per unit.Density of RDX is 1.57 g/cm3
Density of RDX is 1.57 g/cm3 Source: wikipedia.
Increase RDX obtained from uncrafting grenades
Adjust RDX and HMTD requierd for recipes.
1 unit of RDX now is 100 units of RDX 1 unit of HMTD now is 20 units of HMTD I am not balancing the explosives yet that will be another PR if I have time](https://github.com/CleverRaven/Cataclysm-DDA/commit/0c8a30ac3bf820d239c8d424f178833eb6750efb) by NeviNovat :hammer_and_wrench: Merge pull request #34180 from KorGgenT/wonder-error-handling WONDER spell flag error handling by ZhilkinSerg :hammer_and_wrench: Merge pull request #34185 from Hymore246/tec_counter-fix Fix tec_counter not working correctly by ZhilkinSerg :hammer_and_wrench: Fix tec_counter not working correctly by Hymore246 :hammer_and_wrench: Fix vehicle accessing the main map during mapgen: Add a handler parameter to
vehicle::remove_part
that handles map interactions (and similar stuff outside the reach of the vehicle). This handler is different when the function is called during mapgen and interacts with the temporary mapgen map in that case. by BevapDin :hammer_and_wrench: Martial Arts Rebalance for Niten Ichi-Ryu by Hymore246 :hammer_and_wrench: WONDER spell flag error handling by KorGgenT :hammer_and_wrench: Merge pull request #34169 from sick-trigger/biod Allow fire to be used for crafting biodiesel by ZhilkinSerg :hammer_and_wrench: [Fix crash in vehicle display window (#34175) * Add check for WHEEL vehicle parts having matching wheel item slot in base itemAdd check in vehicle part display code to prevent accessing empty item slot.
Remove wheel property from vehicle part "cart_handle" as its base item does not have the wheel item slot.](https://github.com/CleverRaven/Cataclysm-DDA/commit/d3420c9b74b6e9ff7011bc4d0c762cd2f9024b2e) by BevapDin :hammer_and_wrench: Merge pull request #34177 from Fris0uman/fix_get_nam Add missing return to function by ZhilkinSerg :hammer_and_wrench: return by Fris0uman :hammer_and_wrench: [Translate stat name outside enum_to_string (#34172) * translate stat name outside enum_to_string
styling](https://github.com/CleverRaven/Cataclysm-DDA/commit/28789067e6c6c6da73e8ea9e7ccec00638ad79ea) by Fris0uman :hammer_and_wrench: Allow fire to be used for crafting biodiesel by sick-trigger :hammer_and_wrench: Merge pull request #34165 from KorGgenT/artifact-active AEA_BUGS by ZhilkinSerg :hammer_and_wrench: Merge pull request #34152 from Qrox/fault-names Move "faulty" prefix to the correct fault names by ZhilkinSerg :hammer_and_wrench: Merge pull request #34166 from KorGgenT/mutation-spell-fix fix mutations overriding spell level by ZhilkinSerg :hammer_and_wrench: Merge pull request #34161 from curstwist/reorganize-livestock-files reorganize basecamp livestock expansion files by ZhilkinSerg :hammer_and_wrench: Merge pull request #34156 from curstwist/basecamp-faction-expansion-workshop basecamps: adds a new modular workshop expansion by ZhilkinSerg :hammer_and_wrench: Merge pull request #34135 from Hymore246/rebalance-ninjutsu Martial Arts Rebalance for Ninjutsu by Rivet-the-Zombie :hammer_and_wrench: fix mutations overriding spell level by KorGgenT :hammer_and_wrench: decreasing itemgroup probability a bit by RickyVanz :hammer_and_wrench: AEA_BUGS by KorGgenT :hammer_and_wrench: Added bionic weapons by Hymore246
CONTRIBUTORS
Last week there were 33 contributors. :bust_in_silhouette: KorGgenT :bust_in_silhouette: ZhilkinSerg :bust_in_silhouette: ipcyborg :bust_in_silhouette: kevingranade :bust_in_silhouette: davidpwbrown :bust_in_silhouette: OzoneH3 :bust_in_silhouette: snipercup :bust_in_silhouette: free-coffee :bust_in_silhouette: Rivet-the-Zombie :bust_in_silhouette: BevapDin :bust_in_silhouette: Aloxaf :bust_in_silhouette: Fris0uman :bust_in_silhouette: Night-Pryanik :bust_in_silhouette: BrettDong :bust_in_silhouette: Hymore246 :bust_in_silhouette: AnthonBerg :bust_in_silhouette: Skrassh :bust_in_silhouette: DanteTorn :bust_in_silhouette: bobchaos :bust_in_silhouette: fungusakafungus :bust_in_silhouette: AMurkin :bust_in_silhouette: Qrox :bust_in_silhouette: moxian :bust_in_silhouette: l29ah :bust_in_silhouette: Rail-Runner :bust_in_silhouette: tenmillimaster :bust_in_silhouette: John-Candlebury :bust_in_silhouette: Beneficial-Insurance :bust_in_silhouette: mlangsdorf :bust_in_silhouette: fndelacruz :bust_in_silhouette: NeviNovat :bust_in_silhouette: sick-trigger :bust_in_silhouette: RickyVanz
STARGAZERS
Last week there were 31 stagazers. :star: collinarnett :star: Ericheel :star: BananaBonanza :star: TacoTheDank :star: leanme :star: gclaassen :star: Tanmaymandal943 :star: mkrupczak3 :star: TechGFennec :star: peytondwilliams :star: Bungki101 :star: wellington1993 :star: steinihaf :star: XaydBayeck :star: ThomasLinkin :star: Lexaeria :star: YamaTomato :star: mothnode :star: IDEXV :star: pdspatrick :star: thouther :star: mightyzero :star: CodePanter :star: KurzedMetal :star: jrivera282 :star: xudou3 :star: Schmel924 :star: bony2023 :star: chunchengwei :star: res0nat0r :star: benjaminmkos You all are the stars! :star2:
RELEASES
Last week there were 33 releases. :rocket: cdda-jenkins-b9685 Cataclysm-DDA experimental build #9685 :rocket: cdda-jenkins-b9684 Cataclysm-DDA experimental build #9684 :rocket: cdda-jenkins-b9683 Cataclysm-DDA experimental build #9683 :rocket: cdda-jenkins-b9682 Cataclysm-DDA experimental build #9682 :rocket: cdda-jenkins-b9681 Cataclysm-DDA experimental build #9681 :rocket: cdda-jenkins-b9680 Cataclysm-DDA experimental build #9680 :rocket: cdda-jenkins-b9679 Cataclysm-DDA experimental build #9679 :rocket: cdda-jenkins-b9678 Cataclysm-DDA experimental build #9678 :rocket: cdda-jenkins-b9677 Cataclysm-DDA experimental build #9677 :rocket: cdda-jenkins-b9676 Cataclysm-DDA experimental build #9676 :rocket: cdda-jenkins-b9675 Cataclysm-DDA experimental build #9675 :rocket: cdda-jenkins-b9674 Cataclysm-DDA experimental build #9674 :rocket: cdda-jenkins-b9673 Cataclysm-DDA experimental build #9673 :rocket: cdda-jenkins-b9672 Cataclysm-DDA experimental build #9672 :rocket: cdda-jenkins-b9671 Cataclysm-DDA experimental build #9671 :rocket: cdda-jenkins-b9670 Cataclysm-DDA experimental build #9670 :rocket: cdda-jenkins-b9669 Cataclysm-DDA experimental build #9669 :rocket: cdda-jenkins-b9668 Cataclysm-DDA experimental build #9668 :rocket: cdda-jenkins-b9667 Cataclysm-DDA experimental build #9667 :rocket: cdda-jenkins-b9666 Cataclysm-DDA experimental build #9666 :rocket: cdda-jenkins-b9665 Cataclysm-DDA experimental build #9665 :rocket: cdda-jenkins-b9664 Cataclysm-DDA experimental build #9664 :rocket: cdda-jenkins-b9663 Cataclysm-DDA experimental build #9663 :rocket: cdda-jenkins-b9662 Cataclysm-DDA experimental build #9662 :rocket: cdda-jenkins-b9661 Cataclysm-DDA experimental build #9661 :rocket: cdda-jenkins-b9660 Cataclysm-DDA experimental build #9660 :rocket: cdda-jenkins-b9659 Cataclysm-DDA experimental build #9659 :rocket: cdda-jenkins-b9658 Cataclysm-DDA experimental build #9658 :rocket: cdda-jenkins-b9657 Cataclysm-DDA experimental build #9657 :rocket: cdda-jenkins-b9656 Cataclysm-DDA experimental build #9656 :rocket: cdda-jenkins-b9655 Cataclysm-DDA experimental build #9655 :rocket: cdda-jenkins-b9654 Cataclysm-DDA experimental build #9654 :rocket: cdda-jenkins-b9653 Cataclysm-DDA experimental build #9653
That's all for last week, please :eyes: Watch and :star: Star the repository CleverRaven/Cataclysm-DDA to receive next weekly updates. :smiley:
You can also view all Weekly Digests by clicking here.