diff options
author | Hop311 <Hop3114@gmail.com> | 2023-04-18 19:55:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-18 19:55:10 +0200 |
commit | ea077c8a7c78477bd247c7fbd21de13bcf2285e9 (patch) | |
tree | 0cc2be6ef3ab1f2af5c2806f60abe988ca6aa7b5 /game/src/Autoload | |
parent | 258a088018d36e987b3ffe4a9b418a6c21ad9217 (diff) | |
parent | 1fdd198f943a41468b03b2cdc62c24147f707239 (diff) |
Merge pull request #88 from OpenVic2Project/map-drawing
Further Map Stuff
Diffstat (limited to 'game/src/Autoload')
-rw-r--r-- | game/src/Autoload/Events.gd | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd index f4aac70..dbd3f9f 100644 --- a/game/src/Autoload/Events.gd +++ b/game/src/Autoload/Events.gd @@ -4,14 +4,17 @@ var Options = preload("Events/Options.gd").new() var Localisation = preload("Events/Localisation.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" # REQUIREMENTS -# * FS-333, FS-335, FS-341 +# * FS-333, FS-334, FS-335, FS-341 func _ready(): if MapSingleton.load_province_identifier_file(_province_identifier_file) != OK: push_error("Failed to load province identifiers") + if MapSingleton.load_water_province_file(_water_province_file) != OK: + push_error("Failed to load water provinces") if MapSingleton.load_region_file(_region_file) != OK: push_error("Failed to load regions") if MapSingleton.load_province_shape_file(_province_shape_file) != OK: |