You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Change functions that accept a JsonObject to take that as reference to const.
Those functions do not change the object, they just read values from it. This avoid unnecessary copy-operations and allows usage of temporary objects (which don't bind to non-const references).
Remove unnecessary calls to JsonObject::allow_omitted_members
Right now, EMP grenades are somewhat nonsense - they can be crafted out
of some electronic scrap, yet easily take down any robotic enemy. These
are problematic not just from their ease of crafting - they also help to
trivialize robotic enemies.
This commit aims to change the that, by replacing the EMP grenade recipe
with one based off of real-life EMP weapons.
This EMP device works by draining a high-current capacitor (represented
by a plutonium fuel cell) into a 'explosively propelled flux compression
generator'. When this generator is activated, with the aid of an
explosion, it creates a strong magnetic field. This magnetic field is
then passed through a microwave generator (magnetron), into a single
loop antenna, which creates the EMP.
I have created a new uncraftable emp grenade which functions like the
current, but is uncraftable and can only be obtained through military
drops rarely, or more commonly from Hub 01.
I have also obsoleted the recipe for the scrambler grenade, because it
similarly did not make much sense. Hub 01 will generally be the supplier
of these.
I have added a large copper tube, magnetron, and flux compression
generator as necessary components for crafting devices introduced in
this PR.
The tube and flux compression generator have had crafting recipes added.
I have largely replaced the former EMP grenade, that is now an EMP bomb,
with EMP grenades. Particularly in the inventory of Hub 01 NPCs, because
that could get deadly.
I have added the flux compression generator to one itemgroup.
The magnetron appears in none (you can get it from microwaves though).
The large copper tube does not spawn and can only be forged.
Perhaps this could be improved
Adjust EMP explosive power, remove some recipes
Remove the large copper tube completely and the flux compression
generator recipe.
The flux compression generator requires fiberglass to be craftable,
which is more of a hurdle than I initially considered.
The large copper tube was only used in crafting it, and is no longer
needed.
-add motor oil
-expand out ways to clean gun
-gun can be cleaned at same time as lubing, increasing efficiency (time) of the processes
-various other tweaks
Regular gunpowder fouling is now capped a bit. Gun will no longer accumulate dirt to the point of effectively seizing and "blowing up" all the time, except if you use black gunpowder.
If your gun gets really dirty (now only possible with blackpowder ammunition or unlucky zed drop), you will get a message to unload and reload your gun. It will take longer, as the fouling will prevent the mags/cartridges from extracting easily, but you will experience a drop in dirt. This requires no tools and is quite quick compared to a full cleaning action.
Update faults_gun.json
Update faults_gun.json
proportions
Update faults_gun.json
Update faults_gun.json
various, see description
rename procedure to fault
remove combo procedure from mend menu
add fault replacement system
add flags system to faults (for silence of fouling "faults")
Changed displace_vehicle to use vehicle reference .
Removed global vehicle position parameter.
Astyle for tests folder.](576881f) by ipcyborg
🛠️ [Incorporate human meat and fat into existing recipes, remove dedicated recipes (Incorporate human meat and fat into existing recipes, remove dedicated recipes #35630) * JSONize dynamic naming
To allow for items to be given different names depending on the context,
done via a JSON property, reducing the need for both highly similar item
definitions, and some hardcoded dynamic naming systems.
Partially dehardcode corpse naming
Proof of concept for FLAG-based contextual names.
Makes "skinned", "field-dressed", and "quartered" qualifiers defined by
a contextual_names property on the corpse JSON definition.
Change meat dishes' names when mutant meat is used
Proof of concept for COMPONENT_ID-based contextual names.
Add string extraction for conditional names
Rewrite corpse naming
Before, they were long and cumbersome. I was able to reorganize the code
to output far more concise names.
Revise conditional naming documentation
The example was a bit contrived, this one is more applicable while still
covering all the bases.
Additionally, I added a short paragraph warning about automatic
pluralization, to hopefully help others avoid the pitfall I fell into.
Touch-up protein drink/powder conditional names
perturbing pelmeni -> perilous pelmeni
To free up perturbing for:
unpalatable protein powder -> perturbing protein powder
Because unpalatable sounded weird and wasn't alliterative enough.
Also, gave protein drink/shakes the same names, they had none before.
Make CANNIBALISM flag inheritable
The CANNIBALISM flag is already automatically added to food with the
"hflesh" material. This makes it inheritable, paving the way for use in
recipes as an alternative to normal meat while correctly passing on its
negative effects.](489b861) by DaviBones
🛠️ [Shop rebalance (Shop rebalance #35216) * Rebalance Shops
Here's the Weekly Digest for CleverRaven/Cataclysm-DDA:
ISSUES
Last week 167 issues were created.
Of these, 106 issues have been closed and 61 issues are still open.
OPEN ISSUES
💚 #36117 Fix power tool charge consumption oversights, by DaviBones
💚 #36116 updates to doc\MONSTERS.md, by Jerimee
💚 #36115 Radiogenic doesn't heal enough to make getting irradiated a benefit, by mkikt4743
💚 #36114 Power Armor Drains UPS while deactivated, by UnmitigatedDisaster
💚 #36112 Unboard NPC before vertical shift, by davidpwbrown
💚 #36111 Seg Fault when initiating melee combat., by Berkyjay
💚 #36110 Obsolete legacy JSON, by ymber
💚 #36109 add ellipsis pref to style manual, by Jerimee
💚 #36107 Add warning if attempting to keep world, by AlexMooney
💚 #36106 change parameter of plthrow from int to item_location, by KorGgenT
💚 #36104 science_and_tech.json added, by LilShiningMan
💚 #36103 refactor change_side(), by KorGgenT
💚 #36102 Colored selected item and extended win for long items name, by 8street
💚 #36100 Camp upgrade vehicle fixes, by davidpwbrown
💚 #36098 CBM list in "manifesto" computer screen shows color tags as plaintext, by GGgatherer
💚 #36096 Overhaul library mapgen and add SUS bookcases, by ymber
💚 #36092 Android crash on new games with the graphical overmap mod enabled, by Qrox
💚 #36091 crash after new character (cataclysm-tiles.exe), by Jerimee
💚 #36090 Training Spells from NPCs, by araneyl
💚 #36089 Reworked how crafting skill requirement display is generated., by ishtatann
💚 #36088 Game warns of zombies being aimed at, by glenmack
💚 #36087 Add libpulse dependency for sdl, by kevingranade
💚 #36083 turret/vehicle ammo fix based on research, by misterprimus
💚 #36079 Not avoiding open air while performing zone activities, by TJKing293
💚 #36075 Retire procedurally generated houses and basements, by ralreegorganon
💚 #36074 Add "forbidden traits" to professions , by np-vortex
💚 #36073 Can't store screwdriver or stone hammer in hiking backpack or tool belt., by rah-jain
💚 #36072 Replace explosive projectile effect flags with explosion objects, by ymber
💚 #36071 ENCUMBRANCE_UPDATE flag gets stuck on containers, messing up stacking them., by Kelenius
💚 #36065 warn player before drinking water not known to be clean, by misterprimus
💚 #36062 allow "internal" wearables even with skin-contact gear on top, by misterprimus
💚 #36052 meat vanished, by Daebis
💚 #36046 Advanced inventory mass moving liquid bug, by CountAlex
💚 #36039 Radio Activated Explosives don't go off in Animal's/NPC's Bag, by Orange01gaming
💚 #36037 Add new options to always prompt for dangerous terrain and while crouching, by Ramza13
💚 #36036 Clear or Sunny weather with a full moon is too bright to sleep, by digitCruncher
💚 #36031 Eyeglasses/bifocals, while able to start a fire in sunlight, cannot be used to light rolled smokeables in same, by Silvenius
💚 #36016 rescope game::inv_for_ functions, by KorGgenT
💚 #36013 Can crack a safe with a stethoscope while simultaneously listening to an mp3 player, by PenceGL
💚 #36011 Fix in-progress crafting of liquid items to have liquid behaviour, by conghienquoc
💚 #36005 Allow plant mutants to sleep in planter furniture, by AlexanderBodnya
💚 #36004 Varying fouling levels and firearm state during character creation, by CountAlex
💚 #35998 Jsonize hazardous waste sarcophagus, by Night-Pryanik
💚 #35997 Add new mapgen location - private resort., by CountAlex
💚 #35995 [WIP] Add json checking for more mods on all PRs, by jbytheway
💚 #35992 Makes skin tone mutations conflict more consistently, by Morat2255
💚 #35990 (done) Removes long grass from regional terrain lists, makes it into a map extra, by I-am-Erk
💚 #35987 Cars loading around Refugee Center can spawn running, by Maleclypse
💚 #35983 Adds new options to allow auto ignoring sounds and hostile creatures based on safe mode, by Ramza13
💚 #35980 Sausage cannot be crafted with frozen meat., by Xion350
💚 #35979 Error on saving when unrelated damaged save is present but not loaded, by esotericist
💚 #35977 Deconstructing gravel leaves "nothing" terrain, by CSHague
💚 #35971 [WIP] Archery Redux Part 3 attempt 3, by Saint-of-Grey
💚 #35969 #9975 NPCs Can Run Out of Stamina, by crp763
💚 #35968 Automated turrets only attempt to target personnel, not moving vehicles, by Silvenius
💚 #35963 Default evolution tempo hasn't changed since 6 to 1s change. , by SirPendrak
💚 #35960 Scenario Faction relation dialogue, by Zupercharged
💚 #35959 Bugs with installing and uninstalling toolmods, by Night-Pryanik
💚 #35957 [WIP] Blazemod refactor, by ave-
💚 #35954 Add faction ownership sensitivity to auto-pickup and other filters, by CSHague
💚 #35953 Multiple stacks of same items, by NeevAsteria
CLOSED ISSUES
❤️ #36113 updates to doc\MONSTERS.md, by Jerimee
❤️ #36108 ellipsis use in manual of style, by Jerimee
❤️ #36105 Add Fedora and Arch installation instructions, by tim77
❤️ #36101 Capitalization fix for bone bolt migration in MST, by davidpwbrown
❤️ #36099 Replace usage of stringstream with simple string concatenation., by BevapDin
❤️ #36097 Fix flower tiles in clothing stores, by ymber
❤️ #36095 Health Regen Significantly Less Than Expected, by FracturedSolace
❤️ #36094 Giant worms are detectable by IR vision while they are burrowed, by GGgatherer
❤️ #36093 Don't add unlubricated fault if dirt fault is already present, by Qrox
❤️ #36086 Obsolete bone bolt, by kevingranade
❤️ #36085 m content edits hints.json, by Jerimee
❤️ #36084 Finish addition of new alcohols from #35614, by LaVeyanFiend
❤️ #36082 Fix SUS item groups, by ZhilkinSerg
❤️ #36081 Add bashing damage to all items in science.json, by arijust
❤️ #36080 No salvaging rags from feathers, by LaVeyanFiend
❤️ #36078 Fix accessing member value instead of member name., by BevapDin
❤️ #36077 Disassembling feathers produces rags, by ashGlaw
❤️ #36076 Lint json, by ZhilkinSerg
❤️ #36070 Remove debug error log entry, by BevapDin
❤️ #36069 Make gas tank bashable and add broken tank., by arijust
❤️ #36068 Routine i18n updates on 14 Dec 2019, by BrettDong
❤️ #36067 bad invcache json, by RDru
❤️ #36066 Created "generic" version of TWD motel, by Night-Pryanik
❤️ #36064 m content adds to hints/tips, by Jerimee
❤️ #36063 Segmentation error when trying to auto farm., by Lamandus
❤️ #36061 add warning when setting alarm while deaf, by misterprimus
❤️ #36060 fix gun cleaning redundancy, by misterprimus
❤️ #36059 Bug fix for #36056. Verify the skill id is not null before calling npc practice., by ishtatann
❤️ #36058 Add sort by barter value to the advanced inventory screen., by ishtatann
❤️ #36057 remove unused member function from material, by KorGgenT
❤️ #36056 Faction Camp: Completing a planting field task results in seg fault, by Berkyjay
❤️ #36055 m hdr links JSON_INFO.md, by Jerimee
❤️ #36054 Monster group tweaks - GROUP_POOL_NOKIDS and GROUP_ZOMBIE_COP, by CountAlex
❤️ #36053 Bump SDK version to 28, by ZhilkinSerg
❤️ #36051 Fix minor missing space in 'fat' text, by mark7
❤️ #36050 Game crashes when using any other engines apart from electric ones, by Unrepentant-Atheist
❤️ #36049 update book color key, by Jerimee
❤️ #36048 More Capitalism, by AMurkin
❤️ #36047 Remove unused inventory_position, by AMurkin
❤️ #36045 Faulty guns require double lubrication, by CountAlex
❤️ #36044 Add a basic active item cache regression test., by kevingranade
❤️ #36043 Added requirement to have at least one charge in RC car and control for them to work, by Night-Pryanik
❤️ #36042 SUS Kitchen Expansion, by I-am-Erk
❤️ #36041 Remove obsoleted guns from Generic Guns blacklist, by LaVeyanFiend
❤️ #36040 Military.json added -- item_groups sort, by LilShiningMan
❤️ #36038 Clean up cookbooks to conform w JSON_INFO.md#books, by Jerimee
❤️ #36035 Fix animal carry volume calculation, by DaviBones
❤️ #36034 [WIP] Remove wincurses port and its references in comments, by ZhilkinSerg
❤️ #36033 Add lines of code badge to readme, by ifreund
❤️ #36032 Generic Guns error: item on blacklist abzats does not exist, by Jerimee
❤️ #36030 Fix astyle regression, by AMurkin
❤️ #36029 Sealed Gas Tank at gas station is indestructible, by glenmack
❤️ #36028 Arcana monster has invalid flag, by Alterforce
❤️ #36027 Appease clang (2019-12-11), by ZhilkinSerg
❤️ #36026 Fix an active item cache bug that occurred upon map shift, by DaviBones
❤️ #36025 Fix empty() accessor in active_item_cache., by kevingranade
❤️ #36024 Appease clang (2019-12-11), by ZhilkinSerg
❤️ #36023 minor copy edits, by Jerimee
❤️ #36022 Make cataclysm capitalization consistent across json files, by AlexMooney
❤️ #36021 Correct rabbit harvest type, by Maleclypse
❤️ #36020 Make constructions in progress display the progress percentage., by ishtatann
❤️ #36019 minor typo fixes and new content to hints, by Jerimee
❤️ #36018 A question about the game's tiles, by ThomasLinkin
❤️ #36017 use string_reader() for loading json arrays in material_type, by KorGgenT
❤️ #36015 Fix minor grammar error in electronics.json, by Lys3rg1k
❤️ #36014 Make free merchant broker a merchant, with associated perks, by I-am-Erk
❤️ #36012 Reign in cestus damage bonus, by kevingranade
❤️ #36010 Code optimizations reported by static code analysis (2019-12-10), by ZhilkinSerg
❤️ #36009 Allow find_or_create_om_terrain to make new overmaps, by ralreegorganon
❤️ #36008 Fix items not appearing on regional terrains, by I-am-Erk
❤️ #36007 Add a way to iterate over JSON object members, by BevapDin
❤️ #36006 Broken item spawn for fields, by CountAlex
❤️ #36003 Add NO_UNLOAD flag to scuba tanks., by arijust
❤️ #36002 Tweak robot weights and skitterbot deconstruction recipe, by arijust
❤️ #36001 magiclysm - spell addition guidelines, by KorGgenT
❤️ #36000 Scuba tanks can be unloaded, by Kelenius
❤️ #35999 Expand upon and improve reading of integers from JSON, by DaviBones
❤️ #35996 obsolete Battery_Migration mod, by cainiaowu
❤️ #35994 Cannot get the location of the Refugee Center, by scalpelenema
❤️ #35993 Replace desk fan in vehicle cooler recipe, by CSHague
❤️ #35991 craftable stethoscope, by misterprimus
❤️ #35989 Balance fixes/recipes/adjustments and QOL, by misterprimus
❤️ #35988 Fix astyle regression, by AMurkin
❤️ #35986 Code optimizations reported by static code analysis (2019-12-10), by ZhilkinSerg
❤️ #35985 Tweak robot/turret return fire to not be uselessly inaccurate, by kevingranade
❤️ #35984 Display total energy acquirable from fuel in consumption menu, by Fris0uman
❤️ #35982 Add PRIMITIVE_RANGED_WEAPON to compound bows so they don't accumulate dirt and won't need mending., by BevapDin
❤️ #35981 Radio car box contents bugging/Unloaded RC car and remote disappears if used, by adamdeno
❤️ #35978 test PR do not merge, by alanbrady
❤️ #35976 Butter churn deconstruct, by Maleclypse
❤️ #35975 [Aftershock] Atomic churn pseudo tool and deconstruct, by Maleclypse
❤️ #35974 Remove a couple of redundant periods, by DaviBones
❤️ #35973 Wrap up loose ends for new alcohols from #35164, by DaviBones
❤️ #35972 Fix redundant messages from player speech/coughing, by DaviBones
❤️ #35970 Migrate integer sound priorities to existing enumerated sound categories, by DaviBones
❤️ #35967 Fix unloading liquid into same container, by BevapDin
❤️ #35966 Segmentation Fault - NPC working, by Gaunah
❤️ #35965 Map notes don't function with certain characters set as custom glyphs., by Inglonias
❤️ #35964 item_groups sorting, by LilShiningMan
❤️ #35962 Fix modular Turret error on load, by Fris0uman
❤️ #35961 Modify existing handmade carbines, by arijust
❤️ #35958 Fix afterschock error on load, by Fris0uman
❤️ #35956 Error: item group "mischw" already defined with type "collection", by snipercup
❤️ #35952 m, by Jerimee
❤️ #35951 Implement new zombie: Zapper zombie, by arijust
❤️ #35950 m edit of novel_erotic desc, by Jerimee
LIKED ISSUE
👍 #35951 Implement new zombie: Zapper zombie, by arijust
It received 👍 x12, 😄 x0, 🎉 x1 and ❤️ x0.
NOISY ISSUE
🔈 #35951 Implement new zombie: Zapper zombie, by arijust
It received 15 comments.
PULL REQUESTS
Last week, 148 pull requests were created, updated or merged.
OPEN PULL REQUEST
Last week, 1 pull request was opened.
💚 #36112 Unboard NPC before vertical shift, by davidpwbrown
UPDATED PULL REQUEST
Last week, 37 pull requests were updated.
💛 #36117 Fix power tool charge consumption oversights, by DaviBones
💛 #36103 refactor change_side(), by KorGgenT
💛 #36102 Colored selected item and extended win for long items name, by 8street
💛 #36100 Camp upgrade vehicle fixes, by davidpwbrown
💛 #36087 Add libpulse dependency for sdl, by kevingranade
💛 #36083 turret/vehicle ammo fix based on research, by misterprimus
💛 #36075 Retire procedurally generated houses and basements, by ralreegorganon
💛 #36074 Add "forbidden traits" to professions , by np-vortex
💛 #36065 warn player before drinking water not known to be clean, by misterprimus
💛 #36062 allow "internal" wearables even with skin-contact gear on top, by misterprimus
💛 #36037 Add new options to always prompt for dangerous terrain and while crouching, by Ramza13
💛 #36016 rescope game::inv_for_ functions, by KorGgenT
💛 #36011 Fix in-progress crafting of liquid items to have liquid behaviour, by conghienquoc
💛 #36005 Allow plant mutants to sleep in planter furniture, by AlexanderBodnya
💛 #35998 Jsonize hazardous waste sarcophagus, by Night-Pryanik
💛 #35997 Add new mapgen location - private resort., by CountAlex
💛 #35992 Makes skin tone mutations conflict more consistently, by Morat2255
💛 #35990 (done) Removes long grass from regional terrain lists, makes it into a map extra, by I-am-Erk
💛 #35983 Adds new options to allow auto ignoring sounds and hostile creatures based on safe mode, by Ramza13
💛 #35971 [WIP] Archery Redux Part 3 attempt 3, by Saint-of-Grey
💛 #35957 [WIP] Blazemod refactor, by ave-
💛 #35942 [WIP] Replace 'Vitamins (RDA)' text with 'Contains' when NO_VITAMINS is enabled, by anothersimulacrum
💛 #35925 Light Manipulation Spellbook, and new relic effect "BONUS_DODGE", by John-Candlebury
💛 #35865 Split 40mm grenade types, by ymber
💛 #35821 (Done)Adds riot control turrets and makes them more common than lethal types. Removes roadblock robots., by I-am-Erk
💛 #35818 Refactor defense mode, by ZhilkinSerg
💛 #35752 [CR] Update Modular Turrets and Salvaged Robots to match Mainline style and recipes Fixes #35689, by CSHague
💛 #35658 Magiclysm - Golems, by arijust
💛 #35597 Spell-casting NPCs, by araneyl
💛 #35522 Aramid armor is like an onion, it has many layers: Kevlar rework, EOD gear and cut-gear., by tenmillimaster
💛 #35371 Add "looks_like" to all furniture and terrain, by XygenSS
💛 #35242 Remove nuke launch and do some cleanup., by kevingranade
💛 #34908 Fixed weights for all real firearms., by Warriorcat49
💛 #34808 WIP CR Bionic Sniper Profession- CBM Change, by KingApep
💛 #34738 SUS Bathroom, Part 1, by xanderrootslayer
💛 #34690 Towing vehicles, by davidpwbrown
💛 #34246 [WIP]NPC and player auto-crafting from workbench bills, by davidpwbrown
MERGED PULL REQUEST
Last week, 110 pull requests were merged.
💜 #36097 Fix flower tiles in clothing stores, by ymber
💜 #36093 Don't add unlubricated fault if dirt fault is already present, by Qrox
💜 #36086 Obsolete bone bolt, by kevingranade
💜 #36085 m content edits hints.json, by Jerimee
💜 #36084 Finish addition of new alcohols from #35614, by LaVeyanFiend
💜 #36082 Fix SUS item groups, by ZhilkinSerg
💜 #36081 Add bashing damage to all items in science.json, by arijust
💜 #36080 No salvaging rags from feathers, by LaVeyanFiend
💜 #36078 Fix accessing member value instead of member name., by BevapDin
💜 #36076 Lint json, by ZhilkinSerg
💜 #36070 Remove debug error log entry, by BevapDin
💜 #36069 Make gas tank bashable and add broken tank., by arijust
💜 #36068 Routine i18n updates on 14 Dec 2019, by BrettDong
💜 #36066 Created "generic" version of TWD motel, by Night-Pryanik
💜 #36064 m content adds to hints/tips, by Jerimee
💜 #36060 fix gun cleaning redundancy, by misterprimus
💜 #36059 Bug fix for #36056. Verify the skill id is not null before calling npc practice., by ishtatann
💜 #36057 remove unused member function from material, by KorGgenT
💜 #36055 m hdr links JSON_INFO.md, by Jerimee
💜 #36054 Monster group tweaks - GROUP_POOL_NOKIDS and GROUP_ZOMBIE_COP, by CountAlex
💜 #36053 Bump SDK version to 28, by ZhilkinSerg
💜 #36051 Fix minor missing space in 'fat' text, by mark7
💜 #36049 update book color key, by Jerimee
💜 #36048 More Capitalism, by AMurkin
💜 #36047 Remove unused inventory_position, by AMurkin
💜 #36044 Add a basic active item cache regression test., by kevingranade
💜 #36043 Added requirement to have at least one charge in RC car and control for them to work, by Night-Pryanik
💜 #36042 SUS Kitchen Expansion, by I-am-Erk
💜 #36041 Remove obsoleted guns from Generic Guns blacklist, by LaVeyanFiend
💜 #36040 Military.json added -- item_groups sort, by LilShiningMan
💜 #36035 Fix animal carry volume calculation, by DaviBones
💜 #36033 Add lines of code badge to readme, by ifreund
💜 #36030 Fix astyle regression, by AMurkin
💜 #36027 Appease clang (2019-12-11), by ZhilkinSerg
💜 #36026 Fix an active item cache bug that occurred upon map shift, by DaviBones
💜 #36025 Fix empty() accessor in active_item_cache., by kevingranade
💜 #36024 Appease clang (2019-12-11), by ZhilkinSerg
💜 #36022 Make cataclysm capitalization consistent across json files, by AlexMooney
💜 #36021 Correct rabbit harvest type, by Maleclypse
💜 #36019 minor typo fixes and new content to hints, by Jerimee
💜 #36017 use string_reader() for loading json arrays in material_type, by KorGgenT
💜 #36015 Fix minor grammar error in electronics.json, by Lys3rg1k
💜 #36014 Make free merchant broker a merchant, with associated perks, by I-am-Erk
💜 #36012 Reign in cestus damage bonus, by kevingranade
💜 #36010 Code optimizations reported by static code analysis (2019-12-10), by ZhilkinSerg
💜 #36009 Allow find_or_create_om_terrain to make new overmaps, by ralreegorganon
💜 #36008 Fix items not appearing on regional terrains, by I-am-Erk
💜 #36007 Add a way to iterate over JSON object members, by BevapDin
💜 #36003 Add NO_UNLOAD flag to scuba tanks., by arijust
💜 #36002 Tweak robot weights and skitterbot deconstruction recipe, by arijust
💜 #36001 magiclysm - spell addition guidelines, by KorGgenT
💜 #35996 obsolete Battery_Migration mod, by cainiaowu
💜 #35993 Replace desk fan in vehicle cooler recipe, by CSHague
💜 #35991 craftable stethoscope, by misterprimus
💜 #35988 Fix astyle regression, by AMurkin
💜 #35986 Code optimizations reported by static code analysis (2019-12-10), by ZhilkinSerg
💜 #35985 Tweak robot/turret return fire to not be uselessly inaccurate, by kevingranade
💜 #35984 Display total energy acquirable from fuel in consumption menu, by Fris0uman
💜 #35982 Add PRIMITIVE_RANGED_WEAPON to compound bows so they don't accumulate dirt and won't need mending., by BevapDin
💜 #35976 Butter churn deconstruct, by Maleclypse
💜 #35975 [Aftershock] Atomic churn pseudo tool and deconstruct, by Maleclypse
💜 #35974 Remove a couple of redundant periods, by DaviBones
💜 #35972 Fix redundant messages from player speech/coughing, by DaviBones
💜 #35970 Migrate integer sound priorities to existing enumerated sound categories, by DaviBones
💜 #35967 Fix unloading liquid into same container, by BevapDin
💜 #35964 item_groups sorting, by LilShiningMan
💜 #35962 Fix modular Turret error on load, by Fris0uman
💜 #35961 Modify existing handmade carbines, by arijust
💜 #35958 Fix afterschock error on load, by Fris0uman
💜 #35952 m, by Jerimee
💜 #35950 m edit of novel_erotic desc, by Jerimee
💜 #35948 change avatar::read parameter to item &, by KorGgenT
💜 #35945 attempt to fix faction camp canteen recipes, by curstwist
💜 #35944 locations_commercial.json added; item_groups clean up, by LilShiningMan
💜 #35940 Modernize clothing stores, by ymber
💜 #35936 Change functions that accept a JsonObject to take that as reference to const., by BevapDin
💜 #35935 some extra lizardfolk fixes, by KorGgenT
💜 #35932 Reorganize SUS itemgroups, by ymber
💜 #35929 Fix issue with scrolling in item description #35766, by 8street
💜 #35928 Put some stuff into boxes, by I-am-Erk
💜 #35927 Added hints for New Game modes, by Night-Pryanik
💜 #35924 Add supreme pizza, by HipAndroid
💜 #35919 [Magiclysm] update black dragon lair, by curstwist
💜 #35900 Changing plank weight and volume to 2200g and 4400mL, by Jovus
💜 #35889 Refactor how nutrients are stored and processed, by jbytheway
💜 #35888 12ga stocks and brass catcher fixes, by tenmillimaster
💜 #35887 Reduce memory usage of itype, by ifreund
💜 #35839 Jsonized field description affixes, by ZhilkinSerg
💜 #35836 Further expand regional terrains and work them into some map palettes, by I-am-Erk
💜 #35830 Jsonized time to atack skill data, by ZhilkinSerg
💜 #35805 Update and migrate most Realguns content to core, by Rail-Runner
💜 #35784 Turrets return fire at unseen ranged attackers, by Night-Pryanik
💜 #35778 Limit the kinds of terrain that are vulnerable to mattack::growplants, by Kodiologist
💜 #35776 Refactor monster movement flag checks, by ZhilkinSerg
💜 #35775 Refactor monster regeneration flags, by ZhilkinSerg
💜 #35759 Weather Tweaks - new light drizzle category and fix wind, by davidpwbrown
💜 #35740 Monster flag usage frequency, by ZhilkinSerg
💜 #35735 jsonize filthy clothing zone, by KorGgenT
💜 #35734 Bring EMP grenades in line with reality, by anothersimulacrum
💜 #35687 Give NPCs the handicap bonus to use out of LOS welding rigs for vehicle repair, by davidpwbrown
💜 #35664 refactor game::eat(), by KorGgenT
💜 #35649 Fix NPC head explodey when they leave / reenter reality bubble with an activity, by davidpwbrown
💜 #35641 Fixed "Vehicle disappearing when grabbing another veh inside", by ipcyborg
💜 #35630 Incorporate human meat and fat into existing recipes, remove dedicated recipes, by DaviBones
💜 #35455 Document how to build and run the custom clang-tidy checks on Windows, by Qrox
💜 #35312 Prevent dialog asking to enter dangerous terrain, by Ramza13
💜 #35216 Shop rebalance, by crazykiddeath
💜 #35164 More types of alcohol, by Brytenwalda
💜 #34602 Dehardcoded skill and damage requirements in martialarts.cpp, by Hymore246
💜 #34470 Realistic gun cleaning, by misterprimus
COMMITS
Last week there were 245 commits.
🛠️ Remove Warm flag from worm monsters. by arijust
🛠️ Dehardcoded skill and damage requirements in martialarts.cpp (#34602) by Hymore246
🛠️ Merge pull request #36093 from Qrox/fix-redundant-unlubricated Don't add unlubricated fault if dirt fault is already present by ZhilkinSerg
🛠️ m content edits hints.json (#36085) by Jerimee
🛠️ Fix capitalization by ZhilkinSerg
🛠️ Merge pull request #36097 from ymber/floor Fix flower tiles in clothing stores by ZhilkinSerg
🛠️ Remove unnecessary include of sstream by BevapDin
🛠️ Use std::string instead of std::ostringstream Slightly changed some statements as to combine multiple adjacent writes of string literals into a single string literal. Also used
colorize
to get astd::string
, to which other string literals can be added. by BevapDin🛠️ Fix statement without effect. The statement as is has no effect, the content written to
tmp
is never read. This changes the statement to work according to the comment. by BevapDin🛠️ Fix flower tiles in clothing stores by ymber
🛠️ Don't add unlubricated fault if dirt fault is already added by Qrox
🛠️ Merge pull request #36086 from CleverRaven/kevingranade-no-bones-about-it Obsolete bone bolt by Rivet-the-Zombie
🛠️ Finish addition of new alcohols from #35614 (#36084) by LaVeyanFiend
🛠️ TAAAAABS! by kevingranade
🛠️ Migrate bone bolts to crude bolts by kevingranade
🛠️ Remove bone bolt item by kevingranade
🛠️ Create obsoletion entry for bone bolt recipe. by kevingranade
🛠️ Remove bone bolt recipe by kevingranade
🛠️ Fix SUS item groups (#36082) by ZhilkinSerg
🛠️ Typo fix by kevingranade
🛠️ Add bashing damage to all items in science.json (#36081) by arijust
🛠️ fix gun cleaning redundancy (#36060) by misterprimus
🛠️ Merge pull request #36080 from LaVeyanFiend/FeatherBoi No salvaging rags from feathers by ZhilkinSerg
🛠️ Merge pull request #36078 from BevapDin/lyq Fix accessing member value instead of member name. by ZhilkinSerg
🛠️ No salvaging feathers by LaVeyanFiend
🛠️ Fix accessing member value instead of member name. by BevapDin
🛠️ Lint json (#36076) by ZhilkinSerg
🛠️ Modernize clothing stores (#35940) by ymber
🛠️ Merge pull request #36057 from KorGgenT/unused-function remove unused member function from material by ZhilkinSerg
🛠️ [m content adds to hints/tips (#36064) * m content additions
🛠️ SUS Kitchen Expansion (#36042) by I-am-Erk
🛠️ Make gas tank bashable and add broken tank. (#36069) by arijust
🛠️ [Created "generic" version of TWD motel (Created "generic" version of TWD motel #36066) * Created "generic" version of TWD motel
Also several other tweaks.
🛠️ Merge pull request #36059 from ishtatann/ishta-bugfix-36056 Bug fix for #36056. Verify the skill id is not null before calling npc practice. by ZhilkinSerg
🛠️ Merge pull request #36054 from CountAlex/cops_and_dogs Monster group tweaks - GROUP_POOL_NOKIDS and GROUP_ZOMBIE_COP by ZhilkinSerg
🛠️ m hdr links JSON_INFO.md (#36055) by Jerimee
🛠️ Merge pull request #36070 from BevapDin/qen Remove debug error log entry by ZhilkinSerg
🛠️ Merge pull request #36068 from BrettDong/i18n Routine i18n updates on 14 Dec 2019 by ZhilkinSerg
🛠️ Remove debug error log entry:
oter_type_t::load
complains abut this JSON entry being a number and not a string. This causes an entry in the debug log, which causes generating a stack trace, which slows down the game loading. by BevapDin🛠️ Routine i18n updates on 14 Dec 2019 by BrettDong
🛠️ Merge pull request #35991 from misterprimus/craftable-stethoscope craftable stethoscope by Rivet-the-Zombie
🛠️ Bug fix for #36056. Verify the skill id is not null before calling npc practice. by ishtatann
🛠️ remove unused member function from material by KorGgenT
🛠️ Added requirement to have at least one charge (#36043) by Night-Pryanik
🛠️ [Aftershock] Atomic churn pseudo tool and deconstruct (#35975) by Maleclypse
🛠️ Merge pull request #36012 from CleverRaven/kevingranade-cestus-damage-fix Reign in cestus damage bonus by ZhilkinSerg
🛠️ Merge pull request #35985 from kevingranade/turret-return-fire-tweak Tweak robot/turret return fire to not be uselessly inaccurate by ZhilkinSerg
🛠️ Merge pull request #36044 from kevingranade/active-item-test Add a basic active item cache regression test. by ZhilkinSerg
🛠️ Merge pull request #35735 from KorGgenT/jsonize-filthy-clothing-zone jsonize filthy clothing zone by ZhilkinSerg
🛠️ Merge pull request #36053 from CleverRaven/android-28 Bump SDK version to 28 by ZhilkinSerg
🛠️ Monster group tweaks. by CountAlex
🛠️ Updated Android version to 28 on Travis by ZhilkinSerg
🛠️ Bump SDK version to 28 by ZhilkinSerg
🛠️ More Capitalism (#36048) by AMurkin
🛠️ update book color key (#36049) by Jerimee
🛠️ Fix minor missing space in 'obese' display (#36051) by mark7
🛠️ jsonize filthy clothing zone by KorGgenT
🛠️ Remove unused inventory_position (#36047) by AMurkin
🛠️ Fix animal carry volume calculation (#36035) Volume of bag mounted on an animal was counting against storage volume.
E.g. A 20L bag with 80L storage was only actually giving 60L of storage. by DaviBones
🛠️ [Make cataclysm capitalization consistent across json files (Make cataclysm capitalization consistent across json files #36022) * The Capitalism comes to the Cataclysm
The Cataclysm is a proper noun, so capitalize it.](ad70eef) by AlexMooney
🛠️ Merge pull request #36007 from BevapDin/ept Add a way to iterate over JSON object members by kevingranade
🛠️ change avatar::read parameter to item & (#35948) by KorGgenT
🛠️ Merge pull request #35887 from ifreund/itype-memory-usage Reduce memory usage of itype by kevingranade
🛠️ [ Jsonized time to atack skill data (#35830) * Jsonized time to atack skill data
Use JsonArray iterator for companion_skill_practice
Moved declarations to separate lines](93a2e8f) by ZhilkinSerg
🛠️ Add a basic active item cache regression test. by kevingranade
🛠️ [refactor game::eat() (refactor game::eat() #35664) * change scope of game::eat to avatar_action
change parameter from int to item_location
applied to avatar_action::eat and player::consume](bba76b4) by KorGgenT
🛠️ Update mammal.json (#36021) by Maleclypse
🛠️ Merge pull request #36040 from LilShiningMan/LSM---Item-Groups---Military Military.json added -- item_groups sort by ZhilkinSerg
🛠️ Merge pull request #36041 from LaVeyanFiend/TaurShotBlacklist Remove obsoleted guns from Generic Guns blacklist by ZhilkinSerg
🛠️ Merge pull request #36033 from ifreund/lines-of-code Add lines of code badge to readme by ZhilkinSerg
🛠️ Merge pull request #36019 from Jerimee/patch-3 minor typo fixes and new content to hints by Rivet-the-Zombie
🛠️ Remove obsoleted guns from Generic Guns blacklist Update Taurus magazine blacklist by LaVeyanFiend
🛠️ Military.json added -- item_groups sort added military.json to itemgroups folder; continued to sort various lists to appropriate .json files. by LilShiningMan
🛠️ Fix members not being marked as visited when iterating over all of them. by BevapDin
🛠️ Replace calls to JsonValue::read with JsonValue::get_* It's the same, only without the variable. by BevapDin
🛠️ Add named function to check whether a JSON member is considered a comment. Also changes the logic inside the loop to just continue when the member is a comment. This reduces the level of indentation within the actual loop content. by BevapDin
🛠️ Add a way to iterate over JSON object members in one simple loop This replaces most code that used to: 1. extract the names of all members of a JSON object, 2. iterate over them, 3. get each member by name. Now this avoids the creation of the member name set. by BevapDin
🛠️ Remove unnecessary fallback value when calling JsonObject::get_int The member is guaranteed to exist as it's directly from the list of members as reported by
JsonObject::get_member_names
. by BevapDin🛠️ Remove check for specific type of JSON object member: If the JSON member is not of the expected type, we want to report that as error instead of ignoring it. by BevapDin
🛠️ Use range-based loop instead of iterators. by BevapDin
🛠️ Remove redundant clearing: the container that contains this object has been cleared some lines above. by BevapDin
🛠️ Remove unnecessary indentation level. by BevapDin
🛠️ Fix TODO comment: add Doxygen marker and move closer to the relevant source by BevapDin
🛠️ Replace auto with actual type. by BevapDin
🛠️ Rename JsonArrayValueRef to JsonValue. Because it is just that. It has no actual connection to
JsonArray
. Also makes the constructor public and removes the now unnecessary friend declarations. Also remove the friend declarations for it inJsonArray
(not needed at all). by BevapDin🛠️ Rename JsonObject::end to avoid conflicts later by BevapDin
🛠️ Update containers.json by misterprimus
🛠️ Update data/json/recipes/recipe_others.json Co-Authored-By: DaviBones [email protected] by misterprimus
🛠️ Add lines of code badge to readme by ifreund
🛠️ astyle changes from 36017 (#36030) by AMurkin
🛠️ Update hints.json by Jerimee
🛠️ [item_groups sorting (item_groups sorting #35964) * item_groups sorting
sorted more item groups into proper .jsons
Update locations.json
Update data/json/itemgroups/locations.json
Co-Authored-By: ZhilkinSerg [email protected]](def7099) by ZhilkinSerg
🛠️ Migrate integer sound priorities to existing enumerated sound categories (#35970) by DaviBones
🛠️ Merge pull request #36001 from KorGgenT/spell-tier-guideline magiclysm - spell addition guidelines by ZhilkinSerg
🛠️ Merge pull request #36027 from CleverRaven/ZhilkinSerg-clang-whitespaces-2019-12-11 Appease clang (2019-12-11) by ZhilkinSerg
🛠️ Merge pull request #36017 from KorGgenT/material-loading-simplification use string_reader() for loading json arrays in material_type by ZhilkinSerg
🛠️ Merge pull request #36014 from I-am-Erk/broker-inventory Make free merchant broker a merchant, with associated perks by ZhilkinSerg
🛠️ Merge pull request #36025 from kevingranade/fix-active-item-cache-size Fix empty() accessor in active_item_cache. by ZhilkinSerg
🛠️ Merge pull request #35996 from cainiaowu/patch-1 obsolete Battery_Migration mod by ZhilkinSerg
🛠️ Merge pull request #36009 from ralreegorganon/more-permissive-mission-target-finding Allow find_or_create_om_terrain to make new overmaps by ZhilkinSerg
🛠️ Merge pull request #36003 from arijust/scuba_tank_unload Add NO_UNLOAD flag to scuba tanks. by ZhilkinSerg
🛠️ Add missing whitespaces to string by ZhilkinSerg
🛠️ Don't delete too many edges from item cache by DaviBones
🛠️ Remove anonymous namespace by ZhilkinSerg
🛠️ Fix size() accessor in active_item_cache. by kevingranade
🛠️ Add serialization for consumption history So that monotony penalties carry over upon save/load. by DaviBones
🛠️ Changes component hashing method The first method was just using bitwise XOR of the string hashes of the components' type IDs. This could be prone to collisions. Instead, this method sorts, concatenates, and then hashes the IDs. by DaviBones
🛠️ Eating same food repeatedly gives less fun Introduces a new JSON comestible property, "monotony_penalty", that is subtracted from a food item's fun score for every identical meal you've eaten in the last 48 hours. Foods are considered identical if the have the same id, and their components also have the same ids. The penalty can't take a food's fun below 0 or reduce fun for foods that already had negative fun, unless that food has the "NEGATIVE_MONOTONY_OK" flag. Default "monotony_penalty" is 2, except for junk food where it's 0. by DaviBones
🛠️ Few more tweaks to -INT_MIN functions I wanted to be absolutely sure that these functions never risked overflow at any point on any compiler, because I know that if at any point they return an incorrect value, saved games will fail to load due to incorrectly thinking it's unsafe to read INT_MIN from JSON. Also, Qrox pointed out that they should be constexpr. by DaviBones
🛠️ Update hints.json by Jerimee
🛠️ Merge pull request #36015 from Lys3rg1k/master Fix minor grammar error in electronics.json by Rivet-the-Zombie
🛠️ Update hints.json by Jerimee
🛠️ minor typo fixes and content additions to hints by Jerimee
🛠️ use string_reader() for loading json arrays in material_type by KorGgenT
🛠️ lint by misterprimus
🛠️ conflicts by misterprimus
🛠️ conflicts by misterprimus
🛠️ conflicts by misterprimus
🛠️ conflicts by misterprimus
🛠️ Merge branch 'master' into craftable-stethoscope by misterprimus
🛠️ balloon, itemgroups, etc... by misterprimus
🛠️ Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA by Lys3rg1k
🛠️ Merge pull request #36010 from ZhilkinSerg/sa-2019-12-10 Code optimizations reported by static code analysis (2019-12-10) by kevingranade
🛠️ Fix minor grammar error in electronics.json Fix a minor grammar error in electronics.json that describes an item as "explosively pump" instead of the correct "explosively pumped" by Lys3rg1k
🛠️ [Tweak robot weights and skitterbot deconstruction recipe (#36002) * Change weight of dispatch robots.
I set civilian one to 250 kg and military variant to 300 kg, because all these stored drone hacks would make them heavier.
Tweak weight on inactive bots and turrets.
Tweak skitterbot deconstruction recipe.](0fedce8) by arijust
🛠️ Update NPC_free_merchant_broker.json Make him have a merchant mission so he gets a merchant inventory by I-am-Erk
🛠️ Reign in cestus damage bonus by kevingranade
🛠️ Fix items not appearing on regional terrains (#36008) by I-am-Erk
🛠️ Fix issues with integer limits The way the absolute value of INT_MIN was being determined before may have given inconsistent results on different platforms. Also, switched to using std::numeric_limits rather than the corresponding macro constants. by DaviBones
🛠️ Removed redundant empty line by ZhilkinSerg
🛠️ Removed unused global variables by ZhilkinSerg
🛠️ Made global variables static (land_use_code) by ZhilkinSerg
🛠️ Made global variables static (ammotype) by ZhilkinSerg
🛠️ Made global variables static (mongroup_id) by ZhilkinSerg
🛠️ Made global variables static (efftype_id) by ZhilkinSerg
🛠️ Made global variables static (faction_id) by ZhilkinSerg
🛠️ Made global variables static (matype_id) by ZhilkinSerg
🛠️ Made global variables static (trap_str_id) by ZhilkinSerg
🛠️ Made global variables static (zone_type_id) by ZhilkinSerg
🛠️ Made global variables static (itype_id) by ZhilkinSerg
🛠️ Made global variables static (fault_id) by ZhilkinSerg
🛠️ Made global variables static (material_id) by ZhilkinSerg
🛠️ Made global variables static (quality_id) by ZhilkinSerg
🛠️ Made global variables static (trait_id) by ZhilkinSerg
🛠️ Made global variables static (bionic_id) by ZhilkinSerg
🛠️ Made global variables static (species_id) by ZhilkinSerg
🛠️ Made global variables static (effect_id) by ZhilkinSerg
🛠️ Made global variables static (skill_id) by ZhilkinSerg
🛠️ Allow find_or_create_om_terrain to make new overmaps by ralreegorganon
🛠️ Made global variables static (mtype_id) by ZhilkinSerg
🛠️ Add NO_UNLOAD flag to scuba tanks. by arijust
🛠️ magiclysm - spell addition guidelines by KorGgenT
🛠️ obsolete Battery_Migration mode by cainiaowu
🛠️ Prevent dialog asking to enter dangerous terrain (#35312) by Ramza13
🛠️ Expand and improve JSON integer reading Primarily to expand support for very large integers. Before, precision was being lost due to conversion to float, and then back to integer. I also made integer loading more strict. An error will now be thrown if: 1. An unsigned integer is provided with a negative value. 2. The supplied integer is too big (we now have int64 support, but even that has its limits) 3. An integer is supplied with a decimal (previously it was truncated) 4. The above rules hold even when scientific notation is used (yes, we have support for using scientific notation in JSON fields) Number 3 immediately caused a lot of errors in both the base game and in mods. I went through and fixed these. by DaviBones
🛠️ Merge pull request #35993 from CSHague/patch-3 Replace desk fan in vehicle cooler recipe by Rivet-the-Zombie
🛠️ Replaced Desk Fan w/ equivalent amount of parts Seems odd that a desk fan is required when multiple existent cooling machines you can dismantle have no fan components in them, leaving the player to search for them. Replaced the fan with the same amount of materials you can disassemble the fan into. by CSHague
🛠️ Update data/json/itemgroups/locations.json Co-Authored-By: ZhilkinSerg [email protected] by LilShiningMan
🛠️ Add supreme pizza (#35924) by HipAndroid
🛠️ Update recipe_others.json by misterprimus
🛠️ Merge pull request #35988 from AMurkin/astyle Fix astyle regression by ZhilkinSerg
🛠️ Update locations.json by LilShiningMan
🛠️ Merge branch 'master' into LSM---Item-Groups-Declut- by LilShiningMan
🛠️ astyle suffer.cpp by AMurkin
🛠️ Merge pull request #35986 from ZhilkinSerg/sa-2019-12-10 Code optimizations reported by static code analysis (2019-12-10) by kevingranade
🛠️ Merge pull request #35984 from Fris0uman/bioenergy Display total energy acquirable from fuel in consumption menu by kevingranade
🛠️ Simplified Boolean expression by ZhilkinSerg
🛠️ Simplify Boolean expressions by ZhilkinSerg
🛠️ Removed redeclaration of variable by ZhilkinSerg
🛠️ Removed redundant empty declarations and statements by ZhilkinSerg
🛠️ Added noexcept specification to has function by ZhilkinSerg
🛠️ Statsic const trait_DEBUG_HS by ZhilkinSerg
🛠️ Removed unused declarations by ZhilkinSerg
🛠️ Moved TODO comments to separate lines by ZhilkinSerg
🛠️ Removed redundant empty line by ZhilkinSerg
🛠️ display unit by Fris0uman
🛠️ Tweak robot/turret return fire to not be uselessly inaccurate by kevingranade
🛠️ Update furniture-storage.json (#35976) by Maleclypse
🛠️ account for fuel_capacity by Fris0uman
🛠️ attempt to fix faction camp canteen recipes (#35945) add more smoking racks by curstwist
🛠️ Fix issue with scrolling in item description #35766 (#35929) by 8street
🛠️ Display total energy acquirable from fuel, using the most efficient bionic, in the consumption menu by Fris0uman
🛠️ Changing plank weight and volume to 2200g and 4400mL (#35900) by Jovus
🛠️ Merge pull request #35889 from jbytheway/nutrient_struct Refactor how nutrients are stored and processed by kevingranade
🛠️ 12ga stocks and brass catcher fixes (#35888) by tenmillimaster
🛠️ Turrets return fire at unseen ranged attackers (#35784) by Night-Pryanik
🛠️ Suppress clang-tidy warning for move test by ifreund
🛠️ Add explicitly default move constructor and tests by ifreund
🛠️ Avoid unnecessary copy by ifreund
🛠️ Create a new
value_ptr
type for use in itype This cleans up the code considerably over the previous iteration by ifreund🛠️ Jsonized field description affixes (#35839) by ZhilkinSerg
🛠️ Delete duplicated catfood entry This duplication was detected as it started causing load errors and crashes with the new itype plumbing by ifreund
🛠️ Replace optional with unique pointer in itype This results in reduced memory usage compared to optional by ifreund
🛠️ Update and migrate most Realguns content to core (#35805) by Rail-Runner
🛠️ Merge pull request #35972 from DaviBones/redundant-speech-fix Fix redundant messages from player speech/coughing by ZhilkinSerg
🛠️ [Change functions that accept a JsonObject to take that as reference to const. (Change functions that accept a JsonObject to take that as reference to const. #35936) * Make most functions of JsonObject coost.
Change functions that accept a JsonObject to take that as reference to const.
Those functions do not change the object, they just read values from it. This avoid unnecessary copy-operations and allows usage of temporary objects (which don't bind to non-const references).
Remove unnecessary calls to JsonObject::allow_omitted_members
Fix build for cata_tiles.cpp
Fix JSON object member being unvisited
Fix potential nullpointer access in JSON classes:
Error reporting functions are public and can be called on any object, even on those that do not have an associated stream.](604b633) by BevapDin
🛠️ Merge pull request #35967 from BevapDin/lws Fix unloading liquid into same container by ZhilkinSerg
🛠️ Merge pull request #35982 from BevapDin/sgp Add PRIMITIVE_RANGED_WEAPON to compound bows so they don't accumulate dirt and won't need mending. by ZhilkinSerg
🛠️ Add PRIMITIVE_RANGED_WEAPON to compound bows so they don't accumulate dirt and won't need mending. by BevapDin
🛠️ Merge pull request #35961 from arijust/handmade_carbines Modify existing handmade carbines by Rivet-the-Zombie
🛠️ Merge pull request #35974 from DaviBones/fix-errant-periods Remove a couple of redundant periods by ZhilkinSerg
🛠️ Syntax fix by kevingranade
🛠️ Limit the kinds of terrain that are vulnerable to mattack::growplants by Kodiologist
🛠️ Remove a couple of redundant periods by DaviBones
🛠️ Refactor monster movement flag checks (#35776) by ZhilkinSerg
🛠️ [Refactor monster regeneration flags (#35775) * Refactor REGENERATES_X monster flags into number property
Refactor REGENERATES_IN_DARK monster flag into boolean property
Refactor REGEN_MORALE monster flag into boolean property
Apply suggestions from code review
Co-Authored-By: BevapDin [email protected]](a8e29c6) by kevingranade
🛠️ Weather Tweaks - new light drizzle category and fix wind (#35759) by davidpwbrown
🛠️ Added gathering of monster flag usage statistics (#35740) by kevingranade
🛠️ [Bring EMP grenades in line with reality (#35734) * Bring EMP grenades in line with reality
Right now, EMP grenades are somewhat nonsense - they can be crafted out
of some electronic scrap, yet easily take down any robotic enemy. These
are problematic not just from their ease of crafting - they also help to
trivialize robotic enemies.
This commit aims to change the that, by replacing the EMP grenade recipe
with one based off of real-life EMP weapons.
This EMP device works by draining a high-current capacitor (represented
by a plutonium fuel cell) into a 'explosively propelled flux compression
generator'. When this generator is activated, with the aid of an
explosion, it creates a strong magnetic field. This magnetic field is
then passed through a microwave generator (magnetron), into a single
loop antenna, which creates the EMP.
I have created a new uncraftable emp grenade which functions like the
current, but is uncraftable and can only be obtained through military
drops rarely, or more commonly from Hub 01.
I have also obsoleted the recipe for the scrambler grenade, because it
similarly did not make much sense. Hub 01 will generally be the supplier
of these.
I have added a large copper tube, magnetron, and flux compression
generator as necessary components for crafting devices introduced in
this PR.
The tube and flux compression generator have had crafting recipes added.
I have largely replaced the former EMP grenade, that is now an EMP bomb,
with EMP grenades. Particularly in the inventory of Hub 01 NPCs, because
that could get deadly.
I have added the flux compression generator to one itemgroup.
The magnetron appears in none (you can get it from microwaves though).
The large copper tube does not spawn and can only be forged.
Perhaps this could be improved
Remove the large copper tube completely and the flux compression
generator recipe.
The flux compression generator requires fiberglass to be craftable,
which is more of a hurdle than I initially considered.
The large copper tube was only used in crafting it, and is no longer
needed.
I also recalculated the volume/weight/etc of the flux compression
generator and found that I could get away with much lower explosive
power, so I've lowered it, and removed the explosion fudging.](b6e17ea) by anothersimulacrum
🛠️ Give NPCs the handicap bonus to use out of LOS welding rigs for vehicle repair (#35687) * give NPCs the handicap bonus to use out of LOS welding rigs by davidpwbrown
🛠️ [Realistic gun cleaning (#34470) * Update faults_gun.json
main
lint
Update faults_gun.json
Update data/json/items/gun/faults_gun.json
Co-Authored-By: Anton Burmistrov [email protected]
laser weapons should not foul
lint
lighten requirements
Update faults_gun.json
Update faults_gun.json
various
-add motor oil
-expand out ways to clean gun
-gun can be cleaned at same time as lubing, increasing efficiency (time) of the processes
-various other tweaks
Co-Authored-By: Anton Burmistrov [email protected]
merge conflicts
Update ranged.cpp
various tweaks
Reduced cleaning time by a bit.
Pipe cleaner no longer requires rag/fur to craft.
Cleaning actions now require rag/fur to clean.
Regular gunpowder fouling is now capped a bit. Gun will no longer accumulate dirt to the point of effectively seizing and "blowing up" all the time, except if you use black gunpowder.
If your gun gets really dirty (now only possible with blackpowder ammunition or unlucky zed drop), you will get a message to unload and reload your gun. It will take longer, as the fouling will prevent the mags/cartridges from extracting easily, but you will experience a drop in dirt. This requires no tools and is quite quick compared to a full cleaning action.
Update faults_gun.json
Update faults_gun.json
proportions
Update faults_gun.json
Update faults_gun.json
various, see description
fixed error
Update faults_gun.json
final changes
Update src/player_activity.h
Co-Authored-By: Jianxiang Wang (王健翔) [email protected]
Co-Authored-By: Jianxiang Wang (王健翔) [email protected]
Co-Authored-By: Jianxiang Wang (王健翔) [email protected]
guns with highly limited moving parts don't meed lubrication
Update data/json/items/gun/faults_gun.json
Co-Authored-By: Jianxiang Wang (王健翔) [email protected]
Co-Authored-By: BevapDin [email protected]
comments
Update src/item_group.cpp
Co-Authored-By: anothersimulacrum [email protected]
Co-Authored-By: anothersimulacrum [email protected]
Co-Authored-By: anothersimulacrum [email protected]
comments
comments
Update ranged.cpp
dirt ranges
static cast](0d9d764) by kevingranade
🛠️ Fix redundant messages for player speech by DaviBones
🛠️ Fix NPC head explodey when they leave / reenter reality bubble with an activity (#35649) by davidpwbrown
🛠️ [Fixed "Vehicle disappearing when grabbing another veh inside" (Fixed "Vehicle disappearing when grabbing another veh inside" #35641) * Specify vehicle in
displace_vehicle
Fix the loop breaking
Changed
displace_vehicle
to use vehicle reference .Removed global vehicle position parameter.
Astyle for tests folder.](576881f) by ipcyborg
🛠️ [Incorporate human meat and fat into existing recipes, remove dedicated recipes (Incorporate human meat and fat into existing recipes, remove dedicated recipes #35630) * JSONize dynamic naming
To allow for items to be given different names depending on the context,
done via a JSON property, reducing the need for both highly similar item
definitions, and some hardcoded dynamic naming systems.
Partially dehardcode corpse naming
Proof of concept for FLAG-based contextual names.
Makes "skinned", "field-dressed", and "quartered" qualifiers defined by
a contextual_names property on the corpse JSON definition.
Change meat dishes' names when mutant meat is used
Proof of concept for COMPONENT_ID-based contextual names.
Add string extraction for conditional names
Rewrite corpse naming
Before, they were long and cumbersome. I was able to reorganize the code
to output far more concise names.
Revise conditional naming documentation
The example was a bit contrived, this one is more applicable while still
covering all the bases.
Additionally, I added a short paragraph warning about automatic
pluralization, to hopefully help others avoid the pitfall I fell into.
Touch-up protein drink/powder conditional names
perturbing pelmeni -> perilous pelmeni
To free up perturbing for:
unpalatable protein powder -> perturbing protein powder
Because unpalatable sounded weird and wasn't alliterative enough.
Also, gave protein drink/shakes the same names, they had none before.
Make CANNIBALISM flag inheritable
The CANNIBALISM flag is already automatically added to food with the
"hflesh" material. This makes it inheritable, paving the way for use in
recipes as an alternative to normal meat while correctly passing on its
negative effects.](489b861) by DaviBones
🛠️ [Shop rebalance (Shop rebalance #35216) * Rebalance Shops
other shop changes
Phamacy rebalance
Update data/json/mapgen/s_gun.json
Co-Authored-By: Kevin Granade [email protected]
Co-Authored-By: Kevin Granade [email protected]
Update s_gun.json
Update homeimprovement_superstore_new.json](421fa21) by kevingranade
🛠️ More types of alcohol (#35164) by Brytenwalda
🛠️ Detect when unloading liquid into the same container. This works even when the caller does not provide the container item as pointer for the function. by BevapDin
🛠️ Merge pull request #35962 from Fris0uman/modulfix Fix modular Turret error on load by ZhilkinSerg
🛠️ [[Magiclysm] release black dragon lair ([Magiclysm] update black dragon lair #35919) * update black dragon lair
add lizard folk spawns, some ground level improvements.
update dragon
Update data/mods/Magiclysm/monstergroups.json
Co-Authored-By: Curtis Merrill [email protected]
update lair loot for treasure rooms
fix item group name](636df0a) by curstwist
🛠️ item_groups sorting sorted more item groups into proper .jsons by LilShiningMan
🛠️ Fix modular Turret error on load by Fris0uman
🛠️ Tweak recipes for surv_carbine_223 and rifle_308. by arijust
🛠️ Rename pipe rifle .308 by arijust
🛠️ Merge pull request #35958 from Fris0uman/afterfix Fix afterschock error on load by ZhilkinSerg
🛠️ Fix afterschock error on load by Fris0uman
🛠️ Avoid double map lookup by jbytheway
🛠️ Added test for the effect of tapeworm on calories by jbytheway
🛠️ Rewrite compute_default_effective_vitamins This function was unnecessarily messy for no particularly good reason. by jbytheway
🛠️ Introduce new nutrients struct Add a new nutrients struct, which consists of some calorie and vitamin info. Use this struct in food item definitions (specifically, islot_comestible) and in stomach. Turned out stomach already contained a nutrients struct, which contained the above together with water and total volume. That is renamed food_summary, and uses nutrients internally. The main advantage of this separate struct is that it simplifies the arithmetic used to compute aggregate food nutrient values based on components used to craft that food. That code was also refactored and split up to make it easier to understand and helps separate out the things which will need to be separate to work on #28180. The only intended observable behaviour change from this commit is that tapeworms now consume half of the calories you ingest, as well as half the vitamins (they used to only affect vitamins). by jbytheway
🛠️ Tweak starve_test - Ensure the test doesn't run forever. - Make the test actually do something. - Update expected_day to match current behaviour. by jbytheway
🛠️ [Document how to build and run the custom clang-tidy checks on Windows (Document how to build and run the custom clang-tidy checks on Windows #35455) * Document how to build and run the custom clang-tidy checks on Windows
Apply suggestions from code review
Co-Authored-By: Anton Burmistrov [email protected]
Update instructions](6ffa818) by ZhilkinSerg
🛠️ Further expand regional terrains and work them into some map palettes (#35836) by I-am-Erk
🛠️ [Added hints for New Game modes (Added hints for New Game modes #35927) * Added hints for New Game modes
Translation stuff](c42d4ea) by Night-Pryanik
🛠️ [Reorganize SUS itemgroups (Reorganize SUS itemgroups #35932) * Reorganize SUS itemgroups
Rename house SUS file](6b00ffc) by ymber
🛠️ [some extra lizardfolk fixes (some extra lizardfolk fixes #35935) * adjust lizardfolk hunter gun
remove superfluous members
remove superfluous body parts from gun](b5605c9) by KorGgenT
🛠️ Merge pull request #35944 from LilShiningMan/LSM---Location_commercial locations_commercial.json added; item_groups clean up by ZhilkinSerg
🛠️ Merge pull request #35950 from Jerimee/patch-1 m edit of novel_erotic desc by ZhilkinSerg
🛠️ Merge pull request #35952 from Jerimee/patch-2 m by ZhilkinSerg
🛠️ Update instructions by Qrox
🛠️ Apply suggestions from code review Co-Authored-By: Anton Burmistrov [email protected] by Qrox
🛠️ Document how to build and run the custom clang-tidy checks on Windows by Qrox
🛠️ Merge pull request #35928 from I-am-Erk/cardboard-boxes1 Put some stuff into boxes by Rivet-the-Zombie
🛠️ m by Jerimee
🛠️ m edit of novel_erotic desc Change "Hackneyed narrative concealing low-grade literary smut." to "A hackneyed fictional narrative concealing low-grade literary smut." in keeping with book convention by Jerimee
CONTRIBUTORS
Last week there were 42 contributors.
👤 arijust
👤 Hymore246
👤 ZhilkinSerg
👤 Jerimee
👤 BevapDin
👤 ymber
👤 Qrox
👤 Rivet-the-Zombie
👤 LaVeyanFiend
👤 kevingranade
👤 misterprimus
👤 I-am-Erk
👤 Night-Pryanik
👤 BrettDong
👤 ishtatann
👤 KorGgenT
👤 Maleclypse
👤 CountAlex
👤 AMurkin
👤 mark7
👤 DaviBones
👤 AlexMooney
👤 LilShiningMan
👤 ifreund
👤 Lys3rg1k
👤 ralreegorganon
👤 cainiaowu
👤 Ramza13
👤 CSHague
👤 HipAndroid
👤 Fris0uman
👤 curstwist
👤 8street
👤 Jovus
👤 tenmillimaster
👤 Rail-Runner
👤 Kodiologist
👤 davidpwbrown
👤 anothersimulacrum
👤 ipcyborg
👤 Brytenwalda
👤 jbytheway
STARGAZERS
Last week there were 21 stagazers.
⭐ Jerimee
⭐ jordan9001
⭐ eerohele
⭐ Fingell
⭐ anatolbran
⭐ hlah
⭐ Djeeberjr
⭐ RafeHaab
⭐ Jovus
⭐ mikelei8291
⭐ AlexanderBodnya
⭐ illumiMatii
⭐ blake8090
⭐ namkazt
⭐ bigbang20061
⭐ OtpalTS
⭐ aclink918ruby
⭐ xhebox
⭐ wuxinxin544
⭐ zappedfish
⭐ JimmyCalamity
You all are the stars! 🌟
RELEASES
Last week there were 36 releases.
🚀 cdda-jenkins-b10006 Cataclysm-DDA experimental build #10006
🚀 cdda-jenkins-b10005 Cataclysm-DDA experimental build #10005
🚀 cdda-jenkins-b10004 Cataclysm-DDA experimental build #10004
🚀 cdda-jenkins-b10003 Cataclysm-DDA experimental build #10003
🚀 cdda-jenkins-b10002 Cataclysm-DDA experimental build #10002
🚀 cdda-jenkins-b10001 Cataclysm-DDA experimental build #10001
🚀 cdda-jenkins-b10000 Cataclysm-DDA experimental build #10000
🚀 cdda-jenkins-b9999 Cataclysm-DDA experimental build #9999
🚀 cdda-jenkins-b9998 Cataclysm-DDA experimental build #9998
🚀 cdda-jenkins-b9997 Cataclysm-DDA experimental build #9997
🚀 cdda-jenkins-b9996 Cataclysm-DDA experimental build #9996
🚀 cdda-jenkins-b9995 Cataclysm-DDA experimental build #9995
🚀 cdda-jenkins-b9994 Cataclysm-DDA experimental build #9994
🚀 cdda-jenkins-b9993 Cataclysm-DDA experimental build #9993
🚀 cdda-jenkins-b9992 Cataclysm-DDA experimental build #9992
🚀 cdda-jenkins-b9991 Cataclysm-DDA experimental build #9991
🚀 cdda-jenkins-b9990 Cataclysm-DDA experimental build #9990
🚀 cdda-jenkins-b9989 Cataclysm-DDA experimental build #9989
🚀 cdda-jenkins-b9988 Cataclysm-DDA experimental build #9988
🚀 cdda-jenkins-b9987 Cataclysm-DDA experimental build #9987
🚀 cdda-jenkins-b9986 Cataclysm-DDA experimental build #9986
🚀 cdda-jenkins-b9985 Cataclysm-DDA experimental build #9985
🚀 cdda-jenkins-b9984 Cataclysm-DDA experimental build #9984
🚀 cdda-jenkins-b9983 Cataclysm-DDA experimental build #9983
🚀 cdda-jenkins-b9982 Cataclysm-DDA experimental build #9982
🚀 cdda-jenkins-b9981 Cataclysm-DDA experimental build #9981
🚀 cdda-jenkins-b9980 Cataclysm-DDA experimental build #9980
🚀 cdda-jenkins-b9979 Cataclysm-DDA experimental build #9979
🚀 cdda-jenkins-b9978 Cataclysm-DDA experimental build #9978
🚀 cdda-jenkins-b9977 Cataclysm-DDA experimental build #9977
🚀 cdda-jenkins-b9976 Cataclysm-DDA experimental build #9976
🚀 cdda-jenkins-b9975 Cataclysm-DDA experimental build #9975
🚀 cdda-jenkins-b9974 Cataclysm-DDA experimental build #9974
🚀 cdda-jenkins-b9973 Cataclysm-DDA experimental build #9973
🚀 cdda-jenkins-b9972 Cataclysm-DDA experimental build #9972
🚀 cdda-jenkins-b9971 Cataclysm-DDA experimental build #9971
That's all for last week, please 👀 Watch and ⭐ Star the repository CleverRaven/Cataclysm-DDA to receive next weekly updates. 😃
You can also view all Weekly Digests by clicking here.
The text was updated successfully, but these errors were encountered: