-
Notifications
You must be signed in to change notification settings - Fork 106
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
Spritefix/additions #689
base: master
Are you sure you want to change the base?
Spritefix/additions #689
Conversation
Changes: Textures/Decals: Added - BlastMark decal / Oil Spill decal Textures/Structures: Added -Decoration: gore (folder), grave (folder), clutter (folder) -Furniture: 64x128 (folder), presidential rug, Toolcloset folders -Machines: Conveyer stuff (folder), machinery (folder), cistern tall, cirsten broken short / long, water cistern, sunset sarsparilla, pipes(folder), LatheIndustrial, -Storage: Toolkit folder, Dumpster (2 variants), >(in the crate folder) pre-war suitcase, clay pot, ammo box
meta.json files created in all the respective folders
Created meta.json files for all additions Added: Structure/furniture/defensive structures - Barbed wire large, Sandbags, Barbed Fence. Flags in Wallsdecor folder: Added Canadian flag, Ghoul town, riley's rangers. added them to both .json and .yml files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not make one meta file for different sprite states?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
im not expirenced in this tbh, im quite litearly going off what Mac taught me so far. So there's extra help i'd need to have a hand in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lots of similar issues, main ones include changing the copyright info to link to MS13 unless its from their zip file, in that case just credit infrared baron correctly then append your name to the end as the one who converted it.
General other issues are state names being long, paths with spaces in and having too many separate RSI files when a lot of stuff can go in one single RSI if its of similar stuff.
Great work though, I know its a pain to convert stuff. If you correct some of the issues then I can help with the yaml side too.
@@ -99,6 +99,15 @@ | |||
}, | |||
{ | |||
"name": "poster_wecan" | |||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you've created these sprites they'll either need to go in their own meta.json file with your copyright, or append your copyright info to this one. E.g. "X,Y,Z created by Marine...."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename to flag with lower case to match the meta.json and other files.
{ | ||
"version": 1, | ||
"license": "CC-BY-NC-SA-3.0", | ||
"copyright": "converted by Marines for use in nuclear14", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where from? If this is a MS13 sprite then head to the dmi file you got it from on github, right click the commit number on the right of the file name, copy link, paste it in here and say "taken from commit X, converted by Marines for N14".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These toolkits can all go in the same .rsi folder and just merge the meta.json files to have red, green, blue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do these need to be separate or can they be on a 64x64 sprite on a 128x128 sheet to fit them all? Fine if not I recall you mentioning about bounding boxes etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto, is this converted correctly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this go in a closets rsi somewhere
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
try keep the names consistent like wood1_empty, wood1_full,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merge these.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merge these into one rsi and even one state as directions if you want.
# Description Being a little too clever with omitting braces in complicated if statement chains in Vault-Overseers#686 caused blood regeneration for entities without Blood Deficiency to stop working altogether. I added some braces and now blood regeneration works again. I also added `DataField` to `HasBloodDeficiency` because I forgot to add that. # Changelog :cl: Skubman - fix: Passive blood regeneration now works again.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Description
(Today)
Created meta.json files for all additions
Added: Structure/furniture/defensive structures - Barbed wire large, Sandbags, Barbed Fence.
Flags in Wallsdecor folder:
Added Canadian flag, Ghoul town, riley's rangers. added them to both .json and .yml files.