Russian voiceover

.android.json

@@ -1 +1 @@
-{"target_version": 11, "google_play_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim+nfSYGZfSiY+73iyXcx4ZTuFAiEt7tZjRIQQCNqyrFBvMQpiTV+oCweEKCfh8UHPpu9OXkMyLely0AnVUCUa0GzNUSZ3lVSYNw2IR1xl8AVtNgFu7XoAv5hA8JVAgsOElZAqvHyOzTm8Edu34ElB1ZtnaDolVfHvFmbKFtQf1ZRhzcoFsAV5KFyKHmdgfRFyZ/mHZXGPAyNe4Uuo7pfLjs7mXNTt34V5KURlLeRMF+ECQRblQ49yZxh/EayQwXhSAMh9vY7Tam49KEkV+8rQoQnu32Yj/PPtCMxTquH/+iUUM9KMYRFptAK0F2xoDIb+CW95gtVKWHbfFMP0+9+QIDAQAB", "package": "in.dexp.onemangaday", "orientation": "sensorLandscape", "include_pil": false, "expansion": false, "name": "One Manga Day", "source": false, "icon_name": "One Manga Day", "version": "1.8", "layout": null, "permissions": ["VIBRATE"], "include_sqlite": false, "store": "none", "numeric_version": "108"}
+{"target_version": 11, "orientation": "sensorLandscape", "package": "in.dexp.onemangaday", "google_play_key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim+nfSYGZfSiY+73iyXcx4ZTuFAiEt7tZjRIQQCNqyrFBvMQpiTV+oCweEKCfh8UHPpu9OXkMyLely0AnVUCUa0GzNUSZ3lVSYNw2IR1xl8AVtNgFu7XoAv5hA8JVAgsOElZAqvHyOzTm8Edu34ElB1ZtnaDolVfHvFmbKFtQf1ZRhzcoFsAV5KFyKHmdgfRFyZ/mHZXGPAyNe4Uuo7pfLjs7mXNTt34V5KURlLeRMF+ECQRblQ49yZxh/EayQwXhSAMh9vY7Tam49KEkV+8rQoQnu32Yj/PPtCMxTquH/+iUUM9KMYRFptAK0F2xoDIb+CW95gtVKWHbfFMP0+9+QIDAQAB", "include_pil": false, "expansion": false, "name": "One Manga Day", "source": false, "icon_name": "One Manga Day", "version": "2.0", "layout": null, "permissions": ["VIBRATE"], "include_sqlite": false, "store": "none", "numeric_version": "200"}

.gitignore

@@ -1,6 +1,5 @@
 tmp
 game/saves
-game/voice
 pic
 **.bak
 **.rpyc

game/options.rpy

@@ -31,6 +31,9 @@ init -1 python hide:
     #config.help = "android"
     #config.help = "steam"
 
+    config.hw_video = False
+    # used for voice DLC. If True - we have it
+
 
     build.google_play_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim+nfSYGZfSiY+73iyXcx4ZTuFAiEt7tZjRIQQCNqyrFBvMQpiTV+oCweEKCfh8UHPpu9OXkMyLely0AnVUCUa0GzNUSZ3lVSYNw2IR1xl8AVtNgFu7XoAv5hA8JVAgsOElZAqvHyOzTm8Edu34ElB1ZtnaDolVfHvFmbKFtQf1ZRhzcoFsAV5KFyKHmdgfRFyZ/mHZXGPAyNe4Uuo7pfLjs7mXNTt34V5KURlLeRMF+ECQRblQ49yZxh/EayQwXhSAMh9vY7Tam49KEkV+8rQoQnu32Yj/PPtCMxTquH/+iUUM9KMYRFptAK0F2xoDIb+CW95gtVKWHbfFMP0+9+QIDAQAB"
 
@@ -53,7 +56,7 @@ init -1 python hide:
     # Эти управляют именем и версией игры, которые указываются
     # в журналах отладки.
     config.name = "OneMangaDay"
-    config.version = "1.9"
+    config.version = "2.0"
 
     #########################################
     # Темы
@@ -222,11 +225,12 @@ init -1 python hide:
 
     ## Установите True если в игре есть озвучка. 
 
-    config.has_voice = False
-    #config.has_voice = True
+    config.has_voice = False # Will be set in DLC's voice/voice.rpy
+    config.default_emphasize_audio = True
+    #config.default_emphasize_audio = False
     config.emphasize_audio_channels = [ 'voice' ]
-    config.emphasize_audio_volume = 0.10
-    config.emphasize_audio_time = 0.20
+    config.emphasize_audio_volume = 0.1
+    config.emphasize_audio_time = 0.2
     config.auto_voice = "voice/ru/{id}.ogg"
 
 
@@ -359,7 +363,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 = "OneMangaDay-1.9"
+    build.directory_name = "OneMangaDay-2.0"
 
     ## 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,
@@ -430,6 +434,7 @@ init python:
     build.classify('game/**.jpg', 'archive')
 
     # Declare archives
+    #build.classify('game/voice/**', None)
     build.archive("voice", "all")
     build.classify("game/voice/**", "voice")
 

game/screens.rpy

@@ -204,6 +204,9 @@ screen main_menu:
         textbutton _("Загрузить игру") action ShowMenu("load")
         textbutton _("Настройки") action ShowMenu("preferences")
         textbutton _("Достижения") action ShowMenu("achievements")
+        if config.help == "android":
+            #textbutton _("Пожертвовать") action ShowMenu("donate")
+            textbutton _("Пожертвовать") action OpenURL(__("http://onemangaday.dexp.in/ru/donate.html"))
         #textbutton _("Help") action Help()
         #textbutton _("Помошь") action ShowMenu("help")
         textbutton _("Выход") action Quit(confirm=False)
@@ -220,6 +223,49 @@ init -2 python:
 
 
 
+##############################################################################
+# Donate
+screen donate: 
+    #С помощью этих двух функций мы меняем фон, add можно не использовать 
+    tag menu 
+    add "bg/Classroom_41.jpg" 
+    frame:  
+        #Создаем площадь где будет находиться текст, два последних параметра это ширина и высота. 
+        area (10,0,800,540)  
+        #Делаем вертикальную полосу прокрутки 
+        viewport mousewheel True draggable True scrollbars "vertical": 
+            has vbox 
+            text _("{color=#333333}Сделать пожертвование:{/color}")
+            #С помощью этой функции мы опускаем следующий текст на 5 пикселей. 
+            null height 5 
+            $ fulltext = "{color=#555555}"
+            $ fulltext +=__("Если Вам понравилась игра, то Вы можете поддержать автора материально.\n")
+            $ fulltext +=__("\n")
+            $ fulltext +=__("WebMoney:\n")
+            $ fulltext +=__("WMR: {a=https://light.webmoney.ru/v3#/v3/WMTrans?corr=R309863884007}R309863884007{/a}       ")
+            $ fulltext +=__("WMZ: {a=https://light.webmoney.ru/v3#/v3/WMTrans?corr=Z110567914520}Z110567914520{/a}\n")
+            $ fulltext +=__("\n")
+            $ fulltext +=__("PayPal:\n")
+            $ fulltext +=__("paypal@dexp.in\n")
+            $ fulltext +=__("\n")
+            $ fulltext +=__("Почему нет QIWI?\n")
+            $ fulltext +=__("Я живу в Беларуси, здесь QIWI нет.\n")
+            $ fulltext +=__("\n")
+            $ fulltext +=__("Остальные методы пожертвований можно увидеть на {a=http://onemangaday.dexp.in/donate.html}сайте игры{/a}.")
+            $ fulltext += "{/color}"
+            text["[fulltext]"]
+    #Здесь создается ссылка на главное меню 
+    frame: 
+        style_group "mm" 
+        xalign .98 
+        yalign .98 
+        has vbox 
+
+        textbutton _("Вернуться") action Return()
+
+
+
+
 ##############################################################################
 # Help
 screen help: 
@@ -300,7 +346,10 @@ screen navigation:
             textbutton _("Вернуться") action Return()
             textbutton _("Главное меню") action MainMenu()
             textbutton _("Достижения") action ShowMenu("achievements")
-            textbutton _("Помошь") action ShowMenu("help")
+            if config.help == "android": 
+                textbutton _("Пожертвовать") action OpenURL(__("http://onemangaday.dexp.in/ru/donate.html"))
+            else:
+                textbutton _("Помошь") action ShowMenu("help")
 
             textbutton _("Сохранить игру") action ShowMenu("save")
             textbutton _("Загрузить игру") action ShowMenu("load")
@@ -495,11 +544,20 @@ screen preferences:
 
         # Левая колонка.
         vbox:
-            frame:
-                style_group "pref"
-                has vbox
+            if config.hw_video:
+                frame:
+                    style_group "pref"
+                    has vbox
+                    #label _("Озвучка")
+                    if config.has_voice:
+                        textbutton _("Отключить русскую озвучку") action Function(change_voiceover)
+                    else:
+                        textbutton _("Включить русскую озвучку") action Function(change_voiceover)
+            if config.help != "android":  
+                frame:
+                    style_group "pref"
+                    has vbox
 
-                if config.help != "android":  
                     label _("Отображение")
                     textbutton _("Окно") action Preference("display", "window")
                     textbutton _("Полный экран") action Preference("display", "fullscreen")
@@ -519,11 +577,11 @@ screen preferences:
                 label _("Скорость текста")
                 bar value Preference("text speed")
 
-            frame:
-                style_group "pref"
-                has vbox
-                if config.help != "android":                    
-                    textbutton _("Джойстик...") action Preference("joystick")
+            #if config.help != "android":
+            #    frame:
+            #        style_group "pref"
+            #        has vbox
+            #        textbutton _("Джойстик...") action Preference("joystick")
 
 
 
@@ -621,6 +679,15 @@ init -2 python:
     style.pref_slider.xalign = 1.0
 
     style.soundtest_button.xalign = 1.0
+
+init python:
+    def change_voiceover():
+        persistent.chose_voiceover = True
+        if config.has_voice:
+            config.has_voice = False
+        else:
+            config.has_voice = True
+
 
 
 ##############################################################################

game/script.rpy

@@ -859,12 +859,16 @@ label language_chooser:
     menu:
         "{image=items/flags/en.jpg}  English language":
             $ renpy.change_language("english")
+            if not persistent.chose_voiceover:
+                $ config.has_voice = False
             pass
         "{image=items/flags/ru.jpg}  Русский язык":
             $ renpy.change_language(None)
             pass
-        "{image=items/flags/pl.jpg}  Jezyk polski":
+        "{image=items/flags/pl.jpg}  Język polski":
             $ renpy.change_language("polish")
+            if not persistent.chose_voiceover:
+                $ config.has_voice = False
             pass
 
     #$ renpy.utter_restart()
@@ -878,8 +882,6 @@ label splashscreen:
     if not persistent.chose_lang:
         $ persistent.chose_lang = True
         call language_chooser from _call_language_chooser
-    #if _preferences.language == None:
-    #    $ config.translations.update(rusDic)
     return
 
 

game/tl/english/common.rpy

@@ -640,3 +640,35 @@ translate english strings:
     old "Copies the errors.txt file to the clipboard."
     new "Copies the errors.txt file to the clipboard."
 
+# TODO: Translation updated at 2016-02-17 10:38
+
+translate english strings:
+
+    # renpy/common/00gamepad.rpy:32
+    old "Select Gamepad to Calibrate"
+    new "Select Gamepad to Calibrate"
+
+    # renpy/common/00gamepad.rpy:35
+    old "No Gamepads Available"
+    new "No Gamepads Available"
+
+    # renpy/common/00gamepad.rpy:54
+    old "Calibrating [name] ([i]/[total])"
+    new "Calibrating [name] ([i]/[total])"
+
+    # renpy/common/00gamepad.rpy:58
+    old "Press or move the [control!r] [kind]."
+    new "Press or move the [control!r] [kind]."
+
+    # renpy/common/00gamepad.rpy:66
+    old "Skip (A)"
+    new "Skip (A)"
+
+    # renpy/common/00gamepad.rpy:69
+    old "Back (B)"
+    new "Back (B)"
+
+    # renpy/common/00gltest.rpy:105
+    old "Calibrate"
+    new "Calibrate"
+

game/tl/english/screens.rpy

@@ -285,3 +285,23 @@ translate english strings:
     old "Пропуск всех"
     new "Skip all"
 
+    # game/screens.rpy:209
+    old "Пожертвовать"
+    new "Donate"
+
+    # game/screens.rpy:209
+    old "http://onemangaday.dexp.in/ru/donate.html"
+    new "http://onemangaday.dexp.in/donate.html"
+
+    # game/screens.rpy:556
+    old "Озвучка"
+    new "Voiceover"
+
+    # game/screens.rpy:558
+    old "Отключить русскую озвучку"
+    new "Disable Russian voiceover"
+
+    # game/screens.rpy:560
+    old "Включить русскую озвучку"
+    new "Enable Russian voiceover"
+

game/tl/polish/common.rpy

@@ -608,9 +608,6 @@ translate polish strings:
     old "Position copied to clipboard."
     new "Position copied to clipboard."
 
-# TODO: Translation updated at 2015-12-29 12:44
-
-translate polish strings:
 
     # renpy/common/00gltest.rpy:91
     old "Gamepad"
@@ -624,10 +621,6 @@ translate polish strings:
     old "Disable"
     new "Disable"
 
-# TODO: Translation updated at 2015-12-29 12:44
-
-translate polish strings:
-
     # renpy/common/_errorhandling.rpym:544
     old "Copy to Clipboard"
     new "Copy to Clipboard"
@@ -640,3 +633,31 @@ translate polish strings:
     old "Copies the errors.txt file to the clipboard."
     new "Copies the errors.txt file to the clipboard."
 
+    # renpy/common/00gamepad.rpy:32
+    old "Select Gamepad to Calibrate"
+    new "Select Gamepad to Calibrate"
+
+    # renpy/common/00gamepad.rpy:35
+    old "No Gamepads Available"
+    new "No Gamepads Available"
+
+    # renpy/common/00gamepad.rpy:54
+    old "Calibrating [name] ([i]/[total])"
+    new "Calibrating [name] ([i]/[total])"
+
+    # renpy/common/00gamepad.rpy:58
+    old "Press or move the [control!r] [kind]."
+    new "Press or move the [control!r] [kind]."
+
+    # renpy/common/00gamepad.rpy:66
+    old "Skip (A)"
+    new "Skip (A)"
+
+    # renpy/common/00gamepad.rpy:69
+    old "Back (B)"
+    new "Back (B)"
+
+    # renpy/common/00gltest.rpy:105
+    old "Calibrate"
+    new "Calibrate"
+

game/tl/polish/screens.rpy

@@ -283,3 +283,24 @@ translate polish strings:
     old "Пропуск всех"
     new "Pomijanie wszystkich"
 
+
+    # game/screens.rpy:209
+    old "Пожертвовать"
+    new "Darować"
+
+    # game/screens.rpy:209
+    old "http://onemangaday.dexp.in/ru/donate.html"
+    new "http://onemangaday.dexp.in/donate.html"
+
+    # game/screens.rpy:556
+    old "Озвучка"
+    new "Głos"
+
+    # game/screens.rpy:558
+    old "Отключить русскую озвучку"
+    new "Wyłącz rosyjski głos"
+
+    # game/screens.rpy:560
+    old "Включить русскую озвучку"
+    new "Dołącz rosyjski głos"
+

game/tl/polish/script.rpy

@@ -148,3 +148,11 @@ translate polish start_5ccdeede:
     # centered "Озвучено командой сайта xdub.ru"
     centered "Rosyjski głos xdub.ru"
 
+# TODO: Translation updated at 2016-02-17 10:34
+
+translate polish strings:
+
+    # game/script.rpy:859
+    old "{image=items/flags/pl.jpg} Jezyk polski"
+    new ""
+

game/voice/LICENSE

@@ -0,0 +1,13 @@
+CC-BY-4.0
+
+All files authors list:
+DeXPeriX  a.k.a. Dmitry Hrabrov
+
+Russian voiceover by xdub.ru team:
+Izanami a.k.a. Khabarova Anastasia - Laiby, Carry, Spicy, granny
+Elrid a.k.a. Palaguta Alexander - Dex, God-cloud, working with sound
+Sharon a.k.a. Ignatenko Alexandr - Andre, the author's speech
+Kimamire a.k.a. Krashnik Olya - Lap, Yulilla, Mirei, Jess
+MIX-MAN a.k.a. Avvakumov Maxim - Alex
+Kobayashi a.k.a. Stavorjinskaya Yana - Malia, Lin, Azuki, Dragonha, Yana, stranger
+