Merge branch 'hunting' into flower-line

This also changes the retranslated spanish line to be corrected, and corrects the id for the other languages to work using the old line.
Merge branch 'update-readme'
2024-06-10 23:15:58 -05:00 · 2024-06-09 01:28:21 -05:00 · 2024-06-09 05:34:40 +00:00 · 2024-06-08 18:08:36 -05:00 · 2024-06-08 18:01:47 -05:00 · 2024-06-08 17:47:47 -05:00
14 changed files with 34 additions and 147 deletions
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Snoot Game

 <h1>Contributing</h1>
-<p>Find an issue and start working. Creating issues is very helpful. Simply emailing patches/updated versions of the script works too. <b>All PRs/Contributions to the main code should go to the patch branch and NOT master as to leave master a stable branch</b>. All contributions belong to you, but are licensed under the GNU AGPL v3 and are adherent to the GPL-Exception in the root of the project file.</p>
+<p>Find an issue and start working. Creating issues is very helpful. Simply emailing patches/updated versions of the script works too. <b>All PRs/Contributions can go to the master branch now, unless the contributer requests/is specified otherwise.</b>. All contributions belong to you, but are licensed under the GNU AGPL v3 and are adherent to the GPL-Exception in the root of the project file.</p>
 <p>It should be noted that any non-contributor sourced assets for the game MUST be under some form of free licensing that is <a href=https://creativecommons.org/share-your-work/licensing-considerations/compatible-licenses/>compatable with the CC-BY-SA 4.0 (Listed in this link as BY-SA)</a> for it to be added to the game. This includes audio, images, other bits of code, and other copyrightable assets. Compatable licenses include, but aren't limited to, CC-BY, Public Domain, CC-BY-SA 4.0, CC-BY-SA 3.0, The Free Art license, or any other license that is permissive in how it is used.</p>
--- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
+++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
@@ -844,7 +844,7 @@ label chapter_5:

    show fang considering flip with Dissolve(.25)

-    Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how long it takes for those to bloom!"
+    Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how hard those are to get!"

    Ro "Name!{w=.4} What is your name?!"

@@ -1388,7 +1388,6 @@ label chapter_5:

    A "Err{cps=*.1}...{/cps}{w=.3} Sorry?"

-    # TODO: the line "do you have any idea how long it takes for those to bloom" is also used earlier when Anon first falls into the flowerbed
    Ro "{i}Ay Dios mío{/i}{cps=*.1}...{/cps} do you have any idea how long it takes those to bloom?!"

    if not punched_into_flowerbed:
--- a/game/tl/es/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
+++ b/game/tl/es/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
@@ -1116,12 +1116,6 @@ translate es movie_4263d346:
    # "I shrug apologetically."
    "Me encojo de hombros a modo de disculpa."

-# game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy:847
-translate es movie_98d69c6e:
-
-    # Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how long it takes for those to bloom!"
-    Ro "Solo{cps=*.1}...{/cps}{w=.3} ¡URGH!{w=.4} ¿Tienes {i}alguna{/i} idea de cuánto tardan en florecer?"
-
 # game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy:849
 translate es movie_2fab4cce:

@@ -6944,3 +6938,11 @@ translate es strings:
    old "Interrupt"
    new "Interrumpir"

+# TODO: Translation updated at 2023-05-07 00:26
+
+# game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy:847
+translate es movie_f9188bac:
+
+    # Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how hard those are to get!"
+    Ro "Solo{cps=*.1}...{/cps}{w=.3} ¡URGH!{w=.4} ¿Tienes {i}alguna{/i} idea de lo difícil que son conseguirlas?"
+
--- a/game/tl/pl/script/11A.fang-desperately-wants-to-win-prom-night.rpy
+++ b/game/tl/pl/script/11A.fang-desperately-wants-to-win-prom-night.rpy
@@ -134,12 +134,6 @@ translate pl chapter_11A_cb936082:
    # F "So the band’s back together!"
    F "Więc zespół znów jest razem!"

-# game/script/11A.fang-desperately-wants-to-win-prom-night.rpy:65
-translate es chapter_11A_c6e70309:
-
-    # F "Isn’t that great!?"
-    F "Czy to nie jest wspaniałe!?"
-
 # game/script/11A.fang-desperately-wants-to-win-prom-night.rpy:67
 translate pl chapter_11A_4cf0cd74:

