Skip to content

Commit 8bfb76d

Browse files
KoBeWiKoBeWi
committed
Różne poprawki pakietowe
1 parent 951b3e8 commit 8bfb76d

24 files changed

+56
-16
lines changed

‎Maps/Cave1.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Enemies/Bat.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Cave"
1214
mapid = 1

‎Maps/Cave2.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Enemies/Bat.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Cave"
1214
mapid = 3

‎Maps/Cave3.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Objects/SavePoint.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Cave"
1214
mapid = 4

‎Maps/Cave4.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Enemies/Bat.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Cave"
1214
mapid = 5

‎Maps/Forest1.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[ext_resource path="res://Nodes/Backgrounds/Forest.tscn" type="PackedScene" id=6]
99

1010
[node name="Map" type="Area2D"]
11+
collision_layer = 1048575
12+
collision_mask = 1048575
1113
script = ExtResource( 1 )
1214
location = "Plains"
1315
mapid = 8

‎Maps/Forest2.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Backgrounds/Forest.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Plains"
1214
mapid = 9

‎Maps/Keep1.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[ext_resource path="res://Nodes/Backgrounds/Forest.tscn" type="PackedScene" id=6]
99

1010
[node name="Map" type="Area2D"]
11+
collision_layer = 1048575
12+
collision_mask = 1048575
1113
script = ExtResource( 1 )
1214
location = "Plains"
1315
mapid = 10

‎Maps/Keep2.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Graphics/Backgrounds/Castle.png" type="Texture" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Plains"
1214
mapid = 11

‎Maps/Keep3.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
[ext_resource path="res://Graphics/Backgrounds/Castle.png" type="Texture" id=4]
77

88
[node name="Map" type="Area2D"]
9+
collision_layer = 1048575
10+
collision_mask = 1048575
911
script = ExtResource( 1 )
1012
location = "Plains"
1113
mapid = 12

‎Maps/Keep4.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[ext_resource path="res://Graphics/Backgrounds/Castle.png" type="Texture" id=6]
99

1010
[node name="Map" type="Area2D"]
11+
collision_layer = 1048575
12+
collision_mask = 1048575
1113
script = ExtResource( 1 )
1214
location = "Plains"
1315
mapid = 13

‎Maps/Plains1.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[ext_resource path="res://Nodes/Backgrounds/Plains.tscn" type="PackedScene" id=6]
99

1010
[node name="Map" type="Area2D"]
11+
collision_layer = 1048575
12+
collision_mask = 1048575
1113
script = ExtResource( 1 )
1214
location = "Plains"
1315
mapid = 0

‎Maps/Plains2.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
[ext_resource path="res://Nodes/Backgrounds/Plains.tscn" type="PackedScene" id=4]
77

88
[node name="Map" type="Area2D"]
9+
collision_layer = 1048575
10+
collision_mask = 1048575
911
script = ExtResource( 1 )
1012
location = "Plains"
1113
mapid = 2

‎Maps/Plains3.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
[ext_resource path="res://Nodes/Backgrounds/Plains.tscn" type="PackedScene" id=5]
88

99
[node name="Map" type="Area2D"]
10+
collision_layer = 1048575
11+
collision_mask = 1048575
1012
script = ExtResource( 1 )
1113
location = "Plains"
1214
mapid = 7

‎Maps/Village1.tscn

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
[ext_resource path="res://Nodes/Backgrounds/Plains.tscn" type="PackedScene" id=6]
99

1010
[node name="Map" type="Area2D"]
11+
collision_layer = 1048575
12+
collision_mask = 1048575
1113
script = ExtResource( 1 )
1214
location = "Plains"
1315
mapid = 6

‎Nodes/Projectiles/PBat.tscn

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
[sub_resource type="GDScript" id=1]
66
resource_name = "Bone"
7-
script/source = "extends KinematicBody2D
8-
9-
var player
7+
script/source = "extends PlayerProjectile
108

119
onready var sprite = $Sprite
1210

@@ -118,7 +116,7 @@ shape = SubResource( 2 )
118116
scale = Vector2( 0.5, 0.5 )
119117
texture = ExtResource( 1 )
120118
hframes = 4
121-
frame = 3
119+
frame = 2
122120
123121
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
124122
autoplay = "Flying"

‎Nodes/Projectiles/PBone.tscn

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
[sub_resource type="GDScript" id=1]
66
resource_name = "Bone"
7-
script/source = "extends KinematicBody2D
8-
9-
var velocity = Vector2(250, -800)
10-
var player
7+
script/source = "extends PlayerProjectile
118

129
onready var sprite = $Sprite
1310

11+
var velocity = Vector2(250, -800)
12+
1413
func _ready():
1514
if Com.register_node(self, \"Projectiles/PBone\"): return
1615

‎Nodes/Projectiles/PDagger.tscn

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
[sub_resource type="GDScript" id=1]
66
resource_name = "Bone"
7-
script/source = "extends Enemy
8-
9-
var velocity = Vector2(600, 0)
10-
var player
7+
script/source = "extends PlayerProjectile
118

129
onready var sprite = $Sprite
1310

11+
var velocity = Vector2(600, 0)
12+
1413
func _ready():
1514
if Com.register_node(self, \"Projectiles/PDagger\"): return
1615

@@ -62,7 +61,6 @@ extents = Vector2( 30, 12 )
6261
collision_layer = 0
6362
collision_mask = 5
6463
script = SubResource( 1 )
65-
attack = 20
6664
6765
[node name="Collider" type="CollisionShape2D" parent="."]
6866
shape = SubResource( 2 )

‎Scripts/PlayerProjectile.gd

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends KinematicBody2D
2+
class_name PlayerProjectile
3+
4+
var player
5+
6+
func _dispose():
7+
Com.dispose_node(self)

‎Scripts/Resources/MapSettings.gd

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ func _ready():
1616
var shape = RectangleShape2D.new()
1717
shape.extents = Vector2(width * 1920, height * 1080)
1818
shape_node.shape = shape
19+
connect("body_exited", self, "on_exit")
1920
add_child(shape_node)
2021

2122
func _draw():

‎Scripts/System/Resources.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func _ready():
1313
var file_name = dir.get_next()
1414
while file_name != "":
1515
var map = load("res://Maps/" + file_name)
16-
var map_id = map.get_state().get_node_property_value(0, 2)
16+
var map_id = map.get_state().get_node_property_value(0, 4)
1717

1818
maps.resize(max(maps.size(), map_id + 1))
1919
maps[map_id] = map

‎Server/Character.cs

+1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ public void EquipSoul(byte slot, byte from) {
209209
public void Save() {
210210
SetStat("hp", GetStat("max_hp"));
211211
SetStat("mp", GetStat("max_mp"));
212+
syncStats();
212213
GetPlayer().SendPacket(new Packet(Packet.TYPE.STATS).AddStats(this, new String[] {"hp", "mp"}));
213214
database.SaveCharacter(data);
214215
}

‎Server/Packet.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ public Packet AddEquipment(ushort[] equipment) {
172172

173173
public byte[] Bytes() {
174174
if (length > 256) {
175-
throw new Exception("Too many bytes: " + length);
175+
Console.WriteLine("Byte limit exceeded: " + length + "\n" + new System.Diagnostics.StackTrace());
176+
length = 0;
177+
return new byte[0];
178+
// throw new Exception("Too many bytes: " + length);
176179
}
177180

178181
var bytes = new byte[length];

‎TODO.txt

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
-a potem wgl łączy się znowu z serwerem wtf
1414
+informacje jak ktoś wchodzi albo umiera
1515
-wychodzący gracz się nie wylogowyje?
16-
-nie działa mp save odnowa
1716

1817
>zamienić ID map na ich nazwy
1918
+potwierdzenie save

‎project.godot

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ _global_script_classes=[ {
3434
"language": "GDScript",
3535
"path": "res://Scripts/Networking/Packet.gd"
3636
}, {
37+
"base": "KinematicBody2D",
38+
"class": "PlayerProjectile",
39+
"language": "GDScript",
40+
"path": "res://Scripts/PlayerProjectile.gd"
41+
}, {
3742
"base": "Sprite",
3843
"class": "Soul",
3944
"language": "GDScript",
@@ -55,6 +60,7 @@ _global_script_class_icons={
5560
"Enemy": "",
5661
"KeyList": "",
5762
"Packet": "",
63+
"PlayerProjectile": "",
5864
"Soul": "",
5965
"Unpacker": "",
6066
"Weapon": ""

0 commit comments

Comments
 (0)