Skip to content

fix preset/patch for BB and PB #616

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.

Sign up for GitHub

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

Merged
bwhitman merged 1 commit into from
Sep 22, 2025
Merged

fix preset/patch for BB and PB #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amy
Open in desktop
Submodule amy updated from a54034 to e2192f
10 changes: 5 additions & 5 deletions tulip/fs/tulip/ex/bunny_bounce/bunny_bounce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def game_loop(app):
tulip.bg_circle(center_x, center_y,2,253,1)
p_select = random.randrange(0,len(app.flower_notes))
p = app.flower_notes[p_select]
amy.send(osc=get_osc(), wave=amy.PCM, patch=p, vel=0.25)
amy.send(osc=get_osc(), wave=amy.PCM, preset=p, vel=0.25)


if tulip.ticks_ms() > app.start_time + app.time_til_shrooms:
Expand All @@ -155,15 +155,15 @@ def game_loop(app):
w,5,1,random.choice(app.shroom_colors),1)
p_select = random.randrange(0,len(app.shroom_notes))
p = app.shroom_notes[p_select]
amy.send(osc=get_osc(), wave=amy.PCM, patch=p, vel=0.25)
amy.send(osc=get_osc(), wave=amy.PCM, preset=p, vel=0.25)

app.d["x"] += app.d["x_incr"]
app.d["y"] += app.d["y_incr"]

if app.d["x"] + app.rabbit_w >= WIDTH or app.d["x"] <= 0:
app.d["x_incr"] *= -1
twiddle_path(app)
amy.send(osc=get_osc(), wave=amy.PCM, patch=13, note=app.d["curr_note"], vel=0.25)
amy.send(osc=get_osc(), wave=amy.PCM, preset=13, note=app.d["curr_note"], vel=0.25)
app.ringing_pan += (random.random() - 0.5) * 0.1
if app.ringing_pan > 0.75:
app.ringing_pan = 0.75
Expand All @@ -175,7 +175,7 @@ def game_loop(app):
if app.d["y"] + app.rabbit_h >= HEIGHT or app.d["y"] <= 0:
app.d["y_incr"] *= -1
twiddle_path(app)
amy.send(osc=get_osc(), wave=amy.PCM, patch=13, note=app.d["curr_note"], vel=0.25)
amy.send(osc=get_osc(), wave=amy.PCM, preset=13, note=app.d["curr_note"], vel=0.25)
app.ringing_pan += (random.random() - 0.5) * 0.1
if app.ringing_pan > 0.75:
app.ringing_pan = 0.75
Expand Down Expand Up @@ -208,7 +208,7 @@ def game_loop(app):
tulip.bg_pixel(g_x,g_y,random.choice(app.grass_colors))

#14
amy.send(osc=0, wave=amy.PCM, patch=18, vel=0.25, feedback=1)
amy.send(osc=0, wave=amy.PCM, preset=18, vel=0.25, feedback=1)


def deactivate_callback(app):
Expand Down
4 changes: 2 additions & 2 deletions tulip/fs/tulip/ex/planet_boing/planet_boing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def bounce(self, frame):
self.y_v = random.randrange(-10, 10)
p = self.x / tulip.Sprite.SCREEN_WIDTH
#print("x:", self.x, "pan:", p)
amy.send(osc=32+self.sprite_id, wave=amy.PCM, patch=13, note=48+self.sprite_id, vel=0.75, pan=p)
amy.send(osc=32+self.sprite_id, wave=amy.PCM, preset=13, note=48+self.sprite_id, vel=0.75, pan=p)
self.last_bounce = frame
return True
else:
Expand All @@ -97,7 +97,7 @@ def wormholize(self, frame, wormhole):
self.x = wormhole.x
self.y = wormhole.y
p = self.x / tulip.Sprite.SCREEN_WIDTH
amy.send(osc=32+self.sprite_id, wave=amy.PCM, patch=18, note=48+self.sprite_id, vel=0.75, pan=p)
amy.send(osc=32+self.sprite_id, wave=amy.PCM, preset=18, note=48+self.sprite_id, vel=0.75, pan=p)
self.last_wormhole = frame


Expand Down
Loading