diff --git a/.gitignore b/.gitignore index 416e789..fb85297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ .import/ build/ -ngio.ini -tilesets/ -graphics/tiles -shaders/ -ui/ \ No newline at end of file +ngio.ini \ No newline at end of file diff --git a/audio/sounds/mech_hurt_1.ogg b/audio/sounds/mech_hurt_1.ogg new file mode 100644 index 0000000..d76dcc2 Binary files /dev/null and b/audio/sounds/mech_hurt_1.ogg differ diff --git a/audio/sounds/mech_hurt_1.ogg.import b/audio/sounds/mech_hurt_1.ogg.import new file mode 100644 index 0000000..5e9c36e --- /dev/null +++ b/audio/sounds/mech_hurt_1.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/mech_hurt_1.ogg-3613187863d4f98f3a9f22e47b611f8f.oggstr" + +[deps] + +source_file="res://audio/sounds/mech_hurt_1.ogg" +dest_files=[ "res://.import/mech_hurt_1.ogg-3613187863d4f98f3a9f22e47b611f8f.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/mech_hurt_2.ogg b/audio/sounds/mech_hurt_2.ogg new file mode 100644 index 0000000..102da07 Binary files /dev/null and b/audio/sounds/mech_hurt_2.ogg differ diff --git a/audio/sounds/mech_hurt_2.ogg.import b/audio/sounds/mech_hurt_2.ogg.import new file mode 100644 index 0000000..23bbed1 --- /dev/null +++ b/audio/sounds/mech_hurt_2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/mech_hurt_2.ogg-06f2bf8e9e2a35bc165865b277728bc9.oggstr" + +[deps] + +source_file="res://audio/sounds/mech_hurt_2.ogg" +dest_files=[ "res://.import/mech_hurt_2.ogg-06f2bf8e9e2a35bc165865b277728bc9.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/mech_hurt_3.ogg b/audio/sounds/mech_hurt_3.ogg new file mode 100644 index 0000000..a21ee5d Binary files /dev/null and b/audio/sounds/mech_hurt_3.ogg differ diff --git a/audio/sounds/mech_hurt_3.ogg.import b/audio/sounds/mech_hurt_3.ogg.import new file mode 100644 index 0000000..e18a670 --- /dev/null +++ b/audio/sounds/mech_hurt_3.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/mech_hurt_3.ogg-a99c2a508a217f16aaa34167044be027.oggstr" + +[deps] + +source_file="res://audio/sounds/mech_hurt_3.ogg" +dest_files=[ "res://.import/mech_hurt_3.ogg-a99c2a508a217f16aaa34167044be027.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index d6c36c5..565228e 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -65,6 +65,9 @@ const a_bullet_casing = preload("res://audio/sounds/shell.ogg") const a_gun_cock = preload("res://audio/sounds/gun_cock.ogg") const a_famira_die = preload("res://audio/sounds/famira_die.ogg") const a_small_explosion = preload("res://audio/sounds/explosion_small.ogg") +const a_mech_hurt_1 = preload("res://audio/sounds/mech_hurt_1.ogg") +const a_mech_hurt_2 = preload("res://audio/sounds/mech_hurt_2.ogg") +const a_mech_hurt_3 = preload("res://audio/sounds/mech_hurt_3.ogg") var loop_section = null var has_looped = false diff --git a/ihateyou.bat b/ihateyou.bat new file mode 100644 index 0000000..6fc81be --- /dev/null +++ b/ihateyou.bat @@ -0,0 +1,6 @@ +git restore tilesets +git restore graphics/tiles +git restore shaders +git restore ui +git restore project.godot +git restore default_env.tres \ No newline at end of file diff --git a/menus/credits.tscn b/menus/credits.tscn index 496084b..c8277b3 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -861,6 +861,7 @@ position = Vector2( 3584, 0 ) material = SubResource( 7 ) position = Vector2( 74, 69 ) frames = SubResource( 12 ) +frame = 1 playing = true script = ExtResource( 16 ) @@ -891,7 +892,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 2 +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -961,7 +962,6 @@ position = Vector2( 1024, 0 ) material = SubResource( 13 ) position = Vector2( 2880, 24 ) frames = SubResource( 21 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Eviscerator"] @@ -978,7 +978,6 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2952, 24 ) frames = SubResource( 24 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Catbat"] @@ -994,6 +993,7 @@ align = 1 [node name="TheScrump" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2992, 128 ) frames = SubResource( 27 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/TheScrump"] @@ -1010,6 +1010,7 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2880, 102 ) frames = SubResource( 30 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/RollingFiend"] @@ -1025,6 +1026,7 @@ align = 1 [node name="ChipIt" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2960, 62 ) frames = SubResource( 33 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/ChipIt"] @@ -1041,7 +1043,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 6 +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1057,7 +1059,6 @@ align = 1 [node name="SabreSpighter" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2880, 62 ) frames = SubResource( 46 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/SabreSpighter"] @@ -1074,7 +1075,6 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1105,6 +1105,7 @@ position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) frames = SubResource( 54 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Shedge"] @@ -1120,7 +1121,6 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1150,6 +1150,7 @@ align = 1 [node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 200, 64 ) frames = SubResource( 65 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Squig"] @@ -1166,7 +1167,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 7 +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1213,6 +1214,7 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1220,6 +1222,7 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1370,6 +1373,7 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"] diff --git a/objects/enemy/boss/famira.gd b/objects/enemy/boss/famira.gd index a049cfa..1d5b29d 100644 --- a/objects/enemy/boss/famira.gd +++ b/objects/enemy/boss/famira.gd @@ -67,6 +67,16 @@ func hurt(amount: float) -> void: func _attack() -> void: var sg2083 := get_node(sg2083_path) if sg2083.has_method("hurt"): + var r = RandomNumberGenerator.new() + r.randomize() + var snd = r.randi_range(0,2) + match snd: + 0: + Audio.play_sound(Audio.a_mech_hurt_1,Audio.ac_die) + 1: + Audio.play_sound(Audio.a_mech_hurt_2,Audio.ac_die) + 2: + Audio.play_sound(Audio.a_mech_hurt_3,Audio.ac_die) sg2083.hurt(punch_damage) sg2083.knock_back(punch_knockback) diff --git a/objects/enemy/boss/famira.tscn b/objects/enemy/boss/famira.tscn index eb5f6a1..9f4688e 100644 --- a/objects/enemy/boss/famira.tscn +++ b/objects/enemy/boss/famira.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=58 format=2] +[gd_scene load_steps=59 format=2] [ext_resource path="res://objects/enemy/boss/famira.gd" type="Script" id=1] [ext_resource path="res://shaders/scale3x.gdshader" type="Shader" id=2] @@ -4275,25 +4275,25 @@ collision_mask = 128 monitorable = false [node name="Body" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( 0.00461769, -23.9291 ) -rotation = -0.0114693 +position = Vector2( 0.00459766, -23.9291 ) +rotation = -0.0114701 shape = SubResource( 13 ) [node name="Brain" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( 11.5072, -96.7914 ) +position = Vector2( 11.5069, -96.7914 ) rotation = 2.48158 z_index = 100 shape = SubResource( 14 ) [node name="LowerJaw" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( -21.3082, -76.1166 ) +position = Vector2( -21.3083, -76.1164 ) rotation = 1.66395 z_index = 100 shape = SubResource( 15 ) [node name="UpperJaw" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( -21.8181, -103.259 ) -rotation = -1.66238 +position = Vector2( -21.8184, -103.259 ) +rotation = -1.66239 z_index = 100 shape = SubResource( 16 ) diff --git a/objects/enemy/boss/sg2083.gd b/objects/enemy/boss/sg2083.gd index 162547c..531e37c 100644 --- a/objects/enemy/boss/sg2083.gd +++ b/objects/enemy/boss/sg2083.gd @@ -38,7 +38,6 @@ onready var head_sprite = $"%Head" func _physics_process(delta: float) -> void: - print(global_position) match state: State.DEAD: return @@ -128,6 +127,7 @@ func knock_back(amount: float, can_duck: bool = false) -> void: if can_duck and state == State.DUCK: return knockback += amount + print("YOWCH") func _play_laser_sound(play: bool): diff --git a/objects/enemy/boss/sg2083.tscn b/objects/enemy/boss/sg2083.tscn index 701a773..0ebe63b 100644 --- a/objects/enemy/boss/sg2083.tscn +++ b/objects/enemy/boss/sg2083.tscn @@ -2242,7 +2242,7 @@ update_scale = false [node name="KneeBack" type="Sprite" parent="Axle"] modulate = Color( 0.74902, 0.74902, 0.74902, 1 ) -position = Vector2( 6.25088, 28.1233 ) +position = Vector2( 6.25089, 28.1233 ) scale = Vector2( 1, -1 ) z_index = -1 texture = ExtResource( 8 ) diff --git a/objects/lore/boss/dr_intelli.tscn b/objects/lore/boss/dr_intelli.tscn index 8b5728c..a44dfa0 100644 --- a/objects/lore/boss/dr_intelli.tscn +++ b/objects/lore/boss/dr_intelli.tscn @@ -17,4 +17,4 @@ margin_top = 3.0 margin_bottom = 91.0 text = "Dr.Intelli: born 03/23/2051, sg's boss and head of edizon inc. -despite working with him, he does not think fondly of fami, and wants to establish his own dystopia one day." +despite working with him, he does not think fondly of fami. he wishes the world revolved around him instead." diff --git a/objects/lore/hills/sg.tscn b/objects/lore/hills/sg.tscn index ab79ee6..c133ce9 100644 --- a/objects/lore/hills/sg.tscn +++ b/objects/lore/hills/sg.tscn @@ -27,4 +27,5 @@ margin_bottom = 136.0 margin_top = 3.0 margin_bottom = 78.0 text = "SG: -born 07/15/2061, factory worker turned freedom fighter. despite their frailness they will do anything to save the future." +born 07/15/2061, factory worker turned freedom fighter. despite their frailness they will do anything to +change the future."