Fixes
Fixed exiting the computer scene Added more content warnings for corruption scene Attempted to improve handling in Lamia's artwork help Fixed reported crash in training session Fixed types for pet's time display
This commit is contained in:
parent
bfcf86dbeb
commit
f0e24b40f3
|
|
@ -8,5 +8,5 @@ func _on_Closet_onEnter(room):
|
|||
|
||||
func _on_Closet_onReact(_room, key):
|
||||
if(key == "leave"):
|
||||
GM.pc.setLocation("med_lobbynw")
|
||||
GM.pc.setLocation("eng_corridor6")
|
||||
GM.main.reRun()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ func _run():
|
|||
saynn("His paw reaches your chin as he puts two fingers to massage it while he licks his lips. He puts another paw on your {pc.thick} chest, doing round circles with his paw.")
|
||||
saynn("[say=azazel]You know... I'm sure there is a still some space in my Master's corner, and I'd really really want to see you there, with a leash connected to your collar. I think you'd love it too, I think deep down you too would want to be a nice [pulse color=#ac1eff height=0.0 freq=1.0]"+GlobalRegistry.getModule("IssixModule").getPlayerPetName()+"[/pulse] for your Master. Call it an expert opinion.[/say]")
|
||||
saynn("You gulp, the way the feline said it made you flinch, and not in a bad way, it's a scary concept to be owned by someone else so directly. You are already a slave in this prison, but to give yourself so willingly? To a man wanting to assert power over others? That's...")
|
||||
addButton("Hot", "Admit to yourself that this thought makes your knees weak", "hot")
|
||||
addButton("Hot", "Admit to yourself that this thought makes your knees weak (CW: musk, drug use in future scenes)", "hot")
|
||||
addButton("Absurd", "You do not find this idea hot at all (disables future Azazel's corruption scenes)", "nothot")
|
||||
|
||||
if state == "walkno":
|
||||
|
|
@ -31,7 +31,7 @@ func _run():
|
|||
saynn("He looks at you with really surprised look, as if you've said something so illogically outrageous that he is unable to even comprehend such an answer.")
|
||||
saynn("[say=azazel]Wouldn't you want to have scratches behind your ear every morning? To have food in your bowl? To be cared for in this bleak world? To fulfill your Master's wishes and be rewarded?[/say]")
|
||||
saynn("He said, continuing a surprised tone.")
|
||||
addButton("Yes", "Say that this does sound good... (enables future Azazel corruption scenes which contain dubious consent actions)", "hot")
|
||||
addButton("Yes", "Say that this does sound good... (enables future Azazel corruption scenes which contain dubious consent actions CW: musk, drug use)", "hot")
|
||||
addButton("No", "Say that this is delusional to like it (disables future Azazel's corruption scenes)", "nothot")
|
||||
|
||||
if state == "hot":
|
||||
|
|
|
|||
|
|
@ -218,6 +218,7 @@ func _react(_action: String, _args):
|
|||
|
||||
if _action == "computer":
|
||||
runScene("ComputerSimScene", ["ClosetComputer"], "computerexplore")
|
||||
return
|
||||
|
||||
setState(_action)
|
||||
|
||||
|
|
@ -246,10 +247,5 @@ func _react_scene_end(_tag, _result):
|
|||
if(_result is Array):
|
||||
if(_result[0] == true):
|
||||
processTime(3*60)
|
||||
# addMessage("You got 50 credits! But there is something else too..")
|
||||
# addItemToSavedItems(GlobalRegistry.createItem("HorsecockDildo"))
|
||||
# GM.pc.addCredits(50)
|
||||
# addExperienceToPlayer(100)
|
||||
setState("lookaround")
|
||||
return
|
||||
endScene()
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ var pc_pose = null
|
|||
var arts_reviewed = 0
|
||||
var arts_correct = 0
|
||||
var hiisi_help_type = []
|
||||
var azazel = null
|
||||
|
||||
var pick_up_lamia_art = [
|
||||
"You pick up another art from the stash",
|
||||
|
|
@ -82,7 +81,6 @@ var crossword_puzzles = [["Sex in 11 letters", "Intercourse"], ["Subfamily of go
|
|||
|
||||
func _init():
|
||||
sceneID = "PetsTalkScene"
|
||||
azazel = GlobalRegistry.getCharacter("azazel")
|
||||
|
||||
func _initScene(_args = []):
|
||||
pc_pose = "stand" if getModuleFlag("IssixModule", "PC_Enslavement_Role", 0) == 0 else "kneel"
|
||||
|
|
@ -104,6 +102,7 @@ func _run():
|
|||
if(state == "azazelmain"):
|
||||
playAnimation(StageScene.Duo, "kneel", {pc="azazel", npcAction=pc_pose, npc="pc", bodyState={naked=false, hard=false}})
|
||||
clearCharacter()
|
||||
var azazel = GlobalRegistry.getCharacter("azazel")
|
||||
addCharacter("azazel")
|
||||
addButton("Talk", "Talk to Azazel", "azazeltalk")
|
||||
addButton("Appearance", "Look at Azazel", "azazelappearance")
|
||||
|
|
@ -566,6 +565,9 @@ func _run():
|
|||
if state == "artminigame":
|
||||
if arts_reviewed:
|
||||
saynn("You've rated "+str(arts_reviewed)+"/10 artworks.")
|
||||
if artwork == null:
|
||||
saynn("PROGRAMMING ERROR: artwork is null")
|
||||
addButton("Escape", "Mission Failed, We'll Get Em' Next Time", "lamiamain")
|
||||
if artwork[2] == true:
|
||||
saynn(RNG.pick(pick_up_lamia_art)+". The new artwork features "+RNG.pick(odd_lamia_art)+". Although after short moment the artwork is swiftly taken from you by Lamia who feels unusually flustered about you seeing it. He flips it upside down so the drawings are not visible to anyone anymore and puts it into the last box like this. Embarrassed he picks up another artwork from the pile and hands it to you. The new artwork features "+artwork[1]+".")
|
||||
else:
|
||||
|
|
@ -767,9 +769,9 @@ func loadData(data):
|
|||
.loadData(data)
|
||||
|
||||
artwork = SAVE.loadVar(data, "artwork", null)
|
||||
arts_reviewed = SAVE.loadVar(arts_reviewed, "arts_reviewed", null)
|
||||
arts_correct = SAVE.loadVar(arts_correct, "arts_correct", null)
|
||||
hiisi_help_type = SAVE.loadVar(hiisi_help_type, "hiisi_help_type", null)
|
||||
arts_reviewed = SAVE.loadVar(arts_reviewed, "arts_reviewed", 0)
|
||||
arts_correct = SAVE.loadVar(arts_correct, "arts_correct", 0)
|
||||
hiisi_help_type = SAVE.loadVar(hiisi_help_type, "hiisi_help_type", [])
|
||||
|
||||
func markHiisiRewardAsAquired():
|
||||
var HiisiRPS = getModuleFlag("IssixModule", "Hissi_RPS_data", {})
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ func _init():
|
|||
func _run():
|
||||
if(state == ""):
|
||||
saynn("You can choose to put artwork on the wall of your cell if you'd like to.")
|
||||
if (getModuleFlag("IssixModule", "Lamia_Chosen_Drawing", "simplepc") and getModuleFlag("IssixModule", "PC_Saw_Artwork_At_Lamias", false) == false):
|
||||
if (getModuleFlag("IssixModule", "Lamia_Chosen_Drawing") == "simplepc" and getModuleFlag("IssixModule", "PC_Saw_Artwork_At_Lamias", null) == false):
|
||||
addButton("Put artwork", "Put your simplistic artwork enchanted by Lamia on your wall", "putsimple")
|
||||
if getModuleFlag("IssixModule", "Received_Portrait_From_Lamia", false):
|
||||
addButton("Put artwork", "Put the portrait on your wall", "putportrait")
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ func _react(_action: String, _args):
|
|||
], "gym_entrance", "crawl"])
|
||||
|
||||
if(_action == "endthescene"):
|
||||
GM.pc.addSkillExperience("pet", 300)
|
||||
GM.pc.addSkillExperience("Pet", 300)
|
||||
increaseModuleFlag("IssixModule", "Progression_Points")
|
||||
increaseModuleFlag("IssixModule", "PC_Training_Level")
|
||||
endScene()
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ func _run():
|
|||
saynn("Master's mood: "+getMood())
|
||||
saynn("Issix's slave for "+str(getDays())+" days")
|
||||
match GM.main.getModuleFlag("IssixModule", "PC_Enslavement_Role", 1):
|
||||
1.0:
|
||||
1.0, 1:
|
||||
saynn("Amount of time spent in Master's harem today: "+str(getTimeSpentReadable()))
|
||||
var forced = GM.main.getModuleFlag("IssixModule", "Is_Player_Forced_Today", 0)
|
||||
if forced > 0:
|
||||
saynn("You are expected to spend "+Util.getTimeStringHumanReadable(forced)+" in the harem today.")
|
||||
2.0:
|
||||
2.0, 2:
|
||||
saynn("To pay Master for sluttying around yesterday: " + str(GM.main.getModuleFlag("IssixModule", "Prostituation_fee_yesterday", 0) + GM.main.getModuleFlag("IssixModule", "Prostituation_flat_fee", 0)))
|
||||
_:
|
||||
pass
|
||||
|
|
|
|||
Loading…
Reference in a new issue