diff --git a/.gitignore b/.gitignore index de0184c..0ceea1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .import *.import *.blend1 +nohup.out ._* ehthumbs.db diff --git a/scenes/heroes/2.gd b/scenes/heroes/2.gd new file mode 100644 index 0000000..cfd116d --- /dev/null +++ b/scenes/heroes/2.gd @@ -0,0 +1,8 @@ +extends "res://scripts/player.gd" + +#func _ready(): +# get_node("Area").set_gravity_distance_scale(10) + +func _process(delta): + print(get_translation()) + #get_node("Area").set_gravity_vector(get_translation()) diff --git a/scenes/heroes/2.tscn b/scenes/heroes/2.tscn new file mode 100644 index 0000000..6a43275 --- /dev/null +++ b/scenes/heroes/2.tscn @@ -0,0 +1,179 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://scenes/heroes/2.gd" type="Script" id=1] + +[sub_resource type="CapsuleShape" id=1] + +radius = 0.4 +height = 0.5 + +[sub_resource type="RayShape" id=2] + +length = 0.3 +_sections_unfolded = [ "Resource" ] + +[sub_resource type="CapsuleMesh" id=3] + +radius = 0.4 +mid_height = 0.5 +radial_segments = 64 +rings = 8 +_sections_unfolded = [ "Resource" ] + +[sub_resource type="SphereShape" id=4] + +radius = 7.0 + +[node name="RigidBody" type="RigidBody" index="0" groups=[ +"player", +]] + +input_ray_pickable = true +input_capture_on_drag = false +collision_layer = 4 +collision_mask = 1 +mode = 2 +mass = 200.0 +friction = 1.0 +bounce = 0.0 +gravity_scale = 1.0 +custom_integrator = false +continuous_cd = true +contacts_reported = 0 +contact_monitor = false +sleeping = false +can_sleep = true +axis_lock_linear_x = false +axis_lock_linear_y = false +axis_lock_linear_z = false +axis_lock_angular_x = false +axis_lock_angular_y = false +axis_lock_angular_z = false +linear_velocity = Vector3( 0, 0, 0 ) +linear_damp = -1.0 +angular_velocity = Vector3( 0, 0, 0 ) +angular_damp = -1.0 +script = ExtResource( 1 ) +_sections_unfolded = [ "Angular", "Axis Lock", "Collision", "Linear", "Transform", "Visibility", "collision" ] + +[node name="Crosshair" type="Label" parent="." index="0"] + +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -20.0 +margin_top = -7.0 +margin_right = 20.0 +margin_bottom = 7.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 4 +text = "+" +align = 1 +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + +[node name="Body" type="CollisionShape" parent="." index="1"] + +transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0.95, 0 ) +shape = SubResource( 1 ) +disabled = false +_sections_unfolded = [ "Pause", "Transform", "Visibility" ] + +[node name="Leg" type="CollisionShape" parent="." index="2"] + +transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0.05, 0.35, 0 ) +shape = SubResource( 2 ) +disabled = false +_sections_unfolded = [ "Transform", "Visibility" ] + +[node name="Ray" type="RayCast" parent="." index="3"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0 ) +enabled = true +exclude_parent = true +cast_to = Vector3( 0, -0.3, 0 ) +collision_mask = 1 +_sections_unfolded = [ "Transform", "Visibility" ] + +[node name="Yaw" type="Spatial" parent="." index="4"] + +[node name="Pitch" type="Spatial" parent="Yaw" index="0"] + +[node name="Camera" type="Camera" parent="Yaw/Pitch" index="0"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0 ) +keep_aspect = 0 +cull_mask = 1048575 +environment = null +h_offset = 0.0 +v_offset = 0.0 +doppler_tracking = 0 +projection = 0 +current = false +fov = 70.0 +size = 1.0 +near = 0.05 +far = 100.0 +_sections_unfolded = [ "Transform", "Visibility" ] + +[node name="Ray" type="RayCast" parent="Yaw/Pitch" index="1"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0 ) +enabled = true +exclude_parent = true +cast_to = Vector3( 0, 0, -100 ) +collision_mask = 1 +_sections_unfolded = [ "Transform" ] + +[node name="MeshInstance" type="MeshInstance" parent="." index="5"] + +transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0.95, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +mesh = SubResource( 3 ) +skeleton = NodePath("..") +material/0 = null +_sections_unfolded = [ "Transform" ] + +[node name="Area" type="Area" parent="." index="6"] + +input_ray_pickable = false +input_capture_on_drag = false +space_override = 1 +gravity_point = true +gravity_distance_scale = 0.0 +gravity_vec = Vector3( 0, 0, 0 ) +gravity = 50.0 +linear_damp = 0.1 +angular_damp = 1.0 +priority = 0.0 +monitoring = true +monitorable = true +collision_layer = 4 +collision_mask = 1 +audio_bus_override = false +audio_bus_name = "Master" +reverb_bus_enable = false +reverb_bus_name = "Master" +reverb_bus_amount = 0.0 +reverb_bus_uniformity = 0.0 +_sections_unfolded = [ "Audio Bus", "Collision", "Pause", "Reverb Bus", "Transform", "Visibility" ] + +[node name="CollisionShape" type="CollisionShape" parent="Area" index="0"] + +shape = SubResource( 4 ) +disabled = false + + diff --git a/scenes/world.tscn b/scenes/world.tscn index 99143b7..7dcaa26 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -99,7 +99,7 @@ disabled = false [node name="Ball" type="RigidBody" parent="." index="3"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -79.2541, 6.09969, 4.40885 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.4344, 6.09969, 4.40885 ) input_ray_pickable = true input_capture_on_drag = false collision_layer = 1 @@ -113,7 +113,7 @@ custom_integrator = false continuous_cd = false contacts_reported = 0 contact_monitor = false -sleeping = true +sleeping = false can_sleep = true axis_lock_linear_x = false axis_lock_linear_y = false diff --git a/scripts/hero_select.gd b/scripts/hero_select.gd index 4129727..749699c 100644 --- a/scripts/hero_select.gd +++ b/scripts/hero_select.gd @@ -3,6 +3,7 @@ extends OptionButton const hero_names = [ "Wallriding mfer", "WallMAKING mfer", + "an ATTRACTIVE mfer", ] func _ready():