diff --git a/amy b/amy index a54034591..e2192f077 160000 --- a/amy +++ b/amy @@ -1 +1 @@ -Subproject commit a54034591c184dc30dfec8d980c5adca494449d3 +Subproject commit e2192f0778eb272a335f56a552fa0e836cb2b34e diff --git a/tulip/fs/tulip/ex/bunny_bounce/bunny_bounce.py b/tulip/fs/tulip/ex/bunny_bounce/bunny_bounce.py index 7a7f15ee7..29d4cc25f 100644 --- a/tulip/fs/tulip/ex/bunny_bounce/bunny_bounce.py +++ b/tulip/fs/tulip/ex/bunny_bounce/bunny_bounce.py @@ -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: @@ -155,7 +155,7 @@ 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"] @@ -163,7 +163,7 @@ def game_loop(app): 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 @@ -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 @@ -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): diff --git a/tulip/fs/tulip/ex/planet_boing/planet_boing.py b/tulip/fs/tulip/ex/planet_boing/planet_boing.py index 4d46043ec..a6d1b9851 100644 --- a/tulip/fs/tulip/ex/planet_boing/planet_boing.py +++ b/tulip/fs/tulip/ex/planet_boing/planet_boing.py @@ -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: @@ -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