Merge dev into interface

.gitignore

@@ -11,6 +11,9 @@ Desktop.ini
 $RECYCLE.BIN/
 .DS_Store
 
+# Hidden dirs
+*/.*
+
 # Python
 *.py[cod]
 

game/scripts/characters.rpy

@@ -33,37 +33,37 @@ define g15 = Character(None, show_side_image=Image("characters/genie/mage15.webp
 define g16 = Character(None, show_side_image=Image("characters/genie/mage16.webp", xpos=20), show_icon="genie")
 
 # Students
-define twi = Character("Fred and George", show_side_image=Image("characters/misc/weasley_twins/base_01.webp", xalign=1.0), show_icon="fred")
-define fre = Character("Fred", show_side_image=Image("characters/misc/weasley_twins/fred_01.webp", xalign=1.0), show_icon="fred")
-define ger = Character("George", show_side_image=Image("characters/misc/weasley_twins/george_01.webp", xalign=1.0), show_icon="george")
+define twi = Character(_("Fred and George"), show_side_image=Image("characters/misc/weasley_twins/base_01.webp", xalign=1.0), show_icon="fred")
+define fre = Character(_("Fred"), show_side_image=Image("characters/misc/weasley_twins/fred_01.webp", xalign=1.0), show_icon="fred")
+define ger = Character(_("George"), show_side_image=Image("characters/misc/weasley_twins/george_01.webp", xalign=1.0), show_icon="george")
 
 # Teachers
-define spo = Character("Professor Sprout")
+define spo = Character(_("Professor Sprout"))
 
 # Side characters
-define hat = Character("Sorting Hat", show_side_image=Image("characters/misc/hat.webp", xalign=1.0), show_icon="hat")
-define helf = Character("House-Elf", show_side_image=Image("characters/misc/elf.webp", xalign=0.95))
-define malf = Character("Malfoy")
-define cra = Character("Crabbe")
-define goy = Character("Goyle")
-define maf = Character("Madam Mafkin", show_side_image=Image("characters/misc/mafkin.webp", xalign=1.0))
-define myr = Character("Moaning Myrtle")
-define faw = Character("Fawkes", show_icon="fawkes")
-define abe = Character("Aberforth")
+define hat = Character(_("Sorting Hat"), show_side_image=Image("characters/misc/hat.webp", xalign=1.0), show_icon="hat")
+define helf = Character(_("House-Elf"), show_side_image=Image("characters/misc/elf.webp", xalign=0.95))
+define malf = Character(_("Malfoy"))
+define cra = Character(_("Crabbe"))
+define goy = Character(_("Goyle"))
+define maf = Character(_("Madam Mafkin"), show_side_image=Image("characters/misc/mafkin.webp", xalign=1.0))
+define myr = Character(_("Moaning Myrtle"))
+define faw = Character(_("Fawkes"), show_icon="fawkes")
+define abe = Character(_("Aberforth"))
 
 # Non-important characters
-define fem = Character("Female Student")
-define femv = Character("Female Voice")
-define mal = Character("Male Student")
-define mal2 = Character("Another Male Student")
-define sly1 = Character("Slytherin student")
-define sly2 = Character("Another Slytherin student")
-define qcr = Character("Quidditch Crowd")
+define fem = Character(_("Female Student"))
+define femv = Character(_("Female Voice"))
+define mal = Character(_("Male Student"))
+define mal2 = Character(_("Another Male Student"))
+define sly1 = Character(_("Slytherin student"))
+define sly2 = Character(_("Another Slytherin student"))
+define qcr = Character(_("Quidditch Crowd"))
 
 # Special
 define nar = Character("", what_prefix=">", show_icon="narrator", callback=narrator_fade)
 define narrator = nar # Note: Without this definition, anonymous narrator style will be overridden by Renpy.
-define anon = Character("???")
+define anon = Character(_("???"))
 
 # Dumbledore
 define dum1 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_1.webp"), show_icon="dumbledore", dynamic=True)

game/scripts/characters/astoria/common.rpy

@@ -1,9 +1,9 @@
 
 label update_astoria:
 
-    $ name_susan_astoria = renpy.random.choice(["Suzy","Cow","Cow Tits","Milk Bag","Slut","Whore","Piggy","Pig","Bessie","Moo Moo"])
-    $ name_tonks_astoria = renpy.random.choice(["Hag","Old Hag","Punk","Dyke","Lesbo"])
-    $ name_astoria_tonks = renpy.random.choice(["Cutie","Kitty","Princess","Cupcake","Honey"])
+    $ name_susan_astoria = renpy.random.choice([_("Suzy"),_("Cow"),_("Cow Tits"),_("Milk Bag"),_("Slut"),_("Whore"),_("Piggy"),_("Pig"),_("Bessie"),_("Moo Moo")])
+    $ name_tonks_astoria = renpy.random.choice([_("Hag"),_("Old Hag"),_("Punk"),_("Dyke"),_("Lesbo")])
+    $ name_astoria_tonks = renpy.random.choice([_("Cutie"),_("Kitty"),_("Princess"),_("Cupcake"),_("Honey")])
 
     # Chibi Update
     $ astoria_chibi.update()

game/scripts/characters/astoria/vars.rpy

@@ -37,7 +37,8 @@ default states.ast.ev.imperio_with_susan.completed_once = False
 
 # Names
 
-default name_astoria_genie = "Astoria"
-default name_genie_astoria = "Sir"
-default name_susan_astoria = "Cow"
-default name_tonks_astoria = "Old Hag"
+default name_astoria_genie = _("Astoria")
+default name_genie_astoria = _("Sir")
+default name_susan_astoria = _("Cow")
+default name_tonks_astoria = _("Old Hag")
+

game/scripts/characters/astoria/wardrobe.rpy

@@ -49,7 +49,7 @@ default ast_stockings_ann = DollCloth("astoria", ("legwear", "stockings"), "stoc
 default ast_gloves_ann = DollCloth("astoria", ("upper body", "gloves"), "gloves", "ann_takamaki", ["#f98be1ff"])
 default ast_buttplug_ann = DollCloth("astoria", ("misc", "accessory"), "accessory", "ann_takamaki", ["#632a2aff", "#b58787ff"], level=14, zorder=-1)
 
-default ast_outfit_ann = DollOutfit([ast_hair_ann, ast_hat_ann, ast_top_ann, ast_stockings_ann, ast_gloves_ann, ast_buttplug_ann, ast_panties_basic1], price=500, name="Ann Costume", desc="Wearing this will make you look like a different persona.")
+default ast_outfit_ann = DollOutfit([ast_hair_ann, ast_hat_ann, ast_top_ann, ast_stockings_ann, ast_gloves_ann, ast_buttplug_ann, ast_panties_basic1], price=500, name=_("Ann Costume"), desc=_("Wearing this will make you look like a different persona."))
 
 ################
 ## Pubic Hair ##

game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy

@@ -552,7 +552,7 @@ label cc_pf_strip_T2_intro_E2:
             gen "After all, they are two soft, meaty \"bludgers\"!" ("grin", xpos="far_left", ypos="head")
             gen "And I'm a \"beater\"!" ("grin", xpos="far_left", ypos="head")
 
-            $ states.gen.stats.quidditch_position = "beater"
+            $ states.gen.stats.quidditch_position = _("beater")
 
             cho "You are childish.{w} That's what you are..." ("soft", "narrow", "angry", "mid")
             gen "You're the one playing games." ("base", xpos="far_left", ypos="head")
@@ -610,7 +610,7 @@ label cc_pf_strip_T2_intro_E2:
             gen "Yes..." ("base", xpos="far_left", ypos="head")
             gen "You see, I think I've become quite a bit of a seeker myself!" ("grin", xpos="far_left", ypos="head")
 
-            $ states.gen.stats.quidditch_position = "seeker"
+            $ states.gen.stats.quidditch_position = _("seeker")
 
             cho "(...)" ("annoyed", "base", "base", "mid")
             gen "And I believe I've just found my very own golden snatch!" ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy

@@ -150,7 +150,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             gen "Nice, I still got her panties!" ("grin", xpos="far_left", ypos="head")
 
             # Panties acquired message!
-            call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
+            call give_reward(_("You have acquired Cho's panties!"), "interface/icons/panties.webp")
 
         "\"Not even close.\"":
             $ states.cho.mood += 15
@@ -395,7 +395,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             call bld
             gen "Nice, I still got her panties!" ("grin", xpos="far_left", ypos="head")
 
-            call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
+            call give_reward(_("You have acquired Cho's panties!"), "interface/icons/panties.webp")
             $ states.cho.ev.panty_thief.acquired = True
 
     # Reset Hermione clothing.

game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy

@@ -132,7 +132,7 @@ label cc_pf_strip_T3_intro_E1:
         pause .5
 
         # Panties acquired message!
-        call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
+        call give_reward(_("You have acquired Cho's panties!"), "interface/icons/panties.webp")
         $ states.cho.ev.panty_thief.acquired = True
 
     else:

game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy

@@ -1173,7 +1173,7 @@ label .succubus_E2:
 
     # Unlock outfit message. Should only appear once.
     if not ton_outfit_succubus.unlocked:
-        call unlock_clothing(text="New clothing items for Tonks have been unlocked!", item=ton_outfit_succubus)
+        call unlock_clothing(text=_("New clothing items for Tonks have been unlocked!"), item=ton_outfit_succubus)
 
     cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "L")
     ton @ hair horny "Maybe I could dress as a Succubus for Halloween. I'm sure the boys would love it..." ("base", "narrow", "base", "mid")

game/scripts/characters/cho/events/panties.rpy

@@ -19,7 +19,7 @@ label cho_panties_response_T2:
         call cho_walk("desk", "base")
         pause .8
 
-        call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
+        call give_reward(_("You hand over the panties..."), "interface/icons/panties_cum.webp")
 
         play sound "sounds/cloth_sound3.ogg"
         pause .4
@@ -115,7 +115,7 @@ label cho_panties_response_T3:
         call cho_walk("desk", "base")
         pause .8
 
-        call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
+        call give_reward(_("You hand over the panties..."), "interface/icons/panties_cum.webp")
 
         cho @ cheeks blush "(...)" ("upset", "base", "base", "down", xpos="mid", ypos="base", trans=blackfade)
         gen "Something wrong?" ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -88,7 +88,7 @@ label hufflepuff_match:
     with d3
 
     # Show wine
-    call give_reward(text=">Not grape-juice.", gift="interface/icons/wine.webp")
+    call give_reward(text=_(">Not grape-juice."), gift="interface/icons/wine.webp")
 
     gen "That's all the persuasion I needed, my friend!" ("base", xpos="far_left", ypos="head")
     hide screen bld1
@@ -1140,7 +1140,7 @@ label hufflepuff_match_return:
     call cho_walk(action="leave")
 
     stop music fadeout 1.0
-    call unlock_clothing(text="New clothing items for Cho have been unlocked!", item=cho_outfit_cheerleader)
+    call unlock_clothing(text=_("New clothing items for Cho have been unlocked!"), item=cho_outfit_cheerleader)
     call popup("New favours for Cho have been unlocked!", "Congratulations!", "interface/icons/head/cho.webp")
 
     $ states.her.busy = True

game/scripts/characters/cho/favors.rpy

@@ -25,7 +25,7 @@ default cho_ev_suck_it_t3_e2 = Event(id="cho_ev_suck_it_t3_e2", label="cc_pf_blo
 default cho_ev_suck_it_t3_e3 = Event(id="cho_ev_suck_it_t3_e3", label="cc_pf_blowjob_T3_E3", req="states.cho.tier >= 3", queue="cho_eventqueue_suck_it", autoenqueue=True, autodequeue=False)
 
 define cho_favors = [
-    ("cho_eventqueue_talk_to_me", "Talk to me!"),
-    ("cho_eventqueue_inspect_her_body", "Let me inspect you!"),
-    ("cho_eventqueue_suck_it", "Suck it!"),
+    ("cho_eventqueue_talk_to_me", _("Talk to me!")),
+    ("cho_eventqueue_inspect_her_body", _("Let me inspect you!")),
+    ("cho_eventqueue_suck_it", _("Suck it!")),
 ]

game/scripts/characters/cho/summon.rpy

@@ -191,5 +191,5 @@ label cho_favor_menu:
             jump cho_requests
 
 label not_available:
-    $ TBA_message("This feature is currently not available as of version %s." % config.version)
+    $ TBA_message(_("This feature is currently not available as of version %s.") % config.version)
     return

game/scripts/characters/cho/vars.rpy

@@ -74,7 +74,7 @@ default states.cho.ev.quidditch.slytherin_training = False # Finished Slytherin
 default states.cho.ev.quidditch.gryffindor_stage = "" # Dynamic string. Valid choices: 'start', 'ready', 'intro_done', 'completed', 'return'.
 default states.cho.ev.quidditch.gryffindor_failed = False # Found a cheerleader? (Requirements: Ask Luna)
 default states.cho.ev.quidditch.gryffindor_training = False # Finished Gryffindor practice match?
-default states.cho.ev.quidditch.broom_name = "Purple Rocket"
+default states.cho.ev.quidditch.broom_name = _("Purple Rocket")
 default states.cho.ev.quidditch.position = "" # Valid choices: "front", "above", "close"
 default states.cho.ev.quidditch.lock_training = False
 default states.cho.ev.quidditch.lock_practice = True
@@ -109,6 +109,6 @@ default states.cho.ev.manipulate_girls.t3_e4_complete = False
 
 # Names
 
-default name_genie_cho = "Professor"
-default name_cho_genie = "Cho"
-default name_cho_tonks = "Sweetie"
+default name_genie_cho = _("Professor")
+default name_cho_genie = _("Cho")
+default name_cho_tonks = _("Sweetie")

game/scripts/characters/genie/common.rpy

@@ -1,5 +1,5 @@
 
-define character.genie_say = Character("Genie", show_icon="genie")
+define character.genie_say = Character(_("Genie"), show_icon="genie")
 
 init python:
     def gen(what, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):