Fix #6 and other misc. spelling issues and small oversights
This commit is contained in:
parent
fedec3def9
commit
af7411a876
|
|
@ -333,7 +333,7 @@ func give_lore_feedback():
|
||||||
if float(fitting_card_count) / float(total_card_count) < 0.2:
|
if float(fitting_card_count) / float(total_card_count) < 0.2:
|
||||||
Prompts.instruction("You can move on, but you may not have understood Lisa.")
|
Prompts.instruction("You can move on, but you may not have understood Lisa.")
|
||||||
if not unfitting:
|
if not unfitting:
|
||||||
if State.speech_language == 2:
|
if State.speech_locale == 2:
|
||||||
$AnimationPlayer.play("unfitting_de")
|
$AnimationPlayer.play("unfitting_de")
|
||||||
else:
|
else:
|
||||||
$AnimationPlayer.play("unfitting")
|
$AnimationPlayer.play("unfitting")
|
||||||
|
|
@ -341,7 +341,7 @@ func give_lore_feedback():
|
||||||
elif fitting_card_count < total_card_count:
|
elif fitting_card_count < total_card_count:
|
||||||
Prompts.instruction(TranslationServer.translate("You may leave the room, but Lisa only agrees with %d of the %d connections.") % [fitting_card_count, total_card_count])
|
Prompts.instruction(TranslationServer.translate("You may leave the room, but Lisa only agrees with %d of the %d connections.") % [fitting_card_count, total_card_count])
|
||||||
if not incomplete:
|
if not incomplete:
|
||||||
if State.speech_language == 2:
|
if State.speech_locale == 2:
|
||||||
$AnimationPlayer.play("incomplete_de")
|
$AnimationPlayer.play("incomplete_de")
|
||||||
else:
|
else:
|
||||||
$AnimationPlayer.play("incomplete")
|
$AnimationPlayer.play("incomplete")
|
||||||
|
|
@ -349,7 +349,7 @@ func give_lore_feedback():
|
||||||
else:
|
else:
|
||||||
Prompts.instruction("Lisa would like you to leave her room and move on.")
|
Prompts.instruction("Lisa would like you to leave her room and move on.")
|
||||||
if not complete:
|
if not complete:
|
||||||
if State.speech_language == 2:
|
if State.speech_locale == 2:
|
||||||
$AnimationPlayer.play("complete_de")
|
$AnimationPlayer.play("complete_de")
|
||||||
else:
|
else:
|
||||||
$AnimationPlayer.play("complete")
|
$AnimationPlayer.play("complete")
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ var burn_state: burned = burned.NOT:
|
||||||
burn_tween.tween_property(self, "burn_progress", 0.5, 2)
|
burn_tween.tween_property(self, "burn_progress", 0.5, 2)
|
||||||
burn_state = burning
|
burn_state = burning
|
||||||
burned.TORCHED:
|
burned.TORCHED:
|
||||||
print("Card %s has been burned." % HardCards.get_obscure_name(name))
|
print("Card %s has been burned." % CardLibrary.get_obscure_name(name))
|
||||||
has_burned.emit()
|
has_burned.emit()
|
||||||
burn_state = burning
|
burn_state = burning
|
||||||
|
|
||||||
|
|
@ -142,8 +142,8 @@ func init(card_name: String = "card", own_id:StringName = "-1") -> void:
|
||||||
push_error("Illegal card!", card_name, own_id)
|
push_error("Illegal card!", card_name, own_id)
|
||||||
card_id = own_id
|
card_id = own_id
|
||||||
name = card_name
|
name = card_name
|
||||||
# first digit of the card id is 0-3 for youth cards.
|
|
||||||
from_youth = (card_id as String)[0] as int < 4
|
from_youth = int((card_id as String)[0]) < (Scenes.id.TRANSITION as int)
|
||||||
|
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
|
|
@ -158,7 +158,7 @@ func _ready():
|
||||||
func _on_text_updated():
|
func _on_text_updated():
|
||||||
if is_node_ready() and name != "c_void" and name != "3.c_void":
|
if is_node_ready() and name != "c_void" and name != "3.c_void":
|
||||||
if from_youth:
|
if from_youth:
|
||||||
if State.current_room == State.rooms.YOUTH or State.onready_room == State.rooms.YOUTH:
|
if State.get_room_id() <= Room.ids.YOUTH:
|
||||||
background_sprite.animation = "youth"
|
background_sprite.animation = "youth"
|
||||||
else:
|
else:
|
||||||
background_sprite.animation = "aged"
|
background_sprite.animation = "aged"
|
||||||
|
|
@ -263,7 +263,7 @@ func attach_or_exchange_note(note: StickyNote, instant: bool = false) -> void:
|
||||||
else:
|
else:
|
||||||
note.position = sticky_note_position
|
note.position = sticky_note_position
|
||||||
|
|
||||||
if name == "c_hit" and note.name == "c_effort" and Steamworks.has_initialized:
|
if name == "c_hit" and note.name == "c_effort" and Steamworks.is_initialized:
|
||||||
Steam.setAchievement("FIGHT_FOR_GOOD")
|
Steam.setAchievement("FIGHT_FOR_GOOD")
|
||||||
Steam.storeStats()
|
Steam.storeStats()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,7 @@ func pick(id: int) -> void:
|
||||||
winning_id = randi() % options.size() - ( 1 if selection_state == POSTS_SELECTED else 0)
|
winning_id = randi() % options.size() - ( 1 if selection_state == POSTS_SELECTED else 0)
|
||||||
else:
|
else:
|
||||||
winning_id = 1 if id == 0 else 0
|
winning_id = 1 if id == 0 else 0
|
||||||
if Steamworks.has_initialized:
|
if Steamworks.is_initialized:
|
||||||
Steam.setAchievement("FIGHT_BACK")
|
Steam.setAchievement("FIGHT_BACK")
|
||||||
Steam.storeStats()
|
Steam.storeStats()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ const user_saves_path:String = "user://savegames"
|
||||||
set(disconnect):
|
set(disconnect):
|
||||||
if disconnect and not disconnect_steam:
|
if disconnect and not disconnect_steam:
|
||||||
Steam.steamShutdown()
|
Steam.steamShutdown()
|
||||||
Steamworks.has_initialized = false
|
Steamworks.is_initialized = false
|
||||||
elif not disconnect and disconnect_steam:
|
elif not disconnect and disconnect_steam:
|
||||||
Steamworks._ready()
|
Steamworks._ready()
|
||||||
disconnect_steam = disconnect
|
disconnect_steam = disconnect
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,6 @@ var state: AppState = AppState.INIT:
|
||||||
main_menu.hide()
|
main_menu.hide()
|
||||||
pause_menu.hide()
|
pause_menu.hide()
|
||||||
hotswap_ready = false
|
hotswap_ready = false
|
||||||
menu_animation.play("hide_pause_menu")
|
|
||||||
if state == AppState.PAUSE:
|
if state == AppState.PAUSE:
|
||||||
menu_animation.play("hide_pause_menu")
|
menu_animation.play("hide_pause_menu")
|
||||||
AppState.PAUSE:
|
AppState.PAUSE:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue