From 92e7d67c083de793537a4d6bbbb8c193c8d30dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Gro=C3=9F?= Date: Sat, 18 Nov 2017 13:19:58 +0100 Subject: [PATCH] Graphics update 1 --- scenes/asteroid.tscn | 6 +++--- scenes/base.tscn | 33 +++++++++++++++++++-------------- sprites/base_02.png | Bin 0 -> 611 bytes sprites/base_02.png.flags | 2 ++ sprites/cannon_02.png | Bin 0 -> 173 bytes sprites/cannon_02.png.flags | 2 ++ sprites/cannon_02.png~ | Bin 0 -> 228 bytes stages/main_stage.tscn | 1 - 8 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 sprites/base_02.png create mode 100644 sprites/base_02.png.flags create mode 100644 sprites/cannon_02.png create mode 100644 sprites/cannon_02.png.flags create mode 100644 sprites/cannon_02.png~ diff --git a/scenes/asteroid.tscn b/scenes/asteroid.tscn index 08736b3..a043caf 100644 --- a/scenes/asteroid.tscn +++ b/scenes/asteroid.tscn @@ -64,7 +64,7 @@ collision/mask = 1024 collision/margin = 0.08 script/script = ExtResource( 1 ) speed_min = 5 -speed_max = 45 +speed_max = 20 [node name="Sprite" type="Sprite" parent="."] @@ -76,7 +76,7 @@ texture = ExtResource( 2 ) transform/pos = Vector2( -0.649553, -0.311569 ) transform/rot = -180.0 z/z = -1 -config/amount = 64 +config/amount = 32 config/lifetime = 1.0 config/process_mode = 1 config/half_extents = Vector2( 5, 2 ) @@ -104,7 +104,7 @@ color/color_ramp = ExtResource( 3 ) transform/pos = Vector2( 0.892595, 5.7285 ) transform/rot = -180.0 z/z = 1 -config/amount = 32 +config/amount = 16 config/lifetime = 0.4 config/process_mode = 1 config/half_extents = Vector2( 5, 2 ) diff --git a/scenes/base.tscn b/scenes/base.tscn index 8f352c9..12f8f57 100644 --- a/scenes/base.tscn +++ b/scenes/base.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=5 format=1] [ext_resource path="res://scripts/base.gd" type="Script" id=1] -[ext_resource path="res://sprites/base.png" type="Texture" id=2] -[ext_resource path="res://sprites/cannon.png" type="Texture" id=3] -[ext_resource path="res://scripts/ray.gd" type="Script" id=4] +[ext_resource path="res://sprites/cannon_02.png" type="Texture" id=2] +[ext_resource path="res://scripts/ray.gd" type="Script" id=3] +[ext_resource path="res://sprites/base_02.png" type="Texture" id=4] [node name="Base" type="StaticBody2D"] transform/pos = Vector2( 216.299, 209.498 ) +transform/scale = Vector2( 2.05199, 2.05199 ) input/pickable = false collision/layers = 1 collision/mask = 1 @@ -20,26 +21,30 @@ rotation_speed_mult = 1 health = 100 reload_time = 0.8 -[node name="BaseSprite" type="Sprite" parent="."] - -transform/scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) - [node name="CannonSprite" type="Sprite" parent="."] -transform/pos = Vector2( -0.0346317, -7.63508 ) -transform/scale = Vector2( 0.25, 0.25 ) -texture = ExtResource( 3 ) -offset = Vector2( 0.0179825, -27.3786 ) +transform/pos = Vector2( 1.80362, -4.62868 ) +transform/scale = Vector2( 0.80479, 0.80479 ) +texture = ExtResource( 2 ) +offset = Vector2( -0.404516, -2.7748 ) +flip_v = true +__meta__ = { +"_edit_group_": true +} [node name="CannonTip" type="Position2D" parent="CannonSprite"] -transform/pos = Vector2( 0, -56.1053 ) +transform/pos = Vector2( 0.240097, -12.7907 ) [node name="Ray" type="Node2D" parent="CannonSprite"] z/z = -1 -script/script = ExtResource( 4 ) +script/script = ExtResource( 3 ) + +[node name="BaseSprite" type="Sprite" parent="."] + +transform/scale = Vector2( 1, 1 ) +texture = ExtResource( 4 ) [node name="SoundRoomParams" type="SoundRoomParams" parent="."] diff --git a/sprites/base_02.png b/sprites/base_02.png new file mode 100644 index 0000000000000000000000000000000000000000..b75c780b19290911968fea780625c892fd3451b6 GIT binary patch literal 611 zcmV-p0-XJcP)-1uIr*&t)kIr z000(?1w79~XE54XQ`?s;19UDB05DD_$w8&}^Z6Y8eqRFs##kwkv%t*8!^F02B|e!< zl5V%FEtkvEwJQG#W7{?i!%&uO+n7$L$>9nwI@uZFh&WtG*Yymj=XpwB?b6B4bOs|W z2m)}TP3!5g?RO001FG<{qxpmwRHC61z7yGPho@Wju~!06-Xq zg+Q5UN`s^!g#3-E#2jm*#ER6aZL!i5#B2*tiZBe78(cPU8pN_JSwO6ZD-Djt;8?8G z;lQ&)wOUQ?FNgtR>YxUf&Zk=vm@t8fg zM8){=0RZsj*B``ei&e}sKiIJB{#1#v7Jn50tYR)f06^=tn{xB{+wYyX?7O$G0hI5L xynNr^oA0%oS_Wp9_Cc0auif1HIk>G~;xEc82DHHtn~(qi002ovPDHLkV1lki8B72G literal 0 HcmV?d00001 diff --git a/sprites/base_02.png.flags b/sprites/base_02.png.flags new file mode 100644 index 0000000..226e8a3 --- /dev/null +++ b/sprites/base_02.png.flags @@ -0,0 +1,2 @@ +filter=false +gen_mipmaps=false diff --git a/sprites/cannon_02.png b/sprites/cannon_02.png new file mode 100644 index 0000000000000000000000000000000000000000..3cfa5a2911080894f4eff97afbf21c93f62bc176 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Ba!3HF|e7-mXsS-~Y#}JK)cPA&aH^2SaoafVb z{SMiX)RU-EZ**zqhVONjTeg0ir~F9R>ypPjuJD@ajd$5S+ZU-kJSo1XMtZ%q_F*o) R)-a&u44$rjF6*2UngGCcPl5md literal 0 HcmV?d00001 diff --git a/stages/main_stage.tscn b/stages/main_stage.tscn index 8844196..f59be07 100644 --- a/stages/main_stage.tscn +++ b/stages/main_stage.tscn @@ -107,7 +107,6 @@ func _input(event): [node name="Base" parent="." instance=ExtResource( 1 )] transform/pos = Vector2( 211, 240 ) -rotation_speed_mult = 1 [node name="Background" type="CanvasLayer" parent="."]