Переглянути джерело

added pausing to the game

galo 2 роки тому
батько
коміт
ce96b418f7
7 змінених файлів з 29 додано та 27 видалено
  1. 1 1
      Client.gd
  2. 3 3
      PowerMenu.gd
  3. 2 7
      PowerMenu.tscn
  4. 9 2
      Server.gd
  5. 5 5
      main.tscn
  6. 1 0
      playerphysics.gd
  7. 8 9
      playersprite.tscn

+ 1 - 1
Client.gd

@@ -129,7 +129,7 @@ remote func level_up(arg, id):
 #powerpick
 remote func powerpick(arg , id):
 	if has_node('PowerMenu'):
-		$PowerMenu.show()
+		$PowerMenu/CenterContainer.show()
 		print(arg)
 		$PowerMenu.showmenu(arg, id)
 

+ 3 - 3
PowerMenu.gd

@@ -1,10 +1,10 @@
-extends Control
+extends CanvasLayer
 
 var idbuffer = []
 
 func showmenu(powers = ['power1','power2','power3'], id = 0):
 	idbuffer = id
-	show()
+	$CenterContainer.show()
 	for i in $CenterContainer/VBoxContainer.get_child_count():
 		$CenterContainer/VBoxContainer.get_child(i).text  = powers[i]
 
@@ -22,4 +22,4 @@ func _on_Button3_button_down():
 
 func senddatatoserver(arg = ''):
 	get_parent().players_choice_is(arg, idbuffer)
-	hide()
+	$CenterContainer.hide()

+ 2 - 7
PowerMenu.tscn

@@ -2,16 +2,11 @@
 
 [ext_resource path="res://PowerMenu.gd" type="Script" id=1]
 
