summaryrefslogtreecommitdiff
path: root/client/game.gd
diff options
context:
space:
mode:
Diffstat (limited to 'client/game.gd')
-rw-r--r--client/game.gd23
1 files changed, 14 insertions, 9 deletions
diff --git a/client/game.gd b/client/game.gd
index 799b987b..a2893cc8 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -149,32 +149,37 @@ func _ready():
t.finish(warn)
)
- mp.text_message.connect(func(player: int, text: String):
+ mp.text_message.connect(func(player: int, text: String, persist: bool):
var p: Player = players[player]
- p.chat_bubble.set_text(text)
+ p.text_message(text, persist)
)
- mp.clear_message.connect(func(player: int):
+ mp.item_message.connect(func(player: int, item: int, persist: bool):
+ var p: Player = players[player]
+ p.item_message(item_names[item], persist)
+ )
+
+ mp.effect_message.connect(func(player: int, effect: String, persist: bool):
var p: Player = players[player]
- p.item_bubble.remove_item()
- p.chat_bubble.remove_text()
+ p.effect_message(effect, persist)
)
- mp.item_message.connect(func(player: int, item: int):
+ mp.clear_message.connect(func(player: int):
var p: Player = players[player]
- p.item_bubble.set_item(item_names[item])
+ p.clear_message()
)
+
mp.send_join(Global.profile["username"], Global.profile["character"])
mp.set_ingame.connect(func (state):
- if state:
+ if state:
await transition.fade_out()
map.gi_bake()
await transition.fade_in()
map.autobake = true
else:
- map.autobake = false
+ map.autobake = false
await transition.fade_out()
)