Add gathering, unified inventory, and real-time world
This commit is contained in:
Voyager
parent
173371e6fc
commit
fa57edca83
113 changed files with 6700 additions and 1307 deletions
|
|
@ -14,8 +14,9 @@ enum Phase {
|
|||
}
|
||||
|
||||
const HOURS_PER_DAY: float = 24.0
|
||||
const REAL_SECONDS_PER_CYCLE: float = 60.0 * 60.0
|
||||
const REAL_SECONDS_PER_CYCLE: float = 24.0 * 60.0 * 60.0
|
||||
const HOURS_PER_REAL_SECOND: float = HOURS_PER_DAY / REAL_SECONDS_PER_CYCLE
|
||||
const SYSTEM_CLOCK_SAMPLE_INTERVAL_SECONDS: float = 0.25
|
||||
const DAY_START_HOUR: float = 8.0
|
||||
const NIGHT_START_HOUR: float = 20.0
|
||||
const TRANSITION_HALF_HOURS: float = 0.5
|
||||
|
|
@ -27,10 +28,15 @@ const DEFAULT_START_HOUR: float = DAY_START_HOUR
|
|||
|
||||
var _time_hours: float = DEFAULT_START_HOUR
|
||||
var _persistent_time_hours: float = DEFAULT_START_HOUR
|
||||
var _persistence_tracking_enabled: bool = false
|
||||
var _running: bool = false
|
||||
var _system_clock_authority: bool = false
|
||||
var _editor_time_override: bool = false
|
||||
var _phase: Phase = Phase.DAWN
|
||||
var _last_emitted_clock_minute: int = floori(DEFAULT_START_HOUR * 60.0)
|
||||
var _system_clock_sample_elapsed: float = 0.0
|
||||
var _last_system_unix_seconds: float = -1.0
|
||||
var _calendar_date_id: String = ""
|
||||
var _local_datetime: Dictionary = {}
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
|
|
@ -38,17 +44,54 @@ func _ready() -> void:
|
|||
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if not _running:
|
||||
return
|
||||
if _system_clock_authority and not _editor_time_override:
|
||||
_system_clock_sample_elapsed += delta
|
||||
if _system_clock_sample_elapsed >= SYSTEM_CLOCK_SAMPLE_INTERVAL_SECONDS:
|
||||
_system_clock_sample_elapsed = 0.0
|
||||
_sample_system_clock(false)
|
||||
return
|
||||
advance_time(delta)
|
||||
|
||||
|
||||
func begin_session(start_hour: float = DEFAULT_START_HOUR) -> void:
|
||||
func begin_authoritative_session() -> void:
|
||||
_running = true
|
||||
_system_clock_authority = true
|
||||
_editor_time_override = false
|
||||
_system_clock_sample_elapsed = 0.0
|
||||
_last_system_unix_seconds = -1.0
|
||||
set_process(true)
|
||||
_sample_system_clock(true)
|
||||
|
||||
|
||||
func begin_remote_session() -> void:
|
||||
_running = true
|
||||
_system_clock_authority = false
|
||||
_editor_time_override = false
|
||||
_system_clock_sample_elapsed = 0.0
|
||||
_last_system_unix_seconds = -1.0
|
||||
set_process(true)
|
||||
|
||||
|
||||
func begin_test_session(start_hour: float = DEFAULT_START_HOUR) -> void:
|
||||
_running = true
|
||||
_system_clock_authority = false
|
||||
_editor_time_override = false
|
||||
_system_clock_sample_elapsed = 0.0
|
||||
_last_system_unix_seconds = -1.0
|
||||
set_process(false)
|
||||
_set_time_hours(start_hour, true)
|
||||
|
||||
|
||||
func end_session() -> void:
|
||||
_running = false
|
||||
_system_clock_authority = false
|
||||
_editor_time_override = false
|
||||
_system_clock_sample_elapsed = 0.0
|
||||
_last_system_unix_seconds = -1.0
|
||||
_calendar_date_id = ""
|
||||
_local_datetime = {}
|
||||
set_process(false)
|
||||
_set_time_hours(DEFAULT_START_HOUR, true)
|
||||
|
||||
|
|
@ -56,11 +99,8 @@ func end_session() -> void:
|
|||
func advance_time(real_seconds: float) -> void:
|
||||
if not _running or real_seconds <= 0.0:
|
||||
return
|
||||
var advanced_hours := real_seconds * HOURS_PER_REAL_SECOND
|
||||
_set_time_hours(
|
||||
_time_hours + advanced_hours,
|
||||
false,
|
||||
)
|
||||
var advanced_hours: float = real_seconds * HOURS_PER_REAL_SECOND
|
||||
_set_time_hours(_time_hours + advanced_hours, false)
|
||||
natural_time_advanced.emit(advanced_hours)
|
||||
|
||||
|
||||
|
|
@ -71,23 +111,39 @@ func synchronize_time(authoritative_time_hours: float) -> void:
|
|||
|
||||
|
||||
func set_authoritative_time(time_hours: float) -> bool:
|
||||
# This hook intentionally exists only in the Godot editor/test runtime.
|
||||
# Exported clients and dedicated servers always follow their authoritative
|
||||
# machine clock and cannot expose mutable time commands to players.
|
||||
if (
|
||||
not is_finite(time_hours)
|
||||
not OS.has_feature("editor")
|
||||
or not is_finite(time_hours)
|
||||
or time_hours < 0.0
|
||||
or time_hours >= HOURS_PER_DAY
|
||||
):
|
||||
return false
|
||||
_editor_time_override = true
|
||||
_set_time_hours(time_hours, true)
|
||||
authoritative_time_set.emit(_time_hours)
|
||||
return true
|
||||
|
||||
|
||||
func set_persistence_tracking_enabled(enabled: bool) -> void:
|
||||
if _persistence_tracking_enabled == enabled:
|
||||
func clear_editor_time_override() -> void:
|
||||
if not _editor_time_override:
|
||||
return
|
||||
if _persistence_tracking_enabled:
|
||||
_persistent_time_hours = _time_hours
|
||||
_persistence_tracking_enabled = enabled
|
||||
_editor_time_override = false
|
||||
_last_system_unix_seconds = -1.0
|
||||
if _system_clock_authority:
|
||||
_sample_system_clock(true)
|
||||
|
||||
|
||||
func is_using_system_clock() -> bool:
|
||||
return _system_clock_authority and not _editor_time_override
|
||||
|
||||
|
||||
func set_persistence_tracking_enabled(_enabled: bool) -> void:
|
||||
# Kept as a compatibility seam for schema-4 saves. Real-time sessions never
|
||||
# use saved time as an authority.
|
||||
pass
|
||||
|
||||
|
||||
func restore_persistent_time_hours(time_hours: float) -> bool:
|
||||
|
|
@ -98,19 +154,27 @@ func restore_persistent_time_hours(time_hours: float) -> bool:
|
|||
):
|
||||
return false
|
||||
_persistent_time_hours = time_hours
|
||||
if _persistence_tracking_enabled:
|
||||
_set_time_hours(_persistent_time_hours, true)
|
||||
return true
|
||||
|
||||
|
||||
func get_persistent_time_hours() -> float:
|
||||
return _persistent_time_hours
|
||||
return _time_hours if _running else _persistent_time_hours
|
||||
|
||||
|
||||
func get_time_hours() -> float:
|
||||
return _time_hours
|
||||
|
||||
|
||||
func get_calendar_date_id() -> String:
|
||||
return _calendar_date_id
|
||||
|
||||
|
||||
func get_calendar_cycle_id(rollover_hour: float) -> String:
|
||||
if _local_datetime.is_empty():
|
||||
return ""
|
||||
return calendar_cycle_id_from_datetime(_local_datetime, rollover_hour)
|
||||
|
||||
|
||||
func get_phase() -> Phase:
|
||||
return _phase
|
||||
|
||||
|
|
@ -127,6 +191,40 @@ func get_clock_text() -> String:
|
|||
return format_clock_time(_time_hours)
|
||||
|
||||
|
||||
static func time_hours_from_datetime(datetime: Dictionary) -> float:
|
||||
var hour: int = clampi(int(datetime.get("hour", 0)), 0, 23)
|
||||
var minute: int = clampi(int(datetime.get("minute", 0)), 0, 59)
|
||||
var second: int = clampi(int(datetime.get("second", 0)), 0, 59)
|
||||
return (
|
||||
float(hour)
|
||||
+ float(minute) / 60.0
|
||||
+ float(second) / (60.0 * 60.0)
|
||||
)
|
||||
|
||||
|
||||
static func date_id_from_datetime(datetime: Dictionary) -> String:
|
||||
return "%04d-%02d-%02d" % [
|
||||
int(datetime.get("year", 0)),
|
||||
int(datetime.get("month", 0)),
|
||||
int(datetime.get("day", 0)),
|
||||
]
|
||||
|
||||
|
||||
static func calendar_cycle_id_from_datetime(
|
||||
datetime: Dictionary,
|
||||
rollover_hour: float,
|
||||
) -> String:
|
||||
var cycle_datetime: Dictionary = datetime.duplicate(true)
|
||||
if time_hours_from_datetime(datetime) < rollover_hour:
|
||||
var previous_day_unix: int = (
|
||||
Time.get_unix_time_from_datetime_dict(datetime) - 24 * 60 * 60
|
||||
)
|
||||
cycle_datetime = Time.get_datetime_dict_from_unix_time(
|
||||
previous_day_unix
|
||||
)
|
||||
return date_id_from_datetime(cycle_datetime)
|
||||
|
||||
|
||||
static func phase_for_hour(time_hours: float) -> Phase:
|
||||
var hour: float = _normalized_hour(time_hours)
|
||||
if hour >= DAWN_START_HOUR and hour < DAWN_END_HOUR:
|
||||
|
|
@ -153,6 +251,21 @@ static func format_clock_time(time_hours: float) -> String:
|
|||
]
|
||||
|
||||
|
||||
func _sample_system_clock(force_emit: bool) -> void:
|
||||
var datetime: Dictionary = Time.get_datetime_dict_from_system(false)
|
||||
var unix_seconds: float = Time.get_unix_time_from_system()
|
||||
var previous_unix_seconds: float = _last_system_unix_seconds
|
||||
_last_system_unix_seconds = unix_seconds
|
||||
_local_datetime = datetime.duplicate(true)
|
||||
_calendar_date_id = date_id_from_datetime(datetime)
|
||||
_set_time_hours(time_hours_from_datetime(datetime), force_emit)
|
||||
if previous_unix_seconds < 0.0:
|
||||
return
|
||||
var advanced_seconds: float = unix_seconds - previous_unix_seconds
|
||||
if advanced_seconds > 0.0:
|
||||
natural_time_advanced.emit(advanced_seconds / 3600.0)
|
||||
|
||||
|
||||
func _set_time_hours(time_hours: float, force_emit: bool) -> void:
|
||||
var normalized: float = _normalized_hour(time_hours)
|
||||
var next_phase: Phase = phase_for_hour(normalized)
|
||||
|
|
@ -163,8 +276,6 @@ func _set_time_hours(time_hours: float, force_emit: bool) -> void:
|
|||
)
|
||||
_time_hours = normalized
|
||||
_phase = next_phase
|
||||
if _persistence_tracking_enabled:
|
||||
_persistent_time_hours = normalized
|
||||
if phase_was_changed:
|
||||
phase_changed.emit(_phase)
|
||||
if force_emit or clock_minute_changed or phase_was_changed:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue