Forráskód Böngészése

added comments with u16 conversetion code

galo 2 éve
szülő
commit
ab7976f264
7 módosított fájl, 37 hozzáadás és 10 törlés
  1. 5 1
      Client.gd
  2. 1 1
      Enemy.gd
  3. 2 1
      Enemy.tscn
  4. 15 0
      Server.gd
  5. 3 0
      main.tscn
  6. 1 1
      playerphysics.gd
  7. 10 6
      spawner.gd

+ 5 - 1
Client.gd

@@ -82,7 +82,11 @@ remote func player_animation(arg):
 		if $players.has_node(str(id)):
 			$players.get_node(str(id)).animation  = arg[id]
 
+#func reconstruct_int16(bytetest):
+#	return ((bytetest[0] * 255) + bytetest[1])-32768
+
 remote func enemies_position(arg):
+#	pass
 	if not has_node('enemies'): return
 	for i in $enemies.get_children():
 		i.hide()
@@ -101,7 +105,7 @@ remote func attack_anim(arg, id):
 remote func atr_update(arg):
 #	var arg1 = 'player1'
 #	player_atributes[arg1] = arg
-	print(arg)
+#	print(arg)
 	if has_node('Hud/HBoxContainer/'+arg.keys()[0]):
 		get_node('Hud/HBoxContainer/'+arg.keys()[0])._update(arg.values()[0])
 	

+ 1 - 1
Enemy.gd

@@ -28,4 +28,4 @@ func _physics_process(delta):
 	dir_buffer += 1
 	if fmod(dir_buffer,reaction_time) == 0:
 		motion = (target.global_position - global_position).normalized() * speed
-	move_and_slide(motion)
+	position += motion*delta

+ 2 - 1
Enemy.tscn

@@ -7,10 +7,11 @@
 
 [node name="Enemy" type="KinematicBody2D"]
 collision_layer = 4
-collision_mask = 4
+collision_mask = 0
 script = ExtResource( 1 )
 
 [node name="damage_enemy" parent="." instance=ExtResource( 2 )]
+monitorable = false
 damage = -10
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

+ 15 - 0
Server.gd

@@ -64,6 +64,21 @@ func _physics_process(delta):
 	for i in $enemies.get_children():
 		enemies_datachunk[i.name] = [i.global_position, i.type]
 	rpc_id(0, 'enemies_position', enemies_datachunk)
+	
+#	var enemies_datachunk = PoolByteArray()
+#	for i in $enemies.get_children():
+#		enemies_datachunk.append_array( return_int16(i.global_position.x) )
+#		enemies_datachunk.append_array( return_int16(i.global_position.y) )
+#	rpc_id(0, 'enemies_position', enemies_datachunk)
+#
+#func return_int16(number):
+#	var int16 = number + 32768
+#	var bytetest : PoolByteArray
+#	var byte1:int = int(int16/255)
+#	var byte2:int = int(fmod(int16,255))
+#	bytetest.append(byte1)
+#	bytetest.append(byte2)
+#	return bytetest
 
 func player_anim(attack,arg):
 	rpc_id( 0,'attack_anim', attack, int(arg) )

+ 3 - 0
main.tscn

@@ -39,6 +39,9 @@ database = NodePath("../Database")
 
 [node name="enemies" type="Node" parent="Server"]
 script = ExtResource( 6 )
+wave_num = 64
+spawn_speed = 1
+limit = 256
 
 [node name="dmgbox" type="Node" parent="Server"]
 

+ 1 - 1
playerphysics.gd

@@ -12,7 +12,7 @@ var attacks = ['melee']
 var damage = preload('res://damage_player.tscn')
 
 var attack_buffers = {'melee':0}
-var vida = 100
+var vida = 10000
 
 func damage(arg, id):
 	vida += arg

+ 10 - 6
spawner.gd

@@ -2,16 +2,20 @@ extends Node
 
 var enemy = preload('res://Enemy.tscn')
 export var wave_num = 10
+export var spawn_speed = 10
+export var limit = 1024
 
 func _ready():
 	yield(get_tree().create_timer(1.0),"timeout")
 	while true:
-		for x in wave_num:
-			var instance = enemy.instance()
-			var rot = rand_range(-PI,PI)
-			instance.global_position = Vector2(sin(rot), cos(rot)) * 640
-			add_child(instance)
-		yield(get_tree().create_timer(10.0),"timeout")
+		if get_child_count() < limit:
+			for x in clamp(limit-get_child_count(),0,wave_num):
+				var instance = enemy.instance()
+				var rot = rand_range(-PI,PI)
+				instance.global_position = Vector2(sin(rot), cos(rot)) * 640
+				add_child(instance)
+		print('there is a total of: ' + str(get_child_count()) +' enemmies')
+		yield(get_tree().create_timer(spawn_speed),"timeout")
 
 var counter = 0