forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
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
More merges. just trying to grab them all. #2
Merged
a-chancey
merged 586 commits into
a-chancey:TailoringRecipeOverhaul-Cotton
from
CleverRaven:master
Feb 1, 2022
Merged
More merges. just trying to grab them all. #2
a-chancey
merged 586 commits into
a-chancey:TailoringRecipeOverhaul-Cotton
from
CleverRaven:master
Feb 1, 2022
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
Change requested by wapcaplet. This function has no other purpose outside of `widget::finalize`. Co-authored-by: Eric Pierce <[email protected]>
Also refactored append_line() to reflect new alignment parameters.
* Default "text_align" to "left" * Use left alignment in widget tests
Move Goals panel to 0 spaces indent instead of 1 space indent.
* increase various undergarment weights increased multiple items to meet weight threshold to butcher items changed: chestwrap 64 g -> 100 g wool chestwrap 64 g -> 110 g long underwear bottom 88 g -> 100 g long underwear top 96 g -> 102 g thermal shirt 92 g ->112g undershirt 64 g ->100 g used values from amazon when not covered by https://rocketmf.com/en/weight * increase skirt weights increased weights of skirt and nanoskirt to meet weight threshold to butcher * increase various torso clothes weights increased multiple items to meet weight threshold to butcher items changed: halter top 42 g -> 100 g leotard 60 g -> 150 g French maid clothes 100 g -> 250 g short French maid clothes 60 g -> 150 g sundress 60 g -> 300 g used values from amazon when not covered by https://rocketmf.com/en/weight
* Update pl.credits Updated pl.credits based on the latest Transifex fixes. * Update pl.credits Add new translations based on en.credits
Adds the missing "ALLOWS_TAIL" flag to robofac_greaves
* Update en.credits Add 0.D mention for Special thanks, similar to other sections and made Git capitalized. * Update en.credits Minor fixes to 0.8 and 0.9
Add `looks_like` to `bottle_bathroom` so it appears in tilesets as `bottle_plastic`.
…llow cane (#54944) * Add makeshift cane and crutch, add `CRUTCH` tag to hollow cane With a broken leg, the player has no way to craft a cane or crutch. The existing cane and ccrutch are only available via random drops. The hollow cane does not have the `CRUTCH` tag so cannot be used as a crutch. Co-authored-by: Binrui Dong <[email protected]>
Misc spacing, capitalization and some ellipsis corrections
Consistently name saw tools and blades
Fix compile error on Clang compiler
Fix permanent effect default duration
Fix tank capacity
Make most of the weaker alcohols mixable.
a-chancey
pushed a commit
that referenced
this pull request
Sep 28, 2023
* Recover stuff (#2) * Make neoprene closer to rubber (as it is a sort of rubber) * Whoops... * Linings for neoprene (wetsuits), environmental buffs, material adjustments * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Thanks to dictionary * Duplicate removal * Another duplicate * Make diving socks vehave like NORMAL layer boots, compatibility with boots fix * Updated night vision/IR goggles to not break in water * Documented TOUGH_FEET clothing flag * Technical shorts, XL/XS varieties and more thickness varieties! * Quickfix * Another fix * Fix * Technical shorts pockets now provide some protection too. * Update dictionary.txt * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update storage.json * Update custom_storage.json * Light Kevlar wetsuit, Kevlar wetsuits retouch * Nylon thickness adjustment, encumbrance and pocket changes * Misc adjustments to Kevlar wetsuits * Custom diving boots initial addition * Update custom_bodysuits.json * Update swimming.json * Initial implementation of survivor diving gloves * Update custom_bodysuits.json * Kevlar hoods initial implementation * Whoops * Diving leg rig * Encumbrance for technical shorts bungees * Whoops * Update custom_bodysuits.json * Waterproof camera case * Update boots.json * Update flags.json * Fins for boots * Update flags.json * Custom swim fins * Fix * Fix * Another fix * Fix * Update dictionary.txt * Namings * Glove namings * Boot namings * Naming convention change * Update custom_headgear.json * Update custom_bodysuits.json * Update custom_boots.json * Namings, wordings, and other stuff. * Update custom_gloves.json * Update materials.json * Solving coverage weirdness * Solving material weirdness * Moving fins to swimming.json * Arrival of fins to swimming.json, small tweak * Custom fin attachment tweak * Update flags.json * Head straps for stuff * Update flags.json * Update custom_headgear.json * Diving flashlights * Flags, more flags * Wrist mount for a flashlight * Update dictionary.txt * Update tool_armor.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix * Fixes * Update data/json/items/tool/lighting.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update tool_armor.json * Fix * Update dictionary.txt * Add IR goggles to hunting shop loot tables * Fix * Fix * Now swim goggles provide eye protection. * Survivor wetsuit adjustments and new recipes * Remove redundant commas * New wetsuit gloves recipes and their varieties * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update containers.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Readd camera case * Fix * Wetsuit boot recipes * Adjust wetsuit gloves crafting cost * Update hands.json * Update feet.json * Update hands.json * Update survivor.json * Wetsuit hood recipes * Update head.json * Update hands.json * Update head.json * Update hands.json * Update head.json * Update feet.json * Update head.json * Wetsuits and thick wetsuit crafts * Fullface divemasks initial introduction * Update survivor.json * Nestening of unnested new stuff so checker does not freak out * Update data/json/recipes/nested.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix * Fix * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/feet.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/feet.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update storage.json * Fix * Fix * fix `cannot assign explicit value the same as default or inherited value` * Fix `deduped_requirement_data generated too many alternatives` by replacing not waterproof clasps with hand made waterproof one --------- Co-authored-by: randomtyper <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
a-chancey
pushed a commit
that referenced
this pull request
Nov 29, 2023
* Prevents game occasionally seemingly hanging when moving to new submaps The reason for the previous problem was an infinite loop caused by: 1. `map::spawn_monsters_submap` for-loops the list of `current_submap->spawns` 2. for every spawned monster, it calls `monster::on_load` 3. `monster::on_load` calls `monster::try_reproduce`, which in turn calls `map::add_spawn` 4. So a new spawn is added, thus invalidating the iterator used in step 1 5. Undefined behavior caused by using invaliated iterators. On my compiler (gcc 13.2.0), the above problem had the following effect: * The reference `spawn_point &i` pointed to something totally different, so that in particular, `i.count` had garbage values * Instead of `i.count` being reasonable values such as `3` or `1`, the above undefined behavior made it have values such as `925969776` or `-632214304` * `i.count` is the upper bound for the inner for-loop in `map::spawn_monsters_submap`, so depending on the garbage value, it might seem like an infinite loop. Stacktrace of app when frozen and problem happened: ``` #0 0x000055a1eaf36dcb in creature_tracker::find(coords::coord_point<tripoint, (coords::origin)1, (coords::scale)0> const&) const () #1 0x000055a1eaf39253 in Creature* creature_tracker::creature_at<Creature>(coords::coord_point<tripoint, (coords::origin)1, (coords::scale)0> const&, bool) () #2 0x000055a1eaf393b5 in Creature* creature_tracker::creature_at<Creature>(tripoint const&, bool) () #3 0x000055a1eb357a53 in map::spawn_monsters_submap(tripoint const&, bool, bool)::{lambda(tripoint const&)#1}::operator()(tripoint const&) const () #4 0x000055a1eb3a976e in random_point(tripoint_range<tripoint> const&, std::function<bool (tripoint const&)> const&) () #5 0x000055a1eb37dd2d in map::spawn_monsters_submap(tripoint const&, bool, bool) () #6 0x000055a1eb37de77 in map::spawn_monsters(bool, bool) () #7 0x000055a1eb093981 in game::update_map(int&, int&, bool) () #8 0x000055a1eb094451 in game::update_map(Character&, bool) () #9 0x000055a1eb09530f in game::place_player(tripoint const&, bool) () #10 0x000055a1eb0b3a0e in game::walk_move(tripoint const&, bool, bool) () #11 0x000055a1ead27490 in avatar_action::move(avatar&, map&, tripoint const&) () #12 0x000055a1eb0f338c in game::do_regular_action(action_id&, avatar&, std::optional<tripoint> const&) () #13 0x000055a1eb0f6e63 in game::handle_action() () CleverRaven#14 0x000055a1eafbd9ea in do_turn() () CleverRaven#15 0x000055a1eaa5ec13 in main () ``` This commit instead changes the loop in step 1 above so that it explicitly *not* uses iterators, but instead old-fashioned indexed loop. The intention with the change is to allow other parts of the code to add items to the vector `current_submap->spawns` while we are iterating it here. If new items are added, they will be handled in later steps of the loop.
a-chancey
pushed a commit
that referenced
this pull request
Dec 22, 2023
* Fix charges for fermenting/distilling recipes * Update #2 I'm an idiot. Anyways, correction for absence of distilling/evaporation (that's a different process/recipe) and some comment clean-up.
a-chancey
pushed a commit
that referenced
this pull request
Aug 6, 2024
Prevents segfault when performing `firstaid_activity_actor` but the bandage tool disappeared. Backtrace of fixed segfault: ``` Thread 1 "cataclysm-tiles" received signal SIGSEGV, Segmentation fault. (gdb) bt #0 0x0000555555ece5a4 in item::get_usable_item_helper<item> (use_name="heal", self=...) at src/item.cpp:11584 #1 item::get_usable_item (this=0x0, use_name="heal") at src/item.cpp:11606 #2 0x000055555599c6bf in firstaid_activity_actor::finish (this=0x55559b583f20, act=..., who=...) at src/activity_actor.cpp:6651 #3 0x00005555564d8c6b in player_activity::do_turn (this=0x555558108218, you=...) at src/player_activity.cpp:391 #4 0x0000555555ce3fa6 in do_turn () at src/do_turn.cpp:532 #5 0x000055555577511a in main (argc=<optimized out>, argv=<optimized out>) at src/main.cpp:873 ``` An example where this happened was when the bandage was inside a spillable container (clay canning pot), that spilled its contents when starting the activity. Spiling the clay canning pot invalidates the `item_location`. Backtrace of when the clay canning pot was spilled: ``` #0 item_pocket::get_name (this=0x555557fa7540) at src/item_pocket.cpp:2117 #1 item_pocket::handle_liquid_or_spill (this=this@entry=0x555557fa7540, guy=..., avoid=0x555557fa8060) at src/item_pocket.cpp:806 #2 0x0000555555a6aa60 in avatar_action::use_item (you=..., loc=..., method="heal") at src/avatar_action.cpp:1212 #3 0x0000555555a6dda7 in avatar_action::eat_or_use (you=..., loc=...) at src/avatar_action.cpp:988 #4 0x0000555555e3e1c5 in game::do_regular_action (this=this@entry=0x555557f94a60, act=@0x7fffffffd1b0: ACTION_EAT, player_character=..., mouse_target=std::optional [no contained value]) at src/handle_action.cpp:2479 #5 0x0000555555e41260 in game::handle_action (this=0x555557f94a60) at src/handle_action.cpp:3176 #6 0x0000555555ce422f in do_turn () at /usr/include/c++/13/bits/unique_ptr.h:199 #7 0x000055555577511a in main (argc=<optimized out>, argv=<optimized out>) at src/main.cpp:873 ```
a-chancey
pushed a commit
that referenced
this pull request
Aug 6, 2024
Prevents segfault that could previously occur if the item being repaired was invalidated. The target item being repaired could get invalidated for various reasons, such as a follower moving it via zone sorting, the item could burn up in a fire, etc. Previous segfault that this commit attempts to prevent: ``` #0 0x0000555555ef9057 in item::is_null (this=this@entry=0x0) at src/item.cpp:943 #1 0x000055555602322c in repair_item_actor::can_repair_target (this=this@entry=0x555560003e80, pl=..., fix=..., print_msg=print_msg@entry=true, check_consumed_available=check_consumed_available@entry=true) at src/iuse_actor.cpp:2920 #2 0x00005555560243c2 in repair_item_actor::repair (this=this@entry=0x555560003e80, pl=..., tool=..., fix=..., refit_only=refit_only@entry=false) at src/iuse_actor.cpp:3106 #3 0x00005555559d5b55 in repair_item_finish (act=0x5555580cdf58, you=0x5555580cd890, no_menu=false) at src/activity_handlers.cpp:2477 #4 0x0000555555a00f52 in std::function<void (player_activity*, Character*)>::operator()(player_activity*, Character*) const (this=<optimized out>, __args#0=<optimized out>, __args#0@entry=0x5555580cdf58, __args#1=<optimized out>, __args#1@entry=0x5555580cd890) at /usr/include/c++/13/bits/std_function.h:591 #5 0x00005555559ff229 in activity_type::call_finish (this=<optimized out>, act=act@entry=0x5555580cdf58, you=you@entry=0x5555580cd890) at src/activity_type.cpp:168 #6 0x00005555564e368b in player_activity::do_turn (this=0x5555580cdf58, you=...) at src/player_activity.cpp:393 #7 0x0000555555cec856 in do_turn () at src/do_turn.cpp:532 #8 0x0000555555776e74 in main (argc=<optimized out>, argv=<optimized out>) at src/main.cpp:873 ``` Instead, this commit adds a message shown to the player if the target item is no longer valid for whatever reason.
a-chancey
pushed a commit
that referenced
this pull request
Oct 11, 2024
CleverRaven#75942) * feat: add crude_bronze_nail and adjust others to allow entry to the bronze age * fixed crazy mass/density * fix huge mass loss * fix huge mass loss #2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context