Merge branch 'languages' into clean

# Conflicts: # game/tl/french/code/AbYss_MZ.po # game/tl/french/code/Nasty_Burger_Interaction_MZ.po # game/tl/french/code/base/Transition.po # game/tl/french/code/base/character customization.po # game/tl/french/code/base/computer.po # game/tl/french/code/base/controls.po # game/tl/french/code/base/options.po # game/tl/french/code/base/pda_screen.po # game/tl/french/code/base/screens.po # game/tl/french/code/battle/fight_Dash.po # game/tl/french/code/battle/fight_ghost_bathroom.po # game/tl/french/code/battle/fight_ghosts.po # game/tl/french/code/battle/fight_shadow.po # game/tl/french/code/battleoverhaul/battlesetup.po # game/tl/french/code/battleoverhaul/newbattle.po # game/tl/french/code/battleoverhaul/renpy/9999-battle-label.po # game/tl/french/code/battleoverhaul/training_machine.po # game/tl/french/code/characters/lancer.po # game/tl/french/code/cutOut.po # game/tl/french/code/episode1_MZ.po # game/tl/french/code/episode2_MZ.po # game/tl/french/code/episode3_MZ.po # game/tl/french/code/episode4_MZ.po # game/tl/french/code/episode5_MZ.po # game/tl/french/code/episode6_MZ.po # game/tl/french/code/episode7_MZ.po # game/tl/french/code/episode8_MZ.po # game/tl/french/code/episode_1_side_quest_Paulina.po # game/tl/french/code/episode_2_pda_side_quest.po # game/tl/french/code/episode_4_cylindrical.po # game/tl/french/code/episode_4_p_phantom.po # game/tl/french/code/episode_4_twinkle_twinkle.po # game/tl/french/code/episode_5_casual_night.po # game/tl/french/code/episodes_selection.po # game/tl/french/code/house_misc.po # game/tl/french/code/jack_training_machine.po # game/tl/french/code/jazz_yoga.po # game/tl/french/code/laundry_room.po # game/tl/french/code/lily_introduction.po # game/tl/french/code/maddie_breakfast.po # game/tl/french/code/maddie_staying_home.po # game/tl/french/code/maddie_tv.po # game/tl/french/code/maddie_x_jack.po # game/tl/french/code/maddie_yoga.po # game/tl/french/code/mall_parking_lot.po # game/tl/french/code/misc/Desiree_Dialogue.po # game/tl/french/code/misc/Jack_Dialogue_1_MZ.po # game/tl/french/code/misc/Maddie_Dialogue_1_MZ.po # game/tl/french/code/misc/dasirees_service.po # game/tl/french/code/misc/desiree_affection_scenes.po # game/tl/french/code/misc/desiree_cowgirl.po # game/tl/french/code/misc/desiree_repeatable_service.po # game/tl/french/code/mystery_shop_MZ.po # game/tl/french/code/nasty_burger.po # game/tl/french/code/paulina_spookchat.po # game/tl/french/code/sam_handjob.po # game/tl/french/code/sam_home.po # game/tl/french/code/sam_spookchat_selfie.po # game/tl/french/code/school_misc.po # game/tl/french/code/school_upstairs_landing.po # game/tl/french/code/spookchat_paulina.po # game/tl/french/code/spookchat_sam.po # game/tl/french/code/spookchat_star.po # game/tl/french/code/spookchat_tucker.po # game/tl/french/code/star_gym_running.po # game/tl/french/code/the_bus_stop.po # game/tl/french/code/town_map_1.po # game/tl/french/code/valerie_nasty_burger_soda_incident.po
DRincs-Productions · Nov 12, 2022 · 7e82be3 · 7e82be3
2 parents 8133d62 + b0faabc
commit 7e82be3
Show file tree

Hide file tree

Showing 74 changed files with 4,091 additions and 211 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -469,7 +469,25 @@
                 "settings": {
                     "foreground": "#e59400"
                 }
+            },
+            {
+                "scope": "renpy.meta.color.#00ccff",
+                "settings": {
+                    "foreground": "#00ccff"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.#f5bc02",
+                "settings": {
+                    "foreground": "#f5bc02"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.#00ccff",
+                "settings": {
+                    "foreground": "#00ccff"
+                }
             }
         ]
     }
-}
+}
diff --git a/game/tl/french/AbYss_MZ.rpy → game/tl/french/code/AbYss_MZ.rpy b/game/tl/french/AbYss_MZ.rpy → game/tl/french/code/AbYss_MZ.rpy
diff --git a/...tl/french/Nasty_Burger_Interaction_MZ.rpy → ...ench/code/Nasty_Burger_Interaction_MZ.rpy b/...tl/french/Nasty_Burger_Interaction_MZ.rpy → ...ench/code/Nasty_Burger_Interaction_MZ.rpy
diff --git a/game/tl/french/Transition.rpy → game/tl/french/code/base/Transition.rpy b/game/tl/french/Transition.rpy → game/tl/french/code/base/Transition.rpy
diff --git a/game/tl/french/character customization.rpy → ...nch/code/base/character customization.rpy b/game/tl/french/character customization.rpy → ...nch/code/base/character customization.rpy
diff --git a/game/tl/french/computer.rpy → game/tl/french/code/base/computer.rpy b/game/tl/french/computer.rpy → game/tl/french/code/base/computer.rpy
diff --git a/game/tl/french/controls.rpy → game/tl/french/code/base/controls.rpy b/game/tl/french/controls.rpy → game/tl/french/code/base/controls.rpy
diff --git a/game/tl/french/options.rpy → game/tl/french/code/base/options.rpy b/game/tl/french/options.rpy → game/tl/french/code/base/options.rpy
diff --git a/game/tl/french/pda_screen.rpy → game/tl/french/code/base/pda_screen.rpy b/game/tl/french/pda_screen.rpy → game/tl/french/code/base/pda_screen.rpy
diff --git a/game/tl/french/screens.rpy → game/tl/french/code/base/screens.rpy b/game/tl/french/screens.rpy → game/tl/french/code/base/screens.rpy
diff --git a/game/tl/french/fight_Dash.rpy → game/tl/french/code/battle/fight_Dash.rpy b/game/tl/french/fight_Dash.rpy → game/tl/french/code/battle/fight_Dash.rpy
diff --git a/game/tl/french/fight_ghost_bathroom.rpy → ...ench/code/battle/fight_ghost_bathroom.rpy b/game/tl/french/fight_ghost_bathroom.rpy → ...ench/code/battle/fight_ghost_bathroom.rpy
diff --git a/game/tl/french/fight_ghosts.rpy → game/tl/french/code/battle/fight_ghosts.rpy b/game/tl/french/fight_ghosts.rpy → game/tl/french/code/battle/fight_ghosts.rpy
diff --git a/game/tl/french/fight_shadow.rpy → game/tl/french/code/battle/fight_shadow.rpy b/game/tl/french/fight_shadow.rpy → game/tl/french/code/battle/fight_shadow.rpy
diff --git a/game/tl/french/battlesetup.rpy → ...rench/code/battleoverhaul/battlesetup.rpy b/game/tl/french/battlesetup.rpy → ...rench/code/battleoverhaul/battlesetup.rpy
diff --git a/game/tl/french/newbattle.rpy → .../french/code/battleoverhaul/newbattle.rpy b/game/tl/french/newbattle.rpy → .../french/code/battleoverhaul/newbattle.rpy
diff --git a/game/tl/french/9999-battle-label.rpy → ...attleoverhaul/renpy/9999-battle-label.rpy b/game/tl/french/9999-battle-label.rpy → ...attleoverhaul/renpy/9999-battle-label.rpy
diff --git a/game/tl/french/training_machine.rpy → .../code/battleoverhaul/training_machine.rpy b/game/tl/french/training_machine.rpy → .../code/battleoverhaul/training_machine.rpy
diff --git a/game/tl/french/lancer.rpy → game/tl/french/code/characters/lancer.rpy b/game/tl/french/lancer.rpy → game/tl/french/code/characters/lancer.rpy
diff --git a/game/tl/french/cutOut.rpy → game/tl/french/code/cutOut.rpy b/game/tl/french/cutOut.rpy → game/tl/french/code/cutOut.rpy
diff --git a/game/tl/french/episode1_MZ.rpy → game/tl/french/code/episode1_MZ.rpy b/game/tl/french/episode1_MZ.rpy → game/tl/french/code/episode1_MZ.rpy
diff --git a/game/tl/french/episode2_MZ.rpy → game/tl/french/code/episode2_MZ.rpy b/game/tl/french/episode2_MZ.rpy → game/tl/french/code/episode2_MZ.rpy
diff --git a/game/tl/french/episode3_MZ.rpy → game/tl/french/code/episode3_MZ.rpy b/game/tl/french/episode3_MZ.rpy → game/tl/french/code/episode3_MZ.rpy
diff --git a/game/tl/french/episode4_MZ.rpy → game/tl/french/code/episode4_MZ.rpy b/game/tl/french/episode4_MZ.rpy → game/tl/french/code/episode4_MZ.rpy
diff --git a/game/tl/french/episode5_MZ.rpy → game/tl/french/code/episode5_MZ.rpy b/game/tl/french/episode5_MZ.rpy → game/tl/french/code/episode5_MZ.rpy
diff --git a/game/tl/french/episode6_MZ.rpy → game/tl/french/code/episode6_MZ.rpy b/game/tl/french/episode6_MZ.rpy → game/tl/french/code/episode6_MZ.rpy
diff --git a/game/tl/french/episode7_MZ.rpy → game/tl/french/code/episode7_MZ.rpy b/game/tl/french/episode7_MZ.rpy → game/tl/french/code/episode7_MZ.rpy
diff --git a/game/tl/french/episode8_MZ.rpy → game/tl/french/code/episode8_MZ.rpy b/game/tl/french/episode8_MZ.rpy → game/tl/french/code/episode8_MZ.rpy
diff --git a/...l/french/episode_1_side_quest_Paulina.rpy → ...nch/code/episode_1_side_quest_Paulina.rpy b/...l/french/episode_1_side_quest_Paulina.rpy → ...nch/code/episode_1_side_quest_Paulina.rpy
diff --git a/game/tl/french/episode_2_pda_side_quest.rpy → .../french/code/episode_2_pda_side_quest.rpy b/game/tl/french/episode_2_pda_side_quest.rpy → .../french/code/episode_2_pda_side_quest.rpy
diff --git a/game/tl/french/episode_4_cylindrical.rpy → .../tl/french/code/episode_4_cylindrical.rpy b/game/tl/french/episode_4_cylindrical.rpy → .../tl/french/code/episode_4_cylindrical.rpy
diff --git a/game/tl/french/episode_4_p_phantom.rpy → game/tl/french/code/episode_4_p_phantom.rpy b/game/tl/french/episode_4_p_phantom.rpy → game/tl/french/code/episode_4_p_phantom.rpy
diff --git a/game/tl/french/episode_4_twinkle_twinkle.rpy → ...french/code/episode_4_twinkle_twinkle.rpy b/game/tl/french/episode_4_twinkle_twinkle.rpy → ...french/code/episode_4_twinkle_twinkle.rpy
diff --git a/game/tl/french/episode_5_casual_night.rpy → ...tl/french/code/episode_5_casual_night.rpy b/game/tl/french/episode_5_casual_night.rpy → ...tl/french/code/episode_5_casual_night.rpy
diff --git a/game/tl/french/episodes_selection.rpy → game/tl/french/code/episodes_selection.rpy b/game/tl/french/episodes_selection.rpy → game/tl/french/code/episodes_selection.rpy
diff --git a/game/tl/french/house_misc.rpy → game/tl/french/code/house_misc.rpy b/game/tl/french/house_misc.rpy → game/tl/french/code/house_misc.rpy
diff --git a/game/tl/french/jack_training_machine.rpy → .../tl/french/code/jack_training_machine.rpy b/game/tl/french/jack_training_machine.rpy → .../tl/french/code/jack_training_machine.rpy
diff --git a/game/tl/french/jazz_yoga.rpy → game/tl/french/code/jazz_yoga.rpy b/game/tl/french/jazz_yoga.rpy → game/tl/french/code/jazz_yoga.rpy
diff --git a/game/tl/french/laundry_room.rpy → game/tl/french/code/laundry_room.rpy b/game/tl/french/laundry_room.rpy → game/tl/french/code/laundry_room.rpy
diff --git a/game/tl/french/lily_introduction.rpy → game/tl/french/code/lily_introduction.rpy b/game/tl/french/lily_introduction.rpy → game/tl/french/code/lily_introduction.rpy
diff --git a/game/tl/french/maddie_breakfast.rpy → game/tl/french/code/maddie_breakfast.rpy b/game/tl/french/maddie_breakfast.rpy → game/tl/french/code/maddie_breakfast.rpy
diff --git a/game/tl/french/maddie_staying_home.rpy → game/tl/french/code/maddie_staying_home.rpy b/game/tl/french/maddie_staying_home.rpy → game/tl/french/code/maddie_staying_home.rpy
diff --git a/game/tl/french/maddie_tv.rpy → game/tl/french/code/maddie_tv.rpy b/game/tl/french/maddie_tv.rpy → game/tl/french/code/maddie_tv.rpy
diff --git a/game/tl/french/maddie_x_jack.rpy → game/tl/french/code/maddie_x_jack.rpy b/game/tl/french/maddie_x_jack.rpy → game/tl/french/code/maddie_x_jack.rpy
diff --git a/game/tl/french/maddie_yoga.rpy → game/tl/french/code/maddie_yoga.rpy b/game/tl/french/maddie_yoga.rpy → game/tl/french/code/maddie_yoga.rpy
diff --git a/game/tl/french/mall_parking_lot.rpy → game/tl/french/code/mall_parking_lot.rpy b/game/tl/french/mall_parking_lot.rpy → game/tl/french/code/mall_parking_lot.rpy
diff --git a/game/tl/french/Desiree_Dialogue.rpy → .../tl/french/code/misc/Desiree_Dialogue.rpy b/game/tl/french/Desiree_Dialogue.rpy → .../tl/french/code/misc/Desiree_Dialogue.rpy
diff --git a/game/tl/french/Jack_Dialogue_1_MZ.rpy → ...l/french/code/misc/Jack_Dialogue_1_MZ.rpy b/game/tl/french/Jack_Dialogue_1_MZ.rpy → ...l/french/code/misc/Jack_Dialogue_1_MZ.rpy
diff --git a/game/tl/french/Maddie_Dialogue_1_MZ.rpy → ...french/code/misc/Maddie_Dialogue_1_MZ.rpy b/game/tl/french/Maddie_Dialogue_1_MZ.rpy → ...french/code/misc/Maddie_Dialogue_1_MZ.rpy
diff --git a/game/tl/french/dasirees_service.rpy → .../tl/french/code/misc/dasirees_service.rpy b/game/tl/french/dasirees_service.rpy → .../tl/french/code/misc/dasirees_service.rpy
diff --git a/game/tl/french/desiree_affection_scenes.rpy → ...ch/code/misc/desiree_affection_scenes.rpy b/game/tl/french/desiree_affection_scenes.rpy → ...ch/code/misc/desiree_affection_scenes.rpy
diff --git a/game/tl/french/desiree_cowgirl.rpy → game/tl/french/code/misc/desiree_cowgirl.rpy b/game/tl/french/desiree_cowgirl.rpy → game/tl/french/code/misc/desiree_cowgirl.rpy
diff --git a/.../tl/french/desiree_repeatable_service.rpy → .../code/misc/desiree_repeatable_service.rpy b/.../tl/french/desiree_repeatable_service.rpy → .../code/misc/desiree_repeatable_service.rpy
diff --git a/game/tl/french/mystery_shop_MZ.rpy → game/tl/french/code/mystery_shop_MZ.rpy b/game/tl/french/mystery_shop_MZ.rpy → game/tl/french/code/mystery_shop_MZ.rpy
diff --git a/game/tl/french/nasty_burger.rpy → game/tl/french/code/nasty_burger.rpy b/game/tl/french/nasty_burger.rpy → game/tl/french/code/nasty_burger.rpy
diff --git a/game/tl/french/paulina_spookchat.rpy → game/tl/french/code/paulina_spookchat.rpy b/game/tl/french/paulina_spookchat.rpy → game/tl/french/code/paulina_spookchat.rpy
diff --git a/game/tl/french/sam_handjob.rpy → game/tl/french/code/sam_handjob.rpy b/game/tl/french/sam_handjob.rpy → game/tl/french/code/sam_handjob.rpy
diff --git a/game/tl/french/sam_home.rpy → game/tl/french/code/sam_home.rpy b/game/tl/french/sam_home.rpy → game/tl/french/code/sam_home.rpy
diff --git a/game/tl/french/sam_spookchat_selfie.rpy → game/tl/french/code/sam_spookchat_selfie.rpy b/game/tl/french/sam_spookchat_selfie.rpy → game/tl/french/code/sam_spookchat_selfie.rpy
diff --git a/game/tl/french/school_misc.rpy → game/tl/french/code/school_misc.rpy b/game/tl/french/school_misc.rpy → game/tl/french/code/school_misc.rpy
diff --git a/game/tl/french/school_upstairs_landing.rpy → ...l/french/code/school_upstairs_landing.rpy b/game/tl/french/school_upstairs_landing.rpy → ...l/french/code/school_upstairs_landing.rpy
diff --git a/game/tl/french/spookchat_paulina.rpy → game/tl/french/code/spookchat_paulina.rpy b/game/tl/french/spookchat_paulina.rpy → game/tl/french/code/spookchat_paulina.rpy
diff --git a/game/tl/french/spookchat_sam.rpy → game/tl/french/code/spookchat_sam.rpy b/game/tl/french/spookchat_sam.rpy → game/tl/french/code/spookchat_sam.rpy
diff --git a/game/tl/french/spookchat_star.rpy → game/tl/french/code/spookchat_star.rpy b/game/tl/french/spookchat_star.rpy → game/tl/french/code/spookchat_star.rpy
diff --git a/game/tl/french/spookchat_tucker.rpy → game/tl/french/code/spookchat_tucker.rpy b/game/tl/french/spookchat_tucker.rpy → game/tl/french/code/spookchat_tucker.rpy
diff --git a/game/tl/french/star_gym_running.rpy → game/tl/french/code/star_gym_running.rpy b/game/tl/french/star_gym_running.rpy → game/tl/french/code/star_gym_running.rpy
diff --git a/game/tl/french/the_bus_stop.rpy → game/tl/french/code/the_bus_stop.rpy b/game/tl/french/the_bus_stop.rpy → game/tl/french/code/the_bus_stop.rpy
diff --git a/game/tl/french/town_map_1.rpy → game/tl/french/code/town_map_1.rpy b/game/tl/french/town_map_1.rpy → game/tl/french/code/town_map_1.rpy
diff --git a/...ch/valerie_nasty_burger_soda_incident.rpy → ...de/valerie_nasty_burger_soda_incident.rpy b/...ch/valerie_nasty_burger_soda_incident.rpy → ...de/valerie_nasty_burger_soda_incident.rpy