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

Add third automatic loot option for food and drinks, to have them be consumed immediately #832

Merged
merged 94 commits into from
Jul 25, 2024

Conversation

MQDuck
Copy link
Contributor

@MQDuck MQDuck commented Jun 26, 2024

When the option is set, food and drinks only get autoconsumed when they are actually able to restore anything. Otherwise, they get dropped.

@Die4Ever
Copy link
Owner

merge conflicts and unresolved comments

@Die4Ever Die4Ever marked this pull request as draft July 18, 2024 01:02
MQDuck and others added 22 commits July 17, 2024 19:22
that they work even with Confix installed.  Based on changes suggested
by Wryyyong in PR Die4Ever#823  (real fix for Die4Ever#793)
identified as having fake names and should get a random one instead
back if it's before frame 0.7, which is when it notifies and tells the
game to spawn the grenade projectile Die4Ever#805
doors themselves, and need to wait for the alarms to be set off Die4Ever#830
)

* sewer teleporter in 09_NYC_DOCKYARD can't be squeezed past

* reduce dockyard sewer teleporter radius
MQDuck and others added 6 commits July 17, 2024 20:03
* change "woman" unfamiliarName to "Woman"

* move "woman"->"Woman name fix to DXRFixupParis

* Adjust size of teleporters in Cathedral, Ship, and Ocean Lab so you
can't get around them Die4Ever#804

* Make sure you can't frob the ramp in HK Level 2 labs

* fix HX build

* preproc var for bingocheat

* bump version to v3.0.1.0 Alpha for devs

* buff regular sword

* WeaponMegaChoices now clear out any FlagRefs on the weapon choices so
that they work even with Confix installed.  Based on changes suggested
by Wryyyong in PR Die4Ever#823  (real fix for Die4Ever#793)

* Fix randomized robot names

* Reorganize how pawns with different familiar and unfamiliar names are
identified as having fake names and should get a random one instead

* Thrown Projectiles will no longer take damage from halon

* Gunther and Gilbert have ammo for the possible weapons you can give them
in mission 1 and 4 Die4Ever#807

* If giving ammo, an add_ammo amount should apply even if the pawn doesn't
have the ammo type already Die4Ever#807

* Throwing grenades and turning to a wall now only gives you your ammo
back if it's before frame 0.7, which is when it notifies and tells the
game to spawn the grenade projectile Die4Ever#805

* Smoke and gas leaking from barrels will now be moved when they are
shuffled

* Enemies in the Hong Kong Helibase robot bays can no longer open the
doors themselves, and need to wait for the alarms to be set off Die4Ever#830

* add spaces to JacobsShadow hint (Die4Ever#808)

* lower the alarm inside M03 boat house (Die4Ever#811)

* sewer teleporter in 09_NYC_DOCKYARD can't be squeezed past (Die4Ever#816)

* sewer teleporter in 09_NYC_DOCKYARD can't be squeezed past

* reduce dockyard sewer teleporter radius

* vans not breakable in Zero Rando

* fix HX build

* splits overlay is an Advanced game option (Die4Ever#824)

* give "Trash" and "Not Trash" separate keyboard shortcuts (Die4Ever#829)

* paul's bathroom door doesn't shut instantaneously (Die4Ever#817)

* paul's bathroom door doesn't shut instananeously

* DeusExMover -> #var(DeusExPrefix)Mover

* fix HX build

---------

Co-authored-by: Die4Ever <die4ever2005@gmail.com>

---------

Co-authored-by: theastropath@gmail.com <theastropath@gmail.com>
Co-authored-by: Die4Ever <die4ever2005@gmail.com>
@MQDuck MQDuck marked this pull request as ready for review July 18, 2024 03:09
@Die4Ever Die4Ever marked this pull request as draft July 18, 2024 03:23
@MQDuck MQDuck marked this pull request as ready for review July 18, 2024 04:22
@Die4Ever Die4Ever marked this pull request as draft July 22, 2024 00:37
@MQDuck MQDuck marked this pull request as ready for review July 23, 2024 21:28
@Die4Ever Die4Ever marked this pull request as draft July 24, 2024 22:50
@Die4Ever
Copy link
Owner

still some unresolved comments here, putting it back to draft

@Die4Ever
Copy link
Owner

still some other unresolved comments though

@Die4Ever Die4Ever marked this pull request as ready for review July 25, 2024 22:19
@Die4Ever Die4Ever merged commit cbcb7cf into Die4Ever:develop Jul 25, 2024
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.

3 participants