-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix consume bugs #40975
Merged
kevingranade
merged 2 commits into
CleverRaven:master
from
Ramza13:consume_fixes_some_more
May 31, 2020
Merged
Fix consume bugs #40975
kevingranade
merged 2 commits into
CleverRaven:master
from
Ramza13:consume_fixes_some_more
May 31, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anothersimulacrum
added
<Bugfix>
This is a fix for a bug (or closes open issue)
[C++]
Changes (can be) made in C++. Previously named `Code`
Mechanics: Character / Player
Character / Player mechanics
labels
May 30, 2020
fengjixuchui
added a commit
to fengjixuchui/Cataclysm-DDA
that referenced
this pull request
May 31, 2020
Fix consume bugs (CleverRaven#40975)
meladath
added a commit
to meladath/Cataclysm-DDA
that referenced
this pull request
May 31, 2020
commit 6a45cf7 Author: ZhilkinSerg <[email protected]> Date: Sun May 31 10:13:44 2020 +0300 Fix lake shores (CleverRaven#40983) commit 6520c6b Author: ZhilkinSerg <[email protected]> Date: Sun May 31 10:12:13 2020 +0300 Clean up game description in metadata files (CleverRaven#40944) commit dd10244 Author: ussdefiant <[email protected]> Date: Sat May 30 14:39:20 2020 -0600 Changes medium chemistry textbook for science kid start to basic one. commit 85bd73d Merge: 61a8f11 e1c7705 Author: Angela Graves <[email protected]> Date: Sun May 31 00:35:59 2020 -0500 Merge pull request CleverRaven#40981 from faefux/deagle-mag-desc Deaglemag desc typo fix. commit e1c7705 Author: faefux <[email protected]> Date: Sat May 30 23:54:50 2020 -0400 update deaglemap desc fix typo. commit 22867bd Merge: 1602dc1 61a8f11 Author: faefux <[email protected]> Date: Sat May 30 23:52:11 2020 -0400 Merge pull request CleverRaven#7 from CleverRaven/master update commit 61a8f11 Author: Eric <[email protected]> Date: Sat May 30 22:19:43 2020 -0400 Fix consume bugs (CleverRaven#40975) * fixes water heater issue * consume, remove ability to consume crafts and fix consuming liquids commit 62ef415 Author: ymber <[email protected]> Date: Fri May 29 14:47:35 2020 +0100 Remove islot_magazine::protects_contents commit 2e2f8e9 Author: Fris0uman <[email protected]> Date: Sun May 31 04:07:12 2020 +0200 Remove body_part from item.cpp (CleverRaven#40866) * Covers uses bodypart_id * body_art_set is a cata::flat_set<bodypart_str_id> commit 03f4e89 Merge: 20339f2 9fe3d9c Author: Kevin Granade <[email protected]> Date: Sat May 30 19:00:45 2020 -0700 Merge pull request CleverRaven#40824 from olanti-p/lockpick-act-act Migrate ACT_LOCKPICK to the activity actor system commit 20339f2 Author: CodeBandit <[email protected]> Date: Sat May 30 21:23:35 2020 -0400 Add additional considerations for slipping down (CleverRaven#40797) * Add informational messages for climbing bonuses and maluses commit ca01346 Merge: 47c7f74 ed8db11 Author: Kevin Granade <[email protected]> Date: Sat May 30 17:39:23 2020 -0700 Merge pull request CleverRaven#40642 from anothersimulacrum/cmm_appendix JSONize move modes commit 47c7f74 Author: dissociativity <[email protected]> Date: Sun May 31 10:14:38 2020 +1000 rebalance pipe gun recipes (CleverRaven#40912) commit ed8db11 Author: anothersimulacrum <[email protected]> Date: Sat May 30 14:01:21 2020 -0700 Clean up variable initialization commit 8a9f5b6 Author: anothersimulacrum <[email protected]> Date: Sat May 30 14:00:58 2020 -0700 Update translation script for move modes The comment for the panel character is the same as it was when it was hardcoded, in an attempt to preserve the previous translation. I'm not sure if it works though. commit 0aa6ad1 Author: anothersimulacrum <[email protected]> Date: Sat May 30 13:59:24 2020 -0700 Use move mode data, not mode checks, delete enum Centralizing this data in move modes makes maintenance and changes easier. Also, it cleans up the code (see avatar::set_movement_mode). Move mode switching restrictions could use some more nuance, instead of just being restricted to running. The `movement_mode_is` function may seem redundant with the `is_x` functions, but it returns true only if the move mode is the exact provided move mode, where the `is_running` function returns true based on type - this means a theoretical new sprinting mode satisfies is_running, but fails `movement_mode_is( move_mode_running )`. The move_mode_color function in panels was odd - it returned light_gray if the mode was walking, but in the only place it was used, it wasn't called if the move mode was walking, and white was used instead. The vehicle follow distance was previously just 400 times the move speed multiplier of the move mode. Let's future proof it and make it like that, so that we don't get caught by it in the future adding a new move mode. commit 06cf7ff Author: anothersimulacrum <[email protected]> Date: Sat May 30 13:54:09 2020 -0700 Add move mode class, loading code, JSON definition Having data in JSON makes it easier to modify and change. This commit introduces the move mode class, data, loading code, and documentation, but does not actually make any changes. The characters used by the move modes have the capability to be loaded as unicode character, even though this is not used. This is because it may be changed (e.g. in panels) to a non-ascii character. The activity levels map is duplicated from activity_type.cpp - it could possibly be moved somewhere central in the future. The running move mode has a new failure message for switching on a mech. Previously, it was the same as the animal message. commit f15d695 Merge: 996f61c 347bd2b Author: ZhilkinSerg <[email protected]> Date: Sat May 30 21:53:34 2020 +0300 Merge pull request CleverRaven#40971 from BrettDong/i18n Routine i18n updates on 29 May 2020 commit 996f61c Merge: e4d9a10 f299d8e Author: ZhilkinSerg <[email protected]> Date: Sat May 30 21:53:17 2020 +0300 Merge pull request CleverRaven#40972 from ymber/monster_con Remove default in MonsterGroupResult constructor commit f299d8e Author: ymber <[email protected]> Date: Sat May 30 17:43:57 2020 +0100 Remove default in MonsterGroupResult constructor commit e4d9a10 Author: John Bytheway <[email protected]> Date: Sat May 30 15:45:51 2020 +0100 Refactor monster spawning code (CleverRaven#40964) Fixes CleverRaven#40899. The problem was introduced in CleverRaven#40516 due to the way it passed spawn_data around. It only worked for some types of monster spawning. In particular, not when the default monster from a group was selected, nor when a monster from an upgraded group was selected. Avoid the need to re-derive spawn data in map::place_spawns by passing it along in the MonsterGroupResult. Co-authored-by: Oliver Jowett <[email protected]> Co-authored-by: ZhilkinSerg <[email protected]> commit 4ec6695 Merge: d254033 20d6c8b Author: ZhilkinSerg <[email protected]> Date: Sat May 30 17:44:04 2020 +0300 Merge pull request CleverRaven#40963 from ymber/mon_data Move spawn data to MonsterGroupResult commit 20d6c8b Author: ymber <[email protected]> Date: Sat May 30 11:01:36 2020 +0100 Move spawn data to MonsterGroupResult commit d254033 Merge: 3193fbb cf04c0b Author: ZhilkinSerg <[email protected]> Date: Sat May 30 11:26:51 2020 +0300 Merge pull request CleverRaven#40940 from jbytheway/achievement_events Send events for achievements and conducts commit 3193fbb Author: Curtis Merrill <[email protected]> Date: Sat May 30 04:18:30 2020 -0400 Fix multi insert crashes (CleverRaven#40951) * prevent crash on lost item_location in multi insert * prevent freeze when parent item is not in list when switching to nested view commit 5948b09 Merge: 561331f ffc4cbb Author: ZhilkinSerg <[email protected]> Date: Sat May 30 11:17:52 2020 +0300 Merge pull request CleverRaven#40896 from ephemeralstoryteller/unfert-eggs Adds unfertilized eggs to domestic spawn groups commit 561331f Author: Hymore246 <[email protected]> Date: Sat May 30 03:14:57 2020 -0500 [Mythical Martial Arts] Adds new martial art: Desert Wind (CleverRaven#40927) commit 8882a1c Merge: 69e70ce f4e84bc Author: ZhilkinSerg <[email protected]> Date: Sat May 30 11:14:06 2020 +0300 [DinoMod] Cute, thieving dinos (CleverRaven#40941) * [DinoMod] Cute, thieving dinos Eoraptors steal food and drop lab items, Compies are cute, baby dinos are cute and they stumble and bumble. * Eoraptors spawn in roofs and parks at night * Add space commit 69e70ce Author: Curtis Merrill <[email protected]> Date: Sat May 30 04:13:24 2020 -0400 [magiclysm] Manatouched rebalance (CleverRaven#40958) * [Magiclysm] rebalance manatouched * [magiclysm] add orichalcum cauldron and rebalance purified recipes * [magiclysm] add orichalcum cauldron to itemgroups commit 8bf26ee Author: Curtis Merrill <[email protected]> Date: Sat May 30 03:49:07 2020 -0400 pocket size consistency checking (CleverRaven#40591) commit 2bb4c7f Merge: a59207a 9bfb31f Author: Angela Graves <[email protected]> Date: Sat May 30 00:36:54 2020 -0500 Merge pull request CleverRaven#40949 from LyleSY/patch-9 [DinoMod] Update zed-dinosaur commit a59207a Author: Kevin Granade <[email protected]> Date: Sat May 30 03:56:08 2020 +0000 Add skill migration code for chemistry commit f048227 Merge: f006dfa ed14bb7 Author: Kevin Granade <[email protected]> Date: Sat May 30 03:08:19 2020 +0000 Merge remote-tracking branch 'origin/pr/40523' * origin/pr/40523: (36 commits) Obsoleted ammonia recipe Slightly changed description of Advanced Physical Chemistry book Removed ammonia from scrap metal recipe as unrealistic Require three units of water in saltpeter recipe Added ability to learn recipe of lye powder from basic chemistry book Added ability to learn aspirine recipe from basic chemistry book Lowered difficulty of aspirin recipe from 4 to 2, soap recipe from 3 to 2 Made smoke bomb recipe be learned from basic chemistry book Balanced lots of recipes to use chemistry instead of cooking Made fuse recipe use chemistry instead of cooking Balanced several medical recipes to use chemistry (and sometimes first aid) instead of cooking Made boiling salt require chemistry instead of cooking Added basic chemistry book to SUS itemgroup for libraries Removed chemistry skill from soap flakes recipe Reduced chemistry skill requirement in lye recipe from 2 to 1 Updated several recipes to use chemistry instead of cooking Fixed recipes test Poppy painkiller requires chemistry Rebalanced lots of meds and chemical recipes Rebalanced several recipes ferom recipe_others.json ... commit f006dfa Author: DillonSimeone <[email protected]> Date: Fri May 29 20:06:18 2020 -0700 Inhaler fix (CleverRaven#40790) * Inhaler fix Added pocket data to Inhaler, and ammo type for albuterol. Copied the style of Oxygen Tank for the inhaler, and the style of oxygen for the albuterol. * update the inhaler test Co-authored-by: KorGgenT <[email protected]> commit 7ed5854 Author: Kevin Granade <[email protected]> Date: Sat May 30 02:29:00 2020 +0000 Add flag exempting item from capacity vs size checks commit 9fbff3c Merge: 8889927 7564eee Author: Kevin Granade <[email protected]> Date: Fri May 29 17:26:00 2020 -0700 Merge pull request CleverRaven#40920 from ZhilkinSerg/sa-2020-05-28 Code optimizations reported by static code analysis (2020-05-28) commit 9bfb31f Author: LyleSY <[email protected]> Date: Fri May 29 20:10:02 2020 -0400 filthy filthy brackets commit f4e84bc Author: LyleSY <[email protected]> Date: Fri May 29 19:59:45 2020 -0400 Add space commit 78d0153 Author: LyleSY <[email protected]> Date: Fri May 29 19:53:28 2020 -0400 Zombie dinos are both dino and zombie commit ca4340a Author: LyleSY <[email protected]> Date: Fri May 29 19:50:03 2020 -0400 Treasures within commit 9a353e5 Author: LyleSY <[email protected]> Date: Fri May 29 19:40:57 2020 -0400 Remove death drops test commit 7fbaa77 Author: LyleSY <[email protected]> Date: Fri May 29 17:24:34 2020 -0400 Drop feathers and loot commit bc2ccf9 Author: LyleSY <[email protected]> Date: Fri May 29 15:49:08 2020 -0400 Add zed_dino_feather_leather harvest Allows spooky zombie feathers commit feeb027 Author: LyleSY <[email protected]> Date: Fri May 29 15:07:05 2020 -0400 [DinoMod] Update zed-dinosaur Zed-dinos are "classic", their meat is poison, they see at night commit 9fe3d9c Author: olanti-p <[email protected]> Date: Mon May 25 19:10:59 2020 +0300 Don't suspend/resume this activity commit db471a2 Author: olanti-p <[email protected]> Date: Mon May 25 01:54:36 2020 +0300 Limit shortest lockpicking time to 10 seconds commit d805450 Author: olanti-p <[email protected]> Date: Sun May 24 23:41:06 2020 +0300 Close bionics ui when activating bio lockpick commit 0e8bfbf Author: olanti-p <[email protected]> Date: Sun May 24 22:16:43 2020 +0300 Migrate ACT_LOCKPICK to the activity actor system commit 8889927 Merge: 639b535 84cd68d Author: ZhilkinSerg <[email protected]> Date: Fri May 29 18:46:00 2020 +0300 Merge pull request CleverRaven#40938 from anothersimulacrum/flaremetothemoon Convert flares to using pyrotechnic commit 347bd2b Author: Brett Dong <[email protected]> Date: Fri May 29 22:02:26 2020 +0800 Routine i18n updates on 29 May 2020 commit ba9513b Author: LyleSY <[email protected]> Date: Fri May 29 09:04:06 2020 -0400 Eoraptors spawn in roofs and parks at night commit a109789 Author: LyleSY <[email protected]> Date: Fri May 29 08:51:21 2020 -0400 [DinoMod] Cute, thieving dinos Eoraptors steal food and drop lab items, Compies are cute, baby dinos are cute and they stumble and bumble. commit 7564eee Author: ZhilkinSerg <[email protected]> Date: Fri May 29 12:23:52 2020 +0300 Apply suggestions from code review commit fa980f3 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 18:13:13 2020 +0300 Use constant references in loops+modernize loops commit 7264a72 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 16:48:21 2020 +0300 Use constant references in function parameters commit c10eae0 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 20:42:34 2020 +0300 Make object_type a class enum commit 4a062fe Author: ZhilkinSerg <[email protected]> Date: Thu May 28 20:36:45 2020 +0300 Make vitamin_type a class enum commit 01596cf Author: ZhilkinSerg <[email protected]> Date: Thu May 28 20:34:09 2020 +0300 Rename magic_energy_type and make it a class enum commit c60e07e Author: ZhilkinSerg <[email protected]> Date: Thu May 28 12:29:03 2020 +0300 Remove unreachable code commit e677fa1 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 12:14:39 2020 +0300 Remove redundant member initializers in constructors commit f3fa0f9 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 11:11:03 2020 +0300 Remove redundant empty statements, declarations and lines commit f74623e Author: ZhilkinSerg <[email protected]> Date: Thu May 28 12:17:05 2020 +0300 Add noexcept specifier to special functions commit f8cd3b1 Author: ZhilkinSerg <[email protected]> Date: Thu May 28 10:52:36 2020 +0300 Add missing enum qualifier to fix Android builds commit 84cd68d Author: anothersimulacrum <[email protected]> Date: Thu May 28 22:52:53 2020 -0700 Convert flares to using pyrotechnic Also, be safer in item::getlight_emit() - if ammo_required() is 0, it doesn't need to go into the CHARGEDIM block, and doing so would cause crashes when ammo_data() didn't exist. Though if it doesn't have require ammo, it shouldn't have CHARGEDIM anyways. Fix the Aftershock smartphone flashlight crashing with both the code changes above and by removing the unused CHARGEDIM flag. Add a proper ammo type for flares, so they CHARGEDIM properly. commit cf04c0b Author: John Bytheway <[email protected]> Date: Thu May 28 22:19:09 2020 -0400 Tests for new achievement events commit bd32c48 Author: John Bytheway <[email protected]> Date: Thu May 28 21:53:19 2020 -0400 Events for gaining achievements / failing conducts Having these recorded as events ensures that they get recorded in the memorial log so there's a permanent record. commit d5047ce Author: John Bytheway <[email protected]> Date: Thu May 28 21:52:22 2020 -0400 Add cata_variant type for achievement_id commit 3efd7ed Author: John Bytheway <[email protected]> Date: Thu May 28 21:51:19 2020 -0400 Create achievement_id alias This has spread far enough to warrant a type alias now. commit ed14bb7 Merge: 90c751d b7cd69d Author: Anton Burmistrov <[email protected]> Date: Thu May 28 21:45:19 2020 +0400 Merge branch 'master' into chemistry-skill commit ffc4cbb Author: ephemeralstoryteller <[email protected]> Date: Wed May 27 12:23:15 2020 -0400 adds unfertilized eggs commit 90c751d Author: Valiant <[email protected]> Date: Wed May 20 09:57:27 2020 +0400 Obsoleted ammonia recipe commit b5a193a Author: Valiant <[email protected]> Date: Mon May 18 17:21:51 2020 +0400 Slightly changed description of Advanced Physical Chemistry book commit 311129c Author: Valiant <[email protected]> Date: Mon May 18 17:18:40 2020 +0400 Removed ammonia from scrap metal recipe as unrealistic commit ca512a3 Author: Valiant <[email protected]> Date: Sat May 16 08:16:24 2020 +0400 Require three units of water in saltpeter recipe commit 1d66656 Author: Valiant <[email protected]> Date: Sat May 16 08:13:55 2020 +0400 Added ability to learn recipe of lye powder from basic chemistry book commit fb2992f Author: Valiant <[email protected]> Date: Sat May 16 07:58:30 2020 +0400 Added ability to learn aspirine recipe from basic chemistry book commit 676b44a Author: Valiant <[email protected]> Date: Fri May 15 13:56:37 2020 +0400 Lowered difficulty of aspirin recipe from 4 to 2, soap recipe from 3 to 2 commit 9e14fa4 Author: Valiant <[email protected]> Date: Thu May 14 22:50:07 2020 +0400 Made smoke bomb recipe be learned from basic chemistry book commit ead5984 Author: Valiant <[email protected]> Date: Thu May 14 22:42:15 2020 +0400 Balanced lots of recipes to use chemistry instead of cooking commit ec6f967 Author: Valiant <[email protected]> Date: Thu May 14 22:32:01 2020 +0400 Made fuse recipe use chemistry instead of cooking commit e7be07e Author: Valiant <[email protected]> Date: Thu May 14 22:29:23 2020 +0400 Balanced several medical recipes to use chemistry (and sometimes first aid) instead of cooking commit df455f1 Author: Valiant <[email protected]> Date: Thu May 14 21:46:09 2020 +0400 Made boiling salt require chemistry instead of cooking commit f4b0177 Author: Valiant <[email protected]> Date: Thu May 14 16:06:45 2020 +0400 Added basic chemistry book to SUS itemgroup for libraries commit b221e44 Author: Valiant <[email protected]> Date: Thu May 14 16:03:36 2020 +0400 Removed chemistry skill from soap flakes recipe commit 1862dd3 Author: Valiant <[email protected]> Date: Thu May 14 15:58:00 2020 +0400 Reduced chemistry skill requirement in lye recipe from 2 to 1 commit feb9d49 Author: Valiant <[email protected]> Date: Thu May 14 14:45:04 2020 +0400 Updated several recipes to use chemistry instead of cooking commit 6593e33 Author: Valiant <[email protected]> Date: Thu May 14 14:18:57 2020 +0400 Fixed recipes test commit 6942c2e Author: Valiant <[email protected]> Date: Thu May 14 13:18:59 2020 +0400 Poppy painkiller requires chemistry commit 7fc32f1 Author: Valiant <[email protected]> Date: Thu May 14 13:10:22 2020 +0400 Rebalanced lots of meds and chemical recipes commit 69ec7f6 Author: Valiant <[email protected]> Date: Thu May 14 12:45:43 2020 +0400 Rebalanced several recipes ferom recipe_others.json commit 5df4bb0 Author: Valiant <[email protected]> Date: Thu May 14 12:23:27 2020 +0400 Rebalanced dynamite recipe commit 0907de1 Author: Valiant <[email protected]> Date: Thu May 14 12:16:44 2020 +0400 Updated book_learn requirements for oxyacetylene and acetylene commit f8c9c1d Author: Valiant <[email protected]> Date: Thu May 14 12:13:28 2020 +0400 Balanced fuel recipes' difficulty commit bd36666 Author: Valiant <[email protected]> Date: Thu May 14 12:08:35 2020 +0400 Slightly increased superglue difficulty commit 4bc615e Author: Valiant <[email protected]> Date: Thu May 14 11:32:53 2020 +0400 Fix reading test commit 2bf186e Author: Valiant <[email protected]> Date: Thu May 14 10:50:39 2020 +0400 Balanced chemistry training books required_level and max_level commit 7245c5c Author: Valiant <[email protected]> Date: Thu May 14 10:43:33 2020 +0400 Reduced difficulty for all mutagens and purifiers by two commit 9045ffd Author: Valiant <[email protected]> Date: Wed May 13 20:09:41 2020 +0400 Lint commit 0aa86b5 Author: Valiant <[email protected]> Date: Wed May 13 20:06:51 2020 +0400 Added low-level chemistry training book and added it to several appropriate item groups commit 69ad997 Author: Valiant <[email protected]> Date: Wed May 13 17:14:12 2020 +0400 Lint commit d3c3187 Author: Valiant <[email protected]> Date: Wed May 13 17:08:24 2020 +0400 Fixed a bug commit 2a5d534 Author: Valiant <[email protected]> Date: Wed May 13 16:44:01 2020 +0400 Added doxygen stuff commit ff5ae7b Author: Valiant <[email protected]> Date: Wed May 13 16:41:10 2020 +0400 Changed many recipes' required or used skill from cooking to chemistry commit db8e545 Author: Valiant <[email protected]> Date: Wed May 13 16:40:22 2020 +0400 Added starting chemistry skill (or changed to it from starting cooking skill) on several professions commit 14a244e Author: Valiant <[email protected]> Date: Wed May 13 16:39:13 2020 +0400 Changed several books' skill from cooking and fabrication to chemistry commit e21cabd Author: Valiant <[email protected]> Date: Wed May 13 16:34:53 2020 +0400 Added chemistry skill Also updated description of cooking skill. commit 1602dc1 Merge: 96a1f06 f918a14 Author: faefux <[email protected]> Date: Tue Aug 27 11:14:55 2019 +0100 Merge pull request CleverRaven#6 from CleverRaven/master merge commit 96a1f06 Merge: 68406bf 5a173a4 Author: faefux <[email protected]> Date: Fri Aug 2 00:30:24 2019 +0100 Merge pull request CleverRaven#5 from CleverRaven/master merge commit 68406bf Merge: 4ce8939 7344388 Author: faefux <[email protected]> Date: Mon Jul 15 18:48:54 2019 +0100 Merge pull request CleverRaven#4 from CleverRaven/master merge commit 4ce8939 Merge: 8cc730f 34186b1 Author: faefux <[email protected]> Date: Wed Jun 26 02:10:03 2019 +0100 Merge pull request CleverRaven#3 from CleverRaven/master merge commit 8cc730f Merge: a7b5fc0 a26ac8d Author: faefux <[email protected]> Date: Tue Jun 25 21:02:57 2019 +0100 Merge pull request CleverRaven#2 from CleverRaven/master merge commit a7b5fc0 Merge: dc3475c c5fecaf Author: faefux <[email protected]> Date: Mon Jun 24 00:24:00 2019 +0100 Merge pull request CleverRaven#1 from CleverRaven/master merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
<Bugfix>
This is a fix for a bug (or closes open issue)
[C++]
Changes (can be) made in C++. Previously named `Code`
Mechanics: Character / Player
Character / Player mechanics
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Fixes issues with consuming liquids"
Purpose of change
Fixes #40893
Fixes #40731
Fixes issues with consuming liquids and prevents consuming freshly crafted liquids before placing.
Describe the solution
Made sure charges where subtracted where needed, added use of default volume, prevented consuming freshly crafted liquids before placing them
Describe alternatives you've considered
Leaving ability to consume freshly crafted liquids. The problem is that all the handle liquid code is setup to return instantly and making consume take time means it can not be done unless the liquid exists somewhere.
Testing
Additional context