Created
February 4, 2026 17:53
-
-
Save wjt/2b3569f02d1fed4dd6b64e9e09e3c78d to your computer and use it in GitHub Desktop.
Threadbare PR 1865 conflict resolution
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 70c60831e77e26f1efda45ef9560cf02f8d81340 | |
| Merge: 1c1ec84f b2cc145e | |
| Author: Will Thompson <wjt@endlessaccess.org> | |
| Date: Wed Feb 4 17:45:26 2026 +0000 | |
| Merge remote-tracking branch 'origin/main' into issue_1847 | |
| diff --cc scenes/game_elements/props/filling_barrel/filling_barrel.tscn | |
| index 507aac10,1bc0eea5..7f44c0bc | |
| --- a/scenes/game_elements/props/filling_barrel/filling_barrel.tscn | |
| +++ b/scenes/game_elements/props/filling_barrel/filling_barrel.tscn | |
| @@@ -1,7 -1,6 +1,7 @@@ | |
| - [gd_scene load_steps=22 format=3 uid="uid://y8ha8abfyap2"] | |
| + [gd_scene format=3 uid="uid://y8ha8abfyap2"] | |
| [ext_resource type="Script" uid="uid://be17wk85qlu28" path="res://scenes/game_elements/props/filling_barrel/components/filling_barrel.gd" id="1_md0e3"] | |
| +[ext_resource type="Texture2D" uid="uid://brranfy51i56n" path="res://scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/components/barrel_glow/barrel_glow.png" id="3_8hqam"] | |
| [ext_resource type="SpriteFrames" uid="uid://dlsq0ke41s1yh" path="res://scenes/game_elements/props/filling_barrel/components/filling_barrel_sprite_frames.tres" id="3_o1oxn"] | |
| [ext_resource type="AudioStream" uid="uid://6tgopt072bfq" path="res://scenes/game_elements/props/filling_barrel/components/fill.wav" id="4_6inx0"] | |
| [ext_resource type="AudioStream" uid="uid://s7ne07cx0j72" path="res://scenes/game_elements/props/filling_barrel/components/complete.wav" id="5_3gtj0"] | |
| @@@ -238,14 -166,7 +238,14 @@@ position = Vector2(0, -21 | |
| sprite_frames = ExtResource("3_o1oxn") | |
| animation = &"filling" | |
| +[node name="BarrelGlow" type="AnimatedSprite2D" parent="."] | |
| +visible = false | |
| +sprite_frames = SubResource("SpriteFrames_ftrfy") | |
| +animation = &"glowing" | |
| +frame_progress = 0.55175865 | |
| +offset = Vector2(0, -21) | |
| + | |
| - [node name="HitBox" type="StaticBody2D" parent="."] | |
| + [node name="HitBox" type="StaticBody2D" parent="." unique_id=1847617565] | |
| unique_name_in_owner = true | |
| position = Vector2(2, -18) | |
| collision_layer = 0 | |
| diff --cc scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/ink_combat_round_6.tscn | |
| index 8dae77d3,2ddd943a..77ac0300 | |
| --- a/scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/ink_combat_round_6.tscn | |
| +++ b/scenes/quests/lore_quests/quest_003/2_ink_drinker_levels/ink_combat_round_6.tscn | |
| @@@ -59,16 -58,12 +59,16 @@@ script = ExtResource("28_ihx08" | |
| type = 1 | |
| metadata/_custom_type_script = "uid://bgmwplmj3bfls" | |
| - [node name="InkCombatRound6" type="Node2D"] | |
| + [node name="InkCombatRound6" type="Node2D" unique_id=559694113] | |
| - [node name="BackgroundMusic" parent="." instance=ExtResource("1_7y6db")] | |
| + [node name="BackgroundMusic" parent="." unique_id=1117240436 instance=ExtResource("1_7y6db")] | |
| stream = ExtResource("2_1a5yo") | |
| +[node name="BarrelUnlockSequence" type="Node" parent="." node_paths=PackedStringArray("barrels")] | |
| +script = ExtResource("3_ihx08") | |
| +barrels = [NodePath("../OnTheGround/FillingBarrel"), NodePath("../OnTheGround/FillingBarrel2"), NodePath("../OnTheGround/FillingBarrel3")] | |
| + | |
| - [node name="FillGameLogic" type="Node" parent="."] | |
| + [node name="FillGameLogic" type="Node" parent="." unique_id=14736843] | |
| script = ExtResource("3_1a5yo") | |
| barrels_to_win = 3 | |
| autostart = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment