Added scenes to gallery; fixed positioning bugs; added kids in more s…

…cenes; tweaked LOVED_GOOD and relaxed.

game/computer-pad-screen.rpy

@@ -27,6 +27,8 @@ screen computer_pad(periods):
     add "bg/computer-pad.png"
 
     text "{font=fonts/Exo2.otf}User {color=#888}[her_name]{/color} has logged on.{/font}" size 12 xalign 0.1 ypos 20 color "FFFFFF"
+    textbutton "?" xpos 877 ypos 18 style "no_border" action Jump("tutorial")
+
     frame:
         style_group "cp"
         background None

game/credits.rpy

@@ -117,7 +117,7 @@ label show_credits:
         show brennan normal at right, rising behind text
         show lily upset at quarterleft, rising behind text
     else:
-        show brennan mad at right, rising behind text
+        show brennan normal at right, rising behind text
         show lily at quarterleft, rising behind text        
     with dissolve
     $ renpy.pause(6.0, hard=skippable)

game/dse.rpy

@@ -18,7 +18,7 @@ init python:
     dp_choice("Focus on Work", "act_work")
 
     #You can't skip work on work event months
-    dp_choice("Take it Easy", "act_skip_work", enable="(month>1) and (month<25) and (not ((month % 3) == 0))")
+    dp_choice("Take it Easy", "act_skip_work", enable="(month>1) and (not ((month % 3) == 0))")
 
     dp_period("Skills", "skill_focus_act")
     dp_choice("Domestic", "act_domestic", enable="skill_domestic < 100")
@@ -130,7 +130,7 @@ label day:
         menu:
             "Would you like to see the Tutorial?"
             "Yes":
-                call tutorial
+                call tutorial(False)
             "No":
                 $pass
 

game/ending.rpy

@@ -1,5 +1,4 @@
-# TODO: It's anticlimactic to have all these after giving birth. Shouldn't you get a break, anyway?
-# BUT, I want people to see month 25 messages... perhaps we could have this be a morning_event instead?
+# For MONTH 25, decide which ending to display.
 label monthly_event_25:
     play music "music/Rain.ogg" fadeout 1.0
     "It had been two years since we first arrived on Talaam. In a way, it felt like we had been here forever. But sometimes I still expected to find myself back on Earth, waking up from a long, long dream."
@@ -97,7 +96,7 @@ label bad_ending:
 # OR - Community failing, marriage succeeding
 # OR - both mediocre
 label mediocre_ending:
-    "Things were rough on Talaam. I wasn't sure they would ever get better."
+    "Things were rough on Talaam. I wasn't sure they would ever get easier."
     if (community_level >= COMMUNITY_LEVEL_OK):
         "But at least I had my friends and neighbors; we all helped each other out."
     else:
@@ -113,7 +112,7 @@ label mediocre_ending:
         "Like my job."
 
     if (community_level >= COMMUNITY_LEVEL_OK):
-        "I felt needed and appreciated at work, even if I didn't always feel that way at home."
+        "I loved my work; everything I did there was really important."
         call work_appreciation
 
     scene bg fields with fade
@@ -128,7 +127,7 @@ label mediocre_ending:
         him normal "Hi, [her_name]."
 
     show him at midright with move
-    her normal "Hi, [his_name]. What's for dinner?"
+    her happy "Hi, [his_name]. What's for dinner?"
     him serious "Stir-fry. Lots of fresh veggies this month!"
     if (loved >= 0):
         her normal "Okay, well, I guess we better eat what we have."
@@ -188,36 +187,48 @@ label mediocre_ending:
             him nude normal "After all, this little baby's depending on us."
             her serious "Yeah..."
 
-    show him nude sleeping
-    show her serious
-    with dissolve
-    "We kissed good night, but I lay awake for a little while, thinking a lot and worrying a little. I wanted to believe in our colony, to believe in our marriage, but I knew it took more than believing in something to make it come true."
-    "Sometimes it seemed like [his_name] wasn't even the same person I'd married before we came here."
-    "I guess I wasn't the same person, either."
-    "We didn't sit around gazing into each other's eyes anymore, and we didn't rush home from work just to see one another."
-    "Was it love binding us together, or just habit?"
-    if (loved > 0):
-        show her normal
-        "It was love, of course, just a different kind."
-        "The kind of love that works together towards hopes and dreams..."
-        "The kind of love that trusts and endures..."
-        "The kind of love that forgives..."
-        "The kind of love that was worth sacrificing for."
-        "Even if the colony failed, our love bound us together. It couldn't fail, because it wasn't some outside force beyond my control - I would not let my love fail."
-        "I couldn't control [his_name], of course. But he had shown me that he would do the same."
-        "I held onto that thought and let my worries slip away."
-        "If we had each other, we could do anything."
-    else:
-        "Sometimes we felt more like coworkers than a couple..."
-        "If we were back on Earth, would we even be together?"
-        "..."
-        "It was pointless to think about such things. We were here, we had a job to do, and we would do it together."
-        "We'd do whatever we had to to make this colony a success."
-        "After all, we'd managed to make Talaam, this strange and unfriendly planet, a real home."
-        "If we could do that, we could do anything."
-    show her sleeping with dissolve
-    scene black with fade
-    $ is_nude = False
+    label cg_mediocre:        
+        scene bg bedroom
+        $ is_nude = True        
+        show him nude sleeping at quarterright, squatting
+        show her concerned at midleft, squatting
+
+        if (is_pregnant):
+            show baby girl at quarterleftbaby
+        show bedroom_covers
+        show night
+        with dissolve
+        "We kissed good night, but I lay awake for a little while, thinking a lot and worrying a little. I wanted to believe in our colony, to believe in our marriage, but I knew it took more than believing in something to make it come true."
+        "Sometimes it seemed like [his_name] wasn't even the same person I'd married before we came here."
+        "I guess I wasn't the same person, either."
+        "We didn't sit around gazing into each other's eyes anymore, and we didn't rush home from work just to see one another."
+        "Was it love binding us together, or just habit?"
+        if (loved >= LOVED_GOOD):
+            show her normal
+            "It was love, of course, just a different kind."
+            "The kind of love that works together towards hopes and dreams..."
+            "The kind of love that trusts and endures..."
+            "The kind of love that forgives..."
+            "The kind of love that was worth sacrificing for."
+            "Even if the colony failed, our love bound us together. It couldn't fail, because it wasn't some outside force beyond my control - I would not let my love fail."
+            "I couldn't control [his_name], of course. But he had shown me that he would do the same."
+            "I held onto that thought and let my worries slip away."
+            "If we had each other, we could do anything."
+        else:
+            "Sometimes we felt more like coworkers than a couple..."
+            "If we were back on Earth, would we even be together?"
+            show her sad
+            "..."
+            show her serious            
+            "It was pointless to think about such things. We were here, we had a job to do, and we would do it together."
+            "We'd do whatever we had to to make this colony a success."
+            show her normal
+            "After all, we'd managed to make Talaam, this strange and unfriendly planet, a real home."
+            "If we could do that, we could do anything."
+        show her sleeping with dissolve
+        scene black with fade
+        $ is_nude = False
+        $ renpy.end_replay()
     call show_ending_cg
     $ persistent.got_mediocre_ending = True    
     ".:. Good Ending, 2 of 3."
@@ -242,7 +253,7 @@ label skill_appreciation:
         him surprised "Oh yeah? How'd it go?"
         her serious "Pretty good. Though sometimes I wish people would just work out their own problems."
         him normal "Like what?"
-        her serious "Oh, like \"Someone's goat is getting onto my property! Do something!\" when really they should just go tell Thuc, \"Hey, your goat came in my fields, can I help you fix your fence?\""
+        her flirt "Oh, like \"Someone's goat is getting onto my property! Do something!\" when really they should just go tell Thuc, \"Hey, your goat came in my fields, can I help you fix your fence?\""
         him normal "Ha ha, I know exactly what you're talking about."
         her serious "I just have to remember that we can't make everyone be happy, and they're not going to come tell us all the good things that are going on."
         him normal "Sounds like you've got a good perspective."
@@ -338,7 +349,7 @@ label work_appreciation:
         if (cheated_on_him):
             "I held onto him tightly, then lifted my face for a farewell kiss. He did not disappoint."
         else:
-            "I let go, but he was still holding me. Finally, he let go, a wry smile on his face."
+            "I let go, but he was still holding me. Finally, he stepped away, a wry smile on his face."
         show brennan at midleft with move
 
     brennan "Anyway, goodbye, [her_name]."
@@ -416,18 +427,28 @@ label good_ending:
     her laughing "What a waste! You should pick somewhere exotic!"
     him nude happy "What could be more exotic than an alien planet? Besides, you make everything seem exotic..."
     her flirt "I think the word you're looking for is \"erotic\", not \"exotic\"."
-    show him nude normal at center, squatting
-    with move
-    "He didn't say anything else, just buried his face in my hair and tightened his grip around my waist. I held on tight to his arms, feeling safety and love and happiness swirling around us."
-    "I wanted to hold on to this feeling right here that we had worked so hard for. And it was work - it wasn't easy to forgive, or compromise, or stay calm."
-    "But those moments when we made the choice to listen instead of judge, to help instead of sit back, or to be honest instead of hide an ugly truth - those were the moments that built our love, little by little."
-    "Like a coral reef, or a redwood tree, or a stalactite, it took time, and in many ways it was still fragile."
-    "But as long as we kept building, it could only grow."
-    show her sleeping
-    show him nude sleeping
-    with dissolve
-    scene black with fade
-    $ is_nude = False
+    label cg_good:
+        scene bg bedroom        
+        $ is_nude = True
+        # we re-show these in case we are in the middle of a gallery replay
+        show her normal at midleft, squatting        
+        show him nude normal at center, squatting
+        if (is_pregnant):
+                show baby girl at quarterleftbaby        
+        show bedroom_covers
+        show night          
+        with move
+        "He didn't say anything else, just buried his face in my hair and tightened his grip around my waist. I held on tight to his arms, feeling safety and love and happiness swirling around us."
+        "I wanted to hold on to this feeling right here that we had worked so hard for. And it was work - it wasn't easy to forgive, or compromise, or stay calm."
+        "But those moments when we made the choice to listen instead of judge, to help instead of sit back, or to be honest instead of hide an ugly truth - those were the moments that built our love, little by little."
+        "Like a coral reef, or a redwood tree, or a stalactite, it took time, and in many ways it was still fragile."
+        "But as long as we kept building, it could only grow."
+        show her sleeping
+        show him nude sleeping
+        with dissolve
+        scene black with fade
+        $ is_nude = False
+        $ renpy.end_replay()        
     call show_ending_cg
     $ persistent.got_good_ending = True
     ".:. Best Ending, 3 of 3."

game/events-domestic.rpy

@@ -248,6 +248,13 @@ label domestic_5:
             else:
                 "I made some cookies using smashed fruit as a sweetener.  They weren't very sweet, but I added some spices and nuts so they had lots of interesting flavors."
             scene bg community_center
+            show him happy at right
+            show her happy at quarterright
+            with moveinright
+            show van at midright
+            show raul at midleft
+            show kid at center
+            with moveinleft
             "The kids made costumes out of scraps and household items, and they went around trick-or-treating to all the farms and houses."
             if (want_kids):
                 "I wondered what it would be like to have our own child and take them trick-or-treating and celebrate holidays together. What will our kids be like?"

game/events-evening-alone.rpy

@@ -121,7 +121,7 @@ label relax_alone_3:
     "It was one she sent several years ago, but she told me all about my siblings, and how the neighbors were doing, and I better take good care of [his_name] and is he taking care of me, that sort of thing."
     "Even though I knew it would take four years for my letter to cross the vast space between our planets, I wrote back. I told her all about the farm and [his_name] and the town and my job. I wonder how much she could understand; our life was so different here..."
     "Still, it felt good to be connected to Earth."
-    if (relaxed < 0):
+    if (relaxed < -5):
         $ relaxed = 0
     else:
         $ relaxed += 5
@@ -338,7 +338,10 @@ label relax_alone_c:
     with dissolve
     play bg_sfx "sfx/splash.mp3"
     her normal "Ahhh...."
-    $ relaxed += 5
+    if (relaxed < -5):
+        $ relaxed = 0
+    else:
+        $ relaxed += 5
     $ loved -= 2
     scene black with fade
     $ is_nude = False

game/events-evening-together.rpy

@@ -106,7 +106,7 @@ label relax_together_1:
     play bg_sfx "sfx/splash.mp3"
     "It felt so good to soak and relax together."
 
-    if (relaxed < 0):
+    if (relaxed < -5):
         $ relaxed = 0
     else:
         $ relaxed += 5
@@ -209,7 +209,7 @@ label relax_together_3:
             him normal "I see your point."
             $ loved += 5
             $ made_love += 1
-            $ relaxed += 2
+            $ relaxed += 5
 
         "That bothers me.":
             her sad "That bothers me. Why didn't you tell me that was one of the factors?"
@@ -221,6 +221,7 @@ label relax_together_3:
             her sad "I love you, too, [his_nickname]. But... never mind."
 
             $ loved += 2
+            $ relaxed += 3
 
         "That's deceitful.":
             her annoyed "That's deceitful. I feel used."
@@ -239,7 +240,6 @@ label relax_together_3:
             him angry "I'm sorry, okay?! What more can I say?!"
             her sad "Nothing. Just- don't say anything more right now."
             $ loved -= 5
-            $ relaxed -= 2
 
     return
 
@@ -280,8 +280,7 @@ label relax_together_4:
             show him normal at center, behind her with move
             "He copied what I had done earlier, and gave me quite the massage, too. It was so relaxing to just sit and do nothing while he took care of all my tense muscles. He takes such good care of me..."
             $ made_love += 1
-            $ relaxed += 5
-
+        $ relaxed += 5
         $ loved += 5
 
     return
@@ -812,7 +811,7 @@ label relax_together_g:
             show him nude sleeping
             with dissolve
             $ loved += 2
-            $ relaxed += 2
+            $ relaxed += 3
         "Tell him off.":
             her angry "You had your chance, but you missed it. Sorry, I can't just wait around all day for you to finally decide to show up and get some action."
             him nude concerned "C'mon, [her_nickname]..."
@@ -858,24 +857,51 @@ label relax_together_i:
     show him normal at midleft with moveinleft
     menu:
         "What should I do?"
-        "Make one for [his_name] too.":
-            him normal "It looks like you had some fun this afternoon."
-            her happy "I made one for you too!"
-            him surprised "What am I, king of the faeries?"
-            her flirt "And I'm the queen! All the insects will obey our orders!"
-            him happy "Maybe if those orders include eating everything in sight!"
-            $ loved += 2
+        "Do a little dance":
+            show her happy at right with move
+            show her flirt at squatting with move
+            show her normal at midright, standing with move
+            him happy "Wow, you're like a woodland nymph."
+            her flirt "Think you can catch me?"
+            show her laughing at right with move
+            "I darted away, throwing a teasing smile over my shoulder at [his_name]."
+            show him happy at quarterright with move
+            show her happy at left with move
+            "He ran after me as I hopped over fences and twirled around trees."
+            show him laughing at midleft with move
+            if (skill_physical >= 60):
+                "He was slowing down. I decided it would be more fun to let him catch me."
+            show him normal at quarterleft, sitting
+            show her flirt at left, sitting
+            with move
+            "He finally caught up to me and tackled me playfully."
+            him flirting "Hmmm, now that I've captured you, what'll you give me?"
+            "I draped the flower circlet over his head."
+            her flirt "How about that?"
+            him serious "How about this?"
+            "He kissed me softly on the forehead, then on the cheeks, then finally I grabbed his head and brought our lips together."
 
-        "Make matching flower bracelets.":
-            him happy "Glad to see those weeds are getting some practical use!"
-            her concerned "Well, jewelry isn't exactly practical, but it is fun."
+        "Make matching flower circlets.":
+            him surprised "What am I, king of the faeries?"
+            her happy "And I'm the queen! All the insects will obey our orders!"
             him flirting "Shall I address you as Queen Mab from now on?"
             her flirt "Yes. I'll fulfill all your wishes... in your dreams."
-            him flirting "Ooo, harsh. But being with you is like a dream come true, so does that mean you'll fulfill my wishes here?"
+            him serious "Ooo, harsh. But being with you is like a dream come true, so does that mean you'll fulfill my wishes here?"
             "You get in a tickle fight, and one of your flower bracelets falls off. It was fun while it lasted."
-            $ loved += 2
             $ made_love += 1
+
+        "Apologize":
+            her concerned "Sorry, this is kind of a waste of time, isn't it?"
+            if (loved < 0):
+                him concerned "Yeah... we really need to get rid of those weeds."
+                her sad "Okay."
+                him normal "Here, I'll help you."
+                her normal "Oh, thanks!"
+            else:
+                him happy "If it makes you happy, it's not a complete waste of time. Here, I'll help you finish pulling the weeds."
+            "We finished pulling the weeds together while we talked."
 
+    $ loved += 2
     $ relaxed += 3
     return
 
@@ -886,6 +912,7 @@ label relax_together_j:
     show him normal at left
     with dissolve
     "I was sitting at the table, reading on my computer pad, when I got a message from [his_name]."
+    show her surprised
     play bg_sfx "sfx/message.mp3"
     "(Why is he sending me a message? He's right there...)"
     him_c "Right now I am sitting five feet away from the hottest chick in the universe."
@@ -911,6 +938,10 @@ label relax_together_j:
             show her laughing
             "He looked over at me with what I'm sure he thought was a melting gaze, but instead it just made me laugh."
             show him laughing
+            show her flirt at midright
+            show him flirting at midleft
+            with move
+
             "Soon he was laughing, too, and we were kissing, and everything seemed just about perfect."
             $ loved += 2
         "Nothing.":