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

плюшки ватрушки! #136

Merged

Conversation

Kenshut
Copy link

@Kenshut Kenshut commented Nov 16, 2023

Добавляю различные "плюшки-ватрушки"

Краткое содержание:
Добавление места "последнего боя"
Добавление условия "категория оружия в руках"
Обновление айди-шника для компилирование сборки windows msvc
Разнообразие концовок-мира для НПС
Слабые точки триффидов и описание при разделке
Слабые точки грибов и описание при разделке
Слабые точки слизи

Портировал из:
CleverRaven#68458
CleverRaven#68044
CleverRaven#69592
CleverRaven#69758
CleverRaven#69764
CleverRaven#69700
CleverRaven#69583

@RenechCDDA
Copy link

@AtomicFox556 This appears to be a copy of CleverRaven#68458 (authored by @NetSysFire) and CleverRaven#69156 (authored by @detahramet, @TheShadowFerret, and @Termineitor244) without attribution.

@Kenshut
Copy link
Author

Kenshut commented Nov 18, 2023

@RenechCDDA You are absolutely right, we are just manually transferring the changes from dda, since atomic fox has been refusing to make a pull request directly from dda since August, since there is an unpleasant update there as far as I remember

@NetSysFire
Copy link

"just manually transferring the changes" does not justify giving no attribution whatsoever. You are still bound by the upstream license, which requires attribution.

@AtomicFox556
Copy link
Owner

@AtomicFox556 This appears to be a copy of CleverRaven#68458 (authored by @NetSysFire) and CleverRaven#69156 (authored by @detahramet, @TheShadowFerret, and @Termineitor244) without attribution.

Noted, thanks.

"just manually transferring the changes" does not justify giving no attribution whatsoever. You are still bound by the upstream license, which requires attribution.

What would you consider sufficient attribution, just to avoid further misunderstandings?

@andrei8l
Copy link

What would you consider sufficient attribution, just to avoid further misunderstandings?

The original author(s) and emails need to be listed in the commit message. Ideally you accomplish that by cherry-picking the original commits. The lazy, but still acceptable, way is to add Co-authored-by: NAME <[email protected]> to the bottom of the commit message. Github has some information about that here.

Since this PR hasn't been merged yet, I strongly recommend that you redo it by cherry picking and adding your modifications in a separate commit.

For #130 the easiest way would be to start with an interactive rebase, then amend every commit with the correct authorship, and finally force-push to the repo. There are many guides on stackoverflow for that.

src/condition.h Outdated Show resolved Hide resolved
src/condition.h Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: MNG-cataclysm <[email protected]>
Co-authored-by: Empyrean-Heaven <[email protected]>
Kenshut and others added 11 commits November 26, 2023 23:08
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by:  PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Co-authored-by: PatrikLundell <[email protected]>
Copy link

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  •  He had a dream he told no other about.  It was a grand ideal, a fantasy out of a long-dead era.  He aspired to become a leader who would shield humanity from the tribulations of the new world.  He gathered survivors and built a settlement with the **fledging** numbers he had.  They held out for as long as they could, but the dream of civilization could not flourish.  He died a heartbroken man.
    
  •  He had a dream he told no other about.  It was a grand ideal, a fantasy out of a long-dead era.  He aspired to become a leader who would shield humanity from the tribulations of the new world.  He gathered survivors and built a settlement with the **fledging** numbers he had.  With his unshakeable spirit and exceptional talent, he managed to lift up his people into a brighter dawn.  Before long, his realm encompassed vast swaths of land.  He honored you as one of the founders of his kingdom.
    
  •  He increasingly grew fanatical as the whole world decayed around him.  In due time, he saw himself as something more than human.  Arriving at an abandoned cathedral, he climbed to the top of its spire before ringing the bells again and again.  He belched out holy **harangues** at the heathens below and laughed maniacally as the undead eventually tore through his body.
    
  •  Lived a troubled life after your passing.  Trusting no one but herself, she struggled viciously at the end of the world.  Through great effort, she formed a minor village that would end up becoming a safe haven for mutants.  In their humble hovel, she would later be acclaimed as a **saintess**.
    
  •  She had a dream she told no other about.  It was a grand ideal, a fantasy out of a long-dead era.  She aspired to become a leader who would shield humanity from the tribulations of the new world.  She gathered survivors and built a settlement with the **fledging** numbers she had.  They held out for as long as they could, but the dream of civilization could not flourish.  She died a heartbroken woman.
    
  •  She had a dream she told no other about.  It was a grand ideal, a fantasy out of a long-dead era.  She aspired to become a leader who would shield humanity from the tribulations of the new world.  She gathered survivors and built a settlement with the **fledging** numbers she had.  With her infinite grace and unyielding devotion, she managed to lift up her people into a brighter dawn.  Before long, her realm encompassed vast swaths of land.  She honored you as one of the founders of her kingdom.
    
  •  She increasingly grew fanatical as the whole world decayed around her.  In due time, she saw herself as something more than human.  Arriving at an abandoned cathedral, she climbed to the top of its spire before ringing the bells again and again.  She belched out holy **harangues** at the heathens below and laughed maniacally as the undead eventually tore through her body.
    
  •  Started fervently devouring the Gospel and soon had absolute conviction that she was the Virgin Mother.  In her anguished throes of madness, she ended up seeing the vision of the good **sheperd** over the horizon as she stepped off the edge of a skyscraper.
    
  • At the top of the creature you find what you assume is a brain, although it seems to employ quadrilateral symmetry and thus is shaped and organized completely differently from that of terrestial versions.
  • The fibers you find inside the creatures are more akin to plant fibers than anything found in animals or terrestial fungii.
  • You find that the tendrils at the base of the creature seem to serve a dual role of providing mobility as well as to connect to a mycelium, with a capillary network within them possibly serving to transfer nutrients, but the network ends a short distance into the base.
  • an organ inside the slime, causing the slime to freeze up briefly as it reconstitutes it

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@Kenshut Kenshut marked this pull request as ready for review November 29, 2023 16:25
@AtomicFox556 AtomicFox556 merged commit 21bf745 into AtomicFox556:master Dec 5, 2023
19 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants