Skip to content

Commit

Permalink
Merge branch 'main' into tool-only
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackRam-oss committed Jul 24, 2022
2 parents 40577c6 + 04700ac commit a51113b
Show file tree
Hide file tree
Showing 2 changed files with 300 additions and 1 deletion.
290 changes: 289 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,295 @@
"settings": {
"foreground": "#f00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#ffbe00",
"settings": {
"foreground": "#ffbe00"
}
},
{
"scope": "renpy.meta.color.#ffbe00",
"settings": {
"foreground": "#ffbe00"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#00ff00",
"settings": {
"foreground": "#00ff00"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
},
{
"scope": "renpy.meta.color.#e59400",
"settings": {
"foreground": "#e59400"
}
}
]
}
}
}
11 changes: 11 additions & 0 deletions game/tool/utility.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,16 @@ init -999 python:
return True
return False

def null_or_image(s):
"""It checks for the presence of an image, in case it is not there it returns a null value. Possible use: avoid mistakes in the management of clothes."""
# s = renpy.substitute(s)
if renpy.has_image(s):
return s
elif renpy.list_files(s):
return s
else:
return Null()
config.displayable_prefix['check'] = null_or_image

label set_background(img):
scene expression (img) as bg

0 comments on commit a51113b

Please sign in to comment.