merge: integrate remote player quest slices
This commit is contained in:
@@ -13,6 +13,7 @@ var target_name: String
|
||||
var carried_amounts: Dictionary
|
||||
var decision_reason: String
|
||||
var _has_decision_reason: bool
|
||||
var opportunity_note: VillagerOpportunityNote
|
||||
|
||||
var has_open_need := false
|
||||
var need_type: StringName
|
||||
@@ -46,6 +47,7 @@ func _init(
|
||||
need_type = StringName(inspection_need.get("need_type", &""))
|
||||
need_progress = String(inspection_need.get("progress", ""))
|
||||
need_response = String(inspection_need.get("response", ""))
|
||||
opportunity_note = inspection_need.get("opportunity_note") as VillagerOpportunityNote
|
||||
|
||||
|
||||
func has_decision_reason() -> bool:
|
||||
@@ -77,6 +79,7 @@ func cache_key() -> String:
|
||||
var carried_parts: Array[String] = []
|
||||
for item_id in carried_keys:
|
||||
carried_parts.append("%s=%.3f" % [String(item_id), float(carried_amounts[item_id])])
|
||||
var note_part := opportunity_note.cache_key() if opportunity_note != null else "-"
|
||||
return (
|
||||
"|"
|
||||
. join(
|
||||
@@ -94,6 +97,7 @@ func cache_key() -> String:
|
||||
String(need_type),
|
||||
need_progress,
|
||||
need_response,
|
||||
note_part,
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user