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 more types of generators #75618

Closed
wants to merge 4,876 commits into from
Closed

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Aug 12, 2024

Summary

Content "More generator types"

Purpose of change

More = better

Describe the solution

  • Add more generators
  • Find what power field does (probably changes consumption rate of fuel consumption?)
  • Find what to do with active_backup_generator
  • Mapgen work

Testing

Installed, put fuel, seems to work

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Appliance/Power Grid Anything to do with appliances and power grid json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 12, 2024
Standing-Storm and others added 25 commits December 18, 2024 13:08
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>
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>
[Magiclysm] Fix animist convert spell missing damage type
* Rip out tr_ledge hack

* Make non Character creatures fall again

* Typify and rename ledge -> try_fall

* Add tr_ledge obsoletion

* Remove t_hole

* Fix climbing down triggering falling first resulting in you burying yourself

* Update map.cpp

* Fix being grapple pulled off a roof sending you into the ground

* Fix spawned NPCs not falling until they move

* Fix spawned monsters not falling until they move

Not the most ideal looking spot for this but its the only place all the calls I could find filter down to

* Fix a test expecting spawned NPCs to float

* Another test that expects floating to be fine

* Appease our clang overlords

* More appeasement

* Did you know stashing changes for one branch on another by accident and forgetting about them is not great?

* More fixes

* Appease our clang overlords

* Fix some since typified stuff
Don't assign missions during testing, for real this time
* typified character.h + npc.h

* demanded collateral change

* demanded collateral change
* Initial commit

* Tweaks

* Treant grabbing

* Change mana cost

* Raise Awakening of the Forest Guardian Difficulty

* Add Flames of the Apocalypse

* Add missing RANDOM_DAMAGE to Flames of the Apocalypse
…_transform-tests

Structure Damage: Car Crashes, migration to ter_furn_transform to retain terrains
Standing-Storm and others added 22 commits December 31, 2024 15:00
* Better skill requirement UI for martial arts

Borrow strings from crafting UI to show skills that you have minimum
requirements to show as green/red. Goal is to make easier to scan what
you can actually do.

* Apply suggestions from code review

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>
…-air

Suppress debug message when dragging furniture off the ledge
Co-Authored-By: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Remove a few nonsense recipes

* Lint

The welding goggles were removed from part of the recipe as they'd be too dark to see through reliably
…rice-adjustments

[Magiclysm] More Forge price adjustments
…lades summon (CleverRaven#78826)

* Initial commit

* Add pet subspell component

* Edit atack conditions

* Edit description

* Edit weight ratio
 Scale spell window to spell list and terminal size
* Add new variants of Everburning light sources, Two new Statues, and a Taxidermy Owlbear

* Add New Forge alongside existing forge while migration occurs

* Increase light emitted from new Everburning light sources. Make it possible to move through the candelabra

* Fix lighting around the forge and re-export the map

* Remove old forge, migrate content into new forge. Update all references to new forge mapgen

* Re-add Forge Trap and Populate forge with Dwarves and automata

* Lint

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

* Lint

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

* Randomize Flowers in forge

* Increase number of loot zones. NPCs can now use all the shelves and displays in their shop area.

* CDDA Tests bully me for number of spaces in furniture desc

* Spell Correction so CDDA doesn't bully me

* Forge Lords don't store items where they can't see them.

* Lint

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

* Vault Emits Vault Air on tiles

* EOC spritzes you with safe shopping experience whenever you are in the forge.

* Migrate the Old Forge OMTs for existing saves.

* Fix Map using solid rock on a level where soil should be present

---------

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

* Lock storage room door

* Swap upstairs position of toilet and sink

* Slightly reduce spell odds in locked room

* Reconfigure downstairs bathroom

* Further bathroom reconfigurations

* Glass wall upstairs in bigshot offices

* Kick tests
Copy link
Contributor

github-actions bot commented Jan 2, 2025

It appears you modified a .po or .pot file. These translation files are automatically generated, pushed to, and pulled from Transifex, and should not be modified otherwise. If these changes are intended, please add Translation file changes are intended to the PR body.

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. Code: Build Issues regarding different builds and build environments [Markdown] Markdown issues and PRs Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Jan 2, 2025
@GuardianDll GuardianDll closed this Jan 2, 2025
@GuardianDll GuardianDll deleted the generators branch January 2, 2025 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Appliance/Power Grid Anything to do with appliances and power grid astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.