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
Fix some trap avoidance with monsters (and a death function) #34
Closed
MNG-cataclysm
wants to merge
3,730
commits into
I-am-Erk:master
from
MNG-cataclysm:exodii_labyrinth_monster_fix
Closed
Fix some trap avoidance with monsters (and a death function) #34
MNG-cataclysm
wants to merge
3,730
commits into
I-am-Erk:master
from
MNG-cataclysm:exodii_labyrinth_monster_fix
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
…ks (CleverRaven#72867) * Relimb No WIP timers, dummy Ooooh piece of dead code * Thank you, typobot Remove space, TODO remove time No U * Def didn't fix that on the web interface and overwrote with forcepush, nosir
[DinoMod] skeletal looks_like fix
* minor JSON edits * switch baby mutant rattlesnakes to give mutant meat
Documentation fixes
add "Forget all recipes" to debug menu
`Can't see` doesn't close the crafting GUI
* Weekly Changelog 2024-04-08 to 2024-04-15 * Apply suggestions from code review --------- Co-authored-by: David Seguin <[email protected]> Co-authored-by: Maleclypse <[email protected]>
* Spell, plus effect, plus scroll, plus spawns for that scroll. * fix slight formatting error * fix another slight formatting error * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Change to bionic power, lower cost --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…73107) * Not count type mag/mag_well in pickup inventory. * Apply the change for frozen_liquid. * astyle-check * Clang-tidy * Fix item_cannot_contain_contents_it_already_has. * Revert "Fix item_cannot_contain_contents_it_already_has." This reverts commit b6dec3a. * Try to pass the test case. * Remove unused parameter. * Add is_pick_up_inv back.
* old ones audited * two new ones + egg renaming * tamable wildlife compatibility * whoops * egg nutritional value audit * destroy the rehydrated egg * egg rename * wild spawns
* initial commit * add disassembly recipes and breaks_into versions; stats are delivered from GIZ GmbH `Guideline on the Manual Dismantling of Refrigerators and Air Conditioners` * replace some fridges and freezers in vehicles with a new one * fix itemgroups, make them more destroyed * change furniture to match new stats * fix aftershock migration
…d_context Type and context in variables is no more
[MoM] Add `city_sizes` parameter to city buildings
…ven#73037) * Labpocalypse Now, remove and reduce a bunch of legacy lab spawns * Massive overhaul of overmap generation test to add item demographics analysis * Uniqueify some exodii spawns that were way too common * Dial down microlab occurrence rates * Tune up some misc oter type and extra spawn ratios * Overhaul core gun spawning item groups * Extensive tweaks to gun spawns in various mapgen
…ast-room [Sky Island] Add east bunker room upgrades to possible missions
- move `squares[destarea]` to where it is not undefined behaviour - typo fix - style
…nputs don't trickle fast imgui inputs
* Add `calories()` math function * add assigning function * remove u_val version of the kcal checks * replaces all instances of u_val('kcal') with new function * document change * fix clang tidy error * Update src/math_parser_diag.cpp Co-authored-by: mqrause <[email protected]> * Update src/math_parser_diag.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * resolve the rest of shiv, fix (potentially) few tests * missed the zero * remove percent calories assigning since you can't assign calories as percent anymore * remove math kcal test because it's not a shim * the way this test is made drive me insane * i was told this can fix the test * spare me * now this one is my fault * fix MoM using old syntax * Do floating point math Co-authored-by: anothersimulacrum <[email protected]> * get rid of magic number * revert `Do floating point math` because i don't want static cast all the returns in the function. better approach would be divide this function in two, one for raw value that return int, one for percent value that return double or function that return healthy kcal directly * add `-> double` * Update src/math_parser_diag.cpp Co-authored-by: anothersimulacrum <[email protected]> --------- Co-authored-by: mqrause <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: anothersimulacrum <[email protected]>
…o the "move creatures" power (CleverRaven#73162) * Initial commit * Split Force Shove * Fix id errors * Fix even more id errors * < 1 rather than == 0 * Remove unnecessary space
* Update numbers * Slight adjustment
display fridge is a base item of a display fridge
know recipe? always ask group
AIM: when cannot wear, try to wield
Update the table of contents in doc/JSON_INFO.md
Fixed line 356 id from "TALK_EXODII_MERCHANT_TalkJobs" to "TALK_EXODII_MERCHANT_TalkJob."
fix clang test
Routine tileset updates on 01 May 2024
* Fixing an issue where a popup with lots of buttons that is longer than the screen doesn't properly wrap the buttons to the next line. * appeasing clang
…efine_fix Fixing broken text on ImTui when building with cmake
…ceport-travel Aftershock: Fix travel to port augustmoon
Wet Towels No Longer Prompt to be Turned Off
* Add Flying Robot Species Whirring 'footsteps' and no bleeding mechanical fluid, meant for quadcopter esque drones * Assign base_drone ROBOT_FLYING species * Assign Camspy ROBOT_FLYING Species
Thanks for the review Co-authored-by: Procyonae <[email protected]>
Co-authored-by: Procyonae <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Procyonae <[email protected]>
It appears you modified a |
What the heck? |
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
Bugfixes "Fix borg trap avoidance and stiltwalker death function."
Purpose of change
Fleshborgs would walk through traps, meaning that they could glide over chasms with #33. Stiltwalkers also produced an error on death, as they tried to break into a nonexistent item.
Describe the solution
Give Stiltwalkers a regular death function and have fleshborgs avoid traps so they don't glide over chasms.
Describe alternatives you've considered
Not doing this, or giving fleshborgs an item to break into.
Testing
Everything works. Borgs don't go over chasms and stiltwalkers properly produce a corpse.
Additional context
N/A