diff --git a/errors.txt b/errors.txt index 30fc235..975d599 100644 --- a/errors.txt +++ b/errors.txt @@ -2,9 +2,9 @@ errors listed below, and try again. -File "game/characters/personnage.rpy", line 72: expected an indented block - def parle(self,sujet): - ^ +File "game/characters/personnage.rpy", line 69: expected an indented block + self.salaire = self.salaire - (self.salaire * 0.2) + ^ Ren'Py Version: Ren'Py 8.1.3.23091805 -Tue Jan 16 16:22:22 2024 +Tue Jan 16 17:27:28 2024 diff --git a/game/cache/bytecode-39.rpyb b/game/cache/bytecode-39.rpyb index 1506a0f..e903880 100644 Binary files a/game/cache/bytecode-39.rpyb and b/game/cache/bytecode-39.rpyb differ diff --git a/game/cache/py3analysis.rpyb b/game/cache/py3analysis.rpyb index c177170..a6c26e4 100644 Binary files a/game/cache/py3analysis.rpyb and b/game/cache/py3analysis.rpyb differ diff --git a/game/cache/screens.rpyb b/game/cache/screens.rpyb index 328cdba..81a5788 100644 Binary files a/game/cache/screens.rpyb and b/game/cache/screens.rpyb differ diff --git a/game/cache/shaders.txt b/game/cache/shaders.txt index 7fee90d..434e1bb 100644 --- a/game/cache/shaders.txt +++ b/game/cache/shaders.txt @@ -1,7 +1,7 @@ -renpy.ftl -renpy.geometry renpy.solid -renpy.dissolve renpy.geometry -renpy.solid -renpy.texture renpy.geometry renpy.texture +renpy.ftl +renpy.texture +renpy.geometry renpy.solid +renpy.solid +renpy.dissolve renpy.geometry renpy.dissolve renpy.dissolve diff --git a/game/characters/personnage.rpy b/game/characters/personnage.rpy index bd2c8f7..77e72ae 100644 --- a/game/characters/personnage.rpy +++ b/game/characters/personnage.rpy @@ -1,6 +1,6 @@ # Définition des éléments communs aux personnages init 0 python: - class Personnage: + class Personnage(object): # Variables des classes des personnages def __init__(self): @@ -17,6 +17,7 @@ init 0 python: self.anciennete = None self.etudes = None self.chomage = None + self.humeur = None # Méthode qui définit la fiche personnage complète def etat_civil(self): @@ -43,9 +44,9 @@ init 0 python: self.social = renpy.random.choice(["technicien", "secrétaire", "graphiste"]) # nombre d'années d'études # TODO pondérer par des statistiques - self.etudes = renpy.random.randint (0,8) + self.etudes = renpy.random.randint(0,8) # nombre d'annés d'expérience sur toute la carrière - self.experience = renpy.random.randint(0, self.age - (18 + self.etudes)) + self.experience = renpy.random.randint(0, self.age - 18 + self.etudes) # entreprise employeuse self.entreprise = renpy.random.choice(["SAFE energies", "Watt-o-watt", "Enercentrale"]) # nombre d'années d'ancienneté dans l'entreprise @@ -55,22 +56,34 @@ init 0 python: # salaire brut actuel # TODO s'appuyer sur des statistiques # salaire de base - if self.social == "ouvrier": + if self.social == "technicien": self.salaire = renpy.random.randint(1400, 1700) - if self.social == "employé": + if self.social == "secrétaire": self.salaire = renpy.random.randint(1700, 2000) - if self.social == "cadre": + if self.social == "graphiste": self.salaire = renpy.random.randint(2000, 4000) # majoration suivant l'experience (5% par année d'exp) # TODO s'appuyer sur des statistiques - # self.salaire = self.salaire + (self.salaire * self.experience * 0.05) + self.salaire = self.salaire + (self.salaire * self.experience * 0.05) # minoration de 20% si genre = femme - # if self.genre == "femme": - # self.salaire = self.salaire - (self.salaire * 0.2) + if self.genre == "femme": + self.salaire = self.salaire - (self.salaire * 0.2) + # suppression des décimales + self.salaire = int(self.salaire) + # Humeur du personnage (de base 0) + self.humeur = 0 # Méthode qui permet d'appeller les dialogues avec les autres personnages def parle(self,sujet): - parse = str(self.c)+"."+str(sujet)+"_"+str(self.humeur) + # Réglage de l'humeur (<10 = sympahtique, entre -10 et 10 = neutre, >10 = antipathique) + if self.humeur >= 10: + mood = "sympathique" + elif self.humeur <= -10: + mood = "antipathique" + else: + mood = "neutre" + # Parsing des label (nom.sujet_humeur) + parse = str(self.c)+"."+str(sujet)+"_"+str(mood) return parse diff --git a/game/characters/safeenergies/patron.rpy b/game/characters/safeenergies/patron.rpy index e571afa..683f353 100644 --- a/game/characters/safeenergies/patron.rpy +++ b/game/characters/safeenergies/patron.rpy @@ -2,6 +2,7 @@ init 25 python : class Patron (Personnage): # Variables des classes des personnages def __init__(self): + super(Patron,self).__init__() # importation des variables de la classe Personnage self.c = Character("Christopher", color="#220fafff") self.genre = "homme" self.age = "49" @@ -15,11 +16,15 @@ init 25 python : self.anciennete = 4 self.etudes = 10 self.chomage = 0 - self.humeur = "aimable" + self.humeur = 0 label Christopher: -label .bonjour_aimable: - patron_safe.c "Bonjour [m.c], asseyez-vous, je vous en prie." +label .bonjour_sympathique: + patron_safe.c "Bonjour [m.c], merci d'être venu. Asseyez-vous, je vous en prie." + return label .bonjour_antipathique: - patron_safe.c "Asseyez-vous." - \ No newline at end of file + patron_safe.c "Asseyez-vous." + return +label .bonjour_neutre: + patron_safe.c "Bonjour, [m.c], asseyez-vous." + return \ No newline at end of file diff --git a/game/saves/navigation.json b/game/saves/navigation.json index 4dc6b29..53ae766 100644 --- a/game/saves/navigation.json +++ b/game/saves/navigation.json @@ -1 +1 @@ -{"error": false, "size": [1920, 1080], "name": "Patron, donne-moi une augmentation", "version": "1.0", "location": {"label": {"Christopher": ["game/characters/safeenergies/patron.rpy", 20], "Christopher.bonjour_aimable": ["game/characters/safeenergies/patron.rpy", 21], "Christopher.bonjour_antipathique": ["game/characters/safeenergies/patron.rpy", 23], "fiches_personnages": ["game/script.rpy", 7], "start": ["game/script.rpy", 29], "apres_midi": ["game/story/apres_midi.rpy", 1], "matin": ["game/story/matin.rpy", 1], "midi": ["game/story/midi.rpy", 1], "morning_routine": ["game/story/morning_routine.rpy", 1], "negociation_patron": ["game/story/negociation_patron.rpy", 1], "petit_dejeuner": ["game/story/petit_dejeuner.rpy", 1], "trajet": ["game/story/trajet.rpy", 1]}, "define": {"config.check_conflicting_properties": ["game/gui.rpy", 16], "gui.accent_color": ["game/gui.rpy", 30], "gui.idle_color": ["game/gui.rpy", 34], "gui.idle_small_color": ["game/gui.rpy", 38], "gui.hover_color": ["game/gui.rpy", 41], "gui.selected_color": ["game/gui.rpy", 46], "gui.insensitive_color": ["game/gui.rpy", 50], "gui.muted_color": ["game/gui.rpy", 55], "gui.hover_muted_color": ["game/gui.rpy", 56], "gui.text_color": ["game/gui.rpy", 59], "gui.interface_text_color": ["game/gui.rpy", 60], "gui.text_font": ["game/gui.rpy", 66], "gui.name_text_font": ["game/gui.rpy", 69], "gui.interface_text_font": ["game/gui.rpy", 72], "gui.text_size": ["game/gui.rpy", 75], "gui.name_text_size": ["game/gui.rpy", 78], "gui.interface_text_size": ["game/gui.rpy", 81], "gui.label_text_size": ["game/gui.rpy", 84], "gui.notify_text_size": ["game/gui.rpy", 87], "gui.title_text_size": ["game/gui.rpy", 90], "gui.main_menu_background": ["game/gui.rpy", 96], "gui.game_menu_background": ["game/gui.rpy", 97], "gui.textbox_height": ["game/gui.rpy", 106], "gui.textbox_yalign": ["game/gui.rpy", 110], "gui.name_xpos": ["game/gui.rpy", 116], "gui.name_ypos": ["game/gui.rpy", 117], "gui.name_xalign": ["game/gui.rpy", 121], "gui.namebox_width": ["game/gui.rpy", 125], "gui.namebox_height": ["game/gui.rpy", 126], "gui.namebox_borders": ["game/gui.rpy", 130], "gui.namebox_tile": ["game/gui.rpy", 134], "gui.dialogue_xpos": ["game/gui.rpy", 139], "gui.dialogue_ypos": ["game/gui.rpy", 140], "gui.dialogue_width": ["game/gui.rpy", 143], "gui.dialogue_text_xalign": ["game/gui.rpy", 148], "gui.button_width": ["game/gui.rpy", 158], "gui.button_height": ["game/gui.rpy", 159], "gui.button_borders": ["game/gui.rpy", 163], "gui.button_tile": ["game/gui.rpy", 167], "gui.button_text_font": ["game/gui.rpy", 170], "gui.button_text_size": ["game/gui.rpy", 173], "gui.button_text_idle_color": ["game/gui.rpy", 176], "gui.button_text_hover_color": ["game/gui.rpy", 177], "gui.button_text_selected_color": ["game/gui.rpy", 178], "gui.button_text_insensitive_color": ["game/gui.rpy", 179], "gui.button_text_xalign": ["game/gui.rpy", 183], "gui.radio_button_borders": ["game/gui.rpy", 192], "gui.check_button_borders": ["game/gui.rpy", 194], "gui.confirm_button_text_xalign": ["game/gui.rpy", 196], "gui.page_button_borders": ["game/gui.rpy", 198], "gui.quick_button_borders": ["game/gui.rpy", 200], "gui.quick_button_text_size": ["game/gui.rpy", 201], "gui.quick_button_text_idle_color": ["game/gui.rpy", 202], "gui.quick_button_text_selected_color": ["game/gui.rpy", 203], "gui.choice_button_width": ["game/gui.rpy", 217], "gui.choice_button_height": ["game/gui.rpy", 218], "gui.choice_button_tile": ["game/gui.rpy", 219], "gui.choice_button_borders": ["game/gui.rpy", 220], "gui.choice_button_text_font": ["game/gui.rpy", 221], "gui.choice_button_text_size": ["game/gui.rpy", 222], "gui.choice_button_text_xalign": ["game/gui.rpy", 223], "gui.choice_button_text_idle_color": ["game/gui.rpy", 224], "gui.choice_button_text_hover_color": ["game/gui.rpy", 225], "gui.choice_button_text_insensitive_color": ["game/gui.rpy", 226], "gui.slot_button_width": ["game/gui.rpy", 237], "gui.slot_button_height": ["game/gui.rpy", 238], "gui.slot_button_borders": ["game/gui.rpy", 239], "gui.slot_button_text_size": ["game/gui.rpy", 240], "gui.slot_button_text_xalign": ["game/gui.rpy", 241], "gui.slot_button_text_idle_color": ["game/gui.rpy", 242], "gui.slot_button_text_selected_idle_color": ["game/gui.rpy", 243], "gui.slot_button_text_selected_hover_color": ["game/gui.rpy", 244], "config.thumbnail_width": ["game/gui.rpy", 248], "config.thumbnail_height": ["game/gui.rpy", 249], "gui.file_slot_cols": ["game/gui.rpy", 253], "gui.file_slot_rows": ["game/gui.rpy", 254], "gui.navigation_xpos": ["game/gui.rpy", 264], "gui.skip_ypos": ["game/gui.rpy", 267], "gui.notify_ypos": ["game/gui.rpy", 270], "gui.choice_spacing": ["game/gui.rpy", 273], "gui.navigation_spacing": ["game/gui.rpy", 276], "gui.pref_spacing": ["game/gui.rpy", 279], "gui.pref_button_spacing": ["game/gui.rpy", 282], "gui.page_spacing": ["game/gui.rpy", 285], "gui.slot_spacing": ["game/gui.rpy", 288], "gui.main_menu_text_xalign": ["game/gui.rpy", 291], "gui.frame_borders": ["game/gui.rpy", 301], "gui.confirm_frame_borders": ["game/gui.rpy", 304], "gui.skip_frame_borders": ["game/gui.rpy", 307], "gui.notify_frame_borders": ["game/gui.rpy", 310], "gui.frame_tile": ["game/gui.rpy", 313], "gui.bar_size": ["game/gui.rpy", 327], "gui.scrollbar_size": ["game/gui.rpy", 328], "gui.slider_size": ["game/gui.rpy", 329], "gui.bar_tile": ["game/gui.rpy", 333], "gui.scrollbar_tile": ["game/gui.rpy", 334], "gui.slider_tile": ["game/gui.rpy", 335], "gui.bar_borders": ["game/gui.rpy", 338], "gui.scrollbar_borders": ["game/gui.rpy", 339], "gui.slider_borders": ["game/gui.rpy", 340], "gui.vbar_borders": ["game/gui.rpy", 343], "gui.vscrollbar_borders": ["game/gui.rpy", 344], "gui.vslider_borders": ["game/gui.rpy", 345], "gui.unscrollable": ["game/gui.rpy", 349], "config.history_length": ["game/gui.rpy", 357], "gui.history_height": ["game/gui.rpy", 361], "gui.history_name_xpos": ["game/gui.rpy", 365], "gui.history_name_ypos": ["game/gui.rpy", 366], "gui.history_name_width": ["game/gui.rpy", 367], "gui.history_name_xalign": ["game/gui.rpy", 368], "gui.history_text_xpos": ["game/gui.rpy", 371], "gui.history_text_ypos": ["game/gui.rpy", 372], "gui.history_text_width": ["game/gui.rpy", 373], "gui.history_text_xalign": ["game/gui.rpy", 374], "gui.nvl_borders": ["game/gui.rpy", 383], "gui.nvl_list_length": ["game/gui.rpy", 387], "gui.nvl_height": ["game/gui.rpy", 391], "gui.nvl_spacing": ["game/gui.rpy", 395], "gui.nvl_name_xpos": ["game/gui.rpy", 399], "gui.nvl_name_ypos": ["game/gui.rpy", 400], "gui.nvl_name_width": ["game/gui.rpy", 401], "gui.nvl_name_xalign": ["game/gui.rpy", 402], "gui.nvl_text_xpos": ["game/gui.rpy", 405], "gui.nvl_text_ypos": ["game/gui.rpy", 406], "gui.nvl_text_width": ["game/gui.rpy", 407], "gui.nvl_text_xalign": ["game/gui.rpy", 408], "gui.nvl_thought_xpos": ["game/gui.rpy", 412], "gui.nvl_thought_ypos": ["game/gui.rpy", 413], "gui.nvl_thought_width": ["game/gui.rpy", 414], "gui.nvl_thought_xalign": ["game/gui.rpy", 415], "gui.nvl_button_xpos": ["game/gui.rpy", 418], "gui.nvl_button_xalign": ["game/gui.rpy", 419], "gui.language": ["game/gui.rpy", 429], "quick_menu": ["game/screens.rpy", 267], "gui.history_allow_tags": ["game/screens.rpy", 934], "config.nvl_list_length": ["game/screens.rpy", 1366], "bubble.frame": ["game/screens.rpy", 1475], "bubble.thoughtframe": ["game/screens.rpy", 1476], "bubble.properties": ["game/screens.rpy", 1478], "bubble.expand_area": ["game/screens.rpy", 1504], "config.name": ["game/options.rpy", 18], "gui.show_name": ["game/options.rpy", 24], "config.version": ["game/options.rpy", 29], "gui.about": ["game/options.rpy", 35], "build.name": ["game/options.rpy", 46], "config.has_sound": ["game/options.rpy", 55], "config.has_music": ["game/options.rpy", 56], "config.has_voice": ["game/options.rpy", 57], "config.enter_transition": ["game/options.rpy", 83], "config.exit_transition": ["game/options.rpy", 84], "config.intra_transition": ["game/options.rpy", 89], "config.after_load_transition": ["game/options.rpy", 94], "config.end_game_transition": ["game/options.rpy", 99], "config.window": ["game/options.rpy", 117], "config.window_show_transition": ["game/options.rpy", 122], "config.window_hide_transition": ["game/options.rpy", 123], "config.save_directory": ["game/options.rpy", 156], "config.window_icon": ["game/options.rpy", 163]}, "screen": {"say": ["game/screens.rpy", 98], "input": ["game/screens.rpy", 175], "choice": ["game/screens.rpy", 208], "quick_menu": ["game/screens.rpy", 1525], "navigation": ["game/screens.rpy", 288], "main_menu": ["game/screens.rpy", 352], "game_menu": ["game/screens.rpy", 418], "about": ["game/screens.rpy", 545], "save": ["game/screens.rpy", 586], "load": ["game/screens.rpy", 593], "file_slots": ["game/screens.rpy", 600], "preferences": ["game/screens.rpy", 729], "history": ["game/screens.rpy", 890], "help": ["game/screens.rpy", 982], "keyboard_help": ["game/screens.rpy", 1011], "mouse_help": ["game/screens.rpy", 1062], "gamepad_help": ["game/screens.rpy", 1085], "confirm": ["game/screens.rpy", 1151], "skip_indicator": ["game/screens.rpy", 1216], "notify": ["game/screens.rpy", 1274], "nvl": ["game/screens.rpy", 1313], "nvl_dialogue": ["game/screens.rpy", 1345], "bubble": ["game/screens.rpy", 1433]}, "transform": {"delayed_blink": ["game/screens.rpy", 1235], "notify_appear": ["game/screens.rpy", 1285]}, "callable": {"touch": ["game/gui.rpy", 441], "small": ["game/gui.rpy", 448], "Personnage.__init__": ["game/characters/personnage.rpy", 6], "Personnage.etat_civil": ["game/characters/personnage.rpy", 22], "Personnage.parle": ["game/characters/personnage.rpy", 72], "dialogue": ["game/engine/interractions.rpy", 8], "Patron.__init__": ["game/characters/safeenergies/patron.rpy", 4]}}, "build": {"directory_name": "Patronjeveuxuneaugmentation-1.0", "executable_name": "Patronjeveuxuneaugmentation", "include_update": false, "packages": [{"name": "pc", "formats": ["zip"], "file_lists": ["windows", "linux", "renpy", "all"], "description": "PC: Windows and Linux", "update": true, "dlc": false, "hidden": false}, {"name": "linux", "formats": ["tar.bz2"], "file_lists": ["linux", "linux_arm", "renpy", "all"], "description": "Linux", "update": true, "dlc": false, "hidden": false}, {"name": "mac", "formats": ["app-zip", "app-dmg"], "file_lists": ["mac", "renpy", "all"], "description": "Macintosh", "update": true, "dlc": false, "hidden": false}, {"name": "win", "formats": ["zip"], "file_lists": ["windows", "renpy", "all"], "description": "Windows", "update": true, "dlc": false, "hidden": false}, {"name": "market", "formats": ["bare-zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "Windows, Mac, Linux for Markets", "update": true, "dlc": false, "hidden": false}, {"name": "steam", "formats": ["zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "steam", "update": true, "dlc": false, "hidden": true}, {"name": "android", "formats": ["directory"], "file_lists": ["android", "all"], "description": "android", "update": false, "dlc": true, "hidden": true}, {"name": "ios", "formats": ["directory"], "file_lists": ["ios", "all"], "description": "ios", "update": false, "dlc": true, "hidden": true}, {"name": "web", "formats": ["zip"], "file_lists": ["web", "renpy", "all"], "description": "web", "update": false, "dlc": true, "hidden": true}], "archives": [["archive", ["all"]]], "documentation_patterns": ["*.html", "*.txt"], "base_patterns": [["*.py", null], ["*.sh", null], ["*.app/", null], ["*.dll", null], ["*.manifest", null], ["*.keystore", null], ["lib/", null], ["renpy/", null], ["update/", null], ["common/", null], ["update/", null], ["old-game/", null], ["icon.ico", null], ["icon.icns", null], ["project.json", null], ["log.txt", null], ["errors.txt", null], ["traceback.txt", null], ["image_cache.txt", null], ["text_overflow.txt", null], ["dialogue.txt", null], ["dialogue.tab", null], ["profile_screen.txt", null], ["files.txt", null], ["memory.txt", null], ["tmp/", null], ["game/saves/", null], ["game/bytecode.rpyb", null], ["archived/", null], ["launcherinfo.py", null], ["android.txt", null], ["game/presplash*.*", ["all"]], ["android.json", ["android"]], [".android.json", ["android"]], ["android-*.png", ["android"]], ["android-*.jpg", ["android"]], ["ouya_icon.png", null], ["ios-presplash.*", ["ios"]], ["ios-launchimage.png", null], ["ios-icon.png", null], ["web-presplash.png", ["web"]], ["web-presplash.jpg", ["web"]], ["web-presplash.webp", ["web"]], ["progressive_download.txt", ["web"]], ["steam_appid.txt", null], ["game/cache/bytecode-39.rpyb", ["all"]], ["game/cache/bytecode-311.rpyb", ["web"]], ["game/cache/bytecode-*.rpyb", null], ["**~", null], ["**.bak", null], ["**/.**", null], ["**/#**", null], ["**/thumbs.db", null], [".*", null], ["**", ["all"]]], "renpy_patterns": [["renpy/common/_compat/**", null], ["renpy/common/_roundrect/**", null], ["renpy/common/_outline/**", null], ["renpy/common/_theme**", null], ["lib/**/_ssl.*", null], ["renpy/**__pycache__/**.cpython-39.pyc", ["all"]], ["renpy/**__pycache__", ["all"]], ["**~", null], ["**/#*", null], ["**/.*", null], ["**.old", null], ["**.new", null], ["**.rpa", null], ["**/steam_appid.txt", null], ["renpy.py", ["all"]], ["renpy/", ["all"]], ["renpy/**.py", ["renpy"]], ["renpy/**.pxd", null], ["renpy/**.pxi", null], ["renpy/**.pyx", null], ["renpy/**.pyc", null], ["renpy/**.pyo", null], ["renpy/common/", ["all"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**.rpy", ["renpy"]], ["renpy/common/**.rpym", ["renpy"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**", ["all"]], ["renpy/**", ["all"]], ["lib/*/renpy", null], ["lib/*/renpy.exe", null], ["lib/*/pythonw.exe", null], ["lib/py2-*/", null], ["lib/py*-windows-i686/**", ["windows_i686"]], ["lib/py*-windows-x86_64/**", ["windows"]], ["lib/py*-linux-i686/**", ["linux_i686"]], ["lib/py*-linux-aarch64/**", ["linux_arm"]], ["lib/py*-linux-armv7l/**", ["linux_arm"]], ["lib/py*-linux-*/**", ["linux"]], ["lib/py*-mac-*/**", ["mac"]], ["lib/python2.*/**", null], ["lib/**", ["windows", "linux", "mac", "android", "ios"]], ["renpy.sh", ["linux", "mac"]]], "xbit_patterns": ["**.sh", "lib/py*-linux-*/*", "lib/py*-mac-*/*", "**.app/Contents/MacOS/*"], "version": "1.0", "display_name": "Patron, donne-moi une augmentation", "exclude_empty_directories": true, "allow_integrated_gpu": true, "renpy": false, "script_version": true, "destination": "Patronjeveuxuneaugmentation-1.0-dists", "itch_channels": [["*-all.zip", "win-osx-linux"], ["*-market.zip", "win-osx-linux"], ["*-pc.zip", "win-linux"], ["*-win.zip", "win"], ["*-mac.zip", "osx"], ["*-linux.tar.bz2", "linux"], ["*-release.apk", "android"]], "mac_info_plist": {}, "merge": [["linux_i686", "linux"], ["windows_i686", "windows"]], "include_i686": true, "change_icon_i686": true, "android_permissions": [], "_sdk_fonts": false}} \ No newline at end of file +{"error": false, "size": [1920, 1080], "name": "Patron, donne-moi une augmentation", "version": "1.0", "location": {"label": {"Christopher": ["game/characters/safeenergies/patron.rpy", 21], "Christopher.bonjour_sympathique": ["game/characters/safeenergies/patron.rpy", 22], "Christopher.bonjour_antipathique": ["game/characters/safeenergies/patron.rpy", 25], "Christopher.bonjour_neutre": ["game/characters/safeenergies/patron.rpy", 28], "fiches_personnages": ["game/script.rpy", 7], "start": ["game/script.rpy", 29], "apres_midi": ["game/story/apres_midi.rpy", 1], "matin": ["game/story/matin.rpy", 1], "midi": ["game/story/midi.rpy", 1], "morning_routine": ["game/story/morning_routine.rpy", 1], "negociation_patron": ["game/story/negociation_patron.rpy", 1], "petit_dejeuner": ["game/story/petit_dejeuner.rpy", 1], "trajet": ["game/story/trajet.rpy", 1]}, "define": {"config.check_conflicting_properties": ["game/gui.rpy", 16], "gui.accent_color": ["game/gui.rpy", 30], "gui.idle_color": ["game/gui.rpy", 34], "gui.idle_small_color": ["game/gui.rpy", 38], "gui.hover_color": ["game/gui.rpy", 41], "gui.selected_color": ["game/gui.rpy", 46], "gui.insensitive_color": ["game/gui.rpy", 50], "gui.muted_color": ["game/gui.rpy", 55], "gui.hover_muted_color": ["game/gui.rpy", 56], "gui.text_color": ["game/gui.rpy", 59], "gui.interface_text_color": ["game/gui.rpy", 60], "gui.text_font": ["game/gui.rpy", 66], "gui.name_text_font": ["game/gui.rpy", 69], "gui.interface_text_font": ["game/gui.rpy", 72], "gui.text_size": ["game/gui.rpy", 75], "gui.name_text_size": ["game/gui.rpy", 78], "gui.interface_text_size": ["game/gui.rpy", 81], "gui.label_text_size": ["game/gui.rpy", 84], "gui.notify_text_size": ["game/gui.rpy", 87], "gui.title_text_size": ["game/gui.rpy", 90], "gui.main_menu_background": ["game/gui.rpy", 96], "gui.game_menu_background": ["game/gui.rpy", 97], "gui.textbox_height": ["game/gui.rpy", 106], "gui.textbox_yalign": ["game/gui.rpy", 110], "gui.name_xpos": ["game/gui.rpy", 116], "gui.name_ypos": ["game/gui.rpy", 117], "gui.name_xalign": ["game/gui.rpy", 121], "gui.namebox_width": ["game/gui.rpy", 125], "gui.namebox_height": ["game/gui.rpy", 126], "gui.namebox_borders": ["game/gui.rpy", 130], "gui.namebox_tile": ["game/gui.rpy", 134], "gui.dialogue_xpos": ["game/gui.rpy", 139], "gui.dialogue_ypos": ["game/gui.rpy", 140], "gui.dialogue_width": ["game/gui.rpy", 143], "gui.dialogue_text_xalign": ["game/gui.rpy", 148], "gui.button_width": ["game/gui.rpy", 158], "gui.button_height": ["game/gui.rpy", 159], "gui.button_borders": ["game/gui.rpy", 163], "gui.button_tile": ["game/gui.rpy", 167], "gui.button_text_font": ["game/gui.rpy", 170], "gui.button_text_size": ["game/gui.rpy", 173], "gui.button_text_idle_color": ["game/gui.rpy", 176], "gui.button_text_hover_color": ["game/gui.rpy", 177], "gui.button_text_selected_color": ["game/gui.rpy", 178], "gui.button_text_insensitive_color": ["game/gui.rpy", 179], "gui.button_text_xalign": ["game/gui.rpy", 183], "gui.radio_button_borders": ["game/gui.rpy", 192], "gui.check_button_borders": ["game/gui.rpy", 194], "gui.confirm_button_text_xalign": ["game/gui.rpy", 196], "gui.page_button_borders": ["game/gui.rpy", 198], "gui.quick_button_borders": ["game/gui.rpy", 200], "gui.quick_button_text_size": ["game/gui.rpy", 201], "gui.quick_button_text_idle_color": ["game/gui.rpy", 202], "gui.quick_button_text_selected_color": ["game/gui.rpy", 203], "gui.choice_button_width": ["game/gui.rpy", 217], "gui.choice_button_height": ["game/gui.rpy", 218], "gui.choice_button_tile": ["game/gui.rpy", 219], "gui.choice_button_borders": ["game/gui.rpy", 220], "gui.choice_button_text_font": ["game/gui.rpy", 221], "gui.choice_button_text_size": ["game/gui.rpy", 222], "gui.choice_button_text_xalign": ["game/gui.rpy", 223], "gui.choice_button_text_idle_color": ["game/gui.rpy", 224], "gui.choice_button_text_hover_color": ["game/gui.rpy", 225], "gui.choice_button_text_insensitive_color": ["game/gui.rpy", 226], "gui.slot_button_width": ["game/gui.rpy", 237], "gui.slot_button_height": ["game/gui.rpy", 238], "gui.slot_button_borders": ["game/gui.rpy", 239], "gui.slot_button_text_size": ["game/gui.rpy", 240], "gui.slot_button_text_xalign": ["game/gui.rpy", 241], "gui.slot_button_text_idle_color": ["game/gui.rpy", 242], "gui.slot_button_text_selected_idle_color": ["game/gui.rpy", 243], "gui.slot_button_text_selected_hover_color": ["game/gui.rpy", 244], "config.thumbnail_width": ["game/gui.rpy", 248], "config.thumbnail_height": ["game/gui.rpy", 249], "gui.file_slot_cols": ["game/gui.rpy", 253], "gui.file_slot_rows": ["game/gui.rpy", 254], "gui.navigation_xpos": ["game/gui.rpy", 264], "gui.skip_ypos": ["game/gui.rpy", 267], "gui.notify_ypos": ["game/gui.rpy", 270], "gui.choice_spacing": ["game/gui.rpy", 273], "gui.navigation_spacing": ["game/gui.rpy", 276], "gui.pref_spacing": ["game/gui.rpy", 279], "gui.pref_button_spacing": ["game/gui.rpy", 282], "gui.page_spacing": ["game/gui.rpy", 285], "gui.slot_spacing": ["game/gui.rpy", 288], "gui.main_menu_text_xalign": ["game/gui.rpy", 291], "gui.frame_borders": ["game/gui.rpy", 301], "gui.confirm_frame_borders": ["game/gui.rpy", 304], "gui.skip_frame_borders": ["game/gui.rpy", 307], "gui.notify_frame_borders": ["game/gui.rpy", 310], "gui.frame_tile": ["game/gui.rpy", 313], "gui.bar_size": ["game/gui.rpy", 327], "gui.scrollbar_size": ["game/gui.rpy", 328], "gui.slider_size": ["game/gui.rpy", 329], "gui.bar_tile": ["game/gui.rpy", 333], "gui.scrollbar_tile": ["game/gui.rpy", 334], "gui.slider_tile": ["game/gui.rpy", 335], "gui.bar_borders": ["game/gui.rpy", 338], "gui.scrollbar_borders": ["game/gui.rpy", 339], "gui.slider_borders": ["game/gui.rpy", 340], "gui.vbar_borders": ["game/gui.rpy", 343], "gui.vscrollbar_borders": ["game/gui.rpy", 344], "gui.vslider_borders": ["game/gui.rpy", 345], "gui.unscrollable": ["game/gui.rpy", 349], "config.history_length": ["game/gui.rpy", 357], "gui.history_height": ["game/gui.rpy", 361], "gui.history_name_xpos": ["game/gui.rpy", 365], "gui.history_name_ypos": ["game/gui.rpy", 366], "gui.history_name_width": ["game/gui.rpy", 367], "gui.history_name_xalign": ["game/gui.rpy", 368], "gui.history_text_xpos": ["game/gui.rpy", 371], "gui.history_text_ypos": ["game/gui.rpy", 372], "gui.history_text_width": ["game/gui.rpy", 373], "gui.history_text_xalign": ["game/gui.rpy", 374], "gui.nvl_borders": ["game/gui.rpy", 383], "gui.nvl_list_length": ["game/gui.rpy", 387], "gui.nvl_height": ["game/gui.rpy", 391], "gui.nvl_spacing": ["game/gui.rpy", 395], "gui.nvl_name_xpos": ["game/gui.rpy", 399], "gui.nvl_name_ypos": ["game/gui.rpy", 400], "gui.nvl_name_width": ["game/gui.rpy", 401], "gui.nvl_name_xalign": ["game/gui.rpy", 402], "gui.nvl_text_xpos": ["game/gui.rpy", 405], "gui.nvl_text_ypos": ["game/gui.rpy", 406], "gui.nvl_text_width": ["game/gui.rpy", 407], "gui.nvl_text_xalign": ["game/gui.rpy", 408], "gui.nvl_thought_xpos": ["game/gui.rpy", 412], "gui.nvl_thought_ypos": ["game/gui.rpy", 413], "gui.nvl_thought_width": ["game/gui.rpy", 414], "gui.nvl_thought_xalign": ["game/gui.rpy", 415], "gui.nvl_button_xpos": ["game/gui.rpy", 418], "gui.nvl_button_xalign": ["game/gui.rpy", 419], "gui.language": ["game/gui.rpy", 429], "quick_menu": ["game/screens.rpy", 267], "gui.history_allow_tags": ["game/screens.rpy", 934], "config.nvl_list_length": ["game/screens.rpy", 1366], "bubble.frame": ["game/screens.rpy", 1475], "bubble.thoughtframe": ["game/screens.rpy", 1476], "bubble.properties": ["game/screens.rpy", 1478], "bubble.expand_area": ["game/screens.rpy", 1504], "config.name": ["game/options.rpy", 18], "gui.show_name": ["game/options.rpy", 24], "config.version": ["game/options.rpy", 29], "gui.about": ["game/options.rpy", 35], "build.name": ["game/options.rpy", 46], "config.has_sound": ["game/options.rpy", 55], "config.has_music": ["game/options.rpy", 56], "config.has_voice": ["game/options.rpy", 57], "config.enter_transition": ["game/options.rpy", 83], "config.exit_transition": ["game/options.rpy", 84], "config.intra_transition": ["game/options.rpy", 89], "config.after_load_transition": ["game/options.rpy", 94], "config.end_game_transition": ["game/options.rpy", 99], "config.window": ["game/options.rpy", 117], "config.window_show_transition": ["game/options.rpy", 122], "config.window_hide_transition": ["game/options.rpy", 123], "config.save_directory": ["game/options.rpy", 156], "config.window_icon": ["game/options.rpy", 163]}, "screen": {"say": ["game/screens.rpy", 98], "input": ["game/screens.rpy", 175], "choice": ["game/screens.rpy", 208], "quick_menu": ["game/screens.rpy", 1525], "navigation": ["game/screens.rpy", 288], "main_menu": ["game/screens.rpy", 352], "game_menu": ["game/screens.rpy", 418], "about": ["game/screens.rpy", 545], "save": ["game/screens.rpy", 586], "load": ["game/screens.rpy", 593], "file_slots": ["game/screens.rpy", 600], "preferences": ["game/screens.rpy", 729], "history": ["game/screens.rpy", 890], "help": ["game/screens.rpy", 982], "keyboard_help": ["game/screens.rpy", 1011], "mouse_help": ["game/screens.rpy", 1062], "gamepad_help": ["game/screens.rpy", 1085], "confirm": ["game/screens.rpy", 1151], "skip_indicator": ["game/screens.rpy", 1216], "notify": ["game/screens.rpy", 1274], "nvl": ["game/screens.rpy", 1313], "nvl_dialogue": ["game/screens.rpy", 1345], "bubble": ["game/screens.rpy", 1433]}, "transform": {"delayed_blink": ["game/screens.rpy", 1235], "notify_appear": ["game/screens.rpy", 1285]}, "callable": {"touch": ["game/gui.rpy", 441], "small": ["game/gui.rpy", 448], "Personnage.__init__": ["game/characters/personnage.rpy", 6], "Personnage.etat_civil": ["game/characters/personnage.rpy", 23], "Personnage.parle": ["game/characters/personnage.rpy", 77], "dialogue": ["game/engine/interractions.rpy", 8], "Patron.__init__": ["game/characters/safeenergies/patron.rpy", 4]}}, "build": {"directory_name": "Patronjeveuxuneaugmentation-1.0", "executable_name": "Patronjeveuxuneaugmentation", "include_update": false, "packages": [{"name": "pc", "formats": ["zip"], "file_lists": ["windows", "linux", "renpy", "all"], "description": "PC: Windows and Linux", "update": true, "dlc": false, "hidden": false}, {"name": "linux", "formats": ["tar.bz2"], "file_lists": ["linux", "linux_arm", "renpy", "all"], "description": "Linux", "update": true, "dlc": false, "hidden": false}, {"name": "mac", "formats": ["app-zip", "app-dmg"], "file_lists": ["mac", "renpy", "all"], "description": "Macintosh", "update": true, "dlc": false, "hidden": false}, {"name": "win", "formats": ["zip"], "file_lists": ["windows", "renpy", "all"], "description": "Windows", "update": true, "dlc": false, "hidden": false}, {"name": "market", "formats": ["bare-zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "Windows, Mac, Linux for Markets", "update": true, "dlc": false, "hidden": false}, {"name": "steam", "formats": ["zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "steam", "update": true, "dlc": false, "hidden": true}, {"name": "android", "formats": ["directory"], "file_lists": ["android", "all"], "description": "android", "update": false, "dlc": true, "hidden": true}, {"name": "ios", "formats": ["directory"], "file_lists": ["ios", "all"], "description": "ios", "update": false, "dlc": true, "hidden": true}, {"name": "web", "formats": ["zip"], "file_lists": ["web", "renpy", "all"], "description": "web", "update": false, "dlc": true, "hidden": true}], "archives": [["archive", ["all"]]], "documentation_patterns": ["*.html", "*.txt"], "base_patterns": [["*.py", null], ["*.sh", null], ["*.app/", null], ["*.dll", null], ["*.manifest", null], ["*.keystore", null], ["lib/", null], ["renpy/", null], ["update/", null], ["common/", null], ["update/", null], ["old-game/", null], ["icon.ico", null], ["icon.icns", null], ["project.json", null], ["log.txt", null], ["errors.txt", null], ["traceback.txt", null], ["image_cache.txt", null], ["text_overflow.txt", null], ["dialogue.txt", null], ["dialogue.tab", null], ["profile_screen.txt", null], ["files.txt", null], ["memory.txt", null], ["tmp/", null], ["game/saves/", null], ["game/bytecode.rpyb", null], ["archived/", null], ["launcherinfo.py", null], ["android.txt", null], ["game/presplash*.*", ["all"]], ["android.json", ["android"]], [".android.json", ["android"]], ["android-*.png", ["android"]], ["android-*.jpg", ["android"]], ["ouya_icon.png", null], ["ios-presplash.*", ["ios"]], ["ios-launchimage.png", null], ["ios-icon.png", null], ["web-presplash.png", ["web"]], ["web-presplash.jpg", ["web"]], ["web-presplash.webp", ["web"]], ["progressive_download.txt", ["web"]], ["steam_appid.txt", null], ["game/cache/bytecode-39.rpyb", ["all"]], ["game/cache/bytecode-311.rpyb", ["web"]], ["game/cache/bytecode-*.rpyb", null], ["**~", null], ["**.bak", null], ["**/.**", null], ["**/#**", null], ["**/thumbs.db", null], [".*", null], ["**", ["all"]]], "renpy_patterns": [["renpy/common/_compat/**", null], ["renpy/common/_roundrect/**", null], ["renpy/common/_outline/**", null], ["renpy/common/_theme**", null], ["lib/**/_ssl.*", null], ["renpy/**__pycache__/**.cpython-39.pyc", ["all"]], ["renpy/**__pycache__", ["all"]], ["**~", null], ["**/#*", null], ["**/.*", null], ["**.old", null], ["**.new", null], ["**.rpa", null], ["**/steam_appid.txt", null], ["renpy.py", ["all"]], ["renpy/", ["all"]], ["renpy/**.py", ["renpy"]], ["renpy/**.pxd", null], ["renpy/**.pxi", null], ["renpy/**.pyx", null], ["renpy/**.pyc", null], ["renpy/**.pyo", null], ["renpy/common/", ["all"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**.rpy", ["renpy"]], ["renpy/common/**.rpym", ["renpy"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**", ["all"]], ["renpy/**", ["all"]], ["lib/*/renpy", null], ["lib/*/renpy.exe", null], ["lib/*/pythonw.exe", null], ["lib/py2-*/", null], ["lib/py*-windows-i686/**", ["windows_i686"]], ["lib/py*-windows-x86_64/**", ["windows"]], ["lib/py*-linux-i686/**", ["linux_i686"]], ["lib/py*-linux-aarch64/**", ["linux_arm"]], ["lib/py*-linux-armv7l/**", ["linux_arm"]], ["lib/py*-linux-*/**", ["linux"]], ["lib/py*-mac-*/**", ["mac"]], ["lib/python2.*/**", null], ["lib/**", ["windows", "linux", "mac", "android", "ios"]], ["renpy.sh", ["linux", "mac"]]], "xbit_patterns": ["**.sh", "lib/py*-linux-*/*", "lib/py*-mac-*/*", "**.app/Contents/MacOS/*"], "version": "1.0", "display_name": "Patron, donne-moi une augmentation", "exclude_empty_directories": true, "allow_integrated_gpu": true, "renpy": false, "script_version": true, "destination": "Patronjeveuxuneaugmentation-1.0-dists", "itch_channels": [["*-all.zip", "win-osx-linux"], ["*-market.zip", "win-osx-linux"], ["*-pc.zip", "win-linux"], ["*-win.zip", "win"], ["*-mac.zip", "osx"], ["*-linux.tar.bz2", "linux"], ["*-release.apk", "android"]], "mac_info_plist": {}, "merge": [["linux_i686", "linux"], ["windows_i686", "windows"]], "include_i686": true, "change_icon_i686": true, "android_permissions": [], "_sdk_fonts": false}} \ No newline at end of file diff --git a/game/saves/persistent b/game/saves/persistent index dd502a7..4fc5960 100644 Binary files a/game/saves/persistent and b/game/saves/persistent differ diff --git a/game/story/apres_midi.rpy b/game/story/apres_midi.rpy index 6cb130f..ccd2e21 100644 --- a/game/story/apres_midi.rpy +++ b/game/story/apres_midi.rpy @@ -1,2 +1,4 @@ label apres_midi: - m.c "Allez, c'est la dernière ligne droite avant la négociation avec mon patron." \ No newline at end of file + m.c "Allez, c'est la dernière ligne droite avant la négociation avec mon patron." + + return \ No newline at end of file diff --git a/game/story/matin.rpy b/game/story/matin.rpy index 05db9cf..cead7a1 100644 --- a/game/story/matin.rpy +++ b/game/story/matin.rpy @@ -1,2 +1,4 @@ label matin: - m.c "Me voici arrivé au travail, allez zou au boulot." \ No newline at end of file + m.c "Me voici arrivé au travail, allez zou au boulot." + + return \ No newline at end of file diff --git a/game/story/midi.rpy b/game/story/midi.rpy index 1e31ab8..c7fd517 100644 --- a/game/story/midi.rpy +++ b/game/story/midi.rpy @@ -1,2 +1,4 @@ label midi: - m.c "Oh, il est déjà midi ? Où est-ce que je vais aller manger ?" \ No newline at end of file + m.c "Oh, il est déjà midi ? Où est-ce que je vais aller manger ?" + + return \ No newline at end of file diff --git a/game/story/morning_routine.rpy b/game/story/morning_routine.rpy index 6069e25..203e091 100644 --- a/game/story/morning_routine.rpy +++ b/game/story/morning_routine.rpy @@ -8,4 +8,6 @@ label morning_routine: m.c "Je travaille comme [m.social] chez [m.entreprise] depuis [m.anciennete] ans. " m.c "Après [m.etudes] années d'études, j'ai travaillé pendant [m.experience] ans dans ce métier." m.c "Je gagne aujourd'hui [m.salaire] euros bruts par mois." - m.c "Et aujourd'hui, je vais tâcher d'obtenir une augmentation." \ No newline at end of file + m.c "Et aujourd'hui, je vais tâcher d'obtenir une augmentation." + + return \ No newline at end of file diff --git a/game/story/negociation_patron.rpy b/game/story/negociation_patron.rpy index ec3092d..bc33baa 100644 --- a/game/story/negociation_patron.rpy +++ b/game/story/negociation_patron.rpy @@ -2,4 +2,14 @@ label negociation_patron: m.c "Bonjour patron, donne-moi une augmentation !" call expression patron_safe.parle("bonjour") + m.c "Non, je veux pas m'assoir !" + $ patron_safe.humeur -= 10 + call expression patron_safe.parle("bonjour") + m.c "Bon, ok, mais seulement si vous me le demandez gentilement." + $ patron_safe.humeur += 25 + call expression patron_safe.parle("bonjour") + m.c "Allez, ok je m'assieds." + + return + diff --git a/game/story/petit_dejeuner.rpy b/game/story/petit_dejeuner.rpy index 5aa12d9..253bfef 100644 --- a/game/story/petit_dejeuner.rpy +++ b/game/story/petit_dejeuner.rpy @@ -1,2 +1,4 @@ label petit_dejeuner: - m.c "Petit dèj : Miam, j'ai faim !" \ No newline at end of file + m.c "Petit dèj : Miam, j'ai faim !" + + return \ No newline at end of file diff --git a/game/story/trajet.rpy b/game/story/trajet.rpy index 2b8fcb0..bbe4116 100644 --- a/game/story/trajet.rpy +++ b/game/story/trajet.rpy @@ -1,2 +1,4 @@ label trajet: - m.c "Allez hop, je suis en route pour le travail." \ No newline at end of file + m.c "Allez hop, je suis en route pour le travail." + + return \ No newline at end of file diff --git a/game/tl/None/common.rpymc b/game/tl/None/common.rpymc index ba771bd..5b24ac3 100644 Binary files a/game/tl/None/common.rpymc and b/game/tl/None/common.rpymc differ