From 3d542b1b793b687bf94ec1135df0f0b73d5e185e Mon Sep 17 00:00:00 2001 From: allespro Date: Sat, 13 Jul 2019 22:18:27 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2?= =?UTF-8?q?=D1=80=D0=B0=D0=B3=20=D1=88=D0=BB=D1=91=D0=BF=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=87=D0=BE=D0=BC=20=D0=B3=D0=B5=D1=80=D0=BE?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Именно шлёпает. Шлёпает потому что пока не смог сделать нормальный удар. --- ...d.png-5b2d518d7ba176daa681b994606cc83b.md5 | 3 + ....png-5b2d518d7ba176daa681b994606cc83b.stex | Bin 0 -> 411 bytes Enemy1.tscn | 52 +++-- KinematicEnemy1.gd | 20 ++ enemy/waepons/Wooden_sword.png | Bin 0 -> 6085 bytes enemy/waepons/Wooden_sword.png.import | 34 +++ export_presets.cfg | 197 ++++++++++++++++++ fonts/PixelFont.tres | 1 - scenes/playernode.tscn | 1 - waepons/Wooden_sword.gd | 134 ++++++++++++ waepons/Wooden_sword.tscn | 37 ++++ 11 files changed, 456 insertions(+), 23 deletions(-) create mode 100644 .import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.md5 create mode 100644 .import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.stex create mode 100644 enemy/waepons/Wooden_sword.png create mode 100644 enemy/waepons/Wooden_sword.png.import create mode 100644 export_presets.cfg create mode 100644 waepons/Wooden_sword.gd create mode 100644 waepons/Wooden_sword.tscn diff --git a/.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.md5 b/.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.md5 new file mode 100644 index 0000000..c15d2b9 --- /dev/null +++ b/.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.md5 @@ -0,0 +1,3 @@ +source_md5="426cdc1f72a1a968d6c5bc4771f56445" +dest_md5="291b35e22065f46e999fb828cbe4a7b9" + diff --git a/.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.stex b/.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.stex new file mode 100644 index 0000000000000000000000000000000000000000..434d5dfbe847945708c2a874c9bc73a1c65e30b9 GIT binary patch literal 411 zcmZ>F2@a8BU|;}Y2oPXr1TyM@M1Y^WLMM>m<&xq83h{b+xC8-duyPJIAZw+U&p8GL zMkh}f#}JRst5cUzAYy3*qcp@wHROizGvEFn6Y-JCZpl8HEcyqGD|Y0 zu4~rmO}MQm&$Q!BQHIIo6wZrL%pp5XxttjC)_0^b-r82$c+{<-`OKV<6PsFGrI&^n zyi<)%SLHTrY&jLBW4hS)Q2ViD$+hbyWGfg>xH~^=!&EiR2?8hH`G5G%DyO6MC(I+K z>1|fUe_5%8*{Y&Kr#Kpp|9+@_^{MleppybO3KFKX7nZZsdNjAF-M%Y0ufFZr>E|^Y zRzG}~{2^Yx>9u)t!kTT{m#=*MyZ)2wZV?WbZGH+&ADYyelN4@W6@GGQKmSbm1HWeW zOvuUS;tUZ{I@sl$a3w>rs#AT2vG abs(PlayerPos.x)):# верхняя половина четверти $AnimatedSprite.play("UP") + side = "up" else: $AnimatedSprite.stop() elif(PlayerPos.x > 0 && PlayerPos.y < 0): # 2 ая четверть четверти if(abs(PlayerPos.y) < abs(PlayerPos.x)):# нижняя половина четверти $AnimatedSprite.play("RIGHT") + side = "right" elif(abs(PlayerPos.y) > abs(PlayerPos.x)):# верхняя половина четверти $AnimatedSprite.play("UP") + side = "up" else: $AnimatedSprite.stop() elif(PlayerPos.x > 0 && PlayerPos.y > 0): # 3 ая четверть четверти if(abs(PlayerPos.y) < abs(PlayerPos.x)):# верхняя половина четверти $AnimatedSprite.play("RIGHT") + side = "right" elif(abs(PlayerPos.y) > abs(PlayerPos.x)):# нижняя половина четверти $AnimatedSprite.play("DOWN") + side = "down" else: $AnimatedSprite.stop() elif(PlayerPos.x < 0 && PlayerPos.y > 0): # 4 ая четверть четверти if(abs(PlayerPos.y) > abs(PlayerPos.x)):# нижняя половина четверти $AnimatedSprite.play("DOWN") + side = "down" elif(abs(PlayerPos.y) < abs(PlayerPos.x)):# верхняя половина четверти $AnimatedSprite.play("LEFT") + side = "left" else: $AnimatedSprite.stop() # Перестать проигрывать анимацию else: @@ -60,6 +73,7 @@ func rotation_loop(): # Супер сложная математическая func attack(): IsPlayerNear = true + func stop_attack(): $AnimatedSprite.stop() IsPlayerNear = false @@ -68,6 +82,10 @@ func _on_HitZone_area_entered(area): # Функция будущей атаки, var groups = area.get_groups() if (groups.has("player")): CanHitPlayer = true + print(side) + $Sword.set_sword_position(20, side) + $Sword.show() + $Sword.enable_sword() func _on_Area2D_area_entered(area): var groups = area.get_groups() @@ -79,3 +97,5 @@ func _on_HitZone_area_exited(area): var groups = area.get_groups() if (groups.has("player")): CanHitPlayer = false + $Sword.hide() + $Sword.disable_sword() \ No newline at end of file diff --git a/enemy/waepons/Wooden_sword.png b/enemy/waepons/Wooden_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..69abcdd640704fca4843946bce43455d53374c5f GIT binary patch literal 6085 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 LNkvXXu0mjfzm%Rw literal 0 HcmV?d00001 diff --git a/enemy/waepons/Wooden_sword.png.import b/enemy/waepons/Wooden_sword.png.import new file mode 100644 index 0000000..0167e89 --- /dev/null +++ b/enemy/waepons/Wooden_sword.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://enemy/waepons/Wooden_sword.png" +dest_files=[ "res://.import/Wooden_sword.png-5b2d518d7ba176daa681b994606cc83b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/export_presets.cfg b/export_presets.cfg new file mode 100644 index 0000000..3c70456 --- /dev/null +++ b/export_presets.cfg @@ -0,0 +1,197 @@ +[preset.0] + +name="Android" +platform="Android" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key="" + +[preset.0.options] + +graphics/32_bits_framebuffer=true +one_click_deploy/clear_previous_install=true +custom_package/debug="" +custom_package/release="" +command_line/extra_args="" +version/code=1 +version/name="1.0" +package/unique_name="" +package/name="" +package/signed=true +screen/immersive_mode=true +screen/orientation=0 +screen/support_small=true +screen/support_normal=true +screen/support_large=true +screen/support_xlarge=true +screen/opengl_debug=false +launcher_icons/xxxhdpi_192x192="" +launcher_icons/xxhdpi_144x144="" +launcher_icons/xhdpi_96x96="" +launcher_icons/hdpi_72x72="" +launcher_icons/mdpi_48x48="" +keystore/debug="" +keystore/debug_user="" +keystore/debug_password="" +keystore/release="" +keystore/release_user="" +keystore/release_password="" +apk_expansion/enable=false +apk_expansion/SALT="" +apk_expansion/public_key="" +architectures/armeabi-v7a=true +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +permissions/custom_permissions=PoolStringArray( ) +permissions/access_checkin_properties=false +permissions/access_coarse_location=false +permissions/access_fine_location=false +permissions/access_location_extra_commands=false +permissions/access_mock_location=false +permissions/access_network_state=false +permissions/access_surface_flinger=false +permissions/access_wifi_state=false +permissions/account_manager=false +permissions/add_voicemail=false +permissions/authenticate_accounts=false +permissions/battery_stats=false +permissions/bind_accessibility_service=false +permissions/bind_appwidget=false +permissions/bind_device_admin=false +permissions/bind_input_method=false +permissions/bind_nfc_service=false +permissions/bind_notification_listener_service=false +permissions/bind_print_service=false +permissions/bind_remoteviews=false +permissions/bind_text_service=false +permissions/bind_vpn_service=false +permissions/bind_wallpaper=false +permissions/bluetooth=false +permissions/bluetooth_admin=false +permissions/bluetooth_privileged=false +permissions/brick=false +permissions/broadcast_package_removed=false +permissions/broadcast_sms=false +permissions/broadcast_sticky=false +permissions/broadcast_wap_push=false +permissions/call_phone=false +permissions/call_privileged=false +permissions/camera=false +permissions/capture_audio_output=false +permissions/capture_secure_video_output=false +permissions/capture_video_output=false +permissions/change_component_enabled_state=false +permissions/change_configuration=false +permissions/change_network_state=false +permissions/change_wifi_multicast_state=false +permissions/change_wifi_state=false +permissions/clear_app_cache=false +permissions/clear_app_user_data=false +permissions/control_location_updates=false +permissions/delete_cache_files=false +permissions/delete_packages=false +permissions/device_power=false +permissions/diagnostic=false +permissions/disable_keyguard=false +permissions/dump=false +permissions/expand_status_bar=false +permissions/factory_test=false +permissions/flashlight=false +permissions/force_back=false +permissions/get_accounts=false +permissions/get_package_size=false +permissions/get_tasks=false +permissions/get_top_activity_info=false +permissions/global_search=false +permissions/hardware_test=false +permissions/inject_events=false +permissions/install_location_provider=false +permissions/install_packages=false +permissions/install_shortcut=false +permissions/internal_system_window=false +permissions/internet=false +permissions/kill_background_processes=false +permissions/location_hardware=false +permissions/manage_accounts=false +permissions/manage_app_tokens=false +permissions/manage_documents=false +permissions/master_clear=false +permissions/media_content_control=false +permissions/modify_audio_settings=false +permissions/modify_phone_state=false +permissions/mount_format_filesystems=false +permissions/mount_unmount_filesystems=false +permissions/nfc=false +permissions/persistent_activity=false +permissions/process_outgoing_calls=false +permissions/read_calendar=false +permissions/read_call_log=false +permissions/read_contacts=false +permissions/read_external_storage=false +permissions/read_frame_buffer=false +permissions/read_history_bookmarks=false +permissions/read_input_state=false +permissions/read_logs=false +permissions/read_phone_state=false +permissions/read_profile=false +permissions/read_sms=false +permissions/read_social_stream=false +permissions/read_sync_settings=false +permissions/read_sync_stats=false +permissions/read_user_dictionary=false +permissions/reboot=false +permissions/receive_boot_completed=false +permissions/receive_mms=false +permissions/receive_sms=false +permissions/receive_wap_push=false +permissions/record_audio=false +permissions/reorder_tasks=false +permissions/restart_packages=false +permissions/send_respond_via_message=false +permissions/send_sms=false +permissions/set_activity_watcher=false +permissions/set_alarm=false +permissions/set_always_finish=false +permissions/set_animation_scale=false +permissions/set_debug_app=false +permissions/set_orientation=false +permissions/set_pointer_speed=false +permissions/set_preferred_applications=false +permissions/set_process_limit=false +permissions/set_time=false +permissions/set_time_zone=false +permissions/set_wallpaper=false +permissions/set_wallpaper_hints=false +permissions/signal_persistent_processes=false +permissions/status_bar=false +permissions/subscribed_feeds_read=false +permissions/subscribed_feeds_write=false +permissions/system_alert_window=false +permissions/transmit_ir=false +permissions/uninstall_shortcut=false +permissions/update_device_stats=false +permissions/use_credentials=false +permissions/use_sip=false +permissions/vibrate=false +permissions/wake_lock=false +permissions/write_apn_settings=false +permissions/write_calendar=false +permissions/write_call_log=false +permissions/write_contacts=false +permissions/write_external_storage=false +permissions/write_gservices=false +permissions/write_history_bookmarks=false +permissions/write_profile=false +permissions/write_secure_settings=false +permissions/write_settings=false +permissions/write_sms=false +permissions/write_social_stream=false +permissions/write_sync_settings=false +permissions/write_user_dictionary=false diff --git a/fonts/PixelFont.tres b/fonts/PixelFont.tres index 665f270..6c5abcc 100644 --- a/fonts/PixelFont.tres +++ b/fonts/PixelFont.tres @@ -10,4 +10,3 @@ font_data = ExtResource( 1 ) [resource] default_font = SubResource( 1 ) - diff --git a/scenes/playernode.tscn b/scenes/playernode.tscn index 864423c..4488139 100644 --- a/scenes/playernode.tscn +++ b/scenes/playernode.tscn @@ -13,4 +13,3 @@ script = ExtResource( 1 ) [node name="KinematicPlayer" parent="." instance=ExtResource( 3 )] position = Vector2( 689.217, 356.237 ) - diff --git a/waepons/Wooden_sword.gd b/waepons/Wooden_sword.gd new file mode 100644 index 0000000..5eec00d --- /dev/null +++ b/waepons/Wooden_sword.gd @@ -0,0 +1,134 @@ +extends KinematicBody2D + +var center_position:Vector2 = position +var sword_side +var radius +var speed = 1 +var last_rotation +var long = 2.5 +var attack = false + +func _ready(): + #set_sword_position(40, "left") + hide() + $Area2D/CollisionShape2D.disabled = true + +func disable_sword(): + $Area2D/CollisionShape2D.disabled = true + +func enable_sword(): + $Area2D/CollisionShape2D.disabled = true + +func rotation_loop(mv): # x^2 + y^2 = r^2 + if(sword_side == "up"): + + if (position.x > radius/long): + speed = -speed + if (position.x < -radius/long): + speed = -speed + if (position.y > radius): + speed = -speed + if (position.y < -radius): + speed = -speed + position.x += speed + if(speed > 0): + position.y = -sqrt(radius*radius - position.x*position.x) * speed + if(speed < 0): + position.y = sqrt(radius*radius - position.x*position.x) * speed + rotation_degrees += speed + + if(sword_side == "down"): + + if (position.x > radius/long): + speed = -speed + if (position.x < -radius/long): + speed = -speed + if (position.y > radius): + speed = -speed + if (position.y < -radius): + speed = -speed + position.x += speed + if(speed > 0): + position.y = sqrt(radius*radius - position.x*position.x) * speed + if(speed < 0): + position.y = -sqrt(radius*radius - position.x*position.x) * speed + rotation_degrees -= speed + + if(sword_side == "right"): + if (position.x > radius): + speed = -speed + if (position.x < -radius): + speed = -speed + if (position.y > radius/long): + speed = -speed + if (position.y < -radius/long): + speed = -speed + position.y += speed + if(speed > 0): + position.x = sqrt(radius*radius - position.y*position.y) * speed + if(speed < 0): + position.x = -sqrt(radius*radius - position.y*position.y) * speed + rotation_degrees += speed + + if(sword_side == "left"): + if (position.x > radius): + speed = -speed + if (position.x < -radius): + speed = -speed + if (position.y > radius/long): + speed = -speed + if (position.y < -radius/long): + speed = -speed + position.y += speed + if(speed > 0): + position.x = -sqrt(radius*radius - position.y*position.y) * speed + if(speed < 0): + position.x = sqrt(radius*radius - position.y*position.y) * speed + rotation_degrees -= speed + + +# if (position.x > radius): +# speed = -speed +# if (position.x < -radius): +# speed = -speed +# if (position.y > radius): +# speed = -speed +# if (position.y < -radius): +# speed = -speed +# position.x += speed * mv +# if(speed > 0): +# position.y = radius*radius - position.x*position.x +# if(speed < 0): +# position.y = -(radius*radius - position.x*position.x) + #print(position.x, " | ", position.y, " | ", mv) + +func stop_play(): + attack = false + +func set_sword_position(move, side): + attack = true + sword_side = side + radius = move + position.x = 0 + position.y = 0 + if(side == "left"): + position.x = -move + rotation_degrees = -135 + elif(side == "right"): + position.x = move + rotation_degrees = 45 + elif(side == "up"): + position.y = -move + rotation_degrees = -45 + elif(side == "down"): + position.y = move + rotation_degrees = 135 + last_rotation = rotation_degrees + print(position.x, " | ", position.y) + + + +func _physics_process(delta): + if(attack): + rotation_loop(delta) + pass \ No newline at end of file diff --git a/waepons/Wooden_sword.tscn b/waepons/Wooden_sword.tscn new file mode 100644 index 0000000..8ec90cb --- /dev/null +++ b/waepons/Wooden_sword.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://waepons/Wooden_sword.gd" type="Script" id=1] +[ext_resource path="res://enemy/waepons/Wooden_sword.png" type="Texture" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 9.68418, 3.46865 ) + +[node name="Sword" type="KinematicBody2D"] +scale = Vector2( 0.5, 0.5 ) +script = ExtResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 2 ) + +[node name="Area2D" type="Area2D" parent="." groups=[ +"waepon", +"1", +]] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2( 6.30433, -6.49831 ) +rotation = -0.785398 +scale = Vector2( 1, 1 ) +shape = SubResource( 1 ) + +[node name="Debug" type="Node" parent="."] +editor/display_folded = true + +[node name="DebugCamera" type="Camera2D" parent="Debug"] +current = true +zoom = Vector2( 0.1, 0.1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 6.30433, -6.49831 ) +rotation = -0.785398 +shape = SubResource( 1 )