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

[Sky Island] Teleporting items back home #70200

Merged
merged 5 commits into from
Dec 14, 2023

Conversation

gettingusedto
Copy link
Contributor

@gettingusedto gettingusedto commented Dec 14, 2023

Summary

Mods "[Sky Island] teleporting items back home"

Purpose of change

The exit obelisk being in a room kinda implies it can transport item back home, but can't. Now that item teleportation is possible, i'm adding it.

Describe the solution

See commit.

Describe alternatives you've considered

Not doing so.

Testing

I teleported good amount of items and it got teleported back home.

Additional context

It may teleport some stuff that is outside of the room, but i dont think that'll be much issue, i hope.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Sky Island Anything about the Sky Island mod labels Dec 14, 2023
@gettingusedto gettingusedto marked this pull request as draft December 14, 2023 06:02
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Dec 14, 2023
@gettingusedto gettingusedto marked this pull request as ready for review December 14, 2023 07:18
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 14, 2023
@Maleclypse Maleclypse merged commit 5ad5275 into CleverRaven:master Dec 14, 2023
19 of 23 checks passed
@gettingusedto gettingusedto deleted the sky-island-item-teleport branch December 14, 2023 14:03
gkarfakis19 pushed a commit to gkarfakis19/Cataclysm-DDA that referenced this pull request Dec 14, 2023
* Update EOCs.json

* Update EOCs.json

* Update EOCs.json

* Update EOCs.json

* Update EOCs.json
@DenCheesecake
Copy link

Quick question, what happens to the items left in the room with the obelisk in case of the player's death? Say, the player dropped some stuff in the room, went for more loot, and died. Will all the items disappear alongside the room during the next raid? Thanks!

Maleclypse pushed a commit that referenced this pull request Dec 20, 2023
* Initial commit. Infrastracture.

* monster stash

* first attempt at pelagic vs ocean shore creatures

* Proper handling of ocean vs pelagic.

* added a bunch of fish (JSON linted)

* added a bunch of fish (json linted, and fixed)

* Proper handling of ocean vs pelagic + added a bunch of fish.

* Update player_activity.cpp

* Small eoc doc fixes

* Invalidate non-adjacent containers for ALL and DRAGGED (#70172)

This also changes it to not update the container_base_loc's position for ALL and DRAGGED, which made it so pressing X would exit out to a 1-9 location instead of ALL or DRAGGED

Co-authored-by: andrei <[email protected]>

* Allow spawning items with flags (#70168)

* First

* Update npctalk.cpp

* Update npctalk.cpp

* Update src/npctalk.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Sky Island] Teleporting items back home (#70200)

* Update EOCs.json

* Update EOCs.json

* Update EOCs.json

* Update EOCs.json

* Update EOCs.json

* Add ```gains_proficiency``` event (#70194)

* create gains_proficiency event

* add event trigger

* Update EFFECT_ON_CONDITION.md

* updated memorial test

* retrigger checks

* [MoM] Add ability for pyrokinetics to cauterize their wounds (#70132)

* Initial commit

* Bleeding that's too heavy cannot be stopped

* Add infection chance

* Add missing types

* Fix infection intensity

* Fix practice recipe

* Reduce capacity of test battery a bit

The value being this large resulted in an integer overflow in
pocket_data::max_contains_volume(). Reduce it until there's no more
integer overflow.

* Proper handling of ocean vs pelagic + added a bunch of fish.

* reversed gitignore accidental change

* reversed gitignore accidental change

* shark rebalance

* Update data/json/monsters/fish.json

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

* Update data/json/monsters/fish.json

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

* Update data/json/monsters/fish.json

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

* small changes to resolve issues

* small changes to resolve issues

* Update wilderness.json to fix bass typo

* Update fish.json

* Update data/json/monsters/fish.json

Co-authored-by: Karol1223 <[email protected]>

* removed roe names

---------

Co-authored-by: Ramza13 <[email protected]>
Co-authored-by: Anton Simakov <[email protected]>
Co-authored-by: Kamayana <[email protected]>
Co-authored-by: andrei <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: gettingusedto <[email protected]>
Co-authored-by: Francisco Machado <[email protected]>
Co-authored-by: Standing-Storm <[email protected]>
Co-authored-by: ehughsbaird <[email protected]>
Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
Co-authored-by: Karol1223 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Sky Island Anything about the Sky Island mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants