From 99124628ddd69d5ae0a5fa5247b477efb72a90f5 Mon Sep 17 00:00:00 2001 From: Frisk Date: Sun, 16 Feb 2025 00:28:54 +0100 Subject: [PATCH] Changed progression system after enslaving Added Luck Token image Added search fail to the drone minigame Updated repo --- IssixMod.json | 6 +-- .../IssixModule/Events/CornerPriorityEvent.gd | 6 ++- Modules/IssixModule/Items/Icons/lucktoken.png | Bin 0 -> 22650 bytes .../Items/Icons/lucktoken.png.import | 35 ++++++++++++++++++ .../Scenes/Overwrites/BullyGangScene.gd | 5 ++- .../Scenes/Overwrites/EatInCanteenScene.gd | 3 ++ .../SlaveryFirst/GenericTrainSessionScene.gd | 5 ++- .../SlaveryFirst/IssixBringsComicbooks.gd | 2 +- .../SlaveryFirst/PunRew/IssixOralScene.gd | 3 ++ .../SlaveryFirst/SlaveryBrandingScene.gd | 2 +- .../SlaveryFirst/SlaveryIntroContScene.gd | 3 +- .../SlaveryFirst/SlaveryTrainingBowlScene.gd | 3 +- .../SlaveryFirst/WalkiesTrainingScene.gd | 4 +- .../Scenes/SlaveryInfoScreenScene.gd | 2 +- .../IssixModule/Scenes/SlaveryIntroScene.gd | 1 - .../IssixModule/Scenes/Tasks/DroneFinder.gd | 28 +++++++++++++- Modules/IssixModule/Skills/Perks/PetSpeech.gd | 3 +- 17 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 Modules/IssixModule/Items/Icons/lucktoken.png create mode 100644 Modules/IssixModule/Items/Icons/lucktoken.png.import diff --git a/IssixMod.json b/IssixMod.json index eb50d5b..08a2c04 100644 --- a/IssixMod.json +++ b/IssixMod.json @@ -1,8 +1,8 @@ { "name": "Issix Mod", - "description": "\nTags: M/player, M/M (implied), petplay, slavery, corruption (of PC, opt-in), degradation, watersports (in-game toggle content), parasite (future, opt-in)\n\nIssix is a demonic dragon sick entirely of the world around, finding peace in BDCC facility. His idea of paradise is to own slaves to keep him company, do YOU want to join them?\n\nIssix mod adds 4 characters to the game - Issix as a dominant demonic dragon who is a master to Azazel, Hiisi and Lamia - his loyal pets. Mod is directed at players who when playing video games prefer to put themselves in submissive roles, as its the player who can join Issix's harem as one of his pets.\nCurrent state of the modification is that its released in Alpha (hah) stage this means that features leading to enslavement are mostly implemented and from then on its placeholder land.\n\nCurrent features:\n* 4 characters, all with some interactions coded in, you can help Lamia categorize their artwork, get some drugs for Azazel and play Rock Paper Scissor with Hiisi\n* 17 scenes, sort of meaningless number, but likely enough of content for at least an hour of gameplay with plans for expansion in the future\n* 1 quest leading to player's voluntary enslavement by Issix\n\nPlanned content:\n* More content after player is enslaved which is currently missing\n* Prostitute role\n* \"Hard mode\" with less choice and total submission to Master\n* Alternative route leading to enslavement\n* Expansion of content for all characters\n\nMod assumes player takes an anthro form, in the future it might be changed but if it's a deal breaker you should know.\n\nEveryone is welcome to contribute to the mod over on GitHub at https://github.com/Friskygote/Issix-mod.", + "description": "\nTags: M/player, M/M (implied), petplay, slavery, corruption (of PC, opt-in), degradation, watersports (in-game toggle content), parasite (future, opt-in)\n\nIssix is a demonic dragon sick entirely of the world around, finding peace in BDCC facility. His idea of paradise is to own slaves to keep him company, do YOU want to join them?\n\nIssix mod adds 4 characters to the game - Issix as a dominant demonic dragon who is a master to Azazel, Hiisi and Lamia - his loyal pets. Mod is directed at players who when playing video games prefer to put themselves in submissive roles, as its the player who can join Issix's harem as one of his pets.\nCurrent state of the modification is that its released in Alpha (hah) stage this means that features leading to enslavement are mostly implemented and from then on its placeholder land.\n\nCurrent features:\n* 4 characters, all with some interactions coded in, you can help Lamia categorize their artwork, get some drugs for Azazel and play Rock Paper Scissor with Hiisi\n* 17 scenes, sort of meaningless number, but likely enough of content for at least an hour of gameplay with plans for expansion in the future\n* 1 quest leading to player's voluntary enslavement by Issix\n\nPlanned content:\n* More content after player is enslaved which is currently missing\n* Prostitute role\n* \"Hard mode\" with less choice and total submission to Master\n* Alternative route leading to enslavement\n* Expansion of content for all characters\n\nMod assumes player takes an anthro form, in the future it might be changed but if it's a deal breaker you should know.\n\nWhile the repository is mainly hosted on https://git.frisk.space/Frisk/Issix-mod, everyone is welcome to contribute to the mod over on GitHub's mirror at https://github.com/Friskygote/Issix-mod, changes will be pulled to source repository.", "author": "Frisk", - "repository": "https://github.com/Friskygote/Issix-mod", - "modversion": "0.9.1", + "repository": "https://git.frisk.space/Frisk/Issix-mod", + "modversion": "0.9.5", "gameversion": "0.1.7" } diff --git a/Modules/IssixModule/Events/CornerPriorityEvent.gd b/Modules/IssixModule/Events/CornerPriorityEvent.gd index ebaf343..e7e59a2 100644 --- a/Modules/IssixModule/Events/CornerPriorityEvent.gd +++ b/Modules/IssixModule/Events/CornerPriorityEvent.gd @@ -4,7 +4,7 @@ func _init(): id = "IssixSpecialEvent" -var registered_special_scenes = [['IssixSlaveryIntroCont', 1, {}], ['IssixBringsComicbooks', 2, {"Comic_Books": 1}], ['IssixSlaveryBowlTraing', 2, {}], ['IssixSlaveryBranding', 3, {}]] +var registered_special_scenes = [['IssixSlaveryIntroCont', 0, {}], ['IssixSlaveryBranding', 0, {}], ['IssixBringsComicbooks', 1, {"Comic_Books": 1}], ['IssixSlaveryBowlTraing', 3, {}], ] class CustomSorter: static func sort_by_progressionpoints(a, b): @@ -29,13 +29,15 @@ func checkRequirements(requirements: Dictionary): func shouldBeShownForcedEvent(): var scenes_seen = getModuleFlag("IssixModule", "Misc_Slavery_Info", {"scenes_seen": []}) - var current_progression_points = GM.main.getModuleFlag("IssixModule", "Progression_Points", 0) + var current_progression_points = GM.pc.getSkillsHolder().getSkill("Pet").getLevel() if GM.main.getDays() >= GM.main.getModuleFlag("IssixModule", "Progression_Day_Next", 0) and GM.main.getModuleFlag("IssixModule", "Unwelcome_At_Corner", false) != true: registered_special_scenes.sort_custom(CustomSorter, "sort_by_progressionpoints") for scene in registered_special_scenes: if scene[1] > current_progression_points: return null if scenes_seen["scenes_seen"].find(scene[0]) == -1 and checkRequirements(scene[2]): + if scene[0] == "IssixSlaveryBranding" and GM.main.getDays() < scenes_seen["day_enslaved"]+9: # Special case for branding scene + continue return scene[0] return null diff --git a/Modules/IssixModule/Items/Icons/lucktoken.png b/Modules/IssixModule/Items/Icons/lucktoken.png new file mode 100644 index 0000000000000000000000000000000000000000..22976cfde46512211d71e8c96d86fe7e7231b01c GIT binary patch literal 22650 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 literal 0 HcmV?d00001 diff --git a/Modules/IssixModule/Items/Icons/lucktoken.png.import b/Modules/IssixModule/Items/Icons/lucktoken.png.import new file mode 100644 index 0000000..efd2ef6 --- /dev/null +++ b/Modules/IssixModule/Items/Icons/lucktoken.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lucktoken.png-5516dfc21eaeb1814777ede82a76e887.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Modules/IssixModule/Items/Icons/lucktoken.png" +dest_files=[ "res://.import/lucktoken.png-5516dfc21eaeb1814777ede82a76e887.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=0 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Modules/IssixModule/Scenes/Overwrites/BullyGangScene.gd b/Modules/IssixModule/Scenes/Overwrites/BullyGangScene.gd index 37c9e76..4a6a137 100644 --- a/Modules/IssixModule/Scenes/Overwrites/BullyGangScene.gd +++ b/Modules/IssixModule/Scenes/Overwrites/BullyGangScene.gd @@ -60,7 +60,7 @@ func _run(): else: addDisabledButton("Pay", "Not enough credits") addButton("Intimidate", "Tell them you won’t leave or pay", "intimidate") - if getModuleFlag("IssixModule", "PC_Training_Level", 0) > 0 and getModuleFlag("IssixModule", "PC_Enslavement_Role", 0) == 1: + if getModuleFlag("IssixModule", "PC_Enslavement_Role", 0) == 1 and (GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 1 or GM.pc.getSkillsHolder().getSkill("Pet").getExperience() > 100): if (GM.pc.getPersonality().getStat(PersonalityStat.Coward) > 0.3): addDisabledButton("Issix", "You are too cowardly to bring up your Master") else: @@ -178,3 +178,6 @@ func getDevCommentary(): func hasDevCommentary(): return true + +func getSceneCreator(): + return "Rahi, Frisk" diff --git a/Modules/IssixModule/Scenes/Overwrites/EatInCanteenScene.gd b/Modules/IssixModule/Scenes/Overwrites/EatInCanteenScene.gd index f3f0e1d..ecacaca 100644 --- a/Modules/IssixModule/Scenes/Overwrites/EatInCanteenScene.gd +++ b/Modules/IssixModule/Scenes/Overwrites/EatInCanteenScene.gd @@ -62,3 +62,6 @@ func _react(_action: String, _args): return setState(_action) + +func getSceneCreator(): + return "Rahi, Frisk" diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/GenericTrainSessionScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/GenericTrainSessionScene.gd index ed5f1e2..c1c60b7 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/GenericTrainSessionScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/GenericTrainSessionScene.gd @@ -85,8 +85,8 @@ func _run(): addButton("Back", "End today's training session", "endthescene") -func shouldBeInHeavyBondage(): # TODO Skill rebalance - return GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 2 or GM.pc.getSkillsHolder().getSkill("Pet").getExperience() > 80 +func shouldBeInHeavyBondage(): + return GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 3 func createButtons(): var trainingLevel = int(getModuleFlag("IssixModule", "PC_Training_Level", 0)) @@ -160,6 +160,7 @@ func _react(_action: String, _args): func _react_scene_end(_tag, _result): if(_tag == "walkies_end"): + goodPoints += 5 if shouldBeInHeavyBondage() else 0 goodPoints += 2 if GM.pc.isMuzzled() else 0 goodPoints += 2 if GM.pc.hasBlockedHands() else 0 destroyBorrowedEquipment() diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/IssixBringsComicbooks.gd b/Modules/IssixModule/Scenes/SlaveryFirst/IssixBringsComicbooks.gd index a3e487f..7c14a45 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/IssixBringsComicbooks.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/IssixBringsComicbooks.gd @@ -73,7 +73,7 @@ func _react(_action: String, _args): scenes["scenes_seen"].append(sceneID) GM.main.setModuleFlag("IssixModule", "Misc_Slavery_Info", scenes.duplicate(true)) setModuleFlag("IssixModule", "Progression_Day_Next", GM.main.getDays()+3) - increaseModuleFlag("IssixModule", "Progression_Points", 1) + GM.pc.addSkillExperience("Pet", 60) endScene() return diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/PunRew/IssixOralScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/PunRew/IssixOralScene.gd index f4a6d50..3e6b221 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/PunRew/IssixOralScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/PunRew/IssixOralScene.gd @@ -50,6 +50,9 @@ func _react(_action: String, _args): if _action == "normal2": GM.pc.addLust(20) + if _action == "normal3": + GM.pc.addStamina(-40) + if(_action == "endthescene"): endScene() return diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryBrandingScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryBrandingScene.gd index d9a63af..456425a 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryBrandingScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryBrandingScene.gd @@ -212,7 +212,7 @@ func _react(_action: String, _args): GM.pc.setLocation("hall_ne_corner") timedifference = GM.main.getTimeCap() - GM.main.timeOfDay processTime(timedifference) - increaseModuleFlag("IssixModule", "Progression_Points") + GM.pc.addSkillExperience("Pet", 200) if _action == "brandtalk": attitude = _args[0] diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryIntroContScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryIntroContScene.gd index b2dc3c8..973fad7 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryIntroContScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryIntroContScene.gd @@ -87,8 +87,7 @@ func _react(_action: String, _args): ], "gym_entrance", "crawl"]) if(_action == "endthescene"): - GM.pc.addSkillExperience("Pet", 300) - increaseModuleFlag("IssixModule", "Progression_Points") + GM.pc.addSkillExperience("Pet", 100) increaseModuleFlag("IssixModule", "PC_Training_Level") setModuleFlag("IssixModule", "Hiisi_Protects_PC", true) endScene() diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryTrainingBowlScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryTrainingBowlScene.gd index 7a636d2..9fc50c1 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryTrainingBowlScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/SlaveryTrainingBowlScene.gd @@ -73,8 +73,7 @@ func _react(_action: String, _args): if(_action == "endthescene"): increaseModuleFlag("IssixModule", "PC_Training_Level") - increaseModuleFlag("IssixModule", "Progression_Points") - GM.pc.addSkillExperience("Pet", 300) + GM.pc.addSkillExperience("Pet", 140) GM.pc.getSkillsHolder().addPerk("BowlTraining") var scenes = GM.main.getModuleFlag("IssixModule", "Misc_Slavery_Info", {"scenes_seen": []}) scenes["scenes_seen"].append(sceneID) diff --git a/Modules/IssixModule/Scenes/SlaveryFirst/WalkiesTrainingScene.gd b/Modules/IssixModule/Scenes/SlaveryFirst/WalkiesTrainingScene.gd index 1c09af6..514cf99 100644 --- a/Modules/IssixModule/Scenes/SlaveryFirst/WalkiesTrainingScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryFirst/WalkiesTrainingScene.gd @@ -293,8 +293,8 @@ func _react(_action: String, _args): -func shouldBeInHeavyBondage(): # TODO Skill rebalance - return GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 2 or GM.pc.getSkillsHolder().getSkill("Pet").getExperience() > 80 +func shouldBeInHeavyBondage(): + return GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 3 func rollDestination(): destination = RNG.pick(destinations.keys()) diff --git a/Modules/IssixModule/Scenes/SlaveryInfoScreenScene.gd b/Modules/IssixModule/Scenes/SlaveryInfoScreenScene.gd index 4071bbe..1042f88 100644 --- a/Modules/IssixModule/Scenes/SlaveryInfoScreenScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryInfoScreenScene.gd @@ -103,7 +103,7 @@ func _run(): addDisabledButton("Drone", "Drone is currently unavailable, talk with Master Issix") elif getModuleFlag("IssixModule", "Drone_Task_Timeout", 0) > 0: addDisabledButton("Drone", "New drone has been ordered, however it will take a while before it gets to the prison") - elif getModuleFlag("IssixModule", "Progression_Points", 0) > 5: + elif GM.pc.getSkillsHolder().getSkill("Pet").getLevel() > 5: addButtonWithChecks("Drone", "Help with finding items", "start_drone_task", [], [ButtonChecks.NotBlindfolded, ButtonChecks.NotHandsBlocked]) else: addDisabledButton("????", "You haven't unlocked this yet") diff --git a/Modules/IssixModule/Scenes/SlaveryIntroScene.gd b/Modules/IssixModule/Scenes/SlaveryIntroScene.gd index 48b5018..0a1889c 100644 --- a/Modules/IssixModule/Scenes/SlaveryIntroScene.gd +++ b/Modules/IssixModule/Scenes/SlaveryIntroScene.gd @@ -252,7 +252,6 @@ func _react(_action: String, _args): if _action == "acceptslavery": GM.pc.addExperience(500) setModuleFlag("IssixModule", "Misc_Slavery_Info", {"day_enslaved": GM.main.getDays(), "scenes_seen": []}) - setModuleFlag("IssixModule", "Progression_Points", 1) setModuleFlag("IssixModule", "Progression_Day_Next", GM.main.getDays()+1) setModuleFlag("IssixModule", "Issix_Mood", 50) setModuleFlag("IssixModule", "Last_Walk", GM.main.getDays()) diff --git a/Modules/IssixModule/Scenes/Tasks/DroneFinder.gd b/Modules/IssixModule/Scenes/Tasks/DroneFinder.gd index fb4d7e9..cb7dd77 100644 --- a/Modules/IssixModule/Scenes/Tasks/DroneFinder.gd +++ b/Modules/IssixModule/Scenes/Tasks/DroneFinder.gd @@ -21,8 +21,6 @@ func _initScene(_args = []): item_target = RNG.pick(["main_dressing2", "main_green_corridor10", "main_green_secret", "main_dressing1", "main_hallroom5", "med_mental_entrance", "medical_hospitalwards", "medical_storage", "med_corridor_split2", "med_nearshower", "med_researchlab", "med_milkingroom", "eng_corridor_blue3", "eng_airventskip", "eng_robotics", "eng_storage", "eng_corridor6", "eng_corridor3", "eng_assemblylab", "mining_shafts_entering", "eng_bay_nearbreakroom", "cellblock_red_playercell", "cellblock_lilac_nearcell", "cellblock_orange_playercell", "cellblock_corridor_nearstairs"]) strike = 0 flying_back = false - # DEBUG - item_target = "eng_assemblylab" func _run(): if(state == ""): @@ -149,6 +147,10 @@ func _run(): saynn("[say=issix]Here you go[/say]") addButton("Finish", "End the task", "endthescene") + if state == "wrong_location_search": + saynn("You decide to dive lower with the drone to search for "+item+" however you find nothing. You do however get a few creatures trying to catch the drone. This unneeded attention significantly increases the risk of the mission. You refocus, maybe the the vibrations from the controller aren't at their max, and the item is somewhere else?") + addButton("Continue", "Continue the search", "search") + if state == "guard_catch": aimCameraAndSetLocName(location) saynn("As you continue flying out of the sudden a large object appears in your eyes scaring you. The visor flashes in colors before becoming completely dark.") @@ -243,6 +245,28 @@ func _react(_action: String, _args): else: _action = "retrival_failure" + if _action == "search_retrieve": + var endLocation = null + if item_target_type == 1: + endLocation = item_target + else: + endLocation = GM.main.IS.getPawn(item_target).getLocation() + if location != endLocation: + var pawsAtNewLoc = GM.main.IS.getPawnsAt(location) + var is_caught = false + for pawn in pawsAtNewLoc: + if pawn.isGuard(): + if RNG.chance(80): + is_caught = true + if is_caught: + _action = "guard_catch" + elif strike == 2: + _action = "retrival_failure" + else: + strike += 1 + _action = "wrong_location_search" + processTime(60) + if _action == "retrival_failure": strike += 1 if strike > 2: diff --git a/Modules/IssixModule/Skills/Perks/PetSpeech.gd b/Modules/IssixModule/Skills/Perks/PetSpeech.gd index da23684..fc52024 100644 --- a/Modules/IssixModule/Skills/Perks/PetSpeech.gd +++ b/Modules/IssixModule/Skills/Perks/PetSpeech.gd @@ -17,8 +17,7 @@ func getPicture(): return "res://Modules/IssixModule/Skills/Images/petspeech.png" func toggleable(): - var ch = npc if npc != null else GM.pc - return !(ch.getSkillsHolder().hasPerk(self.id)) + return true func unlockable(): return false