tonytins/citylimits-next
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accurately find tile coords. moved error msgs to global.

Browse source
This commit is contained in:
Antti Hakkarainen 2023-02-08 18:18:26 +02:00
parent 30ec55066b
commit c440e5f482
8 changed files with 225 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/CameraZoom2D.gd
View file

@ -5,6 +5,13 @@ extends Camera2D
var is_panning_camera = false
var tween
func camera_zoom_in() -> void:
_set_camera_zoom_level(Globals.CAMERA_ZOOM_LEVEL - Globals.CAMERA_ZOOM_FACTOR)
func camera_zoom_out() -> void:
_set_camera_zoom_level(Globals.CAMERA_ZOOM_LEVEL + Globals.CAMERA_ZOOM_DURATION)
func _set_camera_zoom_level(value: float) -> void:
Globals.CAMERA_ZOOM_LEVEL = clamp(value, Globals.CAMERA_MIN_ZOOM_LEVEL, Globals.CAMERA_MAX_ZOOM_LEVEL)
@ -17,13 +24,10 @@ func _set_camera_zoom_level(value: float) -> void:
Globals.CAMERA_ZOOM_DURATION
)
func camera_zoom_in() -> void:
_set_camera_zoom_level(Globals.CAMERA_ZOOM_LEVEL - Globals.CAMERA_ZOOM_FACTOR)
func camera_zoom_out() -> void:
_set_camera_zoom_level(Globals.CAMERA_ZOOM_LEVEL + Globals.CAMERA_ZOOM_DURATION)
func _on_world_set_camera_position(pos: Vector2) -> void:
print("Setting camera pos:", pos)
self.position = pos
func _unhandled_input(event):
if event.is_action_pressed("camera_zoom_in"):
camera_zoom_in()
@ -39,3 +43,4 @@ func _unhandled_input(event):
if event is InputEventMouseMotion and is_panning_camera:
self.position -= event.relative * Globals.CAMERA_PAN_MULTI

6
scripts/Control.gd
View file

@ -3,7 +3,7 @@ extends Control
# var view = get_node("../View")
signal button_pressed(button_name)
@onready var debug_info = get_node("DebugInfo")
@onready var debug_info = get_node(Globals.DEBUGINFO_NODE)
# name, position
var buttons = {
@ -28,10 +28,10 @@ func _process(_delta):
func create_buttons():
for button in buttons:
var values = buttons[button]
var node_path = get_node("ConstructionPanel/" + str(button))
var node_path = get_node(Globals.CONSTRUCTION_PANEL_NODE + "/" + str(button))
if(!node_path):
push_error("Error: Button '" + button + "' not found when trying to set it's properties in Control.gd!")
push_error("Error: Button '%s' not found when trying to set it's properties in Control.gd!", button)
node_path.set_size(Globals.GUI_BUILD_BUTTON_SIZE)
node_path.set_position(values[0])

55
scripts/Globals.gd
View file

@ -1,30 +1,67 @@
# File contains global variables or constants so they all are in one place instead
# of a million files. So you can adjust them easily from one place if needed.
extends Node
var world_map: TileMap
# FILE PATHS
const SCENE_PATH:String = "res://scenes/"
const ART_PATH:String = "res://art/"
const SCRIPT_PATH:String = "res://scripts"
# NODE NAMES
const WORLD_NODE:String = "World"
const DEBUGINFO_NODE:String = "DebugInfo"
const CONSTRUCTION_PANEL_NODE:String = "ConstructionPanel"
const GUI_BUILD_BUTTON_SIZE_X: int = 50
const GUI_BUILD_BUTTON_SIZE_Y: int = 50
const GUI_BUILD_BUTTON_SIZE: Vector2i = Vector2i(GUI_BUILD_BUTTON_SIZE_X,GUI_BUILD_BUTTON_SIZE_Y)
# GAME WINDOW DEFAULT SIZE
const DEFAULT_X_RES:int = 1920
const DEFAULT_Y_RES:int = 1080
const TYPE_RESIDENTIAL = "residential"
const TYPE_COMMERCIAL = "commercial"
const TYPE_INDUSTRIAL = "industrial"
const TYPE_SERVICES = "services"
const TYPE_SOCIAL = "social"
const TYPE_POWERPLANT = "powerplant"
const TYPE_ROADS = "roads"
const TYPE_DEMOLISH = "demolish"
# maybe should use int for these instead for faster matching?
const TYPE_RESIDENTIAL:String = "residential"
const TYPE_COMMERCIAL:String = "commercial"
const TYPE_INDUSTRIAL:String = "industrial"
const TYPE_SERVICES:String = "services"
const TYPE_SOCIAL:String = "social"
const TYPE_POWERPLANT:String = "powerplant"
const TYPE_ROADS:String = "roads"
const TYPE_DEMOLISH:String = "demolish"
# tilemap layers
const LAYER_TERRAIN:int = 0
const LAYER_BUILDINGS:int = 1
# camera movement settings
var CAMERA_ZOOM_LEVEL : float = 1.0
var CAMERA_ZOOM_LEVEL: float = 1.0
const CAMERA_MIN_ZOOM_LEVEL: float = 0.1
const CAMERA_MAX_ZOOM_LEVEL: float = 2.0
const CAMERA_ZOOM_FACTOR: float = 0.1
const CAMERA_ZOOM_DURATION: float = 0.1
const CAMERA_PAN_MULTI:float = 2.0
# city map generation file should have black ground (0,0,0) and white water (1,1,1)
const GROUND_TILE_COLOR_IN_MAP_FILE: Color = Color(0,0,0,1)
const WATER_TILE_COLOR_IN_MAP_FILE: Color = Color(1,1,1,1)
# min and max sizes for a map so the map won't be unreasonably small or large
const MAP_MIN_HEIGHT:int = 100
const MAP_MAX_HEIGHT:int = 1000
const MAP_MIN_WIDTH:int = 100
const MAP_MAX_WIDTH:int = 1000
# tile size
const TILE_SIZE_X:int = 16
const TILE_SIZE_Y:int = 16
# error messages
const ERROR_IMAGE_WIDTH_INCORRECT:String = "Provided map image width '%s' too small or too large. Width should be between: '%s-%s'"
const ERROR_IMAGE_HEIGHT_INCORRECT:String = "Provided map image height '%s' too small or too large. Height should be between: '%s-%s'"
const ERROR_FAILED_TO_LOAD_FILE:String = "Failed to load image with filename: '%s'"

30
scripts/Main.gd
View file

@ -8,7 +8,8 @@
extends Node
var world_map: TileMap
# The idea is for the user to be able to choose the map from GUI later
var map_file_name: String = "res://maps/tampere_10x10km_1000px.png"
func _init():
DisplayServer.window_set_size(
@ -17,21 +18,22 @@ func _init():
# Called when the node enters the scene tree for the first time.
func _ready():
generate_terrain()
Globals.world_map = get_node("World")
if !Globals.world_map:
push_error("Error while making an instance of World node.")
quit_game()
# generate terrain. quit game if generation fails.
if !Globals.world_map.generate_terrain(map_file_name):
push_error("Error in generating the map. Game won't start.")
quit_game()
#SceneTree.quit
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(_delta):
pass
func quit_game():
get_tree().get_root().propagate_notification(NOTIFICATION_WM_CLOSE_REQUEST)
func generate_terrain():
world_map = get_node("World")
var image = Image.new()
image.load("res://maps/tampere_10x10km_1000px.png")
for x in 1000:
for y in 1000:
# layer | position coords | tilemap id | coords of the tile at tilemap | alternative tile
if image.get_pixel(x, y) == Color(1,1,1,1):
world_map.set_cell(0, Vector2i(x, y), 2, Vector2i(0,0), 0)

97
scripts/World.gd
View file

@ -1,8 +1,9 @@
extends TileMap
signal set_camera_position(pos:Vector2)
var building : bool = false
var building_type: String
var tilemap: Vector2i
#var scene
# Called when the node enters the scene tree for the first time.
@ -31,41 +32,93 @@ func _input(event):
# stop processing the sprite (fix it in place). no idea if it is a good idea yet..
#building.set_process(false)
building = false
place_building_to_map()
place_building_to_map(event)
# cancel placement
if event.is_action_pressed("cancel"):
if building != false:
pass
func calculate_grid_coordinates(map_position: Vector2) -> Vector2:
return (map_position).floor()
func place_building_to_map():
# layer | position coords | tilemap id | coords of the tile at tilemap | alternative tile
func place_building_to_map(event):
var tileset_id = 0 # default value
var tilemap_tile_coords: Vector2i
# layer | position coords | tileset id | coords of the tile at tilemap | alternative tile
match building_type:
Globals.TYPE_RESIDENTIAL:
tilemap = Vector2i(0,0)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 0, tilemap, 0)
tilemap_tile_coords = Vector2i(0,0)
tileset_id = 0
Globals.TYPE_COMMERCIAL:
tilemap = Vector2i(4,12)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(4,12)
tileset_id = 1
Globals.TYPE_INDUSTRIAL:
tilemap = Vector2i(4,20)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(4,20)
tileset_id = 1
Globals.TYPE_ROADS:
tilemap = Vector2i(14,2)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(14,2)
tileset_id = 1
Globals.TYPE_DEMOLISH:
tilemap = Vector2i(4,4)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(4,4)
tileset_id = 1
Globals.TYPE_SERVICES:
tilemap = Vector2i(4,8)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(4,8)
tileset_id = 1
Globals.TYPE_SOCIAL:
tilemap = Vector2i(4,0)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(4,0)
tileset_id = 1
_: #default
tilemap = Vector2i(16,16)
set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
tilemap_tile_coords = Vector2i(16,16)
tileset_id = 1
# set_cell(0, local_to_map(get_viewport().get_mouse_position()) , 1, tilemap, 0)
var mouse_pos = local_to_map(get_global_mouse_position())
set_cell(Globals.LAYER_BUILDINGS, mouse_pos, tileset_id, tilemap_tile_coords, 0)
#print("cell set at layer ", Globals.LAYER_BUILDINGS)
#print("cellpos:", local_to_map(get_global_mouse_position()))
#print("event position:", event.position)
func generate_terrain(filename) -> bool:
# Try to load the image which we used to place water & ground to world map
var image:Image = Image.new()
image = load(filename)
if image == null:
var errmsg = Globals.ERROR_FAILED_TO_LOAD_FILE
push_error(errmsg % filename)
return false
var image_height:int = image.get_height()
var image_width:int = image.get_width()
# Check if image is too small or too large
if Globals.MAP_MIN_HEIGHT > image_height or image_height > Globals.MAP_MAX_HEIGHT:
var errmsg = Globals.ERROR_IMAGE_HEIGHT_INCORRECT
errmsg = errmsg % [image_height, Globals.MAP_MIN_HEIGHT, Globals.MAP_MAX_HEIGHT]
push_error(errmsg)
return false
elif Globals.MAP_MIN_WIDTH > image_width or image_width > Globals.MAP_MAX_WIDTH:
var errmsg = Globals.ERROR_IMAGE_WIDTH_INCORRECT
errmsg = errmsg % [image_width, Globals.MAP_MIN_WIDTH, Globals.MAP_MAX_WIDTH]
push_error(errmsg)
return false
# Try to load the world tilemap where we place the tiles
if (Globals.world_map == null):
print("World TileMap node missing or name is wrong.\n
Tried to load: '%s'", Globals.WORLD_NODE)
return false
# Finally populate the world map with hopefully valid tiles!
for x in image_width:
for y in image_height:
# layer | position coords | tilemap id | coords of the tile at tilemap | alternative tile
if image.get_pixel(x, y) == Globals.WATER_TILE_COLOR_IN_MAP_FILE:
Globals.world_map.set_cell(Globals.LAYER_TERRAIN, Vector2i(x, y), 2, Vector2i(0,0), 0)
# center camera to world map
emit_signal(
"set_camera_position",
Vector2(image_height/2.0*Globals.TILE_SIZE_X, image_width/2.0*Globals.TILE_SIZE_Y)
)
return true