Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New card game to play with Monika [Warning:🍝inside] #5555

Merged
merged 52 commits into from May 31, 2022
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
41a1a71
first upload of the whole mess
Booplicate Apr 16, 2020
f23be0d
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Apr 16, 2020
79ec7a7
+2 topics relating to nou
Booplicate Apr 16, 2020
b9189e9
a lot of changes
Booplicate Apr 19, 2020
95fc9cd
Next wave of updates
Booplicate Apr 21, 2020
db03bad
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Apr 21, 2020
1afd5dd
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Apr 25, 2020
17eb462
nou but it's actually playable
Booplicate Apr 25, 2020
868c268
F forgot about game_unlock_db
Booplicate Apr 25, 2020
ee6faa7
more generalization and fixes
Booplicate Apr 30, 2020
56e038b
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate May 15, 2020
50ac56e
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Jun 19, 2020
8e5d1c7
fixes, new expressions, prep for refactoring
Booplicate Aug 11, 2020
61153bd
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Aug 11, 2020
daad5c6
nou mas
Booplicate Aug 23, 2020
7d3dbc9
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Aug 23, 2020
3187877
increased the chances for Monika to win
Booplicate Aug 27, 2020
6ad2a5a
Monika, stop messing up with my code
Booplicate Aug 28, 2020
94e7238
Moni'Py wen?
Booplicate Aug 28, 2020
3437ef7
I was drunk when I coded this
Booplicate Jan 21, 2021
55379d5
Apply suggestions from code review
Booplicate Jan 21, 2021
1786bb5
Some more reqs
Booplicate Jan 21, 2021
7d81808
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Jan 21, 2021
c4fd3af
typofixes
Booplicate Mar 11, 2021
f8ea4ea
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Mar 31, 2021
a19460b
better desk sprites handling, more cohesive hover events
Booplicate Apr 1, 2021
589242a
better code
Booplicate Apr 2, 2021
83fd127
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Apr 12, 2021
fcdd796
req
Booplicate Apr 12, 2021
34ed153
ev db
multimokia Apr 13, 2021
2f81b0a
intro for house rules + consistency
Booplicate Apr 13, 2021
a0b66ef
allow to play with house rules from the get go
Booplicate Apr 13, 2021
7ec9b95
added explanation for house rules
Booplicate Apr 13, 2021
8e31dfb
explain points system
Booplicate Apr 13, 2021
5bfcf17
dlg things
Booplicate Apr 14, 2021
136b43d
missed this
Booplicate Apr 14, 2021
a372bda
AI bug fixes
Booplicate Apr 14, 2021
11cd9e3
Merge remote-tracking branch 'upstream/content' into NoU
multimokia May 4, 2021
2a1fd31
words
multimokia May 4, 2021
0b1e5d1
Merge remote-tracking branch 'upstream/content' into NoU
Booplicate Aug 26, 2021
285a57e
never pushed this why
Booplicate Aug 26, 2021
0c1ea45
Merge remote-tracking branch 'upstream/content' into pr/Booplicate/5555
multimokia May 28, 2022
956c759
clean some mid-game quips
multimokia May 28, 2022
f99416d
`ever_won` is obsolete
Booplicate May 29, 2022
09bdbc9
edits
jmwall24 May 29, 2022
ca2fd6d
Merge branch 'NoU' of https://github.com/Booplicate/MonikaModDev into…
jmwall24 May 29, 2022
127cb99
smol
jmwall24 May 29, 2022
7c16f97
some things
Booplicate May 29, 2022
aceae24
should use `random.random` smh
Booplicate May 29, 2022
8b20855
how did this got reverted
Booplicate May 30, 2022
0d733d4
less formal wording for must
multimokia May 30, 2022
537173b
prompt back
jmwall24 May 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 24 additions & 7 deletions Monika After Story/game/definitions.rpy
Expand Up @@ -4074,12 +4074,12 @@ init -1 python in _mas_root:
renpy.game.persistent.closed_self = False
renpy.game.persistent.seen_monika_in_room = False
renpy.game.persistent._mas_ever_won = collections.defaultdict(bool)
renpy.game.persistent.sessions={
'last_session_end':datetime.datetime.now(),
'current_session_start':datetime.datetime.now(),
'total_playtime':datetime.timedelta(seconds=0),
'total_sessions':0,
'first_session':datetime.datetime.now()
renpy.game.persistent.sessions = {
"last_session_end": datetime.datetime.now(),
"current_session_start": datetime.datetime.now(),
"total_playtime": datetime.timedelta(seconds=0),
"total_sessions": 0,
"first_session": datetime.datetime.now()
}
renpy.game.persistent._mas_xp_lvl = 0
renpy.game.persistent.rejected_monika = True
Expand Down Expand Up @@ -4113,6 +4113,17 @@ init -1 python in _mas_root:
renpy.game.persistent._mas_pnml_data = list()
renpy.game.persistent._mas_piano_keymaps = dict()

# nou
renpy.game.persistent._mas_game_nou_points = {"Monika": 0, "Player": 0}
renpy.game.persistent._mas_game_nou_wins = {"Monika": 0, "Player": 0}
renpy.game.persistent._mas_game_nou_abandoned = 0
renpy.game.persistent._mas_game_nou_house_rules = {
"points_to_win": 200,
"starting_cards": 7,
"stackable_d2": False,
"unrestricted_wd4": False
}

# affection
renpy.game.persistent._mas_affection["affection"] = 0

Expand Down Expand Up @@ -7900,7 +7911,13 @@ default persistent.seen_monika_in_room = False
default persistent._mas_ever_won = collections.defaultdict(bool)
# TODO: Delete this as depricated
# default persistent.ever_won = {'pong':False,'chess':False,'hangman':False,'piano':False}
default persistent.sessions={'last_session_end':None,'current_session_start':None,'total_playtime':datetime.timedelta(seconds=0),'total_sessions':0,'first_session':datetime.datetime.now()}
default persistent.sessions = {
"last_session_end": None,
"current_session_start": None,
"total_playtime": datetime.timedelta(seconds=0),
"total_sessions": 0,
"first_session": datetime.datetime.now()
}
default persistent.random_seen = 0
default persistent._mas_affection = {"affection":0,"goodexp":1,"badexp":1,"apologyflag":False, "freeze_date": None, "today_exp":0}
default persistent._mas_enable_random_repeats = True
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Monika After Story/game/script-ch30.rpy
Expand Up @@ -1887,6 +1887,7 @@ label ch30_reset:
"chess": "mas_unlock_chess",
mas_games.HANGMAN_NAME: "mas_unlock_hangman",
"piano": "mas_unlock_piano",
"nou": "mas_reaction_gift_noudeck"
}
mas_unlockGame("pong") # always unlock pong

Expand Down