Skip to content

Commit

Permalink
Fixed variables not being saved.
Browse files Browse the repository at this point in the history
  • Loading branch information
qirien committed Mar 10, 2017
1 parent 91c0aa8 commit 4553752
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 43 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Temporary files
*~
*.bak
*.swp
tmp/*

# Local-only files
Expand All @@ -15,3 +16,4 @@ traceback.txt
game/saves
game/google-play.rpy
art/
*.json
10 changes: 6 additions & 4 deletions game/events-monthly.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -4809,24 +4809,24 @@ label monthly_event_24:
him concerned "..."
her concerned "..."
else:
him sad "You miss it that much? I thought we were doing pretty good here..."
him surprised "You miss it that much? I thought we were doing pretty good here..."
her sad "Well... yeah, sometimes."
him sad "I've tried to work hard and give you everything you need..."
her concerned "I know you have. It's not your fault."
her concerned "I know you have. It's not your fault things are hard."
him concerned "If you really need to leave... I won't-"
if (community_level <= COMMUNITY_LEVEL_OK):
him concerned "But, you know, you need to work at it, too."
her annoyed "What's that supposed to mean?!"
him concerned "If we want things to be better here, it's up to us to make it happen. We can't just do the bare minimum and hope for the best."
her yelling "The bare minimum?! Is that what you think I've been doing?!"

him concerned "Anyway, no matter what, I'm staying here. I love Talaam. I love the challenge and the adventure. But if you really need to leave... I, I won't-"

him sad "I won't try to stop you."
menu:
"What should I say?"
"{i}I'll never leave you.{/i}" if (loved >= 0):
"He looked almost ready to cry; he really thought I might leave him. But, even so, he still wanted what was best for me."
her concerned "Oh, [his_name], I'll never leave you!."
her sad "Oh, [his_name], I'll never leave you!."
him serious "I need you, [her_name]. You're the reason I work, and the reason I come home."
show him sleeping at center with move
show her sleeping
Expand All @@ -4845,5 +4845,7 @@ label monthly_event_24:
her serious "I'll think about it..."
"He squeezed my hand gingerly, as if worried that if he reached for more I'd run away."
"I squeezed back, but I was still thinking. I couldn't just do what was best for him. I had to think about myself, too."
if (is_pregnant_later):
"...And the baby."

return
3 changes: 3 additions & 0 deletions game/events-morning.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -1647,12 +1647,15 @@ label work_8:
"What should I say?"
"{i}They need me here.{/i}" if (community_level >= COMMUNITY_LEVEL_OK):
her concerned "They need me here. There's no one else that is as good of a [profession] as I am."
$ wants_to_leave = False
$ community_level += 5
"{i}I love the people here.{/i}" if (skill_social >= 50):
her normal "I love the people here. They feel like family."
$ wants_to_leave = False
$ community_level += 5
"{i}I love [his_name].{/i}" if (loved >= 0):
her concerned "I love [his_name] too much to leave him behind."
$ wants_to_leave = False
$ loved += 2
"Actually, I don't want to stay.":
$ wants_to_leave = True
Expand Down
4 changes: 2 additions & 2 deletions game/options.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ init -1 python hide:
# These control the name and version of the game, that are reported
# with tracebacks and other debugging logs.
config.name = "Our Personal Space"
config.version = "1.20"
config.version = "1.21"

config.window_icon = "GUI/window-icon.png"
config.windows_icon = "GUI/windows-icon.png"
Expand Down Expand Up @@ -282,7 +282,7 @@ init python:
## The name that's used for directories and archive files. For example, if
## this is 'mygame-1.0', the windows distribution will be in the
## directory 'mygame-1.0-win', in the 'mygame-1.0-win.zip' file.
build.directory_name = "OurPersonalSpace-1.20"
build.directory_name = "OurPersonalSpace-1.21"

## The name that's uses for executables - the program that users will run
## to start the game. For example, if this is 'mygame', then on Windows,
Expand Down
77 changes: 40 additions & 37 deletions game/script.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -52,43 +52,8 @@ init -201 python:
# Variables about skills. On a scale from 0-100, how skilled is the character?
# These are now defined in dse.rpy

# Variables about our characters and their relationship
# Variables that need to be initialized before anything else
# Constant variables
init -200:
define month = 0
define local_month = 0
define year = 1
define earth_year = 1
define earth_month = 0
define save_name = "Intro" #name for the saved game

define known_each_other = ""
define profession = ""
define father_attitude = ""
define favorite_wedding_gift = ""
define want_kids = False
define have_goat = False
define is_pregnant = False
define is_pregnant_later = False
define wearing_dress = False
define is_nude = False
define slacked_off = 0 #number of times slacked off at work
define has_grass = False
define times_worked = 1
define he_hunts = False
define brennan_relationship = 0
define trimester = "None"
define season = "spring"
define weather = "calm and cool"
define cheated_on_him = False
define exposed_brennan = False
define discovered_qec = False
define ocean_character = ""
define wants_to_leave = False
define hated_food = "turnips"
define baby_name = "Terra"
define notified_stat_max = False

define COMMUNITY_LEVEL_OK = 40
define COMMUNITY_LEVEL_GOOD = 60
define COMMUNITY_LEVEL_MAX = 75
Expand Down Expand Up @@ -163,9 +128,47 @@ label splashscreen:
return


# The game starts here.
#
# START
#
label start:
# Initializing Variables
# Variables about our characters and their relationship
define month = 0
define local_month = 0
define year = 1
define earth_year = 1
define earth_month = 0
define save_name = "Intro" #name for the saved game

define known_each_other = ""
define profession = ""
define father_attitude = ""
define favorite_wedding_gift = ""
define want_kids = False
define have_goat = False
define is_pregnant = False
define is_pregnant_later = False
define wearing_dress = False
define is_nude = False
define slacked_off = 0 #number of times slacked off at work
define has_grass = False
define times_worked = 1
define he_hunts = False
define brennan_relationship = 0
define trimester = "None"
define season = "spring"
define weather = "calm and cool"
define cheated_on_him = False
define exposed_brennan = False
define discovered_qec = False
define ocean_character = ""
define wants_to_leave = False
define hated_food = "turnips"
define baby_name = "Terra"
define notified_stat_max = False


scene bg stars with fade

if (persistent.times_beaten):
Expand Down

0 comments on commit 4553752

Please sign in to comment.