-[node name="PowerMenu" type="Control"]
-visible = false
-anchor_right = 1.0
-anchor_bottom = 1.0
+[node name="PowerMenu" type="CanvasLayer"]
 script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="CenterContainer" type="CenterContainer" parent="."]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 __meta__ = {

+ 9 - 2
Server.gd

@@ -102,7 +102,7 @@ func level_up(lv, maxhp, gain, dmgup, id):
 	$players.get_node(str(id)).dmg += dmgup
 	rpc_id( 0,'atr_update', {id:{'maxhp':maxhp}})
 	
-#	gen_power_queue(str(id))
+	gen_power_queue(str(id))
 
 #powerup code
 
@@ -116,7 +116,7 @@ func gen_power_queue(client):
 	queue_powermenu_request[time]['power'] = gen_power()
 	queue_powermenu_request[time]['client'] = client
 	rpc_id( int(client), 'powerpick', queue_powermenu_request[time]['power'] , time )
-	
+	_pauser_gen(false)
 
 remote func optionpick(id, choice):
 	var client = api.get_rpc_sender_id()
@@ -127,6 +127,13 @@ remote func optionpick(id, choice):
 			$players.get_node(str(client)).add_power(power)
 		queue_powermenu_request.erase(id)
 	print(queue_powermenu_request)
+	_pauser_gen(true)
+
+func _pauser_gen(arg):
+	set_physics_process(arg)
+	$enemies.set_physics_process(arg)
+	for i in $players.get_children():
+		i.set_physics_process(arg)
 
 func gen_power():
 	return ['a','b','c']

+ 5 - 5
main.tscn

@@ -71,7 +71,6 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin1"]
 modulate = Color( 0, 0.811765, 1, 1 )
 frames = SubResource( 5 )
-frame = 3
 playing = true
 offset = Vector2( 32, 32 )
 
@@ -83,7 +82,6 @@ render_target_v_flip = true
 
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin2"]
 frames = SubResource( 5 )
-frame = 1
 speed_scale = 0.8
 playing = true
 offset = Vector2( 32, 32 )
@@ -95,8 +93,9 @@ transparent_bg = true
 render_target_v_flip = true
 
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin3"]
+modulate = Color( 1, 0, 0, 1 )
 frames = SubResource( 5 )
-frame = 3
+frame = 2
 speed_scale = 1.2
 playing = true
 offset = Vector2( 32, 32 )
@@ -108,6 +107,7 @@ transparent_bg = true
 render_target_v_flip = true
 
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin4"]
+modulate = Color( 1, 0, 0.984314, 1 )
 frames = SubResource( 5 )
 frame = 3
 speed_scale = 0.9
@@ -123,10 +123,10 @@ tickrate = 4
 
 [node name="enemies" type="Node" parent="Server"]
 script = ExtResource( 6 )
-spawn_speed = 5
+limit = 10
+mod = 1.2
 hpgain = 1
 dmggain = 3
-xpggain = 50
 enemydmg = 1
 
 [node name="dmgbox" type="Node" parent="Server"]

+ 1 - 0
playerphysics.gd

@@ -53,6 +53,7 @@ func dmg(arg = Vector2.ZERO):
 
 func _physics_process(delta):
 #	get_node('../..').hp_update(vida, name)
+#	print('14')
 	if motion.x != 0: sidebuffer = motion.x > 0
 	for i in attacks:
 		funcref(self,i).call_func()

+ 8 - 9
playersprite.tscn

@@ -219,7 +219,7 @@ tracks/1/keys = {
 "values": [ Color( 1, 0.156863, 0.0470588, 1 ), Color( 0.0784314, 0.286275, 0.552941, 1 ) ]
 }
 
-[sub_resource type="Shader" id=32]
+[sub_resource type="Shader" id=31]
 code = "shader_type canvas_item;
 render_mode blend_mix;
 
@@ -227,14 +227,14 @@ void vertex(){
 	VERTEX.y += (sin(TIME*32f)* mix(VERTEX.x,1f,0.8));
 }"
 
-[sub_resource type="ShaderMaterial" id=33]
-shader = SubResource( 32 )
+[sub_resource type="ShaderMaterial" id=32]
+shader = SubResource( 31 )
 
-[sub_resource type="Gradient" id=34]
+[sub_resource type="Gradient" id=33]
 offsets = PoolRealArray( 0.510949, 1 )
 colors = PoolColorArray( 1, 1, 1, 0.411765, 1, 1, 1, 0 )
 
-[sub_resource type="DynamicFont" id=31]
+[sub_resource type="DynamicFont" id=34]
 size = 12
 outline_size = 2
 font_data = ExtResource( 5 )
@@ -242,7 +242,6 @@ font_data = ExtResource( 5 )
 [node name="playersprite" type="AnimatedSprite"]
 frames = SubResource( 27 )
 animation = "idle"
-frame = 2
 playing = true
 offset = Vector2( 3.72692, -21.0081 )
 script = SubResource( 28 )
@@ -260,11 +259,11 @@ anims/leveup = SubResource( 30 )
 
 [node name="Line2D" type="Line2D" parent="."]
 modulate = Color( 1, 1, 1, 0 )
-material = SubResource( 33 )
+material = SubResource( 32 )
 points = PoolVector2Array( 0, 25, -0.651, -65 )
 width = 32.0
 default_color = Color( 1, 1, 1, 1 )
-gradient = SubResource( 34 )
+gradient = SubResource( 33 )
 
 [node name="Label" type="Node2D" parent="."]
 
@@ -279,7 +278,7 @@ margin_right = 29.5
 margin_bottom = -55.1752
 rect_scale = Vector2( 3, 1e-05 )
 rect_pivot_offset = Vector2( 27.5174, 6.3988 )
-custom_fonts/font = SubResource( 31 )
+custom_fonts/font = SubResource( 34 )
 custom_colors/font_color = Color( 0.688718, 0.956076, 0.892019, 1 )
 custom_colors/font_outline_modulate = Color( 0.221796, 0.266142, 0.474243, 1 )
 text = "Level Up"