Black River Innovation Pull Request, as per Justin Bourque's Instructions #1277

Snowsd · 2025-10-01T22:23:02Z

Here is the unfinished version of my vampire survivors clone, based around a honey bee, Ben McVety at BRIC is building with Justin Borque. Our intro level is not currently connected to our one level we are building. dialogue/lore writing is unfinished. UI, experience drops, and sfx are unfinished. The player can move, shoot with 3 projectiles, and destroy wasp enemies. To add: pickups (3 flowers around the map to represent the threads for the loom), upgrades, mini bosses, sfx, controller support, ending scene change or closing cinematic.

Template files and story quest for NE Expo created.

…at-template-folders rename combat folders to match our storyquest name

folder creation and more renaming

Bee Sprite and animation created for main playable character, named Bumbly

Testing commits using bash Not sure how to do this

…ation-Branch-8-20-25 Ne expo creation branch 8 20 25

Added Bee player character, background image, movement, drop shadow, and work-in-progress on collision for walls on level.

…ovement-8-21-25 Added Bee level, bg, movement

MOved bee for test.

just removing the sample smiley face tiles.

Remove smiley face sample png and copy the template player sprite frame resource, and rename it to match our SQ name. Revert template resource changes back to original template. Replace template resource for character sprite frames with our own.

Rename intro folders and files first with "bee" SQ designation.

update tilemap design for intro scene a bit. Still WIP

moved the bee

Removed duplicate folder 1_bee Level, fixed script for character movement

Tiles folder

Fake tileset

Created a hornet enemy, hp for player and enemies, enemy movement and animations, player and enemy hitboxes and hurtboxes.

…er-name rename folder for outro scene

Added scenes for icicle spear attack, explosion. Added explosion assets for different attacks, sound effects for firing icicle_spear, enemies getting hit, and enemy explosion 1.

Added icicle spear scene, explosion scene, enemy_spawner scene, and can now spawn enemies, fire icicle spears (with firing sound, hit sound, and explosion sounds), hit enemies and kill them.

Added two new attacks: Tornado and attack bees. Added new sprite assets for respective attacks.

wjt · 2025-10-06T14:56:30Z

scenes/quests/story_quests/ne_expo/5_player_components/NE Expo Player.tres

+<<<<<<< Updated upstream
+[gd_resource type="SpriteFrames" load_steps=24 format=3 uid="uid://c5vf5ty20tkeh"]
+=======
+[gd_resource type="SpriteFrames" load_steps=24 format=3 uid="uid://dtlfm7sw037dl"]
+>>>>>>> Stashed changes


commit 1e44083 “Update NE Expo Player.tres” introduced these conflict markers which break this file:

diff --git a/scenes/quests/story_quests/ne_expo/Player Components/NE Expo Player.tres b/scenes/quests/story_quests/ne_expo/Player Components/NE Expo Player.tres index f419e70b..19e91ba1 100644 --- a/scenes/quests/story_quests/ne_expo/Player Components/NE Expo Player.tres +++ b/scenes/quests/story_quests/ne_expo/Player Components/NE Expo Player.tres @@ -1,4 +1,8 @@ +<<<<<<< Updated upstream [gd_resource type="SpriteFrames" load_steps=24 format=3 uid="uid://c5vf5ty20tkeh"] +======= +[gd_resource type="SpriteFrames" load_steps=24 format=3 uid="uid://dtlfm7sw037dl"] +>>>>>>> Stashed changes

Godot says:

res://scenes/quests/story_quests/ne_expo/5_player_components/NE Expo Player.tres:1 - Parse Error: Expected '['.

The conflict is that you have two different UIDs for this file: uid://c5vf5ty20tkeh and uid://dtlfm7sw037dl.

This file doesn't seem to be used so you can either delete it; or delete the <<< === >>> conflict markers and either one of the [gd_resource] headers. One way to do this is to revert the commit that introduced the problem since it didn't do anything else:

git revert 1e44083e46d68d88b101c1cbd14306c091e81d42

wjt · 2025-10-06T15:22:33Z

scenes/tileset.tres

@@ -1206,30 +1206,37 @@ texture_region_size = Vector2i(64, 64)
 0:0/0 = 0
 0:0/0/terrain_set = 0
 0:0/0/terrain = 8
+0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 32, -32, 32, -32, -32, 32, -32, 32, -16, -16, -16)


These were added in commit 80bfcd0. This and the changes below add collisions to the Void_Empty layer, in the tileset's physics layer 0, which maps to "walls" at the game level.

I don't think this change is correct. The void is not a wall: it's a non-walkable floor, and it's marked as such in tileset physics layer 2. But also, this tileset from the main game is not actually used in the quest level that uses the void tiles – you use a copy there – so I think it can be reverted without changing your quest.

wjt · 2025-10-06T15:23:09Z

project.godot


 [rendering]

 textures/canvas_textures/default_texture_filter=0
 renderer/rendering_method="gl_compatibility"
 renderer/rendering_method.mobile="gl_compatibility"
+2d/snap/snap_2d_transforms_to_pixel=true


We deliberately removed this in commit 649af73.

wjt · 2025-10-06T15:25:35Z

project.godot

+up={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+down={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+left={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+right={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}


In the main game we (ab)use ui_up, ui_down, ui_left and ui_right for in-game controls as well as moving around menus. It would probably be better to define our own actions for these but I'd prefer to do that in a separate change, across the whole game, rather than here.

scenes/quests/story_quests/ne_expo/ne_expo_components/Attack Components/angry baby bee.png

wjt · 2025-10-06T15:33:13Z

scenes/quests/story_quests/ne_expo/ne_expo_tiles/myfaketilest

Looks like this is an unused duplicate of scenes/quests/story_quests/ne_expo/ne_expo_tiles/Bee level background-1.png.png.

This is unused and can be removed.

wjt · 2025-10-06T15:34:20Z

...ne_expo/ne_expo_components/Explosion Components/Explosion assets/Explosion_1/Explosion_1.png

It's an unusual choice to have each frame of these animations in separate files – you don't have to change it but I'm curious why!

This was from a free asset pack, and was already formatted that way. I may combine the images into a spritesheet and re-upload when I have time. The asset pack will be added to the .license file.

wjt · 2025-10-06T15:34:58Z

scenes/quests/story_quests/ne_expo/ne_expo_components/Attack Components/Enemy Damage sound.wav

What's the source of the sound effects – your own work?

I created all sfx, and will eventually create a background music track.

This reverts commit 1e44083, which committed conflict markers to this file, making it un-loadable in Godot. As it happens it's not referenced under either UID, so just pick one of them arbitrarily.

This adds physics shapes to the "Void_Empty" sourcce of the tileset, in the "walls". I think this is incorrect because: - These are not walls, but a kind of floor; - These tiles already have collisions on the non_walkable_floor layer; - This tileset is not used in the ne_expo StoryQuest.

wjt · 2025-10-06T15:49:29Z

I'll push a branch that fixes some of these issues, please hold..

This is a shorthand for manually combining Input.get_action_strength() for each axis, as was previously done here. In addition, use ui_up, ui_down, etc. like the rest of the game, rather than new up/down/etc. actions. Revert the corresponding change to project.godot.

This was deliberately removed upstream in commit 649af73.

wjt · 2025-10-06T16:20:41Z

I pushed this PR that will address many of these issues:

Fix upstream conflicts & merge upstream changes Black-River-Innovation-Campus/threadbare#49

Merging that should fix the conflicts shown in this PR; I think the remaining question(s) will then be around asset attribution.

…nflict-fixes Fix upstream conflicts & merge upstream changes

github-actions · 2025-10-24T15:44:33Z

Play this branch at https://endlessm.github.io/threadbare/branches/Black-River-Innovation-Campus/main.

(This launches the game from the start, not directly at the change(s) in this pull request.)

Added license files for all current bee storyquest files.

Snowsd and others added 30 commits August 20, 2025 09:54

Set up base project files

217f4ab

Template files and story quest for NE Expo created.

rename combat folders to match our storyquest name

533a672

Merge pull request #43 from Black-River-Innovation-Campus/rename-comb…

f01a915

…at-template-folders rename combat folders to match our storyquest name

folder creation and more renaming

f35080c

Merge pull request #44 from Black-River-Innovation-Campus/more-renaming

437130d

folder creation and more renaming

Created Bee Sprite

b9446d0

Bee Sprite and animation created for main playable character, named Bumbly

Update NE Expo Player.tres

1e44083

Merge branch 'main' into NE-Expo-Creation-Branch-8-20-25

4668839

Testing commits using bash Not sure how to do this

Merge pull request #45 from Black-River-Innovation-Campus/NE-Expo-Cre…

d26aa43

…ation-Branch-8-20-25 Ne expo creation branch 8 20 25

Added Bee level, bg, movement

80bfcd0

Added Bee player character, background image, movement, drop shadow, and work-in-progress on collision for walls on level.

Merge pull request #46 from Black-River-Innovation-Campus/Character-M…

b5e81f7

…ovement-8-21-25 Added Bee level, bg, movement

Moved bee for test

dca7945

MOved bee for test.

Merge branch 'main' into intro-narrative-work

4a12f18

Update ne_expo_tileset.tres

bc32ff5

just removing the sample smiley face tiles.

quick file edits

b8bb333

Remove smiley face sample png and copy the template player sprite frame resource, and rename it to match our SQ name. Revert template resource changes back to original template. Replace template resource for character sprite frames with our own.

Update intro.tscn

657df06

Merge branch 'main' into intro-narrative-work

81d6b9e

naming all things bee in intro scene

57f063c

Rename intro folders and files first with "bee" SQ designation.

Update bee_intro.dialogue

9cbd477

design intro scene tilemap

7761a08

update tilemap design for intro scene a bit. Still WIP

Update bee_intro.tscn

248b7f8

moved the bee

Updated files, fixed broken scripts

c1d2beb

Removed duplicate folder 1_bee Level, fixed script for character movement

Added Tiles Folder

b44bf67

Tiles folder

add folder with bee background

0944bca

Updated FAKE TILESET

3437c9d

Fake tileset

Added enemies, collisions, hp

dc20b50

Created a hornet enemy, hp for player and enemies, enemy movement and animations, player and enemy hitboxes and hurtboxes.

rename folder for outro scene

0ef9785

Merge pull request #48 from Black-River-Innovation-Campus/change-fold…

c73574e

…er-name rename folder for outro scene

Created Attacks, Explosions, knockback

109ce48

Added scenes for icicle spear attack, explosion. Added explosion assets for different attacks, sound effects for firing icicle_spear, enemies getting hit, and enemy explosion 1.

Added icicle spear attack, explosions

6bf09dc

Added icicle spear scene, explosion scene, enemy_spawner scene, and can now spawn enemies, fire icicle spears (with firing sound, hit sound, and explosion sounds), hit enemies and kill them.

Snowsd added 2 commits October 1, 2025 18:06

Added a tornado and attackbees attacks to player

eab8b34

Added two new attacks: Tornado and attack bees. Added new sprite assets for respective attacks.

Merge branch 'Level_editing_10-1-25'

6e51b04

Snowsd requested a review from a team as a code owner October 1, 2025 22:23

wjt requested changes Oct 6, 2025

View reviewed changes

wjt added 3 commits October 6, 2025 16:45

Revert "Update NE Expo Player.tres"

1177e54

This reverts commit 1e44083, which committed conflict markers to this file, making it un-loadable in Godot. As it happens it's not referenced under either UID, so just pick one of them arbitrarily.

Revert changes to template player

6920e4f

wjt added 6 commits October 6, 2025 16:53

Disable snap_2d_transforms_to_pixel

a7b561c

This was deliberately removed upstream in commit 649af73.

Delete unused duplicate asset

5254cca

project: Revert window size and stretch settings changes

063ec5d

Merge remote-tracking branch 'origin/main' into bric-fixes

519e9e2

ne_expo: Reimport files with Godot 4.5

c361faf

wjt mentioned this pull request Oct 6, 2025

Fix upstream conflicts & merge upstream changes Black-River-Innovation-Campus/threadbare#49

Merged

wjt added the StoryQuest New StoryQuests or updates to existing ones label Oct 24, 2025

Merge pull request #49 from Black-River-Innovation-Campus/upstream-co…

cbb0c5a

…nflict-fixes Fix upstream conflicts & merge upstream changes

Added license files

9936733

Added license files for all current bee storyquest files.

Snowsd closed this Oct 27, 2025

wjt mentioned this pull request Oct 27, 2025

Added licensing files for NE Expo storyquest #1444

Open

Uh oh!

Black River Innovation Pull Request, as per Justin Bourque's Instructions #1277

Black River Innovation Pull Request, as per Justin Bourque's Instructions #1277

Uh oh!

Conversation

Snowsd commented Oct 1, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wjt commented Oct 6, 2025

Uh oh!

wjt commented Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

wjt commented Oct 6, 2025 •

edited

Loading