diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/toy.groovy | 22 | ||||
| -rw-r--r-- | scripts/toy/imagery.groovy | 29 | ||||
| -rw-r--r-- | scripts/toy/intro.groovy | 7 |
3 files changed, 3 insertions, 55 deletions
diff --git a/scripts/toy.groovy b/scripts/toy.groovy index e21f2c8..a19b024 100644 --- a/scripts/toy.groovy +++ b/scripts/toy.groovy @@ -229,21 +229,6 @@ return new Object() { } } - final compose = { texts -> - if (!texts || texts.isEmpty()) return null; - return texts.collect { - t -> t[getRandom(t.size())] - }.join(" ").capitalize(); - }; - final present = { imageSpec, texts -> - if (texts) { - show(compose(texts)); - } - if (imageSpec) { - return showImage(imageSpec); - } - return null; - }; final llmPresent = { text -> final image = showImageForText(text); show(text); @@ -252,13 +237,6 @@ return new Object() { image: image ]; }; - final matchTags = { spec -> - return { obj -> - return spec.collect({ tag, score -> - return (obj.tags.contains(tag.toString()) ? 1 : -1) * score; - }).sum(); - }; - }; final triggerHandlers = []; final addTriggerHandler = { String triggerName, func, defArg = null -> diff --git a/scripts/toy/imagery.groovy b/scripts/toy/imagery.groovy index 18113cc..23b4c79 100644 --- a/scripts/toy/imagery.groovy +++ b/scripts/toy/imagery.groovy @@ -21,22 +21,6 @@ }; }(); - toy.metaClass.selectImage { domme, set, spec -> - def matches = IMAGEDATA[domme]; - if (!matches) return null; - matches = matches.sets[set]; - if (!matches) return null; - def matcher = matchTags(spec); - matches = matches - .images - .collect{ image -> [ image: image, score: matcher(image) ] } - .sort{ image -> -image.score }; - if (matches.isEmpty()) return null; - matches = matches.findAll { image -> image.score >= matches[0].score }; - if (matches.isEmpty()) return null; - return matches[getRandom(matches.size())].image; - }; - toy.metaClass.showImageForText { text -> final captionList = DOMME.captions.collect{ id, caption -> "* ${id} : ${caption}" }.join("\n"); final request = [ @@ -65,19 +49,6 @@ ${captionList}""" return null; } - toy.metaClass.showImage { spec -> - def outfit = loadString("toy.owner.outfit"); - def image = selectImage(DOMME.id, outfit, spec); - if (image) { - setImage("toy/${DOMME.id}/$outfit/${image.image}.jpg"); - return image.tags; - } - else { - setImage(null); - return null; - } - }; - toy.metaClass.showLounge { setImage("toy/$OWNER/lounge.jpg"); }; diff --git a/scripts/toy/intro.groovy b/scripts/toy/intro.groovy index bfe8b68..2ad544c 100644 --- a/scripts/toy/intro.groovy +++ b/scripts/toy/intro.groovy @@ -3,10 +3,9 @@ // Configures a new relationship with $OWNER if (loadString("toy.${DOMME.id}.relationship") == null) { setImage(null); - present(null, [ - ["All images are the property of their respective owners, see watermarks (OnlyTease, ForeverVamp).\n"], - ["Don't do anything you aren't 100% comfortable doing.\n"], - ["Be sure to have configured your toys <b>BEFORE</b> continuing!"]]); + show("""All images are the property of their respective owners, see watermarks (OnlyTease, ForeverVamp). + Don't do anything you aren't 100% comfortable doing. + Be sure to have configured your toys <b>BEFORE</b> continuing!"""); showButton("OK"); // Welcome |