I have a handful of fixes for Farkel.
Spelling and phrasing fixes
Math fixes to avoid non-integer display of some numbers
Slightly shorter wait times in a few cases
Clarify some dates/times with denial
Code:
--- a/scripts/Farkel.groovy
+++ b/scripts/Farkel.groovy
@@ -205,7 +205,7 @@ def playSoundDiceroll = {
//Different image functions
def setImageGame = {
//DOTI : no more
- //see post 6398, ans SexScripts documentation
+ //see post 6398, and SexScripts documentation
//def folder = new File(System.getProperty("user.dir")+"/images/farkel/"+mistress+"/"+pictureSet+"/")
def folder = new File(getDataFolder()+"/images/farkel/"+mistress+"/"+pictureSet+"/")
def fileArray = folder.listFiles()
@@ -309,7 +309,7 @@ def options = {
rememberDenial = false
}
}else if(option == 5){
- if(getBoolean("If you enable this feature, you will enlist in a tournament against all the mistresses. It will consist of three rounds, and only if you beat all rounds will you be able to clame the prize of cumming.","Enable","Disable")){
+ if(getBoolean("If you enable this feature, you will enlist in a tournament against all the mistresses. It will consist of three rounds, and only if you beat all rounds will you be able to claim the prize of cumming.","Enable","Disable")){
tournament = true
}else{
tournament = false
@@ -409,7 +409,7 @@ def introduction = {
if(getBoolean("Not so fast!\n\nIf you lose you will not only be denied an orgasm. You will also receive a punishment based on how bad you played the game.", "I'm in", "*bail*")){
show("I am very pleased to hear that.")
takenBet = true
- wait(5)
+ wait(3)
}else{
show("I guess you are not man enough.\n\nThen let us just play a casual game")
wait(5)
@@ -434,7 +434,7 @@ def betAlgorithm = { maxPunish, minPunish, chanceOfCum, randomSeverity ->
def a = (maxPunish/2)-b*Math.log(50)
punishment = (int) (a+b*Math.log(chanceOfCum))
}else { //If the chance is below 50% an exponential function is used.
- punishment = (int) 20*Math.pow(Math.pow(50/minPunish,1/50),chanceOfCum)
+ punishment = (int) (20*Math.pow(Math.pow(50/minPunish,1/50),chanceOfCum))
}
return punishment*randomSeverity
@@ -451,7 +451,7 @@ def betNegotiation = {
def punishmentChoice
show("So let us start by negotiating the terms.")
- wait(5)
+ wait(3)
def endNegotiation = false
def negotiationRound = 0
@@ -502,7 +502,7 @@ def betNegotiation = {
punishmentSentence = " a ruined orgasm"
punishmentSuggestion = "ruined"
punishmentUpperLimit = 3 // just a place holder
- punishmentLowerLimit = 0 // just a place holder
+ punishmentLowerLimit = 1 // just a place holder
}
}
@@ -517,7 +517,7 @@ def betNegotiation = {
show("It's a deal")
endNegotiation = true
agreement = true
- wait(5)
+ wait(3)
}else{
if(getBoolean("What would you like to negotiate?", "Punishment", "Chance of cumming")){
agreedPunishment= getInteger("<i>Suggest amount of "+punishmentSuggestion+":</i>", agreedPunishment)
@@ -576,7 +576,7 @@ def betNegotiation = {
}
}
if(patience<=0){
- agreedPunishment = (int) initialPunishment * 1.15
+ agreedPunishment = (int) (initialPunishment * 1.15)
setImageDefeat(1)
show("My patience is running short!\n\nYour punishment just increased and will now be "+agreedPunishment+punishmentSentence+".\nThat's my final offer!")
showButton("Okay, Mistress "+mistress+"!")
@@ -997,7 +997,11 @@ def playerRound = {
}
playerTotal += roundPoints
displayTotals()
- show(display+"You got "+roundPoints+" points that round. That brings your grand to "+playerTotal+"."+"\n\n\n\n\n\n")
+ if (roundPoints) {
+ show(display+"You got "+roundPoints+" points that round. That brings your grand total to "+playerTotal+"."+"\n\n\n\n\n\n")
+ } else {
+ show(display+"You got "+roundPoints+" points that round. Your grand total remains "+playerTotal+"."+"\n\n\n\n\n\n")
+ }
wait(10)
if(playerTotal >= (gameEndValue/2) && !halfWay){
@@ -1025,7 +1029,7 @@ def spanking = { message, spanks, bpm ->
//Decides the punishment based on the score
def executePunishment ={
if(punishmentSuggestion=="spanks"){ //it would be more intuitive to use another identification form to figure out which punishment is used. But I did not want to cram unecessary variables in here.
- def rounds = (int) agreedPunishment/20
+ def rounds = (int) (agreedPunishment/20)
def leftover = agreedPunishment % 20
show("As we agreed, "+agreedPunishment+ " spanks to the butt.")
wait(5)
@@ -1037,7 +1041,7 @@ def executePunishment ={
}
return
}else if(punishmentSuggestion=="slaps"){
- def rounds = (int) agreedPunishment/10
+ def rounds = (int) (agreedPunishment/10)
def leftover = agreedPunishment % 10
show("As we agreed, "+agreedPunishment+ " slaps to the balls.")
wait(5)
@@ -1060,17 +1064,17 @@ def executePunishment ={
if(denialTimeStamp>getTime() && rememberDenial){
currentlyInDenial = true
- cal.add(Calendar.MINUTE, (int) (denialTimeStamp-getTime())/60)
+ cal.add(Calendar.MINUTE, (int) ((denialTimeStamp-getTime())/60))
denialUntil = cal.getTime()
}
- denialTimeStamp = (int) denialUntil.getTime()/1000 //Convert from millis to seconds. Comparable with getTime()
+ denialTimeStamp = denialUntil.getTime()/1000 //Convert from millis to seconds. Comparable with getTime()
if(rememberDenial){
save("Farkel.denialTimeStamp", denialTimeStamp)
denialMistress = mistress
save("Farkel.denialMistress", denialMistress)
}
- if(!currentlyInDenial) show("As agreed you will have "+agreedPunishment+" minutes of denial.\n\nIn other words, you cannot cum until " + denialUntil.format("HH:mm")+" "+denialUntil.format("dd/MM")+".")
- else show("As agreed you will have "+agreedPunishment+" minutes of denial.\nSince you are already in denial, your time will be added to your already existing time.\n\nIn other words, you cannot cum until " + denialUntil.format("HH:mm")+" "+denialUntil.format("dd/MM")+".")
+ if(!currentlyInDenial) show("As agreed, you will have "+agreedPunishment+" minutes of denial.\n\nIn other words, you cannot cum until " + denialUntil.format("HH:mm")+" on "+denialUntil.format("EEE MMM dd")+".")
+ else show("As agreed, you will have "+agreedPunishment+" minutes of denial.\nSince you are already in denial, your time will be added to your already existing time.\n\nIn other words, you cannot cum until " + denialUntil.format("HH:mm")+" on "+denialUntil.format("EEE MMM dd")+".")
showButton("Yes Mistress "+mistress+"!")
return
}else if(punishmentSuggestion=="ruined"){
@@ -1149,9 +1153,9 @@ def TimeOfDenial ={
Date denialUntil = new Date()
Calendar cal = Calendar.getInstance()
cal.setTime(denialUntil)
- cal.add(Calendar.MINUTE, (int)(denialTimeStamp-getTime())/60)
+ cal.add(Calendar.MINUTE, (int)((denialTimeStamp-getTime())/60))
denialUntil = cal.getTime()
- return denialUntil.format("HH:mm")+" "+denialUntil.format("dd/MM")
+ return denialUntil.format("HH:mm")+" on "+denialUntil.format("EEE MMM dd")
}
def CheckDenialStatus = {
@@ -1984,7 +1988,7 @@ def victoryPlayer = {
setImageVictory(1)
show("Awww, am I being unfair?\n\nWell, at least I am not the sucker with sore balls!")
wait(8)
- show("Jerk you cock for me!")
+ show("Jerk your cock for me!")
showButton("I am hard, Mistress "+mistress+"!")
setImageVictory(2)
show("Good!\nNow get to the edge!")
@@ -2386,7 +2390,7 @@ def victoryPlayer = {
}
}
- def timeDeadline = (int)(timeTaken[0]+timeTaken[1]+timeTaken[2])/3
+ def timeDeadline = (int)((timeTaken[0]+timeTaken[1]+timeTaken[2])/3)
if(timeDeadline > 25){
setImageDefeat(1)
show("That was pathetic. You spent "+timeDeadline+" seconds on average on the sentences.")
@@ -2621,7 +2625,7 @@ def victoryPlayer = {
show("Now give me 20 strokes as fast as possible!\n\nNo cumming!")
showButton("Done, Mistress "+mistress+"!")
setImageVictory(2)
- show("Common, you can do it faster than that!\n\nAgain!")
+ show("Come on, you can do it faster than that!\n\nAgain!")
showButton("Done, Mistress "+mistress+"!")
setImageVictory(3)
show("That's better!")
@@ -2964,9 +2968,9 @@ def victoryPlayer = {
show("I hope you are ashamed of your performance.")
wait(5)
}else{
- show("Stop! No even a ruined orgasm for you!")
+ show("Stop! Not even a ruined orgasm for you!")
showButton("Yes, Mistress "+mistress+"!")
- show("Now leave with your blue balls.\n\nI hope you are ashemed of your performance.!")
+ show("Now leave with your blue balls.\n\nI hope you are ashamed of your performance.!")
wait(8)
}
}