diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-04 10:47:51 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-04 10:47:51 +0100 |
| commit | e01d332f407420db84fbfd207f18c3fec1c1b6a3 (patch) | |
| tree | b963c671239ecd693d4162afe4b1b9d3b064554e /game/src/Game/GameSession | |
| parent | 9165f5980c5cfe75b3bad4303a5822340f6adcfc (diff) | |
| parent | 6e350a3dc0b596b1f76fab3b943b67b7713ea4fa (diff) | |
Merge pull request #168 from OpenVicProject/update-sim
Sim submodule update + compatibility fixes
Diffstat (limited to 'game/src/Game/GameSession')
| -rw-r--r-- | game/src/Game/GameSession/MapView.gd | 2 | ||||
| -rw-r--r-- | game/src/Game/GameSession/TerrainMap.gdshader | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/game/src/Game/GameSession/MapView.gd b/game/src/Game/GameSession/MapView.gd index 7093c69..62bdd20 100644 --- a/game/src/Game/GameSession/MapView.gd +++ b/game/src/Game/GameSession/MapView.gd @@ -30,7 +30,7 @@ var _window_in_focus : bool = true @export var _zoom_target : float = 1.0: get: return _zoom_target set(v): _zoom_target = clamp(v, _zoom_target_min, _zoom_target_max) -const _zoom_position_multiplier = 3.14159 # Horizontal movement coefficient during zoom +const _zoom_position_multiplier = 3.14159 # Horizontal movement coefficient during zoom var _zoom_position : Vector2 @export var _map_mesh_instance : MeshInstance3D diff --git a/game/src/Game/GameSession/TerrainMap.gdshader b/game/src/Game/GameSession/TerrainMap.gdshader index 35a108b..97b20e4 100644 --- a/game/src/Game/GameSession/TerrainMap.gdshader +++ b/game/src/Game/GameSession/TerrainMap.gdshader @@ -47,7 +47,7 @@ vec3 get_terrain_colour( vec3 tinted_terrain_colour = mix(terrain_colour, tint_colour, 0.3); vec3 mixed_colour = mix(tinted_terrain_colour, province_colour.rgb, province_colour.a); - float highlight_mix_val = 0.1 * (float(province_index == hover_index) + float(province_index == selected_index)); + float highlight_mix_val = 0.4 * (float(province_index == hover_index) + float(province_index == selected_index)); return mix(mixed_colour, highlight_colour, highlight_mix_val); } |