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

RetroDays tileset update (14-10-14) #9542

Closed
wants to merge 1 commit into from

Conversation

Projects
None yet
3 participants
@Antistar
Copy link
Contributor

commented Oct 14, 2014

Updated RetroDays10px and RetroDays20px tilesets.

  • Accounts for all new tiles in 0.A experimental as of 13-10-14.
  • Some tweaks and fixes to existing tiles.
  • Separated ASCII fallback into its own png file for both 10px and 20px.

Thread is here.

Let me know if I messed something up here; I've only made one PR before and that was a few months ago now.

RetroDays tileset update (14-10-14)
Updated RetroDays10px and RetroDays20px tilesets.
- Accounts for all new tiles in 0.A experimental as of 13-10-14.
- Some tweaks and fixes to existing tiles.
- Separated ASCII fallback into its own png file for both 10px and 20px.
"fg":1099,
"rotates":false
},
{
"id":"smoxygen_tank",
"id":"oxygen",

This comment has been minimized.

Copy link
@KA101

KA101 Oct 14, 2014

Contributor

There's still a "smoxygen_tank" in the JSON, tools.json at 337. Doesn't appear to be an "oxygen" item.

(When in doubt, ids don't change. Changed/deleted ids are the number one cause of nones.)

Update: Never mind, I'm blind and missed your moving it. :-/

@Antistar

This comment has been minimized.

Copy link
Contributor Author

commented Oct 14, 2014

I can't remember where I got it from exactly - it would have popped up in the tileset editor or missing tile checker - but there is an oxygen item on the item browser, at least. Not sure what's going on there.

But yeah; I don't think I've ever removed entries from the tileset, even when it does seem like they've been changed or removed from the game. For example mon_zombie_fast changing to mon_zombie_dog a while back, and some things like rubble (seemingly?) changing from terrain to furniture objects sometime recently, with an accompanying change to the prefix in their ids. I just add the new one and leave the old one... just in case.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 14, 2014

OK, was gonna pull it but Git pitched a fit thanks to the parens in your branch name. Gonna ask you to copy this to a branch that doesn't include parentheses in its name. Sorry.

@Antistar

This comment has been minimized.

Copy link
Contributor Author

commented Oct 14, 2014

Alright... git is sort of seat-of-the-pants stuff for me though. Do I need to make a new PR?

@i2amroy

This comment has been minimized.

Copy link
Member

commented Oct 14, 2014

Yeah you will. Basic process is going to be:

  1. Make a new branch sans the parenthesis
  2. Merge the current branch into the new one, you can do this in the "manage branches" menu for the github app (or just redo the changes in the new branch)
  3. Make a new PR with the new branch
  4. Close the old PR
@Antistar

This comment has been minimized.

Copy link
Contributor Author

commented Oct 14, 2014

Thanks - new PR is up. Hopefully I got it right.

@Antistar Antistar closed this Oct 14, 2014

@Antistar Antistar deleted the Antistar:RetroDays(14-10-14) branch Oct 15, 2014

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