Skip to content

Conversation

@Snowsd
Copy link
Contributor

@Snowsd Snowsd commented Oct 27, 2025

Added all currently missing license files for the NE expo storyquest, as required.

Snowsd and others added 30 commits August 20, 2025 09:54
Template files and story quest for NE Expo created.
…at-template-folders

rename combat folders to match our storyquest name
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.
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.
Snowsd and others added 13 commits October 1, 2025 18:06
Added two new attacks: Tornado and attack bees. Added new sprite assets for respective attacks.
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.
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.
…nflict-fixes

Fix upstream conflicts & merge upstream changes
Added license files for all current bee storyquest files.
@Snowsd Snowsd requested a review from a team as a code owner October 27, 2025 15:53
@wjt
Copy link
Member

wjt commented Oct 27, 2025

(For future reference you didn't need to close #1277 and open a fresh pull request.)

@github-actions
Copy link

Play this branch at https://play.threadbare.game/branches/Black-River-Innovation-Campus/main.

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

@Snowsd
Copy link
Contributor Author

Snowsd commented Oct 27, 2025

(For future reference you didn't need to close #1277 and open a fresh pull request.)

Noted. What is the workflow if I do not close the old pull request and re-open a new one? Also, I am seeing a failed check on the checks/licensing information; what is it checking for, and is it important that I rectify whatever is failing in this check?

@wjt
Copy link
Member

wjt commented Oct 27, 2025

(For future reference you didn't need to close #1277 and open a fresh pull request.)

Noted. What is the workflow if I do not close the old pull request and re-open a new one?

Just note on the existing PR when it is ready for re-review.

Also, I am seeing a failed check on the checks/licensing information; what is it checking for, and is it important that I rectify whatever is failing in this check?

The error is:

The following files have no copyright and licensing information:

  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/attack_bees.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/enemy.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/enemy_spawner.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/explosion.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/hit_box.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/hurt_box.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/ice_spear.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/player.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/spawn_info.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/tornado.gd
  • scenes/quests/story_quests/ne_expo/ne_expo_components/Enemy Components/Hornet Stand-in enemy.jpg

@Snowsd
Copy link
Contributor Author

Snowsd commented Oct 27, 2025

(For future reference you didn't need to close #1277 and open a fresh pull request.)

Noted. What is the workflow if I do not close the old pull request and re-open a new one?

Just note on the existing PR when it is ready for re-review.

Also, I am seeing a failed check on the checks/licensing information; what is it checking for, and is it important that I rectify whatever is failing in this check?

The error is:

The following files have no copyright and licensing information:

  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/attack_bees.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/enemy.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/enemy_spawner.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/explosion.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/hit_box.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/hurt_box.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/ice_spear.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/player.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/spawn_info.gd
  • scenes/quests/story_quests/ne_expo/1_Bee Level/Bee level Scripts/tornado.gd
  • scenes/quests/story_quests/ne_expo/ne_expo_components/Enemy Components/Hornet Stand-in enemy.jpg

Got it. Will update on next update of game materials.

Copy link
Member

@wjt wjt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the .gd files, if it's all your own work you can prefix the files with:

# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0

I'll take another look through the rest of the PR later today. Thanks for the revision!

@wjt wjt added the StoryQuest New StoryQuests or updates to existing ones label Oct 27, 2025
"res://scenes/quests/story_quests/": "green",
"res://scenes/quests/story_quests/NO_EDIT/": "yellow"
"res://scenes/quests/story_quests/NO_EDIT/": "yellow",
"res://scenes/quests/story_quests/ne_expo/": "orange"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not have this change because:

  1. It won't scale - if each quest adds its own colour the filesystem will be a kaleidoscope of colour
  2. If every SQ adds this then the branches are pretty much guaranteed to conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

StoryQuest New StoryQuests or updates to existing ones

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants