aboutsummaryrefslogtreecommitdiff
path: root/game/src/Autoload/Events.gd
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2023-05-01 01:34:59 +0200
committer GitHub <noreply@github.com>2023-05-01 01:34:59 +0200
commitb1e985e0774598b3add22069be50f891e981fd79 (patch)
treee18e9cb252030e9b40ff91463ed117dd00a65789 /game/src/Autoload/Events.gd
parent1f8545facd248bbf4ea0cd551fea5f7d9b0efdce (diff)
parent2fec521cc6bbe7b2cda0eef3b830acbfc8b68333 (diff)
Merge pull request #103 from OpenVic2Project/terrain
Cosmetic terrain + Hashmaps
Diffstat (limited to 'game/src/Autoload/Events.gd')
-rw-r--r--game/src/Autoload/Events.gd10
1 files changed, 7 insertions, 3 deletions
diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd
index f94d338..47c3b88 100644
--- a/game/src/Autoload/Events.gd
+++ b/game/src/Autoload/Events.gd
@@ -8,7 +8,9 @@ var ShaderManager = preload("Events/ShaderManager.gd").new()
const _province_identifier_file : String = "res://common/map/provinces.json"
const _water_province_file : String = "res://common/map/water.json"
const _region_file : String = "res://common/map/regions.json"
-const _province_shape_file : String = "res://common/map/provinces.png"
+const _terrain_file : String = "res://common/map/terrain.json"
+const _province_image_file : String = "res://common/map/provinces.png"
+const _terrain_image_file : String = "res://common/map/terrain.png"
# REQUIREMENTS
# * FS-333, FS-334, FS-335, FS-341
@@ -19,5 +21,7 @@ func _ready():
push_error("Failed to load water provinces")
if GameSingleton.load_region_file(_region_file) != OK:
push_error("Failed to load regions")
- if GameSingleton.load_province_shape_file(_province_shape_file) != OK:
- push_error("Failed to load province shapes")
+ if GameSingleton.load_terrain_file(_terrain_file) != OK:
+ push_error("Failed to load terrain variants")
+ if GameSingleton.load_map_images(_province_image_file, _terrain_image_file) != OK:
+ push_error("Failed to load map images")