--- a/game/tl/pl/script/11C.anon-gets-fangs_-pronouns-right,-but-she-tells-him-she_s-okay-with-being-called-a-girl.rpy
+++ b/game/tl/pl/script/11C.anon-gets-fangs_-pronouns-right,-but-she-tells-him-she_s-okay-with-being-called-a-girl.rpy
@@ -202,7 +202,7 @@ translate pl chapter_11C_855bf2b8:
    "Testowałem jej imię kilka razy. To ładne imię. Naprawdę słodkie. Ale{cps=*.1}...{/cps}"

 # game/script/11C.anon-gets-fangs'-pronouns-right,-but-she-tells-him-she's-okay-with-being-called-a-girl.rpy:100
-translate es chapter_11C_338ba861:
+translate pl chapter_11C_338ba861:

    # "Fang fits her more in my mind."
    "Fang pasuje jej bardziej w mojej głowie."
--- a/game/tl/pl/script/11D.anon-gets-fangs_-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy
+++ b/game/tl/pl/script/11D.anon-gets-fangs_-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy
@@ -254,7 +254,7 @@ translate pl chapter_11D_d6f113de:
    A "Miałem zapytać mojego taty o jego stare łachy."

 # game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy:124
-translate es chapter_11D_691321e0:
+translate pl chapter_11D_691321e0:

    # F "You sure? I could ask Naser for his old stuff."
    F "Jesteś pewien? Mogę zapytać Nasera o jego stare rzeczy."
--- a/game/tl/pl/script/14A.KO_OP-ending.rpy
+++ b/game/tl/pl/script/14A.KO_OP-ending.rpy
@@ -306,60 +306,6 @@ translate pl chapter_14A_55f50c33:
    # "Really wish I could just float away in an iceberg like Master Grug after last night."
    "Naprawdę chciałbym po prostu odpłynąć na górze lodowej jak Mistrz Grug po wczorajszej nocy."

-# game/script/14A.KO_OP-ending.rpy:164
-translate es chapter_14A_82c2f372:
-
-    # "I glance at my phone and realize I spent ten hours playing Rock Ring."
-    "Spoglądam na telefon i uświadamiam sobie że spędziłem dziesięć godzin grając w Rock Ring."
-
-# game/script/14A.KO_OP-ending.rpy:166
-translate es chapter_14A_5b778353:
-
-    # "My mind was turned off for most of that, guess I just lost track of time."
-    "Mój umysł był wyłączony przez większość tego, chyba musiałem zgubić rachubę czasu."
-
-# game/script/14A.KO_OP-ending.rpy:176
-translate es chapter_14A_9f115d19:
-
-    # "I’m shaken from my thoughts by a knock at my door."
-    "Pukanie do dzrwi wytrząsa mnie z moich myśli."
-
-# game/script/14A.KO_OP-ending.rpy:178
-translate es chapter_14A_5695822c:
-
-    # "The door I forgot to lock."
-    "Drzwi których zapomniałem zamnknąć."
-
-# game/script/14A.KO_OP-ending.rpy:182
-translate es chapter_14A_79a1d94e:
-
-    # "Oh god, I’m gonna be murdered, butchered, my body parts sold on the black market and turned into some disgusting rhinorex’s sex toys."
-    "O Boże, zostanę zamordowany, zaszlachtowany, moje części ciała sprzedane na czarnym rynku i zamienione w jakieś sex-zabawki dla rhinorex'ów."
-
-# game/script/14A.KO_OP-ending.rpy:184
-translate es chapter_14A_2a0b150f:
-
-    # "Hopefully in that order."
-    "Mam nadzieję że w tej kolejności."
-
-# game/script/14A.KO_OP-ending.rpy:190
-translate es chapter_14A_ea8a1623:
-
-    # "Before I can search for my knife, the door opens to reveal{cps=*.1}...{/cps}"
-    "Zanim zdążę poszukać noża, drzwi się otwierają by ukazać{cps=*.1}...{/cps}"
-
-# game/script/14A.KO_OP-ending.rpy:205
-translate es chapter_14A_c73063d9:
-
-    # F "Anon? You- oh! Hey…"
-    F "Anon? Ty... Oh! Hej..."
-
-# game/script/14A.KO_OP-ending.rpy:208
-translate es chapter_14A_fd939103:
-
-    # F "Uh… Why are you huddled in the fetal position?"
-    F "Eee... Czemu jesteś skulony w pozycji embrionalnej?"
-
 # game/script/14A.KO_OP-ending.rpy:214
 translate pl chapter_14A_2e0d0e88:

--- a/game/tl/pl/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
+++ b/game/tl/pl/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
@@ -1121,7 +1121,7 @@ translate pl movie_4263d346:
    "Zawstydzony wzruszam ramionami."

 # game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy:847
-translate pl movie_98d69c6e:
+translate pl movie_f9188bac:

    # Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how long it takes for those to bloom!"
    Ro "Ja tylko{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Czy masz {i}jakiekolwiek{/i} pojęcie, jak długo trwa kwitnienie!"
--- a/game/tl/pl/script/6.anon-helps-fang-find-a-venue-for-band.rpy
+++ b/game/tl/pl/script/6.anon-helps-fang-find-a-venue-for-band.rpy
@@ -2869,30 +2869,6 @@ translate pl lAnonWaitsForFang_2a02f026:
    # Nas "Hej, Naomi, czy wiesz, że trzynaście procent toalet publicznych{cps=*.1}...{/cps}"
    Nas "Hej, Naomi, czy wiesz, że trzynaście procent toalet publicznych{cps=*.1}...{/cps}"

-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1942
-translate es lAnonWaitsForFang_60b8deab:
-
-    # "Naser babbles with Naomi while we wait for Fang to return."
-    "Naser gada z Naomi gdy my czekamy aż Fang wróci."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1958
-translate es lAnonWaitsForFang_80172f04:
-
-    # F "Alright, I’m done taking a dump or whatever."
-    F "W porządku, skończyłam srać czy coś."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1960
-translate es lAnonWaitsForFang_75e50324:
-
-    # F "Let’s go."
-    F "Chodźmy."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1963
-translate es lAnonWaitsForFang_50113c24:
-
-    # Nas "Wait{cps=*.1}...{/cps} why do you smell like smoke?"
-    Nas "Czekaj{cps=*.1}...{/cps} dlaczego pachniesz fajkami?"
-
 # game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1966
 translate pl lAnonWaitsForFang_4d439f42:

@@ -2905,42 +2881,6 @@ translate pl lAnonWaitsForFang_fd682d16:
    # Nas "You know you aren’t supposed to be smoking, Fang."
    Nas "Wiesz, że nie powinnaś palić, Fang."

-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1972
-translate es lAnonWaitsForFang_7e3ac232:
-
-    # F "Just drop it, dork."
-    F "Weź już odpuść, ćwok."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1974
-translate es lAnonWaitsForFang_5e0dc39a:
-
-    # F "You don’t see me bringing up that leopard mankini you have in your closet."
-    F "Nie widzich chyba żebym wypominała ci to leopardowe mankini które trzymasz w szafie."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1984
-translate es lAnonWaitsForFang_72dafdf9:
-
-    # "Naser’s skin turns a noticeably lighter shade."
-    "Skóra Nasera widocznie zmienia odcień na bledszy."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1988
-translate es lAnonWaitsForFang_3b882b5c:
-
-    # A "That the only thing in the closet?"
-    A "Czy tylko to jedno masz w szafie?"
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1991
-translate es lAnonWaitsForFang_c621b1ca:
-
-    # F "Oh, of fucking course not."
-    F "O, oczywiście że nie."
-
-# game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1993
-translate es lAnonWaitsForFang_39f1c980:
-
-    # F "{cps=*.6}He’s also got this pink-{/cps}{w=.5}{nw}"
-    F "{cps=*.6}Ma też to różowe-{/cps}{w=.5}{nw}"
-
 # game/script/6.anon-helps-fang-find-a-venue-for-band.rpy:1998
 translate pl lAnonWaitsForFang_3b4a19a9:

--- a/game/tl/ru/common.rpy
+++ b/game/tl/ru/common.rpy
@@ -458,19 +458,19 @@

    # 00preferences.rpy:286
    old "auto-forward time"
-    new "время до авто-пролистывания"
+    new "время до автопролистывания"

    # 00preferences.rpy:300
    old "auto-forward"
-    new "авто-пролистывание"
+    new "автопролистывание"

    # 00preferences.rpy:307
    old "Auto forward"
-    new "Авто-пролистывание"
+    new "Автопролистывание"

    # 00preferences.rpy:310
    old "auto-forward after click"
-    new "авто-пролистывание после клика"
+    new "автопролистывание после клика"

    # 00preferences.rpy:319
    old "automatic move"
@@ -734,7 +734,7 @@

    # 00updater.rpy:494
    old "An error is being simulated."
-    new "Cимулируется ошибка."
+    new "Моделируется ошибка."

    # 00updater.rpy:678
    old "Either this project does not support updating, or the update status file was deleted."
--- a/game/tl/ru/screens.rpy
+++ b/game/tl/ru/screens.rpy
@@ -185,6 +185,12 @@ translate ru strings:
    old "You have unlocked all bonus chapters!"
    new "Вы открыли все бонусные главы!"

+    old "You have unlocked the final bonus chapter!"
+    new "Вы открыли финальную бонусную главу!"
+
+    old "You have finished all endings! Complete all bonus chapters to receive the final chapter!"
+    new "Вы завершили игру на все концовки! Пройдите все бонусные главы, чтобы открыть финальную главу!"
+
    old "You have unlocked new bonus chapters, complete unseen endings to see more!"
    new "Вы открыли новые бонусные главы! Завершите игру с другими концовками, чтобы увидеть ещё больше!"

@@ -398,7 +404,7 @@ translate ru strings:

    # game/screens.rpy:1022
    old "Auto-Forward Time"
-    new "Время до авто-пролистывания"
+    new "Время до автопролистывания"

    # game/screens.rpy:1029
    old "Music Volume"
@@ -530,7 +536,7 @@ translate ru strings:

    # game/screens.rpy:1386
    old "Mouse Wheel Up\nClick Rollback Side"
-    new "Колёсико вверх"
+    new "Колёсико вверх\nКлик для отката"

    # game/screens.rpy:1390
    old "Mouse Wheel Down"
@@ -538,11 +544,11 @@ translate ru strings:

    # game/screens.rpy:1397
    old "Right Trigger\nA/Bottom Button"
-    new "Правый триггер"
+    new "Правый триггер\nA/Нижняя кнопка"

    # game/screens.rpy:1401
    old "Left Trigger\nLeft Shoulder"
-    new "Левый триггер"
+    new "Левый триггер\nЛевый бампер"

    # game/screens.rpy:1405
    old "Right Shoulder"
@@ -550,11 +556,11 @@ translate ru strings:

    # game/screens.rpy:1410
    old "D-Pad, Sticks"
-    new "Стики"
+    new "D-Pad, Стики"

    # game/screens.rpy:1414
    old "Start, Guide"
-    new "Начало, руководство"
+    new "Start, Guide"

    # game/screens.rpy:1415
    old "Accesses the game menu."
@@ -562,7 +568,7 @@ translate ru strings:

    # game/screens.rpy:1418
    old "Y/Top Button"
-    new "Y"
+    new "Y/Верхняя кнопка"

    # game/screens.rpy:1421
    old "Calibrate"
--- a/game/tl/ru/script/1.first-two-days-anon-meets-fang.rpy
+++ b/game/tl/ru/script/1.first-two-days-anon-meets-fang.rpy
@@ -519,7 +519,7 @@ translate ru chapter_1_a31a12af:
 # game/script/1.first-two-days-anon-meets-fang.rpy:349
 translate ru chapter_1_b0f6f9d5:

-    # "распластался по земле, ass hurt from hitting jagged concrete and splintered wood."
+    # "I lay on the ground, ass hurt from hitting jagged concrete and splintered wood."
    "Я лежу на земле, моя жопа болит от удара о разбитый бетон и деревянные щепки."

 # game/script/1.first-two-days-anon-meets-fang.rpy:351
--- a/game/tl/ru/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
+++ b/game/tl/ru/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
@@ -1117,7 +1117,7 @@ translate ru movie_4263d346:
    "Я виновато пожимаю плечами."

 # game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy:847
-translate ru movie_98d69c6e:
+translate ru movie_f9188bac:

    # Ro "I just{cps=*.1}...{/cps}{w=.3} URGH!{w=.4} Do you have {i}any{/i} idea how long it takes for those to bloom!"
    Ro "Я просто{cps=*.1}...{/cps}{w=.3} АРГХ!{w=.4} Ты хоть {i}представляешь{/i}, сколько времени им нужно, чтобы расцвести!"
--- a/game/tl/ru/script/7.concert-day.rpy
+++ b/game/tl/ru/script/7.concert-day.rpy
@@ -1498,7 +1498,7 @@ translate ru PostCableConundrum_ffc40d6e_1:
 translate ru PostCableConundrum_6e46797e_1:

    # F "IN THE MORNIIIIIING!"
-    F "УТРААААААААААА!"
+    F "НОООЧИИИИИИИ!"

 # game/script/7.concert-day.rpy:1072
 translate ru PostCableConundrum_0f702231:
Author	SHA1	Message	Date
Map	58469f5ad4	Merge branch 'hunting' into flower-line This also changes the retranslated spanish line to be corrected, and corrects the id for the other languages to work using the old line.	2024-06-10 23:15:58 -05:00
Map	0e7708f920	Merge branch 'update-readme' All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2024-06-09 01:28:21 -05:00
MichaelYick	468be6e067	Merge pull request 'Fix bug where polish will randomly turn spanish' (#242 ) from undo-polishisms-in-spanish into master Reviewed-on: #242	2024-06-09 05:34:40 +00:00
Map	c31073412b	deleted the wrong lines, fixing All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/pr/woodpecker Pipeline was successful Details ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful Details	2024-06-08 18:08:36 -05:00
Map	3e51013a55	remove old polish translation strings that replace spanish lines. Some checks are pending ci/woodpecker/push/woodpecker Pipeline is pending Details ci/woodpecker/pr/woodpecker Pipeline is pending Details	2024-06-08 18:01:47 -05:00
Michael Yick	02c413da81	Fix bug where polish will randomly turn spanish Some checks are pending ci/woodpecker/pr/woodpecker Pipeline is pending Details ci/woodpecker/push/woodpecker Pipeline is pending Details polish technologia,,.., very good.. yes into spac.e... the polish translation team built off the spanish translation and forgot to remove the spanish declarations for their language when translating.	2024-06-08 17:47:47 -05:00
Map	abeb4f9467	change readme to not contribute to an outdate branch All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/pr/woodpecker Pipeline was successful Details ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful Details	2024-05-31 04:16:03 -05:00
MichaelYick	0dacec2e60	Merge pull request 'New Russian Email Patch' (#236 ) from russianpatch into master All checks were successful ci/woodpecker/tag/woodpecker Pipeline was successful Details Reviewed-on: #236	2024-05-23 01:40:48 +00:00
Michael Yick	88327c44df	New Russian Email Patch All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/pr/woodpecker Pipeline was successful Details ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful Details From the email: Hello, Mike! How are you doing? It's Gex again. Some dudes from our Discord wrote me that with the release of patch 10 (or even 9) a couple of lines in the "screens" file were added to the game that we didn't notice. They are responsible for the appearance of notifications about passing the game and opening bonus chapters. Since they were not translated, I decided to make a small patch for the Russian translation, which fixes this problem. In addition, I have corrected a couple of lines in two chapters and "common" that were displayed incorrectly (literally one word in each - a request from guys who are working on voice acting) and added an additional explanation for the gamepad buttons. I would be very grateful if you can add this small fix in the next update (or make it into the existing one, because nothing drastically changes). Sincerely, the translation team All files attached	2024-05-20 16:19:38 -05:00
san7890	279608bf80	actually uses the automated renpy translation feature formatting didn't use the automated renpy feature so this wasn't correct whoops	2023-05-07 00:27:00 -06:00
san7890	93a548957d	fix: Cleans up TODO regarding duplicate Rosa line. Also includes shoddy Spanish translation, definitely requires proofreading.	2023-05-06 23:48:40 -06:00
Michael Yick	1046f65408	Merge pull request 'chore: Removes tradwife flag' (#220 ) from san7890/SnootGame:flag-cleanup into NewPatch Reviewed-on: #220	2023-05-07 02:13:46 +00:00
san7890	404d3f91bd	removes the `trad` arg to `initstats()` as well	2023-05-06 20:11:35 -06:00
san7890	340528ee02	removes the ending flag	2023-05-06 20:06:38 -06:00
san7890	ef4764b322	`get_ending` to not be numerically based, but instead enum-based. (#219 ) Co-authored-by: san7890 <the@san7890.com> Reviewed-on: #219 Co-authored-by: san7890 <san7890@noreply.git.cavemanon.xyz> Co-committed-by: san7890 <san7890@noreply.git.cavemanon.xyz>	2023-05-07 00:44:59 +00:00