- Added and tested hidden property of locations through maps

- Removed bad padding property from sayers

game/content/db/maps.json

@@ -44,6 +44,7 @@
         {
             "id": "general_store",
             "name": "General Store",
+            "hidden": false,
             "x": 475,
             "y": 530,
             "img": "content/gfx/interface/icons/neitral.png"

game/library/characters/classes - characters.rpy

@@ -2184,7 +2184,7 @@ init -9 python:
             self.log_stats()
 
             # add Character:
-            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)), window_left_padding=230)
+            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)))
 
             self.restore_ap()
 
@@ -2247,7 +2247,7 @@ init -9 python:
                 self.arena_active = False # Indicates that char fights at Arena at the time.
 
             # add Character:
-            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)), window_left_padding=230)
+            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)))
 
             self.restore_ap()
 
@@ -2309,7 +2309,7 @@ init -9 python:
                 self.portrait = self.battle_sprite
 
             # add Character:
-            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)), window_left_padding=230)
+            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=self.show("portrait", resize=(120, 120)))
 
             self.restore_ap()
 
@@ -3025,7 +3025,7 @@ init -9 python:
             self.set_flag("day_since_shopping", 1)
 
             # add Character:
-            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=DynamicDisplayable(self._portrait), window_left_padding=230)
+            self.say = Character(self.nickname, color=ivory, show_two_window=True, show_side_image=DynamicDisplayable(self._portrait))
 
         def get_availible_pics(self):
             """

game/library/intro.rpy

@@ -247,9 +247,9 @@ init python:
 
 label intro_story1:
 
-    $ b = Character("???", color=white, what_color=white, show_two_window=True, window_left_padding=230)
-    $ t = Character("Terumi", color=green, what_color=green, show_two_window=True, show_side_image="content\events\Intro\pnterumi.png", window_left_padding=230)
-    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png", window_left_padding=230)
+    $ b = Character("???", color=white, what_color=white, show_two_window=True)
+    $ t = Character("Terumi", color=green, what_color=green, show_two_window=True, show_side_image="content\events\Intro\pnterumi.png")
+    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png")
 
     hide screen pyt_mainscreen
     scene black
@@ -577,7 +577,7 @@ label intro_story1:
     hide expression sakspr at center with dissolve
     "Well then, time to do your own mission."
 label intro_story2:
-    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png", window_left_padding=230)
+    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png")
     stop music fadeout 2.0
     scene black with dissolve
     play music "content/sfx/music/events/cemetery.ogg" fadein 2.0 loop
@@ -649,7 +649,7 @@ label intro_story2:
     stop music fadeout 2.0
     scene black with dissolve
 label intro_story3:
-    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png", window_left_padding=230)
+    $ ec = Character("Carstein", color=white, what_color=white, show_two_window=True, show_side_image="content\events\Intro\EricpCarstein.png")
     scene black with dissolve
     play music "content/sfx/music/events/Town5.ogg" fadein 2.0 loop
     show bg cab with dissolve
@@ -1085,7 +1085,7 @@ label intro_story: # this label goes when MC goes to Sakura's house after it bec
     # show terumi normal at right with move:
         # xzoom -1
         # This is one of the ways to use ATL, you can have the image rotating, changing shape and size, flying around the screen, changing alpha and anything like that.
-    # $ npc1 = Character("Terumi", color=green, what_color=green, show_two_window=True, show_side_image="content\events\Intro\pnterumi.png", window_left_padding=230)
+    # $ npc1 = Character("Terumi", color=green, what_color=green, show_two_window=True, show_side_image="content\events\Intro\pnterumi.png")
     # npc1 "Meow!"
     # t "Or not?"
     # "Note that all the good stuff is written as comments in examples.rpy file and you will not be able to see it from the game!"

game/library/mc_setup/pyt - screens - mc-setup.rpy

@@ -36,7 +36,7 @@ label mc_setup:
                     # del mc_max
                     # del mc_lvl_max
 
-                $ hero.say = Character(hero.nickname, color=ivory, show_two_window=True, show_side_image=hero.show("portrait", resize=(140, 140)), window_left_padding=230)
+                $ hero.say = Character(hero.nickname, color=ivory, show_two_window=True, show_side_image=hero.show("portrait", resize=(120, 120)))
 
                 if hasattr(renpy.store, "neow"):
                     $ del neow

game/library/screens/locations/pyt - screens - town - tavern.rpy

@@ -51,14 +51,15 @@ screen pyt_tavern_town():
                 use rg_lightbutton(img=entry.show("girlmeets",  exclude=["swimsuit", "wildness", "beach", "pool","onsen", "indoors"], type="first_default", label_cache=True, resize=(300, 400)), return_value=['jump', entry])
 
     for key in pytfall.maps("pytfall_tavern"):
-        if "img" in key:
-            python:
-                rx = int(key["rx"]) if "rx" in key else 60
-                ry = int(key["ry"]) if "ry" in key else 60
-                x = int(key['x']) / float(config.screen_width)
-                y = int(key['y']) / float(config.screen_height)
-            use r_lightbutton(img=im.Scale(key['img'], rx, ry), return_value=['location', key["id"]], align=(x, y))
-            frame:
-                background Solid((0, 0, 0, 128))
-                align (x, y+0.05)
-                text (u"%s"%(key['name'])) size 16        
+        if not key.get("hidden", False):
+            if "img" in key:
+                python:
+                    rx = int(key["rx"]) if "rx" in key else 60
+                    ry = int(key["ry"]) if "ry" in key else 60
+                    x = int(key['x']) / float(config.screen_width)
+                    y = int(key['y']) / float(config.screen_height)
+                use r_lightbutton(img=im.Scale(key['img'], rx, ry), return_value=['location', key["id"]], align=(x, y))
+                frame:
+                    background Solid((0, 0, 0, 128))
+                    align (x, y+0.05)
+                    text (u"%s"%(key['name'])) size 16        

game/library/screens/locations/pyt - screens - citybeach.rpy

@@ -56,7 +56,7 @@ screen pyt_city_beach:
         hover (im.MatrixColor(img, im.matrix.brightness(0.15)))
         action [Hide("pyt_city_beach"), Jump("city_beach_right")]
 
-    $img = im.Flip(im.Scale("content/gfx/interface/buttons/blue_arrow.png", 80, 80), horizontal=True)
+    $ img = im.Flip(im.Scale("content/gfx/interface/buttons/blue_arrow.png", 80, 80), horizontal=True)
     imagebutton:
         align (0.01, 0.5)
         idle (img)
@@ -74,26 +74,26 @@ screen pyt_city_beach:
             spacing 70
 
             for entry in gm.display_girls():
-                    if not entry.flag("beach_tags") or entry.flag("beach_tags")[0] < day:
-                        $citybeach_tags_list = [] 
-                        # main set
-                        if entry.has_image("girlmeets","beach"):
-                            $citybeach_tags_list.append(("girlmeets","beach"))
-                        if entry.has_image("girlmeets","swimsuit","simple bg"):
-                            $citybeach_tags_list.append(("girlmeets","swimsuit","simple bg"))  
-                        if entry.has_image("girlmeets","swimsuit","outdoors"):
-                            $citybeach_tags_list.append(("girlmeets","swimsuit","outdoors")) 
-                        # secondary set if nothing found
-                        if not citybeach_tags_list:
-                            if entry.has_image("girlmeets","outdoors"):
-                                $citybeach_tags_list.append(("girlmeets","outdoors"))
-                            if entry.has_image("girlmeets","simple bg"):
-                                $citybeach_tags_list.append(("girlmeets","simple bg"))    
-                        # giveup    
-                        if not citybeach_tags_list:
-                            $citybeach_tags_list.append(("girlmeets"))   
-
-                        $ entry.set_flag("beach_tags", (day, choice(citybeach_tags_list)))
+                if not entry.flag("beach_tags") or entry.flag("beach_tags")[0] < day:
+                    $ citybeach_tags_list = [] 
+                    # main set
+                    if entry.has_image("girlmeets", "beach"):
+                        $ citybeach_tags_list.append(("girlmeets", "beach"))
+                    if entry.has_image("girlmeets", "swimsuit", "simple bg"):
+                        $ citybeach_tags_list.append(("girlmeets", "swimsuit", "simple bg"))  
+                    if entry.has_image("girlmeets", "swimsuit", "outdoors"):
+                        $ citybeach_tags_list.append(("girlmeets" ,"swimsuit", "outdoors")) 
+                    # secondary set if nothing found
+                    if not citybeach_tags_list:
+                        if entry.has_image("girlmeets", "outdoors"):
+                            $citybeach_tags_list.append(("girlmeets", "outdoors"))
+                        if entry.has_image("girlmeets", "simple bg"):
+                            $citybeach_tags_list.append(("girlmeets", "simple bg"))    
+                    # giveup    
+                    if not citybeach_tags_list:
+                        $citybeach_tags_list.append(("girlmeets"))   
 
-                    use rg_lightbutton(img=entry.show(*entry.flag("beach_tags")[1], exclude=["urban", "wildness", "suburb", "nature", "winter", "night"], type="first_default", label_cache=True, resize=(300, 400)), return_value=['jump', entry]) 
+                    $ entry.set_flag("beach_tags", (day, choice(citybeach_tags_list)))
+
+                use rg_lightbutton(img=entry.show(*entry.flag("beach_tags")[1], exclude=["urban", "wildness", "suburb", "nature", "winter", "night"], type="first_default", label_cache=True, resize=(300, 400)), return_value=['jump', entry]) 
 

game/library/screens/locations/pyt - screens - main street.rpy

@@ -67,14 +67,15 @@ screen pyt_main_street():
     # Normal screen
     else:
         for key in pytfall.maps("pytfall_ms"):
-            if "img" in key:
-                python:
-                    rx = int(key["rx"]) if "rx" in key else 25
-                    ry = int(key["ry"]) if "ry" in key else 25
-                    x = int(key['x']) / float(config.screen_width)
-                    y = int(key['y']) / float(config.screen_height)
-                use r_lightbutton(img=ProportionalScale(key['img'], rx, ry), return_value=['location', key["id"]], align=(x, y))
-                frame:
-                    background Frame(Transform(im.Twocolor("content/gfx/frame/ink_box.png", white, grey), alpha=0.5), 5, 5)
-                    align (x, y+0.05)
-                    text (u"%s"%(key['name'])) size 16 color black
+            if not key.get("hidden", False):
+                if "img" in key:
+                    python:
+                        rx = int(key["rx"]) if "rx" in key else 25
+                        ry = int(key["ry"]) if "ry" in key else 25
+                        x = int(key['x']) / float(config.screen_width)
+                        y = int(key['y']) / float(config.screen_height)
+                    use r_lightbutton(img=ProportionalScale(key['img'], rx, ry), return_value=['location', key["id"]], align=(x, y))
+                    frame:
+                        background Frame(Transform(im.Twocolor("content/gfx/frame/ink_box.png", white, grey), alpha=0.5), 5, 5)
+                        align (x, y+0.05)
+                        text (u"%s"%(key['name'])) size 16 color black

game/library/screens/locations/pyt - screens - town.rpy

@@ -34,24 +34,25 @@ screen pyt_city_screen():
     default tt = Tooltip(None)
 
     for key in pytfall.maps("pytfall"):
-        if "img" in key:
-            $ rx = int(key["rx"]) if "rx" in key else 25
-            $ ry = int(key["ry"]) if "ry" in key else 25
-            $ img = ProportionalScale(key["img"], rx, ry)
-            imagebutton:
-                pos (key["x"], key["y"])
-                idle img
-                hover im.MatrixColor(img, im.matrix.brightness(0.25))
-                focus_mask True
-                hovered tt.action(key['name'])
-                action Return(['location', key["id"]])
-        else: # Map-cut-style:
-            imagebutton:
-                idle "".join([pytfall.map_pattern, key["id"], ".png"])
-                hover "".join([pytfall.map_pattern, key["id"], "_hover.png"])
-                focus_mask True
-                hovered tt.action(key['name'])
-                action Return(['location', key["id"]])
+        if not key.get("hidden", False):
+            if "img" in key:
+                $ rx = int(key["rx"]) if "rx" in key else 25
+                $ ry = int(key["ry"]) if "ry" in key else 25
+                $ img = ProportionalScale(key["img"], rx, ry)
+                imagebutton:
+                    pos (key["x"], key["y"])
+                    idle img
+                    hover im.MatrixColor(img, im.matrix.brightness(0.25))
+                    focus_mask True
+                    hovered tt.action(key['name'])
+                    action Return(['location', key["id"]])
+            else: # Map-cut-style:
+                imagebutton:
+                    idle "".join([pytfall.map_pattern, key["id"], ".png"])
+                    hover "".join([pytfall.map_pattern, key["id"], "_hover.png"])
+                    focus_mask True
+                    hovered tt.action(key['name'])
+                    action Return(['location', key["id"]])
 
     if tt.value:
         frame:

game/library/screens/pyt - screens - mainscreen.rpy

@@ -67,8 +67,7 @@ screen pyt_mainscreen():
     default tt = Tooltip("Welcome to PyTFall!\nHave a nice game!!!")
 
     # Main pic:
-    add (im.Scale("content/gfx/bg/bg085_rsz.jpg", config.screen_width, config.screen_height-40)) at sfade(0.0, 1.0, 2.0) ypos 40
-    # add("rukia_mast") align(0.5, 0.5) # align(0.9999, 0.9999)
+    add im.Scale("content/gfx/bg/bg085_rsz.jpg", config.screen_width, config.screen_height-40) at sfade(0.0, 1.0, 2.0) ypos 40
 
     frame:
         align (0.995, 0.88)

game/script.rpy

@@ -166,7 +166,7 @@
                 del mc_pics[picbase]
                 af_pics = mc_pics
                 del mc_pics
-                hero.say = Character(hero.nickname, color=ivory, show_two_window=True, show_side_image=hero.show("portrait", resize=(140, 140)), window_left_padding=230)
+                hero.say = Character(hero.nickname, color=ivory, show_two_window=True, show_side_image=hero.show("portrait", resize=(120, 120)))
                 hero.restore_ap()
                 hero.log_stats()
     else: