From 3524712b6fc9f98e692ebcc1d04365601cc1e24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20H=C3=BCbner?= Date: Fri, 4 Aug 2017 20:53:05 +0200 Subject: [PATCH] add the things. --- Asteroid.tscn | 9 +++++---- Bullet.tscn | 1 + Game.tscn | 1 + Gun.gd | 8 +++++--- Player.gd | 8 ++++---- raw/asteroid.ase | 4 ++-- raw/asteroid.png | Bin 1139 -> 1271 bytes raw/asteroid_medium.ase | 3 +++ raw/asteroid_medium.png | Bin 0 -> 1271 bytes raw/asteroid_medium.png.flags | 2 ++ raw/asteroid_small.ase | 3 +++ raw/asteroid_small.png | Bin 0 -> 604 bytes raw/asteroid_small.png.flags | 2 ++ raw/enemy_grunt.ase | 4 ++-- raw/enemy_grunt.png | Bin 516 -> 272 bytes raw/enemy_grunt.png.flags | 1 - raw/minimap.ase | 4 ++-- raw/minimap.png | Bin 751 -> 820 bytes raw/simple_bullet.ase | 4 ++-- raw/simple_bullet.png | Bin 99 -> 110 bytes 20 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 raw/asteroid_medium.ase create mode 100644 raw/asteroid_medium.png create mode 100644 raw/asteroid_medium.png.flags create mode 100644 raw/asteroid_small.ase create mode 100644 raw/asteroid_small.png create mode 100644 raw/asteroid_small.png.flags diff --git a/Asteroid.tscn b/Asteroid.tscn index d17819e..8db07fa 100644 --- a/Asteroid.tscn +++ b/Asteroid.tscn @@ -1,18 +1,19 @@ [gd_scene load_steps=4 format=1] [ext_resource path="res://Asteroid.gd" type="Script" id=1] -[ext_resource path="res://raw/asteroid.png" type="Texture" id=2] +[ext_resource path="res://raw/asteroid_small.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] custom_solver_bias = 0.0 -extents = Vector2( 25.1672, 26.3172 ) +extents = Vector2( 12.234, 13.1952 ) [node name="Asteroid" type="KinematicBody2D"] +transform/scale = Vector2( 2, 2 ) input/pickable = false shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.17482, 3.67132 ) +shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.17482, 1.87222 ) shapes/0/trigger = false collision/layers = 1 collision/mask = 1 @@ -25,7 +26,7 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -transform/pos = Vector2( -0.17482, 3.67132 ) +transform/pos = Vector2( -0.17482, 1.87222 ) shape = SubResource( 1 ) trigger = false _update_shape_index = 0 diff --git a/Bullet.tscn b/Bullet.tscn index 3a38543..4270b7c 100644 --- a/Bullet.tscn +++ b/Bullet.tscn @@ -10,6 +10,7 @@ extents = Vector2( 0.99762, 3.98857 ) [node name="Bullet" type="KinematicBody2D"] +transform/rot = 180.0 input/pickable = false shapes/0/shape = SubResource( 1 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) diff --git a/Game.tscn b/Game.tscn index 2e750c2..1c056f1 100644 --- a/Game.tscn +++ b/Game.tscn @@ -69,5 +69,6 @@ region_rect = Rect2( 0, 0, 8192, 8192 ) [node name="EnemyGrunt" parent="." instance=ExtResource( 7 )] transform/pos = Vector2( 127.878, -20.3627 ) +transform/scale = Vector2( 1.5, 1.5 ) diff --git a/Gun.gd b/Gun.gd index b7825f8..6902900 100644 --- a/Gun.gd +++ b/Gun.gd @@ -4,18 +4,20 @@ var Bullet = load("res://Bullet.tscn") var gun_cooldown = 0 var gun_delay = 0.1125 +var gun_spread_max = deg2rad(1) # degrees max func _ready(): set_fixed_process(true) - + func _fixed_process(delta): gun_cooldown = clamp(gun_cooldown - delta, 0, 1) - + func fire(delta, vel, dir): if gun_cooldown <= 0: var new_bullet = Bullet.instance() var gun_pos = get_global_pos() new_bullet.set_pos(gun_pos + vel) get_tree().get_root().add_child(new_bullet) - new_bullet.fire(delta, vel, dir, 512) + var rot = rand_range(-gun_spread_max, gun_spread_max) + new_bullet.fire(delta, vel, dir.rotated(rot), 512) gun_cooldown += gun_delay diff --git a/Player.gd b/Player.gd index ea7bc20..5a583d9 100644 --- a/Player.gd +++ b/Player.gd @@ -22,7 +22,7 @@ func _ready(): set_fixed_process(true) left_particles.set_emitting(false) right_particles.set_emitting(false) - + func turn_towards(delta, pos): var target_dir = (pos - get_global_pos()).normalized() @@ -45,12 +45,12 @@ func turn_towards(delta, pos): right_particles.set_emitting(false) ship_dir = ship_dir.rotated(-ca) - + func _fixed_process(delta): var mov_delta = Vector2(0, 0) turn_towards(delta, get_global_mouse_pos()) - + if Input.is_action_pressed("player_move_forwards"): is_moving = true mov_delta += -ship_dir @@ -58,7 +58,7 @@ func _fixed_process(delta): mov_delta += ship_dir else: is_moving = false - + if Input.is_action_pressed("player_attack_primary"): left_gun.fire(delta, ship_vel, -ship_dir) right_gun.fire(delta, ship_vel, -ship_dir) diff --git a/raw/asteroid.ase b/raw/asteroid.ase index a686edb..ee2b410 100644 --- a/raw/asteroid.ase +++ b/raw/asteroid.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b29034b94d6c4daf9e8b33e12b0a7b0640ec0dc6e3938974a1cc03d00c460445 -size 1303 +oid sha256:d519b8966164e3bbb538a80907c06ad017d688e2ea4e6a379f7748927082a55b +size 1043 diff --git a/raw/asteroid.png b/raw/asteroid.png index d5f5fa3341c2a3bf97432a23bba68990ecd03b09..d8548466105b3573c8e0bf27877da6fef980a9d1 100644 GIT binary patch delta 1251 zcmV<91RVSG2=@t)B!9k1L_t(|ob6k?YFj}NJqq~*H|~NV!H^VAuv=HI1px+|bX zixw?fv}n=dKSk%M7ZAg%*9YR~-@o0~Hbl4w$m&qLdKOZ9t z$(>^=dOR3lI+@|^yEg#-Eu2CSVhus~y`62`-9J>m6UZn!4!HzWgr~c;x3eww8(&;i z-hcgaTj|Ha$A1Y#M6@C6I3y7u?f&s#pbE_~zPMUx2cVN>;luln0CW-nKM~I|=AQ$= z?*0LG_f^ZUVmg^&I+Y;10=>t&pBv2t$z(~OWR4G0gGdiV;532V9oMN zJ7o!P2_73qBYb#vnxzRY0<;0BLG!>;|5zW-I5845m;^|cKTI;6%+$qEcmz%%MVluF zQ5&EIJ(BhJoO#}Ed~t=7qr=tzy1?u~)DEZ`UO4r@Kf6x5!FWeT%FRB`#sQc^3ge_~F^9*_M;wg@*`hOzC?o zBz9|nCcGBdr0i@RZF$z{g^K`gRCw?sk)~Sy3>H!thN{#|Tg0zHLt$)hS24kp8{poR{9!1&!Y6EyUT$~Hg z2|T;+aeopd;`mrxD*_^Ed08$%k!oq{3~#+-{`#>v|3XqE!b3m@0M17v0Qv65gC+>G z5G8;cLaEC87--U^CLMv`UYgVb30krwX$KbOR#X{rgVBu8BtVJ?tx`BIlF$GqmjtVFba(%N>14KY zgA{dEg_FP+TY3zvOi&WuLKXqs;7Dg)LT-fUSqpt;=so{H1_50Ct)k~+zsSSAggxyzm-SxCMdO?EM1b=9J?X3%V^7vHHBN#$-f}|(Jp63E{VDT9I z`tqjY1}$%pQp||;r|pCAOz?^vDR%@^4Ulr^9N{@icAp!(C5r9|S$Blia_MkwB`jt- znKhEdX__L1;!R$X>R?I2`Dj$RyAv>-%+y4s2`|v=cd7apU-R?S1S^x!-3Qi7;eT~i zg{7Dw5KoM8%C$TZ$@PGsf*J|oeeSWSGjZ}Ds~$i}ptVB2_*8AE%T1=hJVUYj0l<28 zD0v6(4U*8-iurl%zr+Z-jEMHAoEIK@{jU3-AO$afQ%DyjS=84&0f6rkbL`?{3=(Nn zaO(QF@IaXx%)KZHC`5S6(E(C$#ax9~vb$QY&1d=1lw0B+LSj`WA=U?K{LMgdAdz}= zya3tpzI)IT6#jNVLnA_~6VwIoJzZ2u64%m%&=gPhqbZ4`riE=G;4h+V$uRsJfyDp- N002ovPDHLkV1oT%O|bv~ delta 1118 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 literal 0 HcmV?d00001 diff --git a/raw/asteroid_medium.png.flags b/raw/asteroid_medium.png.flags new file mode 100644 index 0000000..226e8a3 --- /dev/null +++ b/raw/asteroid_medium.png.flags @@ -0,0 +1,2 @@ +filter=false +gen_mipmaps=false diff --git a/raw/asteroid_small.ase b/raw/asteroid_small.ase new file mode 100644 index 0000000..f968591 --- /dev/null +++ b/raw/asteroid_small.ase @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b53a5fab77832a19f681a0334a8da20bea29ebb9bc4d614af8e0acd5120fddf +size 582 diff --git a/raw/asteroid_small.png b/raw/asteroid_small.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa8659a92130509d2717bec5f4da8603d35d45f GIT binary patch literal 604 zcmV-i0;BzjP)JEWzgVsTK%66V zJ5OAw=!pyK*Wag?2nM4GZc2H)y}pNRgV7|kuGeoPo$=IuJb#obiJ4A+U9G`y)YZm* zqaGsEZDc1KANvoFij#Z7@PHnB8<9>*;OqF9dxC!}h2Q`jlg@9{#S_xz+&fX|_1iQI zd0otbbjGuuL>FZ9j4rI(c@o!&0+?F0k?W+A2yUZ_0nBo=R)HRSR}M(u@iDI?y%Jny z=-m7iES76zuRL+iD8pQ#W^Fz{0p-Acx5Z{PSGC4;JP}cR%~0Rm*MA!d3%Zi2&CH9isP2$V!7s5vjM3J0N{|$ zc*tIP&Q9mLh=_a`1R*Zn!`3nc%&R!=#pE~YoZR^$x|EE=Ai&_|IYdgtuGmXniGtV% zfMerWEZ4DHaT0RC;sM}TGSmyom7=oS9w>w1R;Lr<*lUL|bdaB++yhb4%ierat5=e*gLh>4a@J%uA%lGqq z$eY$;XXQ<6g-;+qnE(KNoa{LCf`k1&-3w}R_V?o)d>6OppM!DeMe5Yc-%%?A0Jz*= zQQI8n2(&VgWeQoQ(8@T#(qk84F2+*Pj1sOuDs%REKOi7$F_M`5fPgH;vU36d7bhGv z4!xj(`s!L4_wZC);}N!2c98BIgyq{8D~{RaU=x8qOh5l70s^n?#cEY`XREqf+|Vy1 W7G9v-2Ptm=0000Dw1k~0keJhSxay+s zNLMQWpv`x^YGA&qpPLbYQQDpfx6ebhPc?x!Nl|X=@9p8!5HPL0J0-~7D)(1j^KYxC`PM5NZ&7R64zsNeGN=$ZG|?lP6sGX9C* z*ZY^vKu=7eP{-j>M8lDd44v7vq5@OeYv;dbmQAfxw0)n)_-a*6)yixkcab@vCzl29m{ScA6$0!{`(6=EH2`d8YC_x4-f%|C`zQ_u2K(%>4EG*LR-g zz3?rhIr9-Pjv$FDnNjFClS`b literal 751 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVA|&C;uumf=k4{4SxSKtZ4d2F zUkhuB*eP?P?o|o%&S^0r>r@k_-?B3};>Dt!udwpm8;$H4pU%Uq2vW^amH&XZRKd5y%Qn-KWv z>239Q@_)ywx|L>%{Zx5T%=Jg6O7OWm|GM;^%M}-xO4|RwE|)4%)cE}Ip3ACN2fZ(> zX597cw8-bwq#x$f-dC=AW$|wN+ZZoV{R2z64}R?}eBUk4cz3?s48BsmW`Bl1_q+TX z{>*u}{Qi~|#Sd9_6q__~N-+pY9bn;Q;N(qcVryt&GjL>faAKaZfKg!~qt69~2^SdD zG8jBE7=%q2REC@K!p&?yDxOa)&`!Sd`w^?fn^{0KLpSVV&b7s{9H*XC-^;mX7`^7! z&M8`TEG17>Jwne4-EolnC(taWpycPr6m$K;Lw6B9hgGlk=f$pi)$!wVunIfp`}Lpg ztbwth^Xt`BhWz#V{69-qWz_-0^5=)$#=rg6^QVGR&rj3i|F&ox?$?NE=(wzU;L8*q pd#8v7j%f+2yxRG}39Z5U6Ki9X2H(54D?v${!PC{xWt~$(69CfaB&h%Z diff --git a/raw/simple_bullet.ase b/raw/simple_bullet.ase index 2a4f26e..23c687b 100644 --- a/raw/simple_bullet.ase +++ b/raw/simple_bullet.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e527fef8ec783c4d0fe4da31c38011107940600b9db3df77621c815f35166e0a -size 578 +oid sha256:4d43c431b9848d37f00b63f37a5f0a4a72b482591f925ffe609a723f6fe06ad5 +size 552 diff --git a/raw/simple_bullet.png b/raw/simple_bullet.png index bd5710b37de91439ba532a40668baf1228b66449..9e33a2cec87f5d6c102b28abdbf5473f6126c146 100644 GIT binary patch delta 92 zcmYe!n;;%8z`@4Az+kxT-e(|X>gnPbA~7{N0SJDStG@WZU)%A&q=baT42cU2+*9m0 ug%1QY2A^iTv^7S3#Ur(sZTl4CxEbaPaJ5{R|6nuF00vK2KbLh*2~7aY9U)@? delta 81 zcmc~xo*?eS!NJDBz;Mqvjul90dAc};aLi0j0D>RosxSWU*LM6bDIp;dA))ZVeo7m+ i!6B9z5*HXuSs11ku}414X4?tW#o+1c=d#Wzp$P!jR~ZZd