Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add mvp for flies attack #77

Merged
merged 47 commits into from
Feb 1, 2024
Merged

add mvp for flies attack #77

merged 47 commits into from
Feb 1, 2024

Conversation

TheAfroOfDoom
Copy link
Owner

@TheAfroOfDoom TheAfroOfDoom commented Jan 31, 2024

Summary

This PR adds most of the functionality for the fly attack. It includes:

  • attack functionality (commands)
  • the models for the attack (housefly, venus-fly-trap)
  • sounds for the attack

Later, after Flowey's vines surrounding the arena (models + animations) are added, we'll have to adjust the venus fly trap model/animation slightly to account for the vine models. We'll need to:

  • add a summon animation for the venus fly trap based on a locator on the vine models
  • add a desummon animation for the venus fly trap

Notable commit(s):

88b7185 (#77)

This commit has some decently cool math with Desmos to determine the probability that a fly spawns on the top/bottom/side walls: https://www.desmos.com/calculator/7evdcc1qaz


Test plan

stilllll no unit tests

Reproducing in-game

function _:reset
function _:attack/flies

Preview

model

fun fact: the housefly model is the exact same model + texture as the one used in the original map. credit to @FLOATINGCRETIN

housefly venus-fly-trap
model-housefly-animated image

animations

housefly -- shrink venus-fly-trap -- chomp
model-housefly-animated-shrink model-venus-fly-trap-animation-chomp

attack

in-game -- before in-game -- after, player view
before new top down
undertale in-game -- after, top-down view
undertale new pov

videos with sound

in-game -- before in-game -- after undertale
https://youtu.be/2IprmKr31pU?t=238 https://youtu.be/ytqkEesWw1E https://youtu.be/RJ4kumxv_1k?t=172

Supplemental changes

  • alphabetize keys in sounds.json -- 300a468 (#77)
  • fix ticketize-todos not requiring a colon : -- 0424aab (#77)
  • add entity:hostile/omega-flowey shortcut to workspace -- 6b024d4 (#77)
  • make .ajmodel files render as JSON -- ee3e23c (#77)
  • force new terminals to start in root directory -- 2736f0f (#77)
  • change watch script path logs to always have forward slashes -- 5bd46fe (#77)
  • add util function to pretty-print errors -- 100d1c9 (#77)
  • add debug util function to show name above an entity with some score/value -- c6b2d47 (#77)

new issues:

- when a fly flies into the venus fly trap's mouth
…nated

- also add tick delay to indicator termination so we can easily play a termination animation later
- crazy that its quality enough to reuse
- even crazier that its still importable
- downloaded from resourcepack: https://www.mediafire.com/file/4f4u8i0fg0aga7o/%2521OmegaFloweyBossFight%2521.zip/file
- happens as the housefly is terminating (going into the venus fly trap / indicator)
- being reworked in next commit(s) to be able to loop
- manually stop it at end of attack
- also add to phase 1 of boss fight
- was a weird bug where it wasn't working properly (triggering next attack) when it lived in executor
- probably because the executor did all its actions in a single tick
- instead of having to manually copy the whole tellraw command for each error
- convert all preexisting errors to use new util function
- specifically happened when you'd start more than one flies attack in quick succession (e.g. 2 at once)
- problem was that the fly was getting killed/terminated before running `entity:group/start` / `entity:group/end` and that caused jank
…value

- sample usage:
```
data merge storage utils:debug.set_name { name: 'group.id' }
execute store result storage utils:debug.set_name value int 1 run scoreboard players get @s group.id
function entity:utils/debug/set_name with storage utils:debug.set_name
```
- change direction indicators are facing -- diagonally across arena instead of west/east
- move bullets position/hitbox up for better visual into the fly trap
- was reading scratch images
- also move scratchwork text file into `scratch` directory
- housefly ajmodel has `"texture": null` for a bunch of cubes, but we were only filtering out `undefined` values
@TheAfroOfDoom TheAfroOfDoom marked this pull request as ready for review February 1, 2024 01:57
@TheAfroOfDoom TheAfroOfDoom merged commit 0d680ea into main Feb 1, 2024
5 checks passed
@TheAfroOfDoom TheAfroOfDoom deleted the attack-flies branch February 1, 2024 01:59
TheAfroOfDoom added a commit that referenced this pull request Mar 1, 2024
- ticket: #87
- forgot to make a ticket for this in the `flies` PR #77
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant