Skip to content
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

reweight gemstones in item_groups.json (CleverRaven#36734) #42

Merged
merged 26 commits into from
Jan 7, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

kevingranade and others added 26 commits January 6, 2020 02:06
* Holographic transposition spell

* Add spawn for the holographic transposition scroll

* Remove outdated flag

* Remove unused function parameter

* Changes suggested by code review.

* Update data/mods/Magiclysm/items/spell_scrolls.json

Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]>

* Fix misplaced coma in spell_scrolls.json

* Apply suggestions from code review

Co-Authored-By: LaVeyanFiend <[email protected]>

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
Co-authored-by: LaVeyanFiend <[email protected]>
Adding Grape Seeds to the cooking oil recipe
Take down the Christmas decorations
Add documentation for repairs_like
* Use libbacktrace to generate backtrace

* Move dbghelp symbol initialization to debug_write_backtrace

* Use libbacktrace on cross-compilation to Windows

* Download prebuilt libbacktrace before building

* Use square brackets instead of angle brackets

* Add license text of libbacktrace
Various basecamp actions require components and tools to be consumed.

When there are choices to be made amongst these, the player is presented
with the choice between the various options in the usual way.

However, if the player cancels, the action proceeded regardless.  This
allowed the player to circumvent the consumption of the requirements.

Fix this by separating the selection of the components from the
consumption.  Now the order of events is:

- Select components and tools.
- Select NPC.
- Send NPC on mission.
- Consume components and tools.

We needed to perform the split because we need to select both the
requirements and the NPC before performing alterations to either.

Implemented by introducing a new class basecamp_action_components to
store this selection state.
Handle basecamp component selection cancellation
Fix inventory caching bug causing crash when resuming craft
Adding Grape Seeds to the cooking oil recipe
Also fixed weight and volume of children corpses
Fixed weight and volume of children corpses
Correct sandbag recipe for charges
Overhaul anthill generation to avoid conflicting with other map features
@fengjixuchui fengjixuchui merged commit e2f8b54 into fengjixuchui:master Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.