Burkini/Blouse + Fixes

• -removed penis head piercing light flaccid (art only)
• -removed penis head piercing light erect (art only)
• -removed penis head piercing heavy flaccid (art only)
• -removed penis head piecing heavy erect (art only)
• -corrected ku klux klan robe description grammar
• -added burkini outfit
• -added hijab and blouse outfit

Note(s): "a hijab and blouse" string was conflicting with "a hijab and abaya" due to the CamelCase surrounding art names. "a hijab and blouse" string was changed to "a blouse and hijab" although the link in wardrobe was left as "Hijab and blouse"-- for now. There probably was another way to do it, but I am retarded. @klorpa , just be aware since I believe this outfit was one of your babies. I kept this outfit and the burkini pretty plain/conservative as I wasn't sure if they were intended to be haram versions or not.

"Klan robes" string was changed to "a klan robe" and the link was changed to "Ku Klux Klan Robe" in wardrobe. Descriptions surrounding klan robe(s) were cleaned up as well.

WIP Penis piercing art was removed due to the 160 separate pieces of art it was going to take, honestly not worth it until dynamic scaling gets worked in on penises at a later date.

@Pregmodder also added clothing type list (per request) to the bottom of clothing hair and accessory passages.txt (as a reference)

changed the description

Thank you.

I will have to sync my version with the recent merges though before I can merge this one lest it drown them out under a wave of vector changes.

added 1 commit

• 90c29f74 - Burkini Quickfix

Compare with previous version

merged

mentioned in commit b264dade

One thing as I hussle around to get things straightened up for my overhauling, you did update the item availability JS, right? It runs off strings, so if it can't find "a Klan robe" it's going to declare you don't have it.

Looking at it, it is not. That will have to be handled. Same deal with the changes to the hijab and blouse.

Also please mirror JS changes to devNote/twineJS if at all possible.

JS and twineJS are handled, don't worry about them.

@deepmurk Using "HijabAndBlouse" and renaming the "Hijab" game suffix to "HijabAndAbaya" wouldn't have worked?

@Pregmodder I may have forgotten those existed, I'll update them next time.

@klorpa probably would have worked (if I knew how to do it. Lol) the if I read prndevs post correctly (I forget the merge number) it seems like the gamesuffix list in the art folder was just a text reference, not attached to anything for game use/output that I'm aware of.

@deepmurk The art files in the vector/layers folder could be renamed and it would work, right? Like how the various "slutty x" outfits don't conflict with each other.

@klorpa actually renaming the layers doesn't work, it has to match the CamelCase, but I have no idea how/why the CamelCase selects the words that it does. If the string was changed to 'a nice hijab and blouse' it would probably show up as 'NiceHijab' for me to use as the layer names and work just fine. @prndev would probably know better about how to resolve a conflict with the CamelCase. Since I ran across the same issue again today when picking strings for upcoming outfits.

Eg: 'blue jeans and shirt' and 'blue jeans' would probably conflict.

So I was thinking about doing 'blue jeans and a shirt' and 'tight blue jeans' to make sure the CamelCase separates them.

So "Boob_Outfit_Hijab.tw and Boob_Outfit_HijabAndBlouse.tw" wouldn't work, but "Boob_Outfit_Slutty.tw and Boob_Outfit_SluttyMaid.tw" do? And Boob_Outfit_Hijab.tw can't be renamed to Boob_Outfit_HijabAndAbaya.tw?

@klorpa correct, but I don't know why. I believe prndev had to manually fix those with similar names. But I don't know how it was done. All I do is match the layer name to the CamelCase. If the CamelCase says "CuteOutfit" and I put anything other than CuteOutfit_blah.tw, it will give me an error.

And the CamelCase seems to be derived from some (script?) interpretation of the actual string of the outfit name. If the conflict is resolved I can flip the string back to the original order.

@klorpa @deepmurk You are very close. The camel cased name is derived from the clothing string by the JavaScript function clothing2artSuffix in src/art/artJS.tw. It is currently set consider only words up to the first "and" as there are lengthy descriptions like "stretch pants and a crop-top" which cluttered the file names. This behaviour can be tweaked. Apply this patch to your branch to treat "and" as a normal word:

diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index b52a8306..94dda4c7 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -248,7 +248,7 @@ window.clothing2artSuffix = function (v) {
        } /* universal "special case": latex art is actually "restrictive latex" TODO: align name in vector source */
        return v.replace(/^a[n]? /, "") /* remove "a" and "an" from the beginning*/
                .replace(/ ?(outfit|clothing) ?/, "") /* remove "outfit" and "clothing" (redundant) */
-               .replace(/ and .+/, "") /* remove concatenated descriptions */
+               .replace("-", "") /* remove minus character */
                .replace(/\w\S*/g,
                        function (txt) {
                                return txt.charAt(0).toUpperCase() +

@prndev ah, probably would help if I looked at the files outside of /vector once in awhile. Will this break all my other outfits? I'm in the process of adding ~39 new outfits (pending^tbd^topsecret) and I will poop my pants if I have to do more work. Lol

@deepmurk As far as I see from the current master version, only outfits with "and" in the description will be affected. This is the complete list:

• "Blouse" becomes "BlouseAndHijab" (from "a blouse and hijab")
• "Hijab" is differentiated between "HijabAndAbaya" (from "a hijab and abaya") and "HijabAndBlouse" (from "a hijab and blouse")
• "Niqab" becomes "NiqabAndAbaya" (from "a niqab and abaya")
• "Cutoffs" becomes "CutoffsAndATshirt" (from "cutoffs and a t-shirt")
• "Spats" becomes "SpatsAndATankTop" (from "spats and a tank top")
• "StretchPants" becomes "StretchPantsAndACroptop" (from "stretch pants and a crop-top")

I hope this helps.