From 21e00b56aa4e89813e27f632344477c341b4847a Mon Sep 17 00:00:00 2001 From: Techwizz Date: Sat, 23 Apr 2022 20:59:56 -0600 Subject: [PATCH] fixed a bug with the win screen --- Levels/Main.tscn | 8 +------ Levels/Notice.tscn | 42 +++++++++---------------------------- Levels/Win-02.tscn | 25 ---------------------- Objects/Ai-tank/tank00.tscn | 24 ++++++++++++++++++++- misc/scripts/global.gd | 3 ++- project.godot | 2 +- 6 files changed, 37 insertions(+), 67 deletions(-) diff --git a/Levels/Main.tscn b/Levels/Main.tscn index 73c7cf8..480bcea 100644 --- a/Levels/Main.tscn +++ b/Levels/Main.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://Levels/Menu.gd" type="Script" id=1] [ext_resource path="res://fonts/Extrude.ttf" type="DynamicFontData" id=2] [ext_resource path="res://2D Art/Software Splashes/Godot.png" type="Texture" id=3] [ext_resource path="res://2D Art/Software Splashes/Blender.png" type="Texture" id=4] [ext_resource path="res://2D Art/Software Splashes/Maya.png" type="Texture" id=5] -[ext_resource path="res://2D Art/Software Splashes/skillsUSA.png" type="Texture" id=6] [ext_resource path="res://fonts/Born2bSportyV2.ttf" type="DynamicFontData" id=7] [ext_resource path="res://Audio/menu_music.wav" type="AudioStream" id=8] [ext_resource path="res://Audio/Music.gd" type="Script" id=9] @@ -96,11 +95,6 @@ position = Vector2( 1621, 959 ) scale = Vector2( 0.230098, 0.230098 ) texture = ExtResource( 5 ) -[node name="SkillsUsa" type="Sprite" parent="."] -position = Vector2( 1497, 559 ) -scale = Vector2( 0.36747, 0.36747 ) -texture = ExtResource( 6 ) - [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 8 ) autoplay = true diff --git a/Levels/Notice.tscn b/Levels/Notice.tscn index 712ec30..5695872 100644 --- a/Levels/Notice.tscn +++ b/Levels/Notice.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://fonts/Born2bSportyV2.ttf" type="DynamicFontData" id=1] [ext_resource path="res://Levels/Notice.gd" type="Script" id=2] @@ -25,14 +25,6 @@ font_data = ExtResource( 1 ) size = 60 font_data = ExtResource( 1 ) -[sub_resource type="DynamicFont" id=6] -size = 60 -font_data = ExtResource( 1 ) - -[sub_resource type="DynamicFont" id=7] -size = 60 -font_data = ExtResource( 1 ) - [sub_resource type="DynamicFont" id=8] size = 60 font_data = ExtResource( 1 ) @@ -76,11 +68,13 @@ align = 1 [node name="VBoxContainer2" type="VBoxContainer" parent="."] anchor_left = 0.5 +anchor_top = 0.5 anchor_right = 0.5 -margin_left = -230.0 -margin_top = 384.0 -margin_right = 230.0 -margin_bottom = 852.0 +anchor_bottom = 0.5 +margin_left = -241.0 +margin_top = -170.0 +margin_right = 241.0 +margin_bottom = 170.0 [node name="Label" type="Label" parent="VBoxContainer2"] margin_right = 482.0 @@ -105,34 +99,18 @@ custom_fonts/font = SubResource( 5 ) text = "- Multiplayer" align = 1 -[node name="Label4" type="Label" parent="VBoxContainer2"] +[node name="Label6" type="Label" parent="VBoxContainer2"] margin_top = 204.0 margin_right = 482.0 margin_bottom = 264.0 -custom_fonts/font = SubResource( 6 ) -text = "- Health system" -align = 1 - -[node name="Label5" type="Label" parent="VBoxContainer2"] -margin_top = 268.0 -margin_right = 482.0 -margin_bottom = 328.0 -custom_fonts/font = SubResource( 7 ) -text = "- Health bar" -align = 1 - -[node name="Label6" type="Label" parent="VBoxContainer2"] -margin_top = 332.0 -margin_right = 482.0 -margin_bottom = 392.0 custom_fonts/font = SubResource( 8 ) text = "- Bosses" align = 1 [node name="Label7" type="Label" parent="VBoxContainer2"] -margin_top = 396.0 +margin_top = 268.0 margin_right = 482.0 -margin_bottom = 468.0 +margin_bottom = 340.0 custom_fonts/font = SubResource( 9 ) text = "And much more!" align = 1 diff --git a/Levels/Win-02.tscn b/Levels/Win-02.tscn index f931b6b..200ebd7 100644 --- a/Levels/Win-02.tscn +++ b/Levels/Win-02.tscn @@ -1,8 +1,4 @@ -<<<<<<< HEAD [gd_scene load_steps=6 format=2] -======= -[gd_scene load_steps=5 format=2] ->>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d [ext_resource path="res://fonts/Born2bSportyV2.ttf" type="DynamicFontData" id=1] [ext_resource path="res://Levels/Win-02.gd" type="Script" id=2] @@ -15,23 +11,17 @@ font_data = ExtResource( 1 ) size = 100 font_data = ExtResource( 1 ) -<<<<<<< HEAD [sub_resource type="DynamicFont" id=3] size = 100 font_data = ExtResource( 1 ) -======= ->>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d [node name="Win-level02" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 2 ) -<<<<<<< HEAD __meta__ = { "_edit_use_anchors_": false } -======= ->>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_left = 0.5 @@ -77,7 +67,6 @@ align = 1 [node name="VBoxContainer3" type="VBoxContainer" parent="."] anchor_left = 0.5 -<<<<<<< HEAD anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 @@ -91,21 +80,10 @@ __meta__ = { [node name="Button" type="Button" parent="VBoxContainer3"] margin_right = 172.0 -======= -anchor_right = 0.5 -margin_left = -75.0 -margin_top = 112.0 -margin_right = 75.0 -margin_bottom = 218.0 - -[node name="Button" type="Button" parent="VBoxContainer3"] -margin_right = 150.0 ->>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d margin_bottom = 106.0 custom_fonts/font = SubResource( 2 ) text = "Quit" -<<<<<<< HEAD [node name="VBoxContainer4" type="VBoxContainer" parent="."] anchor_left = 0.5 anchor_right = 0.5 @@ -125,6 +103,3 @@ text = "Main Menu" [connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"] [connection signal="pressed" from="VBoxContainer4/ButtonMainMenu" to="." method="_on_ButtonMainMenu_pressed"] -======= -[connection signal="pressed" from="VBoxContainer3/Button" to="." method="_on_Button_pressed"] ->>>>>>> c22e0313ee202dcd878a994c37dcd1631840bd2d diff --git a/Objects/Ai-tank/tank00.tscn b/Objects/Ai-tank/tank00.tscn index d55b688..ca7de7d 100644 --- a/Objects/Ai-tank/tank00.tscn +++ b/Objects/Ai-tank/tank00.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Objects/Ai-tank/tank00.gd" type="Script" id=1] [ext_resource path="res://Objects/Ai-tank/model/Bottom_tank_blender_enemy.glb" type="PackedScene" id=2] @@ -10,6 +10,18 @@ extents = Vector3( 1.29, 1, 2.428 ) [sub_resource type="BoxShape" id=2] +[sub_resource type="CubeMesh" id=3] + +[sub_resource type="SpatialMaterial" id=4] +flags_transparent = true +albedo_color = Color( 1, 1, 1, 0.117647 ) + +[sub_resource type="CubeMesh" id=5] + +[sub_resource type="SpatialMaterial" id=6] +flags_transparent = true +albedo_color = Color( 1, 0, 0, 0.529412 ) + [node name="AITank00" type="KinematicBody"] script = ExtResource( 1 ) @@ -34,3 +46,13 @@ transform = Transform( -6.24448e-08, 0, -1.42857, 0, 1.42857, 0, 1.42857, 0, -6. [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 4 ) unit_size = 20.0 + +[node name="HealthBarBack" type="CSGMesh" parent="."] +transform = Transform( 2.1, 0, 0, 0, 0.069, 0, 0, 0, 0.343, 0, 2.6666, -2.69651 ) +mesh = SubResource( 3 ) +material = SubResource( 4 ) + +[node name="HealthBar" type="CSGMesh" parent="."] +transform = Transform( 2, 0, 0, 0, 0.039, 0, 0, 0, 0.276, 0.000887275, 2.78065, -2.70032 ) +mesh = SubResource( 5 ) +material = SubResource( 6 ) diff --git a/misc/scripts/global.gd b/misc/scripts/global.gd index 72c9bea..27cd15b 100644 --- a/misc/scripts/global.gd +++ b/misc/scripts/global.gd @@ -9,16 +9,17 @@ var playerhealthbarscale = 2 var bulletdamage = 0 var playerhealthexecfinish = 0 var playerbody +var playerbulletdamage = 2 func _resetvars(): playerdead = 0 tankskilled = 0 - firstlevelcompleted = 0 playerhit = 0 playerhealthbarscale = 2 bulletdamage = 0 playerhealthexecfinish = 0 + playerbulletdamage = 2 func _player_dead(): if playerhealthbarscale <= 0: diff --git a/project.godot b/project.godot index 91f627c..bcb976d 100644 --- a/project.godot +++ b/project.godot @@ -34,7 +34,7 @@ Global="*res://misc/scripts/global.gd" window/size/width=1920 window/size/height=1080 window/size/resizable=false -window/size/borderless=true +window/size/fullscreen=true mouse_cursor/custom_image="res://2D Art/Cursor/Cursor.png" [editor_plugins]