Compare commits
No commits in common. "7f8ed4d7ec17ebec52ae1ad6bfacb27efc5e05e4" and "9e3f0fc34a77d9bf9bfd124d8a97bfb6a0fd5b6b" have entirely different histories.
7f8ed4d7ec
...
9e3f0fc34a
14 changed files with 13 additions and 467 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 42 KiB |
|
|
@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/colony.png-7e0f1c6e1f6ff8cbe6d6c840c822d3ba.c
|
|||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/bptc_ldr=0
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 139 B After Width: | Height: | Size: 157 B |
Binary file not shown.
|
Before Width: | Height: | Size: 195 B After Width: | Height: | Size: 195 B |
|
|
@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/color_cube.png-4881adb426dcdbd1db4cca9d44eddf
|
|||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/bptc_ldr=0
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 240 B |
|
|
@ -1,34 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cua6xdncubtid"
|
||||
path="res://.godot/imported/ColorPallet.png-d411989842053c34062059f3968fb7f0.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Guidelines/ColorPallet.png"
|
||||
dest_files=["res://.godot/imported/ColorPallet.png-d411989842053c34062059f3968fb7f0.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
|
|
@ -1,399 +0,0 @@
|
|||
[gd_resource type="Resource" load_steps=67 format=2]
|
||||
|
||||
[ext_resource path="res://src/Palette/PaletteColor.gd" type="Script" id=1]
|
||||
[ext_resource path="res://src/Palette/Palette.gd" type="Script" id=2]
|
||||
|
||||
[sub_resource type="Resource" id=1]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.901961, 0.360784, 0.4, 1 )
|
||||
index = 0
|
||||
|
||||
[sub_resource type="Resource" id=2]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.901961, 0.592157, 0.360784, 1 )
|
||||
index = 1
|
||||
|
||||
[sub_resource type="Resource" id=3]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.894118, 0.901961, 0.360784, 1 )
|
||||
index = 2
|
||||
|
||||
[sub_resource type="Resource" id=4]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.360784, 0.901961, 0.360784, 1 )
|
||||
index = 3
|
||||
|
||||
[sub_resource type="Resource" id=5]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.360784, 0.901961, 0.733333, 1 )
|
||||
index = 4
|
||||
|
||||
[sub_resource type="Resource" id=6]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.360784, 0.815686, 0.901961, 1 )
|
||||
index = 5
|
||||
|
||||
[sub_resource type="Resource" id=7]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.360784, 0.423529, 0.901961, 1 )
|
||||
index = 6
|
||||
|
||||
[sub_resource type="Resource" id=8]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.545098, 0.360784, 0.901961, 1 )
|
||||
index = 7
|
||||
|
||||
[sub_resource type="Resource" id=9]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.74902, 0.298039, 0.329412, 1 )
|
||||
index = 8
|
||||
|
||||
[sub_resource type="Resource" id=10]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.74902, 0.490196, 0.298039, 1 )
|
||||
index = 9
|
||||
|
||||
[sub_resource type="Resource" id=11]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.741176, 0.74902, 0.298039, 1 )
|
||||
index = 10
|
||||
|
||||
[sub_resource type="Resource" id=12]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.298039, 0.74902, 0.298039, 1 )
|
||||
index = 11
|
||||
|
||||
[sub_resource type="Resource" id=13]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.298039, 0.74902, 0.611765, 1 )
|
||||
index = 12
|
||||
|
||||
[sub_resource type="Resource" id=14]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.298039, 0.682353, 0.74902, 1 )
|
||||
index = 13
|
||||
|
||||
[sub_resource type="Resource" id=15]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.298039, 0.352941, 0.74902, 1 )
|
||||
index = 14
|
||||
|
||||
[sub_resource type="Resource" id=16]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.458824, 0.298039, 0.74902, 1 )
|
||||
index = 15
|
||||
|
||||
[sub_resource type="Resource" id=17]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.501961, 0.2, 0.223529, 1 )
|
||||
index = 16
|
||||
|
||||
[sub_resource type="Resource" id=18]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.501961, 0.32549, 0.2, 1 )
|
||||
index = 17
|
||||
|
||||
[sub_resource type="Resource" id=19]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.498039, 0.501961, 0.2, 1 )
|
||||
index = 18
|
||||
|
||||
[sub_resource type="Resource" id=20]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.501961, 0.2, 1 )
|
||||
index = 19
|
||||
|
||||
[sub_resource type="Resource" id=21]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.501961, 0.411765, 1 )
|
||||
index = 20
|
||||
|
||||
[sub_resource type="Resource" id=22]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.45098, 0.501961, 1 )
|
||||
index = 21
|
||||
|
||||
[sub_resource type="Resource" id=23]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.235294, 0.501961, 1 )
|
||||
index = 22
|
||||
|
||||
[sub_resource type="Resource" id=24]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.305882, 0.2, 0.501961, 1 )
|
||||
index = 23
|
||||
|
||||
[sub_resource type="Resource" id=25]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.4, 0.160784, 0.180392, 1 )
|
||||
index = 24
|
||||
|
||||
[sub_resource type="Resource" id=26]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.4, 0.262745, 0.160784, 1 )
|
||||
index = 25
|
||||
|
||||
[sub_resource type="Resource" id=27]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.396078, 0.4, 0.160784, 1 )
|
||||
index = 26
|
||||
|
||||
[sub_resource type="Resource" id=28]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.160784, 0.4, 0.160784, 1 )
|
||||
index = 27
|
||||
|
||||
[sub_resource type="Resource" id=29]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.160784, 0.4, 0.32549, 1 )
|
||||
index = 28
|
||||
|
||||
[sub_resource type="Resource" id=30]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.160784, 0.364706, 0.4, 1 )
|
||||
index = 29
|
||||
|
||||
[sub_resource type="Resource" id=31]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.160784, 0.188235, 0.4, 1 )
|
||||
index = 30
|
||||
|
||||
[sub_resource type="Resource" id=32]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.243137, 0.160784, 0.4, 1 )
|
||||
index = 31
|
||||
|
||||
[sub_resource type="Resource" id=33]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.278431, 0.113725, 0.12549, 1 )
|
||||
index = 32
|
||||
|
||||
[sub_resource type="Resource" id=34]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.278431, 0.184314, 0.113725, 1 )
|
||||
index = 33
|
||||
|
||||
[sub_resource type="Resource" id=35]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.27451, 0.278431, 0.113725, 1 )
|
||||
index = 34
|
||||
|
||||
[sub_resource type="Resource" id=36]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.113725, 0.278431, 0.113725, 1 )
|
||||
index = 35
|
||||
|
||||
[sub_resource type="Resource" id=37]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.113725, 0.278431, 0.231373, 1 )
|
||||
index = 36
|
||||
|
||||
[sub_resource type="Resource" id=38]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.113725, 0.254902, 0.278431, 1 )
|
||||
index = 37
|
||||
|
||||
[sub_resource type="Resource" id=39]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.113725, 0.129412, 0.278431, 1 )
|
||||
index = 38
|
||||
|
||||
[sub_resource type="Resource" id=40]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.168627, 0.113725, 0.278431, 1 )
|
||||
index = 39
|
||||
|
||||
[sub_resource type="Resource" id=41]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.0823529, 0.0901961, 1 )
|
||||
index = 40
|
||||
|
||||
[sub_resource type="Resource" id=42]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.129412, 0.0823529, 1 )
|
||||
index = 41
|
||||
|
||||
[sub_resource type="Resource" id=43]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.2, 0.0823529, 1 )
|
||||
index = 42
|
||||
|
||||
[sub_resource type="Resource" id=44]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0823529, 0.2, 0.0823529, 1 )
|
||||
index = 43
|
||||
|
||||
[sub_resource type="Resource" id=45]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0823529, 0.2, 0.164706, 1 )
|
||||
index = 44
|
||||
|
||||
[sub_resource type="Resource" id=46]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0823529, 0.184314, 0.2, 1 )
|
||||
index = 45
|
||||
|
||||
[sub_resource type="Resource" id=47]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0823529, 0.0941176, 0.2, 1 )
|
||||
index = 46
|
||||
|
||||
[sub_resource type="Resource" id=48]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.121569, 0.0823529, 0.2, 1 )
|
||||
index = 47
|
||||
|
||||
[sub_resource type="Resource" id=49]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.14902, 0.0627451, 0.0705882, 1 )
|
||||
index = 48
|
||||
|
||||
[sub_resource type="Resource" id=50]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.14902, 0.0980392, 0.0627451, 1 )
|
||||
index = 49
|
||||
|
||||
[sub_resource type="Resource" id=51]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.14902, 0.14902, 0.0627451, 1 )
|
||||
index = 50
|
||||
|
||||
[sub_resource type="Resource" id=52]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0627451, 0.14902, 0.0627451, 1 )
|
||||
index = 51
|
||||
|
||||
[sub_resource type="Resource" id=53]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0627451, 0.14902, 0.121569, 1 )
|
||||
index = 52
|
||||
|
||||
[sub_resource type="Resource" id=54]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0627451, 0.137255, 0.14902, 1 )
|
||||
index = 53
|
||||
|
||||
[sub_resource type="Resource" id=55]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0627451, 0.0705882, 0.14902, 1 )
|
||||
index = 54
|
||||
|
||||
[sub_resource type="Resource" id=56]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.0862745, 0.0627451, 0.14902, 1 )
|
||||
index = 55
|
||||
|
||||
[sub_resource type="Resource" id=57]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.901961, 0.901961, 0.901961, 1 )
|
||||
index = 56
|
||||
|
||||
[sub_resource type="Resource" id=58]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.74902, 0.74902, 0.74902, 1 )
|
||||
index = 57
|
||||
|
||||
[sub_resource type="Resource" id=59]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.501961, 0.501961, 0.501961, 1 )
|
||||
index = 58
|
||||
|
||||
[sub_resource type="Resource" id=60]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.4, 0.4, 0.4, 1 )
|
||||
index = 59
|
||||
|
||||
[sub_resource type="Resource" id=61]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.278431, 0.278431, 0.278431, 1 )
|
||||
index = 60
|
||||
|
||||
[sub_resource type="Resource" id=62]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.2, 0.2, 0.2, 1 )
|
||||
index = 61
|
||||
|
||||
[sub_resource type="Resource" id=63]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.14902, 0.14902, 0.14902, 1 )
|
||||
index = 62
|
||||
|
||||
[sub_resource type="Resource" id=64]
|
||||
script = ExtResource( 1 )
|
||||
color = Color( 0.101961, 0.101961, 0.101961, 1 )
|
||||
index = 63
|
||||
|
||||
[resource]
|
||||
resource_name = "ColorPallet"
|
||||
script = ExtResource( 2 )
|
||||
name = "Color Pallet"
|
||||
comment = ""
|
||||
width = 8
|
||||
height = 8
|
||||
colors = {
|
||||
0: SubResource( 1 ),
|
||||
1: SubResource( 2 ),
|
||||
2: SubResource( 3 ),
|
||||
3: SubResource( 4 ),
|
||||
4: SubResource( 5 ),
|
||||
5: SubResource( 6 ),
|
||||
6: SubResource( 7 ),
|
||||
7: SubResource( 8 ),
|
||||
8: SubResource( 9 ),
|
||||
9: SubResource( 10 ),
|
||||
10: SubResource( 11 ),
|
||||
11: SubResource( 12 ),
|
||||
12: SubResource( 13 ),
|
||||
13: SubResource( 14 ),
|
||||
14: SubResource( 15 ),
|
||||
15: SubResource( 16 ),
|
||||
16: SubResource( 17 ),
|
||||
17: SubResource( 18 ),
|
||||
18: SubResource( 19 ),
|
||||
19: SubResource( 20 ),
|
||||
20: SubResource( 21 ),
|
||||
21: SubResource( 22 ),
|
||||
22: SubResource( 23 ),
|
||||
23: SubResource( 24 ),
|
||||
24: SubResource( 25 ),
|
||||
25: SubResource( 26 ),
|
||||
26: SubResource( 27 ),
|
||||
27: SubResource( 28 ),
|
||||
28: SubResource( 29 ),
|
||||
29: SubResource( 30 ),
|
||||
30: SubResource( 31 ),
|
||||
31: SubResource( 32 ),
|
||||
32: SubResource( 33 ),
|
||||
33: SubResource( 34 ),
|
||||
34: SubResource( 35 ),
|
||||
35: SubResource( 36 ),
|
||||
36: SubResource( 37 ),
|
||||
37: SubResource( 38 ),
|
||||
38: SubResource( 39 ),
|
||||
39: SubResource( 40 ),
|
||||
40: SubResource( 41 ),
|
||||
41: SubResource( 42 ),
|
||||
42: SubResource( 43 ),
|
||||
43: SubResource( 44 ),
|
||||
44: SubResource( 45 ),
|
||||
45: SubResource( 46 ),
|
||||
46: SubResource( 47 ),
|
||||
47: SubResource( 48 ),
|
||||
48: SubResource( 49 ),
|
||||
49: SubResource( 50 ),
|
||||
50: SubResource( 51 ),
|
||||
51: SubResource( 52 ),
|
||||
52: SubResource( 53 ),
|
||||
53: SubResource( 54 ),
|
||||
54: SubResource( 55 ),
|
||||
55: SubResource( 56 ),
|
||||
56: SubResource( 57 ),
|
||||
57: SubResource( 58 ),
|
||||
58: SubResource( 59 ),
|
||||
59: SubResource( 60 ),
|
||||
60: SubResource( 61 ),
|
||||
61: SubResource( 62 ),
|
||||
62: SubResource( 63 ),
|
||||
63: SubResource( 64 )
|
||||
}
|
||||
colors_max = 64
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
- Base Sprite Size is 16x16
|
||||
- Small Sprite Size is 8x8
|
||||
|
|
@ -20,6 +20,7 @@ layer_0/tile_data = PackedInt32Array(1114138, 262144, 1, 1048602, 0, 1, 983066,
|
|||
position = Vector2(203, 60)
|
||||
collision_layer = 2
|
||||
script = ExtResource("2_pk6k4")
|
||||
speed = 100
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="Player"]
|
||||
texture = ExtResource("2_0flm2")
|
||||
|
|
@ -43,6 +44,7 @@ gravity_scale = 0.0
|
|||
linear_damp = 5.0
|
||||
script = ExtResource("5_5xgcv")
|
||||
ray = NodePath("RayCast2D")
|
||||
debug_vision = true
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="Enemy"]
|
||||
z_index = 1
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ func look_at_player(delta : float) -> float:
|
|||
self.rotation_degrees += clampf(average_angle, -2 * PI * delta * turn_speed, 2 * PI * delta * turn_speed)
|
||||
return average_angle
|
||||
|
||||
func follow_player(angle : float, delta : float):
|
||||
func follow_player(angle : float):
|
||||
if(target_distance > follow_keep_distance):
|
||||
self.apply_central_force(Vector2.RIGHT.rotated(self.rotation).rotated(deg_to_rad(angle)) * speed * delta * 60)
|
||||
self.apply_central_force(Vector2.RIGHT.rotated(self.rotation).rotated(deg_to_rad(angle)) * speed)
|
||||
pass
|
||||
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ func _physics_process(delta: float):
|
|||
var angle := look_at_player(delta)
|
||||
match state:
|
||||
STATES.TARGETING:
|
||||
follow_player(angle, delta)
|
||||
follow_player(angle)
|
||||
STATES.IDLE:
|
||||
# Do Idle Stuff
|
||||
print("Dam, Nice a pause, time for a Coffee")
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
extends Node
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
pass # Replace with function body.
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
pass
|
||||
|
|
@ -1,24 +1,16 @@
|
|||
extends CharacterBody2D
|
||||
|
||||
@export var speed = 100
|
||||
@export_range(0, 1) var damping_factor := 0.6
|
||||
@export var speed = 50
|
||||
|
||||
func get_move_vector():
|
||||
var input_direction = Input.get_vector("move_left", "move_right", "move_up", "move_down").normalized()
|
||||
return input_direction
|
||||
|
||||
func move_player(delta : float):
|
||||
if get_move_vector() == Vector2.ZERO:
|
||||
# Damp Players Velocity if no Input
|
||||
self.velocity = self.velocity * (1 - min(1, damping_factor * 60 * delta))
|
||||
else:
|
||||
# Set Players Velocity to the Input Direction in the Players Speed
|
||||
self.velocity = get_move_vector() * speed * delta * 60
|
||||
|
||||
# Update The Players Physics Calculations
|
||||
func _physics_process(delta):
|
||||
# Set Velcoity to Move Vector times speed
|
||||
self.velocity = get_move_vector() * speed
|
||||
# Do the Physics-Calculations of the Player
|
||||
self.move_and_slide()
|
||||
pass
|
||||
|
||||
func _physics_process(delta : float):
|
||||
move_player(delta)
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -14,10 +14,6 @@ config/name="2d Hack And Slay"
|
|||
run/main_scene="res://Scenes/Test Scene.tscn"
|
||||
config/features=PackedStringArray("4.0")
|
||||
|
||||
[autoload]
|
||||
|
||||
GameManager="*res://Scripts/GameManager.gd"
|
||||
|
||||
[display]
|
||||
|
||||
window/stretch/mode="viewport"
|
||||
|
|
|
|||
Reference in a new issue