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

Adds LivePeople tileset #26720

Merged
merged 2 commits into from Nov 18, 2018
Merged

Adds LivePeople tileset #26720

merged 2 commits into from Nov 18, 2018

Conversation

rainbowjose
Copy link
Contributor

@rainbowjose rainbowjose commented Nov 16, 2018

Summary

SUMMARY: Content "Adds LivePeople Tileset."

Describe the solution

Just enable tileset as usual, also you can enable custom indicators through mods. I recommend "hybrid".

Purpose of change

For the better game experience.

Additional context

Based on this discussion:
#26676

Original author's repo:
https://github.com/SomeDeadGuy/Cata-MSX-DeadPeopleTileset

@ZhilkinSerg ZhilkinSerg added <Enhancement / Feature> New features, or enhancements on existing Mods Issues related to mods or modding SDL: Tiles / Sound Tiles visual interface and sounds. labels Nov 16, 2018
@rainbowjose
Copy link
Contributor Author

Something "wrong" with json, but it not.

@cainiaowu
Copy link
Contributor

You need to check the build output log:
http://gorgon.narc.ro:8080/job/Cataclysm-PR-Builder/10372/console

12:53:52 Invalid Summary line, please provide a summary similar to the following:
12:53:52 SUMMARY: Features "Added ability to fly."
12:53:52 Makefile:1081: recipe for target 'validate-pr' failed

your summary line should be quoted by three "```" both at top and bottom to pass this validate step.

@rainbowjose
Copy link
Contributor Author

Oh no, this shit again. As I can see my PR have proper summary. I giving up.

@cainiaowu
Copy link
Contributor

cainiaowu commented Nov 16, 2018

In CI build, the build failed with following error:
https://travis-ci.org/CleverRaven/Cataclysm-DDA/jobs/455875993

Formatted data/mods/LivePeople_Chesthole/mod_tileset.json
make: *** [data/mods/LivePeople_Chesthole/mod_tileset.json] Error 1
make: INTERNAL: Exiting with 4 jobserver tokens available; should be 3!
The command "make -j3 RELEASE=1 BACKTRACE=1 DEBUG_SYMBOLS=1 CROSS="$CROSS_COMPILATION"" exited with 2.

which means that your "data/mods/LivePeople_Chesthole/mod_tileset.json" doesnt match the requried code style. You need to lint those file with json formatter first.

@rainbowjose
Copy link
Contributor Author

rainbowjose commented Nov 16, 2018

In CI build, the build failed with following error:

Formatted data/mods/LivePeople_Chesthole/mod_tileset.json
make: *** [data/mods/LivePeople_Chesthole/mod_tileset.json] Error 1
make: INTERNAL: Exiting with 4 jobserver tokens available; should be 3!
The command "make -j3 RELEASE=1 BACKTRACE=1 DEBUG_SYMBOLS=1 CROSS="$CROSS_COMPILATION"" exited with 2.

which means that your "data/mods/LivePeople_Chesthole/mod_tileset.json" doesnt match the requried code style. You need to lint those file with json formatter first.

You can check that json. I can't see problem in that file. Also I already linted it through cata json formatter. It doesn't help.

@cainiaowu
Copy link
Contributor

Check my PR #26620 as an example, your summary line is clearly different with mine.
My summary line has a nice grey background and different font setting because I quote them with proper Markdown.

@AMurkin
Copy link
Contributor

AMurkin commented Nov 16, 2018

You can check that json. I can't see problem in file.

Add new line at the end of file.

@cainiaowu
Copy link
Contributor

Also may related with CRLF setting, you might need a proper text editor to edit those files. (Not quite sure though, but it has caused some similar issues before.)

@AMurkin
Copy link
Contributor

AMurkin commented Nov 16, 2018

I guess your summary line have (or had) two spaces after SUMMARY:.
But it rendered to one space in html view.

Log fragment:
image

I will PR a change to summary validator to fix this issues.

@AMurkin
Copy link
Contributor

AMurkin commented Nov 16, 2018

My summary line has a nice grey background and different font setting because I quote them with proper Markdown.

Backticks are optional: 0 to 3.

@rainbowjose
Copy link
Contributor Author

Hoooray

@ZhilkinSerg ZhilkinSerg self-assigned this Nov 18, 2018
@ZhilkinSerg ZhilkinSerg merged commit d9e90ad into CleverRaven:master Nov 18, 2018
@ZhilkinSerg ZhilkinSerg removed their assignment Nov 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Enhancement / Feature> New features, or enhancements on existing Mods Issues related to mods or modding SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants