duncgibbs/clockwork-city
1
0
Fork 0
generated from krampus/template-godot4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makes post_office work
Some checks failed
linting & formatting / build (push) Successful in 22s
Details
itch.io publish action / build (web, html) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
duncgibbs 2026-04-29 15:25:38 -05:00
parent 6921a1ff63
commit 688ffcbf47
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
prefabs/board.gd
View File

@ -19,6 +19,7 @@ var is_destroying_building: bool = false
var current_map_coord: Vector2i var current_map_coord: Vector2i
var prev_map_coord: Vector2i var prev_map_coord: Vector2i
var is_controlling_camera: bool = false var is_controlling_camera: bool = false
var is_placing_post_office: bool = false
@onready var tile_map: TileMapLayer = %Tiles @onready var tile_map: TileMapLayer = %Tiles
@onready var board_state: Node2D = %BoardState @onready var board_state: Node2D = %BoardState
@ -72,6 +73,7 @@ func set_active_building(building: Building) -> void:
active_building.modulate = Color(1, 1, 1, 0.5) active_building.modulate = Color(1, 1, 1, 0.5)
active_building.is_placing = true active_building.is_placing = true
if active_building is PostOffice: if active_building is PostOffice:
is_placing_post_office = !is_placing_post_office
active_building.place() active_building.place()
@ -124,9 +126,6 @@ func place_active_building() -> void:
for surr_coord in tile_map.get_surrounding_cells(coord): for surr_coord in tile_map.get_surrounding_cells(coord):
if buildings.has(surr_coord): if buildings.has(surr_coord):
return return
Globals.board_game.current_board_state.players[0].money -= active_building.cost
if Globals.board_game.current_board_state.state != BoardState.State.INITIAL_SETUP:
Globals.board_game.current_board_state.players[0].build_actions_taken += 1
active_building.modulate = Color(1, 1, 1, 1) active_building.modulate = Color(1, 1, 1, 1)
for coord in active_building.get_tile_coords(): for coord in active_building.get_tile_coords():
buildings[coord] = active_building buildings[coord] = active_building
@ -134,6 +133,12 @@ func place_active_building() -> void:
tiles.erase(coord) tiles.erase(coord)
if active_building is Spawn: if active_building is Spawn:
Globals.board_game.current_board_state.spawn_placements -= 1 Globals.board_game.current_board_state.spawn_placements -= 1
if active_building is PostOffice and is_placing_post_office:
set_active_building(Building.deserialize(active_building.serialize()))
return
Globals.board_game.current_board_state.players[0].money -= active_building.cost
if Globals.board_game.current_board_state.state != BoardState.State.INITIAL_SETUP:
Globals.board_game.current_board_state.players[0].build_actions_taken += 1
board_state_changed.emit() board_state_changed.emit()
active_building = null active_building = null
@ -231,6 +236,8 @@ func set_board_state(bs: BoardState) -> void:
buildings[coord] = building buildings[coord] = building
building.position = tile_map.map_to_local(building.starting_coord) building.position = tile_map.map_to_local(building.starting_coord)
building.rotation_degrees += 90 * building.get_rotation_count() building.rotation_degrees += 90 * building.get_rotation_count()
if building is PostOffice:
building.place()
func initialize() -> void: func initialize() -> void:

4
prefabs/tiles/buildings/post_office.gd
View File

@ -24,8 +24,8 @@ func get_direction_queue(_citizen: Citizen) -> Array[Board.Direction]:
func activate(citizen: Citizen) -> void: func activate(citizen: Citizen) -> void:
if citizen.get_status_count(Citizen.Status.PACKAGED) > 0: if citizen.get_status_count(Citizen.Status.PACKAGED) > 0:
citizen.remove_all_statuses(Citizen.Status.PACKAGED) citizen.remove_all_statuses(Citizen.Status.PACKAGED)
print("Citizen has delivered a package!") citizen.money += ceili(citizen.package_distance / 2.0)
print("\tDistance: ", citizen.package_distance) citizen.play_money_animation()
citizen.package_distance = 0 citizen.package_distance = 0
else: else:
citizen.add_status(Citizen.Status.PACKAGED) citizen.add_status(Citizen.Status.PACKAGED)

5
scenes/board_game.gd
View File

@ -17,7 +17,7 @@ const SHOP_SCENE = preload("uid://dbn63mv0peqf")
const CHURCH_SCENE = preload("uid://brn0nbkela0m4") const CHURCH_SCENE = preload("uid://brn0nbkela0m4")
const CITY_HALL_SCENE = preload("uid://dtnejoimqiu0o") const CITY_HALL_SCENE = preload("uid://dtnejoimqiu0o")
const DEMOLITIONS_SCENE = preload("uid://dvmglvbersupv") const DEMOLITIONS_SCENE = preload("uid://dvmglvbersupv")
#const POST_OFFICE_SCENE = preload("uid://bpi8owv5lxyjy") const POST_OFFICE_SCENE = preload("uid://bpi8owv5lxyjy")
const BASE_DECK = [ const BASE_DECK = [
BANK_SCENE, BANK_SCENE,
@ -30,7 +30,8 @@ const BASE_DECK = [
SHOP_SCENE, SHOP_SCENE,
CHURCH_SCENE, CHURCH_SCENE,
CITY_HALL_SCENE, CITY_HALL_SCENE,
DEMOLITIONS_SCENE DEMOLITIONS_SCENE,
POST_OFFICE_SCENE
] ]
const WINNING_MONEY_AMOUNT: int = 200 const WINNING_MONEY_AMOUNT: int = 200