From c4c5d9fe82b4a44a5bd14e940550d79319576582 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 6 Jan 2020 16:59:54 +0100 Subject: [PATCH] Added an easy build option for the setup script. Also changed the contrast a bit. --- SConstruct | 66 ++++++++++++++++++++ game/data/spells/16_close_wounds_rank_1.tres | 1 - game/scenes/World.tscn | 2 +- 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 29fa60e2..00355694 100644 --- a/SConstruct +++ b/SConstruct @@ -186,6 +186,72 @@ def setup_all(): setup_addons_third_party_addons() env = Environment() + +if len(sys.argv) > 1: + + arg = sys.argv[1] + + if arg[0] == 'b': + build_string = 'scons ' + + build_string += 'tools=' + if 'e' in arg: + build_string += 'yes' + else: + build_string += 'no' + build_string += ' ' + + build_string += 'target=' + if 'r' in arg: + build_string += 'release' + if 'd' in arg: + build_string += 'debug' + else: + build_string += 'release_debug' + build_string += ' ' + + build_string += 'custom_modules_shared=' + if 's' in arg: + build_string += 'yes' + else: + build_string += 'no' + build_string += ' ' + + build_string += 'platform=' + if 'l' in arg: + build_string += 'x11' + elif 'w' in arg: + build_string += 'windows' + else: + print('No platform specified') + exit() + + build_string += ' ' + + for i in range(2, len(sys.argv)): + build_string += ' ' + sys.argv[i] + ' ' + + print('Running command: ' + build_string) + + cwd = os.getcwd() + full_path = cwd + '/engine/' + + if not os.path.isdir(full_path): + print("engine directory doesnt exists.") + exit() + + os.chdir(full_path) + + subprocess.call('export SCONS_CACHE=~/.scons_cache', shell=True) + subprocess.call('export SCONS_CACHE_LIMIT=5000', shell=True) + + subprocess.call(build_string, shell=True) + + #if arg[0] == 'r': + # pass + + exit() + opts = Variables(args=ARGUMENTS) opts.Add('a', 'What to do', '') diff --git a/game/data/spells/16_close_wounds_rank_1.tres b/game/data/spells/16_close_wounds_rank_1.tres index 0482ddd4..cf71c0fa 100644 --- a/game/data/spells/16_close_wounds_rank_1.tres +++ b/game/data/spells/16_close_wounds_rank_1.tres @@ -9,7 +9,6 @@ resource_name = "Close Wounds" id = 16 spell_type = 8 target_type = 2 -target_relation_type = -870457328 rank = 1 icon = ExtResource( 2 ) caster_aura_applys = [ ExtResource( 3 ) ] diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn index 57fb95d3..252450ad 100644 --- a/game/scenes/World.tscn +++ b/game/scenes/World.tscn @@ -53,7 +53,7 @@ glow_bloom = 0.1 glow_hdr_luminance_cap = 1.0 adjustment_enabled = true adjustment_brightness = 1.1 -adjustment_contrast = 1.25 +adjustment_contrast = 1.22 [node name="World" type="VoxelWorld" groups=[ "save",