Skip to content

Commit fe2a187

Browse files
TechokamiTechokami
authored
Merge pull request #300 from Daniel-Cortez/hyper-ring
Hyper Ring functionality
2 parents 3da5b0a + 74c62c4 commit fe2a187

15 files changed

Lines changed: 282 additions & 26 deletions

File tree

‎Audio/SFX/Objects/HyperRing.wav‎

99.9 KB
Binary file not shown.

‎Audio/SFX/Objects/HyperRing.wav.import‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[remap]
2+
3+
importer="wav"
4+
type="AudioStreamWAV"
5+
uid="uid://q300fm5apt0f"
6+
path="res://.godot/imported/HyperRing.wav-b2da1264c3c800c07063df08bf760fc4.sample"
7+
8+
[deps]
9+
10+
source_file="res://Audio/SFX/Objects/HyperRing.wav"
11+
dest_files=["res://.godot/imported/HyperRing.wav-b2da1264c3c800c07063df08bf760fc4.sample"]
12+
13+
[params]
14+
15+
force/8_bit=false
16+
force/mono=false
17+
force/max_rate=false
18+
force/max_rate_hz=44100
19+
edit/trim=false
20+
edit/normalize=false
21+
edit/loop_mode=0
22+
edit/loop_begin=0
23+
edit/loop_end=-1
24+
compress/mode=0

‎Entities/Items/BigRing.tscn‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
[gd_scene load_steps=13 format=3 uid="uid://bfh812sfnsg66"]
2+
3+
[ext_resource type="Script" path="res://Scripts/Objects/Ring.gd" id="1_6ff7w"]
4+
[ext_resource type="Texture2D" uid="uid://dd5w4k780vuop" path="res://Graphics/Items/big_ring.png" id="2_hoyhl"]
5+
6+
[sub_resource type="AtlasTexture" id="AtlasTexture_sknf7"]
7+
atlas = ExtResource("2_hoyhl")
8+
region = Rect2(0, 0, 32, 32)
9+
10+
[sub_resource type="AtlasTexture" id="AtlasTexture_0pr6h"]
11+
atlas = ExtResource("2_hoyhl")
12+
region = Rect2(32, 0, 32, 32)
13+
14+
[sub_resource type="AtlasTexture" id="AtlasTexture_4do3f"]
15+
atlas = ExtResource("2_hoyhl")
16+
region = Rect2(64, 0, 32, 32)
17+
18+
[sub_resource type="AtlasTexture" id="AtlasTexture_dn0vu"]
19+
atlas = ExtResource("2_hoyhl")
20+
region = Rect2(96, 0, 32, 32)
21+
22+
[sub_resource type="AtlasTexture" id="AtlasTexture_v2sjc"]
23+
atlas = ExtResource("2_hoyhl")
24+
region = Rect2(128, 0, 32, 32)
25+
26+
[sub_resource type="AtlasTexture" id="AtlasTexture_jmjrx"]
27+
atlas = ExtResource("2_hoyhl")
28+
region = Rect2(160, 0, 32, 32)
29+
30+
[sub_resource type="AtlasTexture" id="AtlasTexture_knc7v"]
31+
atlas = ExtResource("2_hoyhl")
32+
region = Rect2(192, 0, 32, 32)
33+
34+
[sub_resource type="AtlasTexture" id="AtlasTexture_7qygs"]
35+
atlas = ExtResource("2_hoyhl")
36+
region = Rect2(224, 0, 32, 32)
37+
38+
[sub_resource type="SpriteFrames" id="2"]
39+
animations = [{
40+
"frames": [{
41+
"duration": 1.0,
42+
"texture": SubResource("AtlasTexture_sknf7")
43+
}, {
44+
"duration": 1.0,
45+
"texture": SubResource("AtlasTexture_0pr6h")
46+
}, {
47+
"duration": 1.0,
48+
"texture": SubResource("AtlasTexture_4do3f")
49+
}, {
50+
"duration": 1.0,
51+
"texture": SubResource("AtlasTexture_dn0vu")
52+
}, {
53+
"duration": 1.0,
54+
"texture": SubResource("AtlasTexture_v2sjc")
55+
}, {
56+
"duration": 1.0,
57+
"texture": SubResource("AtlasTexture_jmjrx")
58+
}, {
59+
"duration": 1.0,
60+
"texture": SubResource("AtlasTexture_knc7v")
61+
}, {
62+
"duration": 1.0,
63+
"texture": SubResource("AtlasTexture_7qygs")
64+
}],
65+
"loop": true,
66+
"name": &"default",
67+
"speed": 10.0
68+
}]
69+
70+
[sub_resource type="RectangleShape2D" id="1"]
71+
size = Vector2(29, 29)
72+
73+
[node name="HyperRing" type="Node2D"]
74+
z_index = 1
75+
script = ExtResource("1_6ff7w")
76+
77+
[node name="RingSprite" type="AnimatedSprite2D" parent="."]
78+
process_mode = 1
79+
z_index = 4
80+
sprite_frames = SubResource("2")
81+
autoplay = "default"
82+
83+
[node name="Hitbox" type="Area2D" parent="."]
84+
collision_layer = 0
85+
collision_mask = 4096
86+
87+
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
88+
modulate = Color(1, 0, 0.819608, 1)
89+
shape = SubResource("1")
90+
91+
[node name="FloorCheck" type="RayCast2D" parent="."]
92+
target_position = Vector2(0, 16)
93+
94+
[connection signal="area_shape_entered" from="Hitbox" to="." method="_on_Hitbox_area_shape_entered"]
95+
[connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"]
96+
[connection signal="body_exited" from="Hitbox" to="." method="_on_Hitbox_body_exited"]

‎Entities/MainObjects/Player.tscn‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=193 format=3 uid="uid://cioq5saowvqxj"]
1+
[gd_scene load_steps=194 format=3 uid="uid://cioq5saowvqxj"]
22

