Skip to content

Commit 3bdfd3c

Browse files
authored
Merge pull request #32 from luksamuk/feature/amy
Add Amy Rose
2 parents 22ebbb2 + 9858990 commit 3bdfd3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1056
-226
lines changed

CHANGELOG.org

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,28 @@ version.
77
* Latest
88

99
- Prevent situations where TOC wouldn't be loaded correctly
10+
- Add Amy Rose! Amy jumps higher than the rest of the cast, has a lower top
11+
speed and slips down steep slopes more easily than the rest of the cast. She
12+
also has a Piko Piko Hammer Attack, a Piko Double Jump, and a Piko Spin
13+
Attack.
14+
- Add framework for extra hitboxes on player
15+
- Add Tails/Amy extra hitboxes (Piko Piko Hammer, Piko Spin, tail attack)
16+
- Generalize behaviours on bosses and objects for ease of use
17+
- [R0] Fix a bug where the boss would continue going forward when defeated out
18+
of a swing animation
19+
- Add SPU SRAM debriefing on space available/used/free
20+
- Add hearts when Amy hits the ground with Piko Piko Hammer
21+
- Make Amy and Level Select unlockable upon beating campaign
22+
- Add a special text slide feature to show special messages
23+
- Render animals in front of player
24+
- Make animals from end-of-level capsule jump around the player
25+
- Show number of disc tracks on options menu instead of level select
26+
- Add a secret code to unlock all unlockable features
27+
- Fix a bug with player top sensors that allowed weird vertical zips
28+
- Add spindash dust, slightly fix spindash animations
29+
- Add default color function, escape sequence, and allow fade values for text
30+
- Amy's Piko Piko Hammer can destroy bombs (R0) and enemy projectiles (R2, R3)
31+
- Fix Tails's tails on Spindash animation
1032

1133
* SAGE 2025 Build: v0.5.1 (2025-08-05)
1234

assets/levels/COMMON/OBJ.TIM

0 Bytes
Binary file not shown.

assets/levels/COMMON/obj.png

3 KB
Loading
83 Bytes
Loading

assets/levels/COMMON/objects_common.toml

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,17 @@ frames = [
147147
]
148148
loopback = 0
149149

150+
[[monitor.fragment.animations]]
151+
id = 8
152+
name = "amy"
153+
duration = 2
154+
frames = [
155+
[168, 0, 16, 16],
156+
[160, 112, 16, 16],
157+
[160, 112, 16, 16],
158+
]
159+
loopback = 0
160+
150161
# ============
151162

152163
[spikes]
@@ -320,6 +331,9 @@ frames = [
320331
[48, 288, 48, 32], # Knuckles
321332
[32, 136, 8, 32, 1, 0], # flip 2 x
322333
[ 0, 136, 32, 32, 1, 0], # flip 1 x
334+
[ 0, 320, 48, 32], # Amy
335+
[32, 136, 8, 32, 1, 0], # flip 2 x
336+
[ 0, 136, 32, 32, 1, 0], # flip 1 x
323337
]
324338
loopback = 0
325339

@@ -344,6 +358,13 @@ duration = 0
344358
frames = [[48, 288, 48, 32]]
345359
loopback = 0
346360

361+
[[goal_sign.fragment.animations]]
362+
id = 4
363+
name = "win_amy"
364+
duration = 0
365+
frames = [[0, 320, 48, 32]]
366+
loopback = 0
367+
347368
# ============
348369

349370
[switch]
@@ -408,6 +429,21 @@ frames = [
408429
]
409430
loopback = -1
410431

432+
[[explosion.animations]]
433+
name = "spindash_dust"
434+
id = 3
435+
duration = 1
436+
frames = [
437+
[ 96, 384, 32, 24],
438+
[ 96, 408, 32, 24],
439+
[ 96, 432, 32, 24],
440+
[ 96, 456, 32, 24],
441+
[ 96, 480, 32, 24],
442+
[128, 384, 32, 24],
443+
[128, 408, 32, 24],
444+
]
445+
loopback = 0
446+
411447
# ============
412448

413449
[monitor_image]
@@ -426,59 +462,66 @@ loopback = 0
426462
[[monitor_image.animations]]
427463
id = 1
428464
name = "ring"
429-
duration = 2
465+
duration = 0
430466
frames = [[216, 0, 16, 16]]
431467
loopback = 0
432468

433469
[[monitor_image.animations]]
434470
id = 2
435471
name = "speedshoes"
436-
duration = 2
472+
duration = 0
437473
frames = [[232, 0, 16, 16]]
438474
loopback = 0
439475

440476
[[monitor_image.animations]]
441477
id = 3
442478
name = "shield"
443-
duration = 2
479+
duration = 0
444480
frames = [[168, 16, 16, 16]]
445481
loopback = 0
446482

447483
[[monitor_image.animations]]
448484
id = 4
449485
name = "invincibility"
450-
duration = 2
486+
duration = 0
451487
frames = [[184, 16, 16, 16]]
452488
loopback = 0
453489

454490
[[monitor_image.animations]]
455491
id = 5
456492
name = "sonic"
457-
duration = 2
493+
duration = 0
458494
frames = [[200, 16, 16, 16]]
459495
loopback = 0
460496

461497
[[monitor_image.animations]]
462498
id = 6
463499
name = "super"
464-
duration = 2
500+
duration = 0
465501
frames = [[216, 16, 16, 16]]
466502
loopback = 0
467503

468504
[[monitor_image.animations]]
469505
id = 7
470506
name = "miles"
471-
duration = 2
507+
duration = 0
472508
frames = [[232, 16, 16, 16]]
473509
loopback = 0
474510

475511
[[monitor_image.animations]]
476512
id = 8
477513
name = "knuckles"
478-
duration = 2
514+
duration = 0
479515
frames = [[144, 112, 16, 16]]
480516
loopback = 0
481517

518+
[[monitor_image.animations]]
519+
id = 9
520+
name = "amy"
521+
duration = 0
522+
frames = [[160, 112, 16, 16]]
523+
loopback = 0
524+
482525
# ============
483526

484527
[shield]
@@ -822,7 +865,30 @@ duration = 0
822865
loopback = 0
823866
frames = [[200, 384, 24, 16]]
824867

825-
# ------------
868+
# ============
869+
870+
[amy_heart]
871+
872+
[[amy_heart.animations]]
873+
id = 0
874+
name = "fade_in"
875+
duration = 3
876+
loopback = 1
877+
frames = [
878+
[96, 80, 16, 16],
879+
[96, 96, 16, 16],
880+
]
881+
882+
[[amy_heart.animations]]
883+
id = 1
884+
name = "fade_out"
885+
duration = 3
886+
loopback = 2
887+
frames = [
888+
[96, 96, 16, 16],
889+
[96, 112, 16, 16],
890+
[96, 112, 16, 16],
891+
]
826892

827893
# ============
828894
# Dummy objects

assets/levels/COMMON/objects_common.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@
7373
<property name="subtype" type="int" value="0"/>
7474
</properties>
7575
</tile>
76+
<tile id="22" type="amy_heart"/>
7677
</tileset>

assets/levels/R0/Z2.tmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@
147147
</object>
148148
<object id="98" gid="109" x="32" y="1423" width="64" height="64" rotation="90"/>
149149
<object id="99" gid="109" x="896" y="1744" width="64" height="64" rotation="-90"/>
150-
<object id="100" gid="111" x="240" y="2080" width="64" height="64"/>
150+
<object id="100" gid="111" x="240" y="2072" width="64" height="64"/>
151151
<object id="101" gid="2147483759" x="2320" y="960" width="64" height="64"/>
152152
<object id="102" gid="109" x="32" y="1936" width="64" height="64" rotation="90"/>
153-
<object id="104" gid="111" x="752" y="2112" width="64" height="64"/>
153+
<object id="104" gid="111" x="752" y="2104" width="64" height="64"/>
154154
<object id="105" gid="109" x="368" y="2304" width="64" height="64"/>
155155
<object id="106" gid="109" x="1296" y="1936" width="64" height="64"/>
156156
<object id="107" gid="109" x="1392" y="1792" width="64" height="64"/>

0 commit comments

Comments
 (0)