From 60e0335353a4fa8821f76d3c91da15de788c38c2 Mon Sep 17 00:00:00 2001 From: betalars Date: Sat, 10 May 2025 15:59:52 +0200 Subject: [PATCH] hotfix 2 --- .../youth_room/scnees/jui_jutsu.tscn | 15 +++++++-------- src/logic-scenes/card_picker/card_picker.gd | 12 +++++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/base-environments/youth_room/scnees/jui_jutsu.tscn b/src/base-environments/youth_room/scnees/jui_jutsu.tscn index affba42..314d471 100644 --- a/src/base-environments/youth_room/scnees/jui_jutsu.tscn +++ b/src/base-environments/youth_room/scnees/jui_jutsu.tscn @@ -490,7 +490,7 @@ tracks/12/path = NodePath("../../..") tracks/12/interp = 1 tracks/12/loop_wrap = true tracks/12/keys = { -"times": PackedFloat32Array(43.5333, 92.4031, 125.533, 155.167, 179.133, 181.935, 209.834, 233.467), +"times": PackedFloat32Array(43.5333, 92.4031, 133.733, 155.167, 179.133, 181.935, 209.834, 233.467), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), "values": [{ "args": [], @@ -811,16 +811,15 @@ clip_children = 2 scale = Vector2(0.6, 0.6) sprite_frames = SubResource("SpriteFrames_liwtr") script = SubResource("GDScript_80sa6") -noise_speed = 0.0 -noise_power = 5.0 +noise_speed = 9.21962 +noise_power = 0.3 [node name="GPUParticles2D" type="GPUParticles2D" parent="PanelContainer/card/BackgroundSprite"] -emitting = false -amount = 1 +amount = 500 texture = ExtResource("6_0qiyf") -lifetime = 5.0 -one_shot = true -explosiveness = 0.29 +lifetime = 3.99993 +speed_scale = 1.01248 +explosiveness = 0.741887 randomness = 0.14 local_coords = true process_material = SubResource("ParticleProcessMaterial_jikd6") diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 3675d2d..9331383 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -61,7 +61,7 @@ func _ready(): Scenes.sign_up_for_sequence(pick_cards, id, 1) if get_tree().root == self.get_parent(): - pick_cards(0, false) + pick_cards(3, false) State.take_stage(self) reset() @@ -178,14 +178,13 @@ func pick(id: int): var winning_id print("Randomly selected card %s" % options[1].text) - if !(options[1].text == "void" and not id == 1): + if not current_scene_id == Scenes.id.YOUTH_JUI_JUTSU: randomize() winning_id = randi() % options.size() - else: winning_id = 2 if id == 0 else 0 - Steam.setAchievement("FIGHT_BACK") - Steam.storeStats() + #Steam.setAchievement("FIGHT_BACK") + #Steam.storeStats() output.append(options.pop_at(winning_id)) random_player = anim_players[winning_id] @@ -236,7 +235,10 @@ func handle_mouse_button(button_event: InputEventMouseButton, new_selection: Nod if button_event.button_index == MOUSE_BUTTON_LEFT and button_event.pressed: pick(options.find(new_selection)) + +var current_scene_id func pick_cards(id: int, repeat: bool): + current_scene_id = id print("Reached actor %s in sequence %s. Is%s repeating." % [name, Scenes.id.keys()[id], " not" if repeat else ""]) if not repeat: Input.mouse_mode = Input.MOUSE_MODE_VISIBLE