Skip to content
Snippets Groups Projects
Commit cad6e8dd authored by Purity's avatar Purity
Browse files

Merge branch 'feature/virginityStatChanges' into 'dev' 

Additions and fix for the virginity stats

See merge request !3168
parents 6e7ba487 66118aa6
No related branches found
No related tags found
1 merge request!3168Additions and fix for the virginity stats
Hide whitespace changes
Inline Side-by-side
game/base-combat/widgets.twee
+ 16
− 0
View file @ cad6e8dd
......@@ -62,11 +62,20 @@
<<set $_npcIndex to $NPCNameList.indexOf(_args[0])>>
<<if $_npcIndex isnot -1>>
<<set $player.virginityDetails[_args[1]].npcPenisSize to $NPCName[$_npcIndex].penissize>>
<<set $player.virginityDetails[_args[1]].npcPenisdesc to $NPCName[$_npcIndex].penisdesc>>
<<else>>
<<run $NPCList.forEach(npc => {
if (npc.fullDescription is _args[0]) $player.virginityDetails[_args[1]].npcPenisSize to npc.penissize;
if (npc.fullDescription is _args[0]) $player.virginityDetails[_args[1]].npcPenisdesc to npc.penisdesc;
})>>
<</if>>
<<if !$player.virginityDetails[_args[1]].npcPenisSize>>
<<if $tentacles>>
<<run Object.values($tentacles).forEach(tentacle => {
if (tentacle and tentacle.fullDesc is _args[0] and tentacle.size isnot undefined) $player.virginityDetails[_args[1]].tentacleSize to tentacle.size;
})>>
<</if>>
<</if>>
<</if>>
<<if _args[0] isnot undefined and _args[0] isnot 0>>
......@@ -329,6 +338,7 @@
<</if>>
<<if $_vType is "penile">>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisSize to $NPCName[$_i].penissize>>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisdesc to $NPCName[$_i].penisdesc>>
<<elseif ["vaginal", "anal", "oral"].includes($_vType)>>
<<if playerHasStrapon() or $player.penisExist>>
<<set $NPCName[$_i].virginityDetails[$_vType].playerPenisSize to playerPenisSize()>>
......@@ -381,13 +391,16 @@
<</if>>
<<if $_vType is "penile">>
<<set $_npc.virginityDetails[$_vType].npcPenisSize to $_npc.penissize>>
<<set $_npc.virginityDetails[$_vType].npcPenisdesc to $_npc.penisdesc>>
<<elseif ["vaginal", "anal", "oral"].includes($_vType)>>
<<set $_npcIndex to $NPCNameList.indexOf($_takerDesc)>>
<<if $_npcIndex isnot -1>>
<<set $_npc.virginityDetails[$_vType].npcPenisSize to $NPCName[$_npcIndex].penissize>>
<<set $_npc.virginityDetails[$_vType].npcPenisdesc to $NPCName[$_npcIndex].penisdesc>>
<<else>>
<<run $NPCList.forEach(npc => {
if (npc.fullDescription is $_takerDesc) $_npc.virginityDetails[$_vType].npcPenisSize to npc.penissize;
if (npc.fullDescription is $_takerDesc) $_npc.virginityDetails[$_vType].npcPenisdesc to npc.penisdesc;
})>>
<</if>>
<</if>>
......@@ -410,14 +423,17 @@
<</if>>
<<if $_vType is "penile">>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisSize to $NPCName[$_i].penissize>>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisdesc to $NPCName[$_i].penisdesc>>
<<elseif ["vaginal", "anal", "oral"].includes($_vType)>>
<<run console.log($_takerDesc)>>
<<set $_npcIndex to $NPCNameList.indexOf($_takerDesc)>>
<<if $_npcIndex isnot -1>>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisSize to $NPCName[$_npcIndex].penissize>>
<<set $NPCName[$_i].virginityDetails[$_vType].npcPenisdesc to $NPCName[$_npcIndex].penisdesc>>
<<else>>
<<run $NPCList.forEach(npc => {
if (npc.fullDescription is $_takerDesc) $NPCName[$_i].virginityDetails[$_vType].npcPenisSize to npc.penissize;
if (npc.fullDescription is $_takerDesc) $NPCName[$_i].virginityDetails[$_vType].npcPenisdesc to npc.penisdesc;
})>>
<</if>>
<</if>>
......
game/base-system/overlays/statistics.twee
+ 13
− 7
View file @ cad6e8dd
......@@ -1593,21 +1593,25 @@
<<default>>
<<set $_text_output to `Taken on: ${$_time.day}/${$_time.month}/${$_time.year}`>>
<</switch>>
<<set $_text_output += ` - ${ampm($_time.hour, $_time.minute)}<br>How recent: <<statisticsTimeCompare _args[0].timestamp>>`>>
<<set $_text_output += ` - ${ampm($_time.hour, $_time.minute)}<br>How recent: <<c>><<statisticsTimeCompare _args[0].timestamp>><</c>>`>>
<<set $_linkColour to "linkBlue">>
<<if _args[0].consensual isnot undefined>>
<<set $_text_output += "<br>Consensual: _args[0].consensual">>
<<set $_text_output += `<br>Consensual: ${_args[0].consensual ? "True" : "False"}`>>
<<set $_linkColour to _args[0].consensual ? "green" : "red">>
<</if>>
<<if _args[0].position>>
<<set $_text_output += "<br>Sex Position: _args[0].position">>
<<set $_text_output += `<br>Sex Position: ${_args[0].position.toUpperFirst()}`>>
<</if>>
<<if _args[0].playerPenisSize>>
<<set $_penisSize to ["micro", "mini", "tiny", "small", "normal", "large", "enormous"]>>
<<set $_text_output += "<br>Penis size: <<print $_penisSize[_args[0].playerPenisSize + 2]>>">>
<<set $_penisSize to ["Micro", "Mini", "Tiny", "Small", "Normal", "Large", "Enormous"]>>
<<set $_text_output += `<br>Penis size: ${$_penisSize[_args[0].playerPenisSize + 2]}`>>
<<elseif _args[0].npcPenisSize>>
<<set $_penisSize to ["tiny", "average", "thick", "huge"]>>
<<set $_text_output += "<br>Penis size: <<print $_penisSize[_args[0].npcPenisSize - 1]>>">>
<<set $_penisSize to ["Tiny", "Average", "Thick", "Huge", "Colossal"]>>
<<if !_args[0].npcPenisdesc or _args[0].npcPenisdesc is "penis">>
<<set $_text_output += `<br>Penis size: ${$_penisSize[_args[0].npcPenisSize - 1]}`>>
<<else>>
<<set $_text_output += `<br>Penis: ${$_penisSize[_args[0].npcPenisSize - 1]} ${_args[0].npcPenisdesc}`>>
<</if>>
<</if>>
<<switch _args[0].passage>>
<<case "Tutorial">><<set $_special to "Didn't know how to scream">>
......@@ -1646,6 +1650,8 @@
<</if>>
<<case "Moor Phallus Plant Masturbation">>
<<set $_special to "Driven mad with pleasure">>
<<default>>
<<if _args[0].npcPenisSize gte 5>><<set $_special to `${_args[3] is "vaginal" ? "Broken" : "Taken"} in the most brutal of ways`>><</if>>
<</switch>>
<<if $_special>><<set $_text_output += `<div class="lewd">Special: ${$_special}</div>`>><</if>>
<<if setup.loveInterestNpc.includes(_args[1]) and $_linkColour isnot "red">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment