Skip to content
Snippets Groups Projects

Stuff

Merged klorpa requested to merge klorpa/fc-pregmod:pregmod-dev into pregmod-master

Merge request reports

Approval is optional

Merged by PregmodderPregmodder 6 years ago (Feb 22, 2019 12:44am UTC)

Merge details

  • Changes merged into pregmod-master with 624865c5.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
10286 dark: 15,
10287 'dark olive': 14,
10288 bronze: 13,
10289 tan: 12,
10290 tan: 11,
10291 olive: 10,
10292 'light olive': 9,
10280 'pure black': 22,
10281 ebony: 21,
10282 black: 20,
10283 'dark brown': 19,
10284 brown: 18,
10285 'light brown': 17,
10286 dark: 16,
10287 'dark olive': 15,
10288 bronzed: 14,
  • Keep the changed version of these. Bronze skin sounds more natural than bronzed you know?

    That said, it ended up with two tans and two lights, if you have some idea on what to swap one of them with.

  • Author Contributor

    The (deprecated?) GenSkinTone widget in pregmodwidgets has the "original" set of skin tone names, where one "light" has been replaced with "lightened", and the "tan"s were replaced by "tanned" and "bronzed", which is apparently an actual term for skin tones (https://www.lorealparisusa.com/beauty-magazine/skin-care/sun-care-and-self-tanning/3-ways-to-get-bronzed-glowing-skin.aspx).

  • That's my point, I pulled those because they don't sound natural when applied to a fresh slave. Same with "natural", in fact. I would prefer to have them replaced with something relevant instead of just duplicating tan and light.

  • Author Contributor

    Should I change all the other places where skin tone names are called? Only this function establishes "bronze" and "tan" as skin tones.

  • Only this function. Purposefully tanning and lightening skin would still be considered tanned and lightened.

  • Author Contributor

    I kinda want to leave this as-is, because I think I'll be revamping the skin tone nameing/coloring scheme sometime soon.

  • I think it is fine as it currently is as I can just throw a catch onto childgen while I'm there fixing other things. Though now that I think about it, wasn't 'pure white''s value .0001 in the past to avoid this issue?

  • Author Contributor

    It was, but that had the other problem of Math.round missing that number entirely.

  • klorpa changed this line in version 10 of the diff

    changed this line in version 10 of the diff

  • Please register or sign in to reply
  • klorpa added 79 commits

    added 79 commits

    Compare with previous version

  • Also it will be awhile before I get time to sort through this merge, if you wanted to pop off the albino fix for a quicker merging.

  • kopareigns
  • klorpa added 12 commits

    added 12 commits

    Compare with previous version

  • klorpa added 1 commit

    added 1 commit

    Compare with previous version

  • klorpa added 1 commit

    added 1 commit

    Compare with previous version

  • klorpa added 24 commits

    added 24 commits

    Compare with previous version

  • klorpa marked as a Work In Progress from klorpa/fc-pregmod@6ea7faa8

    marked as a Work In Progress from klorpa/fc-pregmod@6ea7faa8

  • klorpa unmarked as a Work In Progress

    unmarked as a Work In Progress

  • klorpa changed title from Albino Skin Tone Fix + Pronouns/Etc. to Albino Skin Tone Fix + Pronouns/Etc. (Probably Ready)

    changed title from Albino Skin Tone Fix + Pronouns/Etc. to Albino Skin Tone Fix + Pronouns/Etc. (Probably Ready)

  • kopareigns
  • Arc names are usually bolded, so that should stay. I think it will properly apply the possessive apostrophe though.

  • klorpa added 1 commit

    added 1 commit

    • 2251eee0 - Update pAssociatesPublicSlut.tw

    Compare with previous version

  • klorpa added 81 commits

    added 81 commits

    Compare with previous version

  • klorpa marked as a Work In Progress

    marked as a Work In Progress

  • klorpa changed title from Albino Skin Tone Fix + Pronouns/Etc. (Probably Ready) to WIP: Stuff

    changed title from Albino Skin Tone Fix + Pronouns/Etc. (Probably Ready) to WIP: Stuff

  • You can probably drop the skin tone stuff since it is now working more as intended and deepmurk laid them out personally to better control the color palette of his vector art.

    Also please try to keep merges under 100 files, if not less. I'm dreading those two update packs I still have to process. I hope you don't mind that I'm putting them off for the start of the new year and taking a little break.

  • klorpa added 134 commits

    added 134 commits

    Compare with previous version

  • klorpa added 105 commits

    added 105 commits

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading