change "woman" unfamiliarName to "Woman" #819
Merged
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
|
merge conflicts |
can't get around them Die4Ever#804
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
have the ammo type already Die4Ever#807
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
* paul's bathroom door doesn't shut instananeously * DeusExMover -> #var(DeusExPrefix)Mover * fix HX build --------- Co-authored-by: Die4Ever <die4ever2005@gmail.com>
MQDuck
added a commit
to MQDuck/deus-ex-randomizer
that referenced
this pull request
Jul 18, 2024
* 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>
Die4Ever
added a commit
that referenced
this pull request
Jul 25, 2024
* add (nonfuntional) autoconsume options * combine pick up, drop and autoconsume options. use separate config values for each item class * modify `TryLootItem` check slightly * use string for loot action settings, and also keep autoconsume from crashing the entire game * ConsumableWouldHelp function * ConsumableWouldHelp checks HealingItem values * 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 #823 (real fix for #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 #807 * If giving ammo, an add_ammo amount should apply even if the pawn doesn't have the ammo type already #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 #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 #830 * add spaces to JacobsShadow hint (#808) * lower the alarm inside M03 boat house (#811) * sewer teleporter in 09_NYC_DOCKYARD can't be squeezed past (#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 (#824) * give "Trash" and "Not Trash" separate keyboard shortcuts (#829) * paul's bathroom door doesn't shut instantaneously (#817) * paul's bathroom door doesn't shut instananeously * DeusExMover -> #var(DeusExPrefix)Mover * fix HX build --------- Co-authored-by: Die4Ever <die4ever2005@gmail.com> * stand on warehouse fence without tap dancing * revert old nerf of master pistol 180% vs vanilla 200%, because we have helmets now, and rifles have been buffed a bit * EMP disables cloak * don't give "Rick" a random name when memes are disabled * Small autoturrets fire at half the rate of full sized turrets. Make sure all turrets in the game use their default firerates. * Spawned autoturrets can now randomly be small or large * Restore overheard conversation in superfreighter over "loudspeaker" in the helibay * Restore last infolink from Helios in Area 51 * Fix the "Critical Loctaion Bonus" typo in Area 51 Final... finally. * Is this a Jojo reference? * dxvk.conf max of 500 fps * More piano practice for JC * Piano will now show how many songs have been played * Piano will now make sure all songs get played an equal number of times, while also allowing certain songs to be weighted more (for bingo goals) * Each piano song can have individual weighting * Add Terran 1 to Piano * Blizzard, in it's infinite wisdom, decided it was a good idea to capitalize the C in StarCraft, but not in Warcraft * buff range mod, nerf ranges for pistols and assault rifle, buff accuracy for pistols also fix Accessed None warnings for 3rd person camera * aug tree white color for selector * slightly increase pistol ammo (#842) rates are still lower than vanilla * Oops, more bangers on the piano * I slipped and dropped these great piano tracks * weapon descriptions tell you if it's a good roll or a bad roll (#844) * weapon/aug/skill descriptions tell you if it's a good roll or a bad roll (#844) and don't show in Zero Rando mode * Item swaps fail if they move to the other side of a wall. Make sure placeholders are sufficiently high off the ground. Minor adjustment to weapon mod replacement logic so they don't even try to replace if the class matches * installer DXVK Linux, off by default * aug tree, fix draw styles * Oceanlab UC and Area 51 bunker big fans are highlightable so you can see how much damage you've done #855 * Crowd Control "give item" effects now become selectable based on the loadout in use, so you can't try to give a SWTP player a gep gun and have it rejected by the loadout #854 * Move Ocean Lab greasel lab backtrack button closer to the wall * Fan in Vandenberg Computer is now highlightable * savage doesn't give you an aug on post gas station starts * fix typo in smuggler intercom (#809) * fix typo in smuggler intercom * expand SmugglerDoorBellConvo check a bit to make sure it's in English * More extensive goal information in notes directory (#800) * add goals.json * goals with the same name are next to each other in goals.json * the exit teleporter from nsfhq can't be crawled under (#812) * the exit teleporter from nsfhq can't be crawled under * find nsfhq exit teleporter by url instead of event * don't uselessly try to change teleporter location * water cooler in versalife break room faces away from the wall (#813) * free and infinite aqualung (#845) * free and infinite aqualung * simplify DXRAugAqualung.IsTicked and DXRAugAqualung.Tick * update aqualung description * fix clothes racks with LDDP when memes are disabled (#833) * restore Everett barks (#840) * SkillComputer slightly nerf trained speed in Zero Rando so that the "defaults" display lines up better with randomized values, note this has no effect on randomized values since those only check the range of lowest to highest * teleporters block actors * DXVK 2.4 * fix "cemetery" misspelling in 09_NYC_GRAVEYARD startupMessage (#818) * fix "cemetery" misspelling in 09_NYC_GRAVEYARD startupMessage * add additional check in "Cemetary"->"Cemetery" fix * CleanerBots don't move when disabled (#847) * Fix the "You can dance if you want to" goal not being marked if the ScriptedPawn being watched isn't in the Dancing state (#835) * fix "dance if you want to" goal for NPCs in Conversation state * add PawnAnim_* event to ScopeView * restore commando barks in 06_HONGKONG_STORAGE (#814) * restore commando barks in 06_HONGKONG_STORAGE * Update DXRFixupM06.uc --------- Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * change btnLabelResetToDefaults string so it doesn't conflict with ButtonUpgradeLabel (#827) * change btnLabelResetToDefaults default * old old "Restore Defaults" shortcut; disable it in DXRMenuScreenNewGame * DXRAnimTracker work in progress * Singular bingo goal descriptions (#803) * add singular bingo descriptions * Update DXREvents.uc * Update DXRModules/DeusEx/Classes/DXREvents.uc --------- Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * Chateau DuClare with fixed max value (tour 5 parts, and collect 3 keys) (related to #803) * open vandenberg comm building doors immediately on 129+ starts (#853) * open vandenberg comm building doors immediately on 129+ starts * Update DXRModules/DeusEx/Classes/DXRStartMap.uc Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> --------- Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * Improvements and fixes for adding goals and DXRStartMap (#797) * move StartMapSpecificFlags call from PreFirstEntry to PostFirstEntry * improvements to GetGoalText and AddGoalFromConv. use latter in most places goals are added * MarkConvPlayed adds "_Played" automatically * MarkConvPlayed takes a string instead of a name * restore "NSF Defection (Streets)" start * break StartMapSpecificFlags into PreFirstEntryStartMapFixes and PostFirstEntryStartMapFixes * AddGoalFromConv uses ConEventAddGoal.bPrimaryGoal rather than a parameter * restore modified DefeatNSFCommandCenter goal text * restore riot cop barks in 08_NYC_HOTEL (#815) Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * change "woman" unfamiliarName to "Woman" (#819) * 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 #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 #823 (real fix for #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 #807 * If giving ammo, an add_ammo amount should apply even if the pawn doesn't have the ammo type already #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 #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 #830 * add spaces to JacobsShadow hint (#808) * lower the alarm inside M03 boat house (#811) * sewer teleporter in 09_NYC_DOCKYARD can't be squeezed past (#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 (#824) * give "Trash" and "Not Trash" separate keyboard shortcuts (#829) * paul's bathroom door doesn't shut instantaneously (#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> * slightly move M01 boat Top of Statue so it's easier to see from UNATCO * M06 rename DTS boatperson location to canal waterside apartment * m08 free clinic location closer to door * slightly faster sword animations (#842) * move ConsumableWouldHelp to DXRPlayer * autoconsume some cleanup * disable refuse button for items set to autoconsume * Update DXRVanilla/DeusEx/Classes/Player.uc Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * tweak defaults for melee weapons --------- Co-authored-by: Die4Ever <die4ever2005@gmail.com> Co-authored-by: theastropath@gmail.com <theastropath@gmail.com> Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com>
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.
No description provided.