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

Double the number of survivor's notes #18347

Merged
merged 16 commits into from Sep 18, 2016

Conversation

Projects
None yet
6 participants
@kilozombie
Copy link
Contributor

commented Sep 15, 2016

Well, the first batch was written a while ago, and there's tons of new content, references, and quirks to comment on. More variety is always nice. I suppose you should only read the commit if you want spoilers on all of the notes, aha.

Forgive me if the PR is messed up, haven't used git seriously in a while.

},{
"type" : "snippet",
"category" : "note",
"text" : "\"IT'S FLOATING! THE TEMPLE IS FLOATING!\""

This comment has been minimized.

Copy link
@DangerNoodle

DangerNoodle Sep 15, 2016

Contributor

Is this an Arcana mod reference?

},{
"type" : "snippet",
"category" : "note",
"text" : "\"My friend died, but at least I made her into a blob turret.\""

This comment has been minimized.

Copy link
@DangerNoodle

DangerNoodle Sep 15, 2016

Contributor

Definitely a Vehicle Additions Pack reference.

Maybe it would be interesting if some mods had relevant snippets for survivor notes. I know that Arcana and Magic Items mod has a snippets section for some other type of note, don't think I've seen more than one show up during play. Seem to only be in the added locations.

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

I could move the mod-related notes to those snippet.json files then, if it'd clean things up a bit.

Actually I'd had multiple ideas for very obviously mod-related notes but refrained because I didn't realize I could add them to those mods, so yeah.

This comment has been minimized.

Copy link
@DangerNoodle

DangerNoodle Sep 15, 2016

Contributor

Might be interesting. Could even pester @chaosvolt to suggest ideas for added quotes, for Arcana mod at least.

Begin moving certain notes to mods
Five of the new notes are related directly to mods rather than basegame, and therefore should be moved to their own snippets.json along with others. Five more added to mainline to fill their place, 'cus... why not.
@DangerNoodle

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Will be interesting to see.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Hmm. Once upon a time I DID consider adding survivor's notes to More Survival Tools, but I could never think of any good quotes related to the actual content. o3o

Maybe have some arcana ideas though. Just random snippets off the top of my head:

"summoned a blob thing. It ate my car"
"Weather has been awful ever since I raided that mansion."
"HOLY SHIT IT SHOOTS LIGHTNING"
"Funny paper did a thing. Feeling better, but everything is tree now."
"Do not drink from thgolden cup it fucknghhB"
"It's just glass cleaner with random shit in it, why did it turn red?"
"alien dropped more glowy stuff. wonder what happens if I snort it."
"Thought I found a bible in the old church. Found some weird fire cult book instead."
"Robbed by some crazy fucker in a golden cloak. Only thing he wanted was that weird book I got earlier."
"Weak from blood loss. Weapon runs on it. Not enough to bathe the town in hellfire."
"Burned the book of oaths, voices won't stop helpheLL REPENT"

Arcana survivor's notes
The mod-of-magic surely affects more people than just the cultists most intimately responsible, right?
@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Aw shit, you commented that mere moments after I made that commit. Ahah. Some of those are really good.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Doh. Those ideas added to the commit look nice as well, actually. X3

Fix stupid mistake, add more notes
Courtesy of @chaosvolt for the new ones, aha
@chaosvolt

This comment has been minimized.

Copy link

commented on 4b57c9c Sep 15, 2016

Ah, nice. Seems to better fit the general tone of survivor's notes better, as well.

kilozombie added some commits Sep 15, 2016

Blazemod survivor's notes
A bit more bare than I thought-- as much as I like the mod, it's pretty specific in what it aims to do, and I can't make as many interesting notes as I'd probably want.
PK's Reimagining survivor's notes
In time, all things must grow. Adapt or die, as they say. And in PK's mod, they don't ever stop adapting an optimal method to kill survivors.
@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Don't really know why it threw the blazemod one an error... am I just shit at creating new files? It worked ingame when I tested adding it in the mods folder.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Linting apparently is a thing, and it seems to be screwing over a lot of commits.

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Agh. Well, it's late, I'm gonna head to sleep and leave this for the morning. For now these are all the new notes I've got.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Looks good so far. I would assume ensure that your use of spacing is consistent and such.

No idea whose bright fucking idea it was to make correct code format MANDATORY, when the desired style has changed over time, is not enforced in existing files with even a faint hint of consistency, and when no immediately useful reference is available for people who have no fucking idea what linting is and what the preferred formatting is.

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

I'll go over it once to be consistent, though there's a small spacing inconsistency in the arcana snippets.json which didn't upset anything.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Which might be because the arcana and vanilla snippet files are both pre-existing. Which suggests that not only is this auto-linting thing poorly documented and explained, it also half-asses the task. :V

Changes to spacing, attempt to fix linting
Admittedly, a shitty commit name. Just trying to make this file near-identical to all other snippets.json files.
@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Shrug. I'll go fix the spacing on the other ones for aesthetic's sake and wait for a fix, I guess...?

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

It would help if the error checker explained what error 65 means. Damn near every other potential problem it can detect will give a rundown on what the problem is.

It's possible that it wants 4 spaces for the lines, instead of...not sure how many snippets.json had to begin with. 8?

EDIT: And removing spaces before the },{ sections might also help.

Fix spacing
Absentmindedly made these without adding two spaces to the end of each sentence.
@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Hrrrk. My mind's melting thinking of all the tiny ways it could be wrong and I don't want to make infinite commits just yet-- that'd be Slightly Unprofessional. aaa

kilozombie added some commits Sep 15, 2016

Fix more spacing
Same as with arcana.
@pisskop

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

if were going to put helpful hints onto notes one abour grapplers yanking you off a bike would suffice.

predator impaling, lungers [in base game IWs] lunging, hulks smashing, any thing of this sort

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Fair point. A streamer died recently in mega-endgame by being instantly killed by a grappler, through three layers of quarterpanels, at 25mph, in power armor. It'd be worth a warning!

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

It would help if the error checker explained what error 65 means

It also gives you the error message `Linting data/mods/blazemod/snippets.json: ERROR: Unmatched context 'snippet' (see Jenkins output)

I would assume ensure that your use of spacing is consistent and such.

This message is telling you the linter ruleset doesn't yet cover snippet

and when no immediately useful reference is available for people who have no fucking idea what linting is

Extensive documentation is in tools/format/README.md which other authors have already made use of to write new rules. Coverage is improving all the time.

No idea whose bright fucking idea it was to make correct code format MANDATORY

Linting is being activated in stages in a similar manner to astyle. This is controlled by json_whitelist. It is enabled for blazemod from when we merged the new version in #17456.

Merging poor quality JSON then expecting others to maintain it is antisocial. Equally developers breaking mods has also been a problem. The lint tool solves both - you have to commit good JSON and if a developer changes a JSON field elsewhere it will flag your mod as also requiring update.

and what the preferred formatting is.

Try tools/format/example. You can also run tools/cleanup.sh none data/mod/blazemod/snippets.json to automatically reformat that file. This will shortly become a Makefile target similar to make astyle

Which suggests that not only is this auto-linting thing poorly documented and explained, it also half-asses the task

Linting has been extensively discussed on github and other mod authors aren't struggling with it. The fact that the OP and yourself are only recently returned could be a factor here. It might be worth getting up to speed on recent changes and also moderating the tone of your posts. @chaosvolt I'm going to point out the elephant in the room (#15203) and that whilst currently everyone is turning a blind eye to you submitting PR's via third parties this will need to change if your presence becomes disruptive.

},{
"type" : "snippet",
"category" : "note",
"text" : "\"FUCK FAUX-MUTANTS, BEING 'A MEDICAL' DOES NOT COUNT\""

This comment has been minimized.

Copy link
@Coolthulhu

Coolthulhu Sep 15, 2016

Contributor

A bit too high level for surv notes

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

Yek, I agree. Replaced it with something of equal humor, hopefully.

},{
"type" : "snippet",
"category" : "note",
"text" : "\"We're the eagle-eyes in the sky! Just two mutant avians in our helicopter! Filming the Cataclysm! Check us out on any working electronics!\""

This comment has been minimized.

Copy link
@Coolthulhu

Coolthulhu Sep 15, 2016

Contributor

There are no flying mutants and helicopters yet

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

Crashed helis exist, though.

},{
"type" : "snippet",
"category" : "note",
"text" : "\"It wasn't Russia or China, guys. It was me. It's my fault. You can just call me... Whales.\""

This comment has been minimized.

Copy link
@Coolthulhu

Coolthulhu Sep 15, 2016

Contributor

Sounds like a jab at old dev. I'd rather keep the jabs to current devs.

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

Less of a jab-- just pointing out that he originally made things happen. Tongue-in-cheek, I guess?

This comment has been minimized.

Copy link
@Coolthulhu

Coolthulhu Sep 15, 2016

Contributor

Well, he doesn't exactly like DDA, so probably shouldn't be included.

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

Good point.

},{
"type" : "snippet",
"category" : "note",
"text" : "\"knife screams it screams i cant breathe so scared help me please help\""

This comment has been minimized.

Copy link
@Coolthulhu

Coolthulhu Sep 15, 2016

Contributor

Sounds like mod content. If it is, it should be in a mod.

This comment has been minimized.

Copy link
@kilozombie

kilozombie Sep 15, 2016

Author Contributor

Artifact.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Sorry for getting rather annoyed about this last night, @mugling.

This message is telling you the linter ruleset doesn't yet cover snippet

I can understand the reasoning behind the concept itself, and while this will still trip up new contributors, I acknowledge it's at least possible to make use of it once you're familiar with what it wants and where to get what you need to fix it.

That said, this does indicate that automatic linting is not yet a completely developed feature, and making it cause failed commits due to incompleteness is inexcusable. This is a bigger problem than the minor annoyances I got pissy about earlier.

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Eh. It's excusable in my book-- I'm just generally confused out of lack of knowledge. This isn't an urgent feature I'm PRing here anyway and some more time to make edits/suggestions isn't minded.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

@chaosvolt I'm going to point out the elephant in the room (#15203)

And, I'm sorry? You're dredging up something from over 7 months ago, a pull request in with @kevingranade berated me for failed compiling caused by a bug that was beyond my control, and was additionally unaware of my having successfully compiled a few times before that, when my compiling failures'd been a constant source of frustration even farther back.

I reacted by being a snarky asshole in response to discovering the cause (again, initiated by Kevin's demands that I learn to do something I had already FINALLY figured out), and you should know the rest by now.

In fact, this is relevant in other ways you likely weren't intending. In both cases we have problems caused by something completely unrelated to PR content.

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

and while this will still trip up new contributors,

Within hours of a new contributor opening a PR you have two of the core developers working on a solution for them? I'd like to think that makes us a welcoming and tolerant community...

than the minor annoyances I got pissy about earlier.

...and posts like yours above are an existential threat to that. You've provided no meaningful assistance and a torrent of abuse. Sat behind a keyboard you have nearly limitless time to reply so there isn't any excuse for such outbursts.

I'm going to point out the elephant in the room (#15203)

Another developer banned you from the project. Their intentions weren't ambiguous. It's been discussed at length by others although I've never personally entered an opinion.

And, I'm sorry? You're dredging up something from over 7 months ag

Would you prefer it was brought up earlier? I'm going to put this back in the box for now so please no expletives, emoji, bumping or off-topic posts. To be clear I'm not changing any previous decision but deciding to act only if otherwise unavoidable.

@DangerNoodle

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

I am not sure if any of this is relevant to the current issues regarding this pull request. It seems acceptable for @chaosvolt to make suggestions for snippets, especially since it was my idea to name-drop them for ideas. So long as discussion and implementation of said ideas are kept civil.

I am not fully aware of the "elephant in the room" being brought up, nor why it is relevant to this pull request, other than that being the point when @chaosvolt was removed from the project.

kilozombie added some commits Sep 15, 2016

Update more notes formatting +2 notes
Always worth warning about grapplers-- one of those 'sneaky endgame killers' that snatch your head through a half-open hatch at 50mph and only bring half of it through.
Update formatting
The smallest one of all.
@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

So long as discussion and implementation of said ideas are kept civil.

Always the important part

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Formatting's all fixed, what's next? Just wait for your PR about linting to go through?

@DangerNoodle

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Regardless, my apologies if requesting their ideas is considered undesirable due to their no longer being allowed to contribute. My reasoning was that they are the most familiar with the Arcana and Magic Items mod, being its author. They also seem to have some sort of background for it that is only visible through a few elements of the content. I do not know whether they have elaborated on those details anywhere.

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Formatting's all fixed, what's next? Just wait for your PR about linting to go through?

You need to merge the PR I just made against your branch which adds linter rules for snippet and see if that resolves your problem.

Regardless, my apologies if requesting their ideas is considered undesirable due to their no longer being allowed to contribute

There isn't a need for you to apologize and your contributions are welcome. As above I'm going to defer any action until otherwise unavoidable.

@chaosvolt

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

I did preserve some lore on the first page of the forum thread it originated in: http://smf.cataclysmdda.com/index.php?topic=11013.0

Sorry for being so disruptive about this though. As you can probably guess, I can get snarky when it comes to features that appear to cause problems, and failed commits due to someone else's mistake are a personal pet peeve of mine.

I mean hell, that was provoked my assholeish attitude towards Kevin's farming PR that marked the point when our attitudes toward each other started to nosedive, and were ultimately what prompted my outbursts that led to my being barred from the project.

Sorry though. Seems as usual I can't even add feedback without fucking something up.

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Sorry though. Seems as usual I can't even add feedback without fucking something up.

We are done here. Further off-topic replies will be moderated.

Merge pull request #1 from mugling/snotes
Extend linter to cover text snippets
@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

You need to address @Coolthulhu's review as well before this can be merged

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

I... guess? I forgot to send a comment, but I did adjust the note about 'A MEDICAL' to 'EXTREMELY THIRSTY', it was a good suggestion.

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2016

Hum-- is that it, then? Your commit is in.

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2016

Waiting on a merge from @Coolthulhu on #18349

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 17, 2016

Looks like this one's ready when you are @mugling

@kilozombie

This comment has been minimized.

Copy link
Contributor Author

commented Sep 17, 2016

@mugling

This comment has been minimized.

Copy link
Contributor

commented Sep 17, 2016

Waiting for Jenkins to be restored

@DangerNoodle

This comment has been minimized.

Copy link
Contributor

commented Sep 17, 2016

Hopefully the issue with Jenkins will be resolved without issue.

@mugling mugling merged commit dba75bf into CleverRaven:master Sep 18, 2016

@kilozombie kilozombie deleted the kilozombie:survnotesplus branch Sep 19, 2016

@CleverRaven CleverRaven locked and limited conversation to collaborators Nov 26, 2016

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
You can’t perform that action at this time.