Skip to content

Commit

Permalink
Debug Hotfix (#122)
Browse files Browse the repository at this point in the history
* nsfw window react and related topic override

* Implementation of Fetishes

* Delete nsfw_fetish.rpy

* Implementation of Fetishes (for real this time)

* Updating Main to include Fetish Dictionary

* Correcting Commented Errors

* Update nsfw_window_reacts.rpy

* Update nsfw_window_reacts.rpy

* fix syntax error

* Update nsfw_window_reacts.rpy

* Update nsfw_window_reacts.rpy

* Added reset of horny level to sexting

* Added check for if the player's birthday has been set

Had a user get told they were under 18 when they had just installed the submod.

* Added bookmark derand to topics

* Updated sexting session label to be consistent with other topics

* Changed hour_check to allow custom topic label inputs

* Sexting choice dialogue width, 'getting close'  dialogue

Adds nsfw_screens to provide an override for the screen choice(item) function, itself defined in the MAS files. This override means that if you put ` (sextchoice)` (space included into a dialogue option, it will remove that and apply a new style to the buttons, which have double the usual width.
This has a two-fold improvement; for one, lengthly sexting options will no longer go off the top of the screen. Secondly, the added space means there will be room for more choices down the line (e.g. a finish early button).

This also includes a few quick variations added to monika's "getting close" text in nsfw_sexting_finale. In future, this can be moved into nsfw_main to avoid clutter, but it exists here as a proof of concept.

* Added start of 2 new nsfw compliments

* Updated version no.

* Spread out python

* Added protections for mas_canshowrisque

* Added necessary whitespace

* Removed unecessary whitespaces

* More whitespace

* MORE whitespace

* Added persistent for time when last sexted

* Moved first-time and usual checks to init

* nsfw_last_sexted gets used

* Type fixed

* Renamed for future purposes

* Fixed issue with randomint not working

* Removed whitespace

* Removed whitespace

* Added todos for all incomplete work

* More accurate todo statements

* Added seen_label check to wet compliment

* More polished TODO statements

* Added fetish prompt to pool

* Fixed indent

* added readme to gitignore

* Added eastern instead of two westerns

* typos

* Make check for all gen scroll menus submod

* Commented out unknown code

* Separated pool vs random and sorted alphabetically

* Neatened conditionals

* Created monika sexting init variable

* Created start of Monika sexting init

* Fixed new bar and added QoL for mouseover

* Tried fixing randomint again

* Reset sexting attempts after finishing

* Save when sexting starts as well

* Neatened another conditional

* Spaced comment

* Monika can start sexts. No dialogue yet.

* Swapped variables for consistency

* Added WIP function to rerandom events

* Another TODO

* Fixed female genitalia bug

* Removed unnecessary uses of store prefix

* Typo

* whitespace

* Correct variable is now being checked

* Fixed weird vscode bug

* Made monika sext init check into a function

* Moved sexting init to another rpy

* Fixed new sext check function

* made sexting topics their own file

* renamed sexting init for consistency

* Added counter for total sexting successes

* Expanded Monika sexting session

* Ensured frozen sexting attempts don't count

* Shortened wording

* Added {nw} to menus for consistency

* topic for rejecting monika too many times

* Making words saucy

* Bug fixes

* Added posing

* Added posing and changed some text

* More expressions and more dialogue

* more posing and dialogue

* Added random number generator

* Bug fixes

* Added extra dialogue for low frequency

* Cleaning up comments and some code

* Added way to activate sexting after freezing

* Implemented Monika sexting

* Added moaning compliment

* partial progress on wet compliment

* added stores back

* Fixed player name not working (at least for me)

* added stores back

* rewrote dialogue

* bug fixing

* added poses to moaning compliment

* added poses + dialogue to wet compliment

* Added filler dialogue

* added monika sexting init dialogue

* made random moans during compliment more common

* more dialogue

* Removed todo tags

* added store

* Preparing fetishes for integration with sexting

* made 3-letter tags into arrays for flexibility

* Added fetishes to persistent list

* Updated sext dialogue tables for more specificity

* Adding necessary changes for sexting

* Moved sexting dialogue to variables

* Making consistent variables

* Added types refinement for dialogue

* Added subtype refinement for dialogue

* Condensed variables into arrays

* Moved some declarations to nsfw_main

* Added kama sutra and amanga ranga topics

* fixed dialogue pools not being correctly assigned

* Fixed syntax issue

* 2 new monika quips

* removed unnecessary comments

* WIP for dialogue types

* added .store prefix

* Added nsfw_fix to gitignore

* Added two new response pairings

* Using int instead of pool for allocation

* Improved filling empty pools

* Added recent to search

* Minor type and subtype changes

* Fixed sexting sessions not unlocking correctly

* Made dialogue smoother

* Fixed unlock again

* Added debugging dialogue for testing

* Added new dialogues

* Moved response to before "UND" check

* wasn't looking at types correctly

* Adding/editing dialogue

* Fixed question dialogue not working correctly

* Added/edited some sexting dialogue

* Allows player to disable hand holding dialogue

* Allows player to turn off cheesy lines

* Sorted dialogue

* Replacing dialoguse, still need to do posing

* Added reminder

* Added barebones foot fetish preference

* Cleaned up saving fetishes to persistent

* Added comment blocks to explain functions

* Refined subtype search for special tags

* further fetish refinement

* Added some more dialogue

* Removed duplicate

* Updated submod header

* removed unnecessary python declaration

* Added missing commas

* Separated init for hot and sexy starts

* Fixed bug where shouldchange could not be declared

* Changed thresh to be consistent with other topics

* Added update scripts

* horny mood now requires sexting at least once

* Fixed sexting buttons not displaying correctly

* Missing comma

* I can't math quick maths

* new fix for mood not working correctly

* Missing 'store.' for functions

* Dialogue changes

* Indentation and unnecessary python

* Unecessary python + indentation

* Added reminder

* This just won't save correctly...

* Minor bugfixes

Fixes missing `store.` value, and some broken python code

* Update nsfw_window_reacts.rpy

Fixes a typo with the SPNATI reaction

* New sexting dialogue, fixed Kama Sutra topic

Fixes the Kama Sutra topic to now correctly re-state your preferred position in bed. (Or asks you to go and see that topic again if she hasn't stored your position)

Adds new sexting dialogue prompts and responses

* Update nsfw_sexting_dialogue.rpy

Reduce the size of most lines above a certain length. This helps to make sure the selection boxes don't go up and outside the game window

* Fixed? issue with specific question and answer

* Player can now loop through prompts

* Improved bondage fetish dialogue

* Pulling all types

* Improved comments

* Improved comment

* lowered chance of rare ending for sexting dialogue

* butt fetish progress

* whitespace

* Refined cheesiness fetish somewhat

* Refined anal fetish

* added todo

* wording fixes

* Reworked dominance fetish

* reworked foot fetish

* Fixed topic + reworded topic

* Expanded intro + added posing

* removed todo from yesterdays push

* Fixed up bondage topic + added posing

* Consistency check

* cheesiness can only be turned off after sexting

* Added posing to cheesy fetish

* removed comma

* Progress on anal topic

* reworded anal fetish + added posing

* Added posing to dominance fetish

* monika wont mention past until after safe sex

* Monika wont mention position until after past

* Fixed Ananga Ranga

* Incorrect comma placement

* Added posing and changes to feet fetish

* Fixed broken dialogue in brb topic

* Commented out broken funny dialogue

* Fixed unique tags bug

* Added debug for ease of sexting tests

* Removed unnecessary dialogue

* Fixed bug with leaning sprites

* Fixed all prompts ending the same

* Clarified non-generic tags

* Simplified logic

* Added debugging text for dialogue pool checks

* Updated out of date comment

* Commented debugging code

* More variety in hot responses

* Fixed bug that caused incorrect response to prompt

* Cleaned up appending comments

* Added extra statement pairing

* Clarified unique tags

* Missing commas for dialogue lists

* Added back timer

* debug hotfix

---------

Co-authored-by: TreeWizard96 <[email protected]>
Co-authored-by: TheOneandOnlyDargonite <[email protected]>
  • Loading branch information
3 people authored Sep 20, 2023
1 parent d3aa3c8 commit e381717
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions game/Submods/NSFW Submod/nsfw_main.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -561,13 +561,13 @@ init python in mas_nsfw:
# renpy.say("System", "Type match found: " + ", ".join(str(x) for x in types) + " works with " + ", ".join(str(x) for x in dialogue[0]) + ".") # DEBUG
dp1.append(dialogue)

if len(dp1) == 0: # DEBUG
renpy.say("System", "No dialogue found for the given types. Using a less specific dialogue pool.")
dp1 = dp2 if len(dp2) > 0 else dp3
if len(dp2) > 0:
renpy.say("System", "Dialogue pool 2 used.")
else:
renpy.say("System", "Dialogue pool 3 used.")
# if len(dp1) == 0: # DEBUG
# renpy.say("System", "No dialogue found for the given types. Using a less specific dialogue pool.")
# dp1 = dp2 if len(dp2) > 0 else dp3
# if len(dp2) > 0:
# renpy.say("System", "Dialogue pool 2 used.")
# else:
# renpy.say("System", "Dialogue pool 3 used.")

return dp1

Expand Down

0 comments on commit e381717

Please sign in to comment.