33
[ext_resource type="Script" path="res://Scripts/Player/Player.gd" id="1"]
44
[ext_resource type="PackedScene" uid="uid://d1e4muavtnun6" path="res://Entities/PlayerAvatars/Sonic.tscn" id="2"]
@@ -61,6 +61,7 @@
6161
[ext_resource type="Script" path="res://Scripts/Player/States/Glide.gd" id="59"]
6262
[ext_resource type="AudioStream" uid="uid://78gy6s87pbbo" path="res://Audio/SFX/Player/Land.wav" id="60"]
6363
[ext_resource type="AudioStream" uid="uid://uaa5twt8odin" path="res://Audio/SFX/Player/Slide.wav" id="61"]
64+
[ext_resource type="AudioStream" uid="uid://q300fm5apt0f" path="res://Audio/SFX/Objects/HyperRing.wav" id="64_3rplp"]
6465
[ext_resource type="AudioStream" uid="uid://bmiq3qg6r81hw" path="res://Audio/SFX/Player/WaterRunV2.wav" id="64_04xna"]
6566
[ext_resource type="Texture2D" uid="uid://b1k615l251fu5" path="res://Graphics/Misc/WaterSurfaceSplash.png" id="64_ovmgw"]
6667
[ext_resource type="AudioStream" uid="uid://buu4anko53vx2" path="res://Audio/SFX/Objects/ChemJump.wav" id="65_7v2sx"]
@@ -1491,6 +1492,10 @@ stream = ExtResource("65_7v2sx")
14911492
volume_db = 15.0
14921493
bus = &"SFX"
14931494

1495+
[node name="HyperRing" type="AudioStreamPlayer" parent="SFX"]
1496+
stream = ExtResource("64_3rplp")
1497+
bus = &"SFX"
1498+
14941499
[node name="CrushSensorLeft" type="Area2D" parent="."]
14951500
position = Vector2(-8, 0)
14961501
collision_layer = 0

‎Entities/Misc/HUD.tscn‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=31 format=3 uid="uid://c30uceea18q1w"]
1+
[gd_scene load_steps=32 format=3 uid="uid://c30uceea18q1w"]
22

33
[ext_resource type="Material" uid="uid://bveqi5m5ihsgj" path="res://Shaders/PlayerPalette.tres" id="2_xy7bp"]
44
[ext_resource type="FontFile" uid="uid://cj70hn8i05uo5" path="res://Graphics/HUD/hud_lives_numerals.png" id="3_eauoj"]
@@ -7,6 +7,7 @@
77
[ext_resource type="Script" path="res://Scripts/Misc/HUD.gd" id="6"]
88
[ext_resource type="FontFile" uid="uid://cticydrc4dda2" path="res://Graphics/HUD/hud_numerals.png" id="6_synv7"]
99
[ext_resource type="Texture2D" uid="uid://gswo6rq3uyy8" path="res://Graphics/HUD/LevelCards/Banner.png" id="7_ccygi"]
10+
[ext_resource type="FontFile" uid="uid://3dtk7ug486gi" path="res://Graphics/HUD/hud_numerals_hyper.png" id="7_fiwnx"]
1011
[ext_resource type="FontFile" uid="uid://v4hx32xo1ema" path="res://Graphics/HUD/LevelCards/font/largefont4.png" id="7_uj3el"]
1112
[ext_resource type="Texture2D" uid="uid://c7a17v25ap4ow" path="res://Graphics/HUD/LevelCards/ActCards.png" id="9_3i4aq"]
1213
[ext_resource type="FontFile" uid="uid://qan4ss21y5gp" path="res://Graphics/HUD/LevelCards/font/smallfont3.png" id="10_8dyi8"]
@@ -738,6 +739,15 @@ offset_bottom = 51.0
738739
theme_override_fonts/font = ExtResource("6_synv7")
739740
text = "0"
740741

742+
[node name="BlueRingCount" type="Label" parent="Counters/Text"]
743+
visible = false
744+
offset_left = 40.0
745+
offset_top = 32.0
746+
offset_right = 64.0
747+
offset_bottom = 51.0
748+
theme_override_fonts/font = ExtResource("7_fiwnx")
749+
text = "AB0"
750+
741751
[node name="Time" type="Sprite2D" parent="Counters/Text"]
742752
visible = false
743753
position = Vector2(0, 16)

‎Graphics/HUD/hud_numerals_hyper.png‎

340 Bytes
Loading

‎Graphics/HUD/hud_numerals_hyper.png.import‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[remap]
2+
3+
importer="font_data_image"
4+
type="FontFile"
5+
uid="uid://3dtk7ug486gi"
6+
path="res://.godot/imported/hud_numerals_hyper.png-710daa2f4b822a4a3a3dc0a0d25c0980.fontdata"
7+
8+
[deps]
9+
10+
source_file="res://Graphics/HUD/hud_numerals_hyper.png"
11+
dest_files=["res://.godot/imported/hud_numerals_hyper.png-710daa2f4b822a4a3a3dc0a0d25c0980.fontdata"]
12+
13+
[params]
14+
15+
character_ranges=PackedStringArray("48-57", "65", "66", "32")
16+
kerning_pairs=PackedStringArray()
17+
columns=13
18+
rows=1
19+
image_margin=Rect2i(0, 0, 0, 0)
20+
character_margin=Rect2i(0, 0, 0, 0)
21+
ascent=0
22+
descent=0
23+
fallbacks=[]
24+
compress=true
25+
scaling_mode=0

‎Graphics/Items/big_ring.png‎

1.01 KB
Loading

‎Graphics/Items/big_ring.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://dd5w4k780vuop"
6+
path="res://.godot/imported/big_ring.png-9515a662948952917646e7bad3490514.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Graphics/Items/big_ring.png"
14+
dest_files=["res://.godot/imported/big_ring.png-9515a662948952917646e7bad3490514.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎Scene/Zones/BaseZone.tscn‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,10 @@ item = 4
15991599
[node name="Monitor2" parent="Monitors" instance=ExtResource("8_8svvy")]
16001600
position = Vector2(408, 672)
16011601

1602+
[node name="Monitor3" parent="Monitors" instance=ExtResource("8_8svvy")]
1603+
position = Vector2(1200, 336)
1604+
item = 10
1605+
16021606
[node name="Monitor4" parent="Monitors" instance=ExtResource("8_8svvy")]
16031607
position = Vector2(3136, 368)
16041608
item = 8

0 commit comments

Comments
 (0)