Merge branch 'main' of https://git.ruff.co.il/amai.ig/otomai

description in release!

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,8 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\game"
+  ],
+  "SelectedNode": "\\game\\shiro_route.rpy",
+  "PreviewInSolutionExplorer": false
+}

Jenkinsfile

@@ -80,4 +80,14 @@ pipeline {
             }
         }
     }
+    post {
+        success {
+            // Trigger the deploy-prod-job on success of the build
+            build job: 'otomai-prod', wait: false
+        }
+        failure {
+            // Optionally, you can handle failure scenarios (e.g., notify team, etc.)
+            echo "Build failed, deployment not triggered."
+        }
+    }
 }

Jenkinsfile-prod

@@ -0,0 +1,31 @@
+pipeline {
+    agent {
+        label 'prod'  // Runs on a node labeled 'prod'
+    }
+    stages {
+        stage('Clean Old Container') {
+            steps {
+                script {
+                    catchError(buildResult: 'SUCCESS', message: 'Container doesn\'t exist on host, skipping...', stageResult: 'ABORTED') {
+                        sh 'docker stop game-pod1'
+                        sh 'docker rm game-pod1'
+                    }
+                }
+            }
+        }
+        stage('Run new container in Production') {
+            steps {
+                script {
+                    // Define registry credentials and image name
+                    def registryCredentialsId = '7e506860-ca64-47bd-92a8-1a591dd12cba'
+                    def imageName = 'git.ruff.co.il/amai.ig/otomai:latest'
+
+                    // Login to registry and run container in prod environment
+                    docker.withRegistry('https://git.ruff.co.il', registryCredentialsId) {
+                        docker.image(imageName).run('-p 22443:80 --name game-pod1')
+                    }
+                }
+            }
+        }
+    }
+}

errors.txt

@@ -2,13 +2,9 @@
 errors listed below, and try again.
 
 
-File "game/script.rpy", line 44: choice menuitem expects a non-empty block.
+File "game/sprite_settings.rpy", line 157: group expects a non-empty block.
-    "אני גם אוהב פפסי":
+    group sfx:
-                       ^
-
-File "game/script.rpy", line 47: Line is indented, but the preceding jump statement statement does not expect a block. Please check this line's indentation. You may have forgotten a colon (:).
-    "אני לא אוהב פפסי":
               ^
 
 Ren'Py Version: Ren'Py 8.3.2.24090902
-Sat Sep 28 09:59:45 2024
+Tue Feb  4 11:52:33 2025

game/.vscode/settings.json

@@ -0,0 +1,135 @@
+{
+    "files.exclude": {
+        "**/*.rpyc": true,
+        "**/*.rpa": true,
+        "**/*.rpymc": true,
+        "**/cache/": true
+    },
+    "editor.tokenColorCustomizations": {
+        "textMateRules": [
+            {
+                "scope": "renpy.meta.plain",
+                "settings": {
+                    "fontStyle": ""
+                }
+            },
+            {
+                "scope": "renpy.meta.i",
+                "settings": {
+                    "fontStyle": "italic"
+                }
+            },
+            {
+                "scope": "renpy.meta.b",
+                "settings": {
+                    "fontStyle": "bold"
+                }
+            },
+            {
+                "scope": [
+                    "renpy.meta.u",
+                    "renpy.meta.a"
+                ],
+                "settings": {
+                    "fontStyle": "underline"
+                }
+            },
+            {
+                "scope": "renpy.meta.s",
+                "settings": {
+                    "fontStyle": "strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.b",
+                "settings": {
+                    "fontStyle": "italic bold"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.u",
+                "settings": {
+                    "fontStyle": "italic underline"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.s",
+                "settings": {
+                    "fontStyle": "italic strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.b renpy.meta.u",
+                "settings": {
+                    "fontStyle": "bold underline"
+                }
+            },
+            {
+                "scope": "renpy.meta.b renpy.meta.s",
+                "settings": {
+                    "fontStyle": "bold strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.u renpy.meta.s",
+                "settings": {
+                    "fontStyle": "underline strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.b renpy.meta.u",
+                "settings": {
+                    "fontStyle": "italic bold underline"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.b renpy.meta.s",
+                "settings": {
+                    "fontStyle": "italic bold strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.u renpy.meta.s",
+                "settings": {
+                    "fontStyle": "italic underline strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.b renpy.meta.u renpy.meta.s",
+                "settings": {
+                    "fontStyle": "bold underline strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.i renpy.meta.b renpy.meta.u  renpy.meta.s",
+                "settings": {
+                    "fontStyle": "italic bold underline strikethrough"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.text",
+                "settings": {
+                    "foreground": "#ffffff"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.#fff",
+                "settings": {
+                    "foreground": "#fff"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.#ff0000",
+                "settings": {
+                    "foreground": "#ff0000"
+                }
+            },
+            {
+                "scope": "renpy.meta.color.#5e9cff",
+                "settings": {
+                    "foreground": "#5e9cff"
+                }
+            }
+        ]
+    }
+}

game/gallery.rpy

@@ -0,0 +1,75 @@
+init python:
+
+    # Step 1. Create the gallery object.
+    g = Gallery()
+    g.locked_button = "button_gallery_locked"
+
+    # Step 2. Add buttons and images to the gallery.
+    
+    # aoi good ending
+    g.button("סוף טוב אאוי")
+    g.condition("persistent.aoi_ending")
+    g.image("cg_aoi_good")
+
+    # aoi bad ending
+    g.button("סוף רע אאוי")
+    g.condition("persistent.aoi_ending_bad")
+    g.image("cg_aoi_bad")
+
+
+    # shiro good ending
+    g.button("סוף טוב שירו")
+    g.condition("persistent.shiro_ending")
+    g.image("cg_shiro_good")
+
+
+    # shiro bad ending
+    g.button("סוף רע שירו")
+    g.condition("persistent.shiro_ending_bad")
+    g.image("cg_shiro_bad")
+
+
+    # akai good ending
+    g.button("סוף טוב אקאי")
+    g.condition("persistent.akai_ending")
+    g.image("cg_akai_good")
+
+
+    # akai bad ending
+    g.button("סוף רע אקאי")
+    g.condition("persistent.akai_ending_bad")
+    g.image("cg_akai_bad")
+
+
+    # The transition used when switching images.
+    g.transition = dissolve
+
+# Step 3. The gallery screen we use.
+screen gallery:
+
+    # Ensure this replaces the main menu.
+    tag menu
+
+    # The background.
+    add "bg_contest_stage_front"
+
+    # A grid of buttons.
+    grid 3 3:
+
+        xfill True
+        yfill True
+        yoffset 80
+
+        # Call make_button to show a particular button.
+        add g.make_button("סוף טוב אאוי", "button_aoi_good", xalign=0.5, yalign=0.5, xzoom=0.1, yzoom=0.1)
+        add g.make_button("סוף רע אאוי", "button_aoi_bad", xalign=0.5, yalign=0.5, xzoom=0.1, yzoom=0.1)
+        add g.make_button("סוף טוב שירו", "button_shiro_good", xalign=0.5, yalign=0.5, xzoom=0.1,yzoom=0.1)
+
+        add g.make_button("סוף רע שירו", "button_shiro_bad", xalign=0.5, yalign=0.5, zoom=0.1)
+        add g.make_button("סוף טוב אקאי", "button_akai_good", xalign=0.5, yalign=0.5, zoom=0.1)
+        add g.make_button("סוף רע אקאי", "button_akai_bad", xalign=0.5, yalign=0.5, zoom=0.1)
+
+
+    # The screen is responsible for returning to the main menu. It could also
+    # navigate to other gallery screens.
+    textbutton "חזור" action Return() xalign 0.5 yalign 0.8

game/gui.rpy

@@ -27,17 +27,17 @@ define config.check_conflicting_properties = True
 ## The colors of text in the interface.
 
 ## An accent color used throughout the interface to label and highlight text.
-define gui.accent_color = '#990000'
+define gui.accent_color = '#834a96'
 
 ## The color used for a text button when it is neither selected nor hovered.
-define gui.idle_color = '#707070'
+define gui.idle_color = '#ffffff'
 
 ## The small color is used for small text, which needs to be brighter/darker to
 ## achieve the same effect.
-define gui.idle_small_color = '#606060'
+define gui.idle_small_color = '#e2e2e2'
 
 ## The color that is used for buttons and bars that are hovered.
-define gui.hover_color = '#990000'
+define gui.hover_color = '#834a96'
 
 ## The color used for a text button when it is selected but not focused. A
 ## button is selected if it is the current screen or preference value.
@@ -48,24 +48,24 @@ define gui.insensitive_color = '#7070707f'
 
 ## Colors used for the portions of bars that are not filled in. These are not
 ## used directly, but are used when re-generating bar image files.
-define gui.muted_color = '#c16666'
+define gui.muted_color = '#834a96'
-define gui.hover_muted_color = '#d69999'
+define gui.hover_muted_color = '#9c5fb0'
 
 ## The colors used for dialogue and menu choice text.
-define gui.text_color = '#404040'
+define gui.text_color = '#ffffff'
-define gui.interface_text_color = '#404040'
+define gui.interface_text_color = '#858585'
 
 
 ## Fonts and Font Sizes ########################################################
 
 ## The font used for in-game text.
-define gui.text_font = "DejaVuSans.ttf"
+define gui.text_font = "Assistant-Regular.ttf"
 
 ## The font used for character names.
-define gui.name_text_font = "DejaVuSans.ttf"
+define gui.name_text_font = "Rubik-ExtraBold.ttf"
 
 ## The font used for out-of-game text.
-define gui.interface_text_font = "DejaVuSans.ttf"
+define gui.interface_text_font = "Assistant-Bold.ttf"
 
 ## The size of normal dialogue text.
 define gui.text_size = 33
@@ -108,12 +108,12 @@ define gui.textbox_yalign = 1.0
 
 ## The placement of the speaking character's name, relative to the textbox.
 ## These can be a whole number of pixels from the left or top, or 0.5 to center.
-define gui.name_xpos = 360
+define gui.name_xpos = 0.82
 define gui.name_ypos = 0
 
 ## The horizontal alignment of the character's name. This can be 0.0 for left-
 ## aligned, 0.5 for centered, and 1.0 for right-aligned.
-define gui.name_xalign = 0.0
+define gui.name_xalign = 1.0
 
 ## The width, height, and borders of the box containing the character's name, or
 ## None to automatically size it.
@@ -132,7 +132,7 @@ define gui.namebox_tile = False
 ## The placement of dialogue relative to the textbox. These can be a whole
 ## number of pixels relative to the left or top side of the textbox, or 0.5 to
 ## center.
-define gui.dialogue_xpos = 402
+define gui.dialogue_xpos = 0.75
 define gui.dialogue_ypos = 75
 
 ## The maximum width of dialogue text, in pixels.
@@ -140,7 +140,7 @@ define gui.dialogue_width = 1116
 
 ## The horizontal alignment of the dialogue text. This can be 0.0 for left-
 ## aligned, 0.5 for centered, and 1.0 for right-aligned.
-define gui.dialogue_text_xalign = 0.0
+define gui.dialogue_text_xalign = 1.0
 
 
 ## Buttons #####################################################################
@@ -173,7 +173,7 @@ define gui.button_text_insensitive_color = gui.insensitive_color
 
 ## The horizontal alignment of the button text. (0.0 is left, 0.5 is center, 1.0
 ## is right).
-define gui.button_text_xalign = 0.0
+define gui.button_text_xalign = 1.0
 
 
 ## These variables override settings for different kinds of buttons. Please see
@@ -190,7 +190,7 @@ define gui.confirm_button_text_xalign = 0.5
 
 define gui.page_button_borders = Borders(15, 6, 15, 6)
 
-define gui.quick_button_borders = Borders(15, 6, 15, 0)
+define gui.quick_button_borders = Borders(15, 6, 15, 5)
 define gui.quick_button_text_size = 21
 define gui.quick_button_text_idle_color = gui.idle_small_color
 define gui.quick_button_text_selected_color = gui.accent_color
@@ -250,7 +250,7 @@ define gui.file_slot_rows = 2
 
 ## The position of the left side of the navigation buttons, relative to the left
 ## side of the screen.
-define gui.navigation_xpos = 60
+define gui.navigation_xpos = 1630
 
 ## The vertical position of the skip indicator.
 define gui.skip_ypos = 15
@@ -350,16 +350,16 @@ define gui.history_spacing = 0
 
 ## The position, width, and alignment of the label giving the name of the
 ## speaking character.
-define gui.history_name_xpos = 233
+define gui.history_name_xpos = 1100
 define gui.history_name_ypos = 0
 define gui.history_name_width = 233
-define gui.history_name_xalign = 1.0
+define gui.history_name_xalign = 0.0
 
 ## The position, width, and alignment of the dialogue text.
-define gui.history_text_xpos = 255
+define gui.history_text_xpos = 1078
 define gui.history_text_ypos = 3
 define gui.history_text_width = 1110
-define gui.history_text_xalign = 0.0
+define gui.history_text_xalign = 1.0
 
 
 ## NVL-Mode ####################################################################
@@ -389,17 +389,17 @@ define gui.nvl_name_width = 225
 define gui.nvl_name_xalign = 1.0
 
 ## The position, width, and alignment of the dialogue text.
-define gui.nvl_text_xpos = 675
+define gui.nvl_text_xpos = 1400
-define gui.nvl_text_ypos = 12
+define gui.nvl_text_ypos = 40
-define gui.nvl_text_width = 885
+define gui.nvl_text_width = 1000
-define gui.nvl_text_xalign = 0.0
+define gui.nvl_text_xalign = 1.0
 
 ## The position, width, and alignment of nvl_thought text (the text said by the
 ## nvl_narrator character.)
 define gui.nvl_thought_xpos = 360
 define gui.nvl_thought_ypos = 0
 define gui.nvl_thought_width = 1170
-define gui.nvl_thought_xalign = 0.0
+define gui.nvl_thought_xalign = 1.0
 
 ## The position of nvl menu_buttons.
 define gui.nvl_button_xpos = 675
@@ -443,8 +443,8 @@ init python:
 
         ## Adjust the location of the textbox.
         gui.textbox_height = 360
-        gui.name_xpos = 120
+        gui.name_xpos = 1815
-        gui.dialogue_xpos = 135
+        gui.dialogue_xpos = 1775
         gui.dialogue_width = 1650
 
         ## Change the size and spacing of various things.
@@ -457,7 +457,7 @@ init python:
         gui.pref_button_spacing = 15
 
         gui.history_height = 285
-        gui.history_text_width = 1035
+        gui.history_text_width = 800
 
         gui.quick_button_text_size = 30