0.7.0

CHANGELOG.md

@@ -17,3 +17,41 @@ initial release
 - log settings
 - custom color
 - server name & join message previews
+
+0.4
+----
+- bbcode filtering added
+- bbcode enabled globally
+- intrusive bbcode separated
+- custom name bbcode
+
+0.5
+----
+- update to webfishing 1.09
+- bbcode stuff only to lucystools users
+- intrusive bbcode now client toggle
+- lots of stuff removed due to 1.09 having it already! 
+- panel stays closed if closed, open if open
+
+0.5.1
+----
+- Lure 4.1.0 compatibility
+- log fixes
+- spawn fixes
+
+0.6.0
+----
+- custom text color (bbcode qol)
+- experimental color bug bbcode
+- better (actually somewhat working) bbcode filtering
+
+0.6.1
+----
+- menu doesn't auto-open if it was closed
+
+0.7.0
+----
+- update to webfishing 1.10
+- bbcode stuff only to lucystools users, color bug was patched
+- LucysLib 0.1.0 dependency
+- custom lobby code

Godot/mods/Lucy.LucysTools/lucys_menu.gd

@@ -1,86 +1,146 @@
 extends Control
 
-var MANAGER = null
+var MANAGER
 
-func setup(manager):
+const LucysLib_t = preload("res://mods/LucysLib/main.gd")
-	MANAGER = manager
+const BBCode_t = preload("res://mods/LucysLib/bbcode.gd")
-	get_node("%lucy_bbcode").pressed = manager.allow_bbcode
-	get_node("%lucy_punchback").pressed = manager.do_punchback
-	get_node("%lucy_servername").text = manager.custom_server_name
-	get_node("%lucy_servername_preview").bbcode_text = manager.custom_server_name + "'s Lobby"
-	get_node("%lucy_servermsg").text = manager.server_join_message
-	get_node("%lucy_servermsg_preview").bbcode_text = manager.server_join_message
-	get_node("%lucy_fpackets").value = manager.frame_packets
-	get_node("%lucy_bpackets").value = manager.bulk_packets
-	get_node("%lucy_binterval").value = manager.bulk_interval
-	get_node("%lucy_finterval").value = manager.full_interval
 
-	get_node("%lucy_chatcolor_bool").pressed = manager.custom_color_enabled
+func setup():
-	get_node("%lucy_chatcolor").color = Color(manager.custom_color)
+	if MANAGER.DEBUG: print("[LUCYSTOOLS MENU] Setup...")
+	get_node("%lucy_punchback").pressed = MANAGER.do_punchback
+	get_node("%lucy_servername").text = MANAGER.custom_server_name
+	get_node("%lucy_servername_preview").bbcode_text = MANAGER.custom_server_name
+	get_node("%lucy_servermsg").text = MANAGER.server_join_message
+	var srv_m_bb: BBCode_t.BBCodeTag = MANAGER.LucysLib.BBCode.parse_bbcode_text(MANAGER.server_join_message)
+	get_node("%lucy_servermsg_preview").bbcode_text = srv_m_bb.get_full(MANAGER.allowed_bb)
+	get_node("%lucy_servermsg_preview2").bbcode_text = srv_m_bb.get_stripped()
+	
+	get_node("%lucy_chatcolor_bool").pressed = MANAGER.custom_color_enabled
+	get_node("%lucy_chatcolor").color = Color(MANAGER.custom_color)
+	get_node("%lucy_chatcolor_bool2").pressed = MANAGER.custom_text_color_enabled
+	get_node("%lucy_chatcolor2").color = Color(MANAGER.custom_text_color)
+	
+	get_node("%lucy_lobbycode").text = MANAGER.custom_lobbycode
+	
+	get_node("%lucy_name").text = MANAGER.custom_name
+	
+	var tag_container = get_node("%bbcode_tags")
+	var new_btn
+	for v in BBCode_t.TAG_TYPE.values():
+		if v == BBCode_t.TAG_TYPE.ROOT or v == BBCode_t.TAG_TYPE.NULL: continue
+		new_btn = CheckBox.new()
+		new_btn.text = BBCode_t.TAG_TYPE.keys()[v]
+		new_btn.connect("pressed",self,"_tags_changed")
+		tag_container.add_child(new_btn)
 	
 	update()
 
 func update():
-	get_node("%lucy_srv_allow_bbcode").text = "Yes" if MANAGER.srv_allow_bbcode else "No"
+	if MANAGER.DEBUG: print("[LUCYSTOOLS MENU] Update...")
+	var tag_type
+	for tag_btn in get_node("%bbcode_tags").get_children():
+		tag_type = BBCode_t.TAG_TYPE[tag_btn.text]
+		tag_btn.pressed = tag_type in MANAGER.allowed_bb
+		if MANAGER.DEBUG: print("[LUCYSTOOLS M UPDATE] " + tag_btn.text + " " + str(tag_type) + " " + str(tag_btn.pressed))
+	_on_lucy_name_text_changed(MANAGER.custom_name)
+
+func _tags_changed():
+	if MANAGER.DEBUG: print("[LUCYSTOOLS MENU] Tags changed...")
+	var tag_type
+	var allowed = []
+	for tag_btn in get_node("%bbcode_tags").get_children():
+		tag_type = BBCode_t.TAG_TYPE[tag_btn.text]
+		if tag_btn.pressed: allowed.append(tag_type)
+		if MANAGER.DEBUG: print("[LUCYSTOOLS M _TAGS_CHANGED]" + tag_btn.text + " " + str(tag_type) + " " + str(tag_btn.pressed))
+	MANAGER.allowed_bb = allowed
+
+func _on_lucy_name_text_changed(new_text):
+	if MANAGER.DEBUG: print("[LUCYSTOOLS MENU] Name text changed...")
+	var result: BBCode_t.BBCodeTag = MANAGER.LucysLib.BBCode.parse_bbcode_text(new_text)
+	
+	var net_name = Network.STEAM_USERNAME.replace("[", "").replace("]", "")
+	var good = result.get_stripped() == net_name
+	get_node("%lucy_name_preview").bbcode_text = result.get_full(MANAGER.allowed_bb)
+	get_node("%lucy_namegood").bbcode_text = "[color=green]Good[/color]" if good else "[color=red]Bad[/color]"
+	
+	MANAGER.custom_name_enabled = good
+	MANAGER.custom_name = new_text if good else ""
 
 func _ready():
-	print("[LUCY] Menu Ready")
+	print("[LUCYSTOOLS] Menu Ready")
 	
-	get_node("%lucy_bbcode").disabled = MANAGER.host_required and not Network.GAME_MASTER 
+	MANAGER = $"/root/LucyLucysTools"
-	get_node("%lucy_raincloud").disabled = not Network.GAME_MASTER or not MANAGER.ingame
+	
-	get_node("%lucy_meteor").disabled = not Network.GAME_MASTER or not MANAGER.ingame
+	visible = MANAGER.lucys_menu_visible
-	get_node("%lucy_freezerain").disabled = not Network.GAME_MASTER or not MANAGER.ingame
+	
-	get_node("%lucy_clearrain").disabled = not Network.GAME_MASTER or not MANAGER.ingame
+	var can_spawn = (Network.GAME_MASTER or Network.PLAYING_OFFLINE) and MANAGER.ingame
-	get_node("%lucy_clearmeteor").disabled = not Network.GAME_MASTER or not MANAGER.ingame
+	
+	get_node("%lucy_raincloud").disabled = not can_spawn
+	get_node("%lucy_meteor").disabled = not can_spawn
+	get_node("%lucy_void").disabled = not can_spawn
+	get_node("%lucy_freezerain").disabled = not can_spawn
+	get_node("%lucy_clearrain").disabled = not can_spawn
+	get_node("%lucy_clearmeteor").disabled = not can_spawn
+	get_node("%lucy_lobbyrefresh").disabled = not can_spawn
 
 func _input(event):
 	if event is InputEventKey and event.scancode == KEY_F5 && event.pressed:
 		visible = !visible
-		print("[LUCY] Menu visble: ", visible)
+		print("[LUCYSTOOLS] Menu visble: ", visible)
+		MANAGER.lucys_menu_visible = visible
 	
 	if event is InputEventKey and event.scancode == KEY_F6 && event.pressed:
 		var name = Steam.getLobbyData(Network.STEAM_LOBBY_ID, "name")
+		var lname = Steam.getLobbyData(Network.STEAM_LOBBY_ID, "lobby_name")
 		var nm = Steam.getNumLobbyMembers(Network.STEAM_LOBBY_ID)
 		var code = Steam.getLobbyData(Network.STEAM_LOBBY_ID, "code")
 		var type = Steam.getLobbyData(Network.STEAM_LOBBY_ID, "type")
-		var lobby_dat = {"name": name, "nm": nm, "code": code, "type": type}
+		var bbname = Steam.getLobbyData(Network.STEAM_LOBBY_ID, "bbcode_lobby_name")
-		print("[LUCY] LOBBY ", lobby_dat)
+		var lobby_dat = {"name": name, "lobby_name":lname, "bbcode_lobby_name":bbname, "nm": nm, "code": code, "type": type}
+		print("[LUCYSTOOLS] LOBBY ", lobby_dat)
 
 func _on_lucy_bbcode_toggled(button_pressed):
 	MANAGER.allow_bbcode =  button_pressed
 func _on_lucy_punchback_toggled(button_pressed):
 	MANAGER.do_punchback =  button_pressed
 func _on_lucy_servername_text_changed(new_text):
-	get_node("%lucy_servername_preview").bbcode_text = new_text + "'s Lobby"
+	get_node("%lucy_servername_preview").bbcode_text = new_text
 	MANAGER.custom_server_name = new_text
 func _on_lucy_servermsg_text_changed(new_text):
-	get_node("%lucy_servermsg_preview").bbcode_text = new_text
+	var srv_m_bb: BBCode_t.BBCodeTag = MANAGER.LucysLib.BBCode.parse_bbcode_text(new_text)
+	get_node("%lucy_servermsg_preview").bbcode_text = srv_m_bb.get_full(MANAGER.allowed_bb)
+	get_node("%lucy_servermsg_preview2").bbcode_text = srv_m_bb.get_stripped()
 	MANAGER.server_join_message = new_text
-func _on_lucy_fpackets_value_changed(value):
-	MANAGER.frame_packets = value
-func _on_lucy_bpackets_value_changed(value):
-	MANAGER.bulk_packets = value
-func _on_lucy_binterval_value_changed(value):
-	MANAGER.bulk_interval = value
-func _on_lucy_finterval_value_changed(value):
-	MANAGER.full_interval = value
 func _on_lucy_chatcolor_bool_toggled(button_pressed):
 	MANAGER.custom_color_enabled = button_pressed
 func _on_lucy_chatcolor_color_changed(color):
 	MANAGER.custom_color = color
+func _on_lucy_chatcolor_bool2_toggled(button_pressed):
+	MANAGER.custom_text_color_enabled = button_pressed
+func _on_lucy_chatcolor2_color_changed(color):
+	MANAGER.custom_text_color = color
+func _on_lucy_intbbcode_toggled(button_pressed):
+	MANAGER.allow_intrusive_bbcode = button_pressed
+func _on_lucy_bug_bb_toggled(button_pressed):
+	MANAGER.bug_bbcode = button_pressed
+func _on_lucy_srv_bbcode_toggled(button_pressed):
+	if (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
+	MANAGER.srv_bbcode = button_pressed
+func _on_lucy_lobbycode_text_changed(new_text):
+	MANAGER.custom_lobbycode = new_text
 
 func _on_lucy_raincloud_pressed():
-	if not MANAGER.ingame: return
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
-	print("[LUCY] Spawning raincloud")
+	print("[LUCYSTOOLS] Spawning raincloud")
 	var player = MANAGER.get_player()
 	var pos = Vector3(player.global_transform.origin.x, 42, player.global_transform.origin.z)
 	var zone = player.current_zone
 	Network._sync_create_actor("raincloud", pos, zone, - 1, Network.STEAM_ID)
 
 func _on_lucy_meteor_pressed():
-	if not MANAGER.ingame: return
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
 	if get_tree().get_nodes_in_group("meteor").size() > 10: return
-	print("[LUCY] Spawning meteor")
+	print("[LUCYSTOOLS] Spawning meteor")
 	var player_pos = MANAGER.get_player().global_transform.origin
 	var dist = INF
 	var point = null
@@ -94,27 +154,45 @@ func _on_lucy_meteor_pressed():
 	Network._sync_create_actor("fish_spawn_alien", pos, zone, - 1, Network.STEAM_ID)
 
 func _on_lucy_freezerain_pressed():
-	if not MANAGER.ingame or not Network.GAME_MASTER: return
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
-	print("[LUCY] Freezing rain")
+	print("[LUCYSTOOLS] Freezing rain")
 	for cloud in get_tree().get_nodes_in_group("raincloud"):
 		if cloud.controlled == true:
 			cloud.speed = 0
 			cloud.decay = false
 
 func _on_lucy_clearrain_pressed():
-	if not MANAGER.ingame or not Network.GAME_MASTER: return
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
-	print("[LUCY] Clearing rain")
+	print("[LUCYSTOOLS] Clearing rain")
 	for cloud in get_tree().get_nodes_in_group("raincloud"):
 		cloud._deinstantiate(true)
 
 func _on_lucy_clearchat_pressed():
-	Network.GAMECHAT = ""
+	Network._wipe_chat()
-	Network.LOCAL_GAMECHAT = ""
 	Network.emit_signal("_chat_update")
 
 func _on_lucy_clearmeteor_pressed():
-	if not MANAGER.ingame or not Network.GAME_MASTER: return
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
-	print("[LUCY] Clearing meteor")
+	print("[LUCYSTOOLS] Clearing meteor")
 	for meteor in get_tree().get_nodes_in_group("meteor"):
 		meteor._deinstantiate(true)
 
+func _on_lucy_void_pressed():
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
+	if get_tree().get_nodes_in_group("void_portal").size() > 10: return
+	print("[LUCYSTOOLS] Spawning void")
+	var player_pos = MANAGER.get_player().global_transform.origin
+	var dist = INF
+	var point = null
+	for n in get_tree().get_nodes_in_group("hidden_spot"):
+		var node_dist = n.global_transform.origin.distance_to(player_pos)
+		if node_dist < dist:
+			dist = node_dist
+			point = n
+	var zone = "main_zone"
+	var pos = point.global_transform.origin
+	Network._sync_create_actor("void_portal", pos, zone, - 1, Network.STEAM_ID)
+
+func _on_lucy_lobbyrefresh_pressed():
+	if not MANAGER.ingame or (not Network.GAME_MASTER and not Network.PLAYING_OFFLINE): return
+	MANAGER.inject_lobby_data(1,Network.STEAM_LOBBY_ID)

Godot/mods/Lucy.LucysTools/lucys_menu.tscn

@@ -4,99 +4,107 @@
 
 [node name="lucys_menu" type="Control"]
 margin_right = 800.0
-margin_bottom = 329.0
+margin_bottom = 400.0
 script = ExtResource( 1 )
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_bottom = 71.0
+margin_bottom = 150.0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
 margin_left = 7.0
 margin_top = 7.0
 margin_right = 793.0
-margin_bottom = 393.0
+margin_bottom = 543.0
 
 [node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
 margin_right = 786.0
 margin_bottom = 14.0
-text = "Lucy's Options - F5 to Toggle Menu"
+text = "Lucy's Options 0.7.0 - F5 to Toggle Menu"
 
 [node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer"]
 margin_top = 18.0
 margin_right = 786.0
 margin_bottom = 22.0
 
-[node name="HFlowContainer" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+[node name="Label4" type="Label" parent="PanelContainer/VBoxContainer"]
 margin_top = 26.0
 margin_right = 786.0
-margin_bottom = 66.0
-rect_pivot_offset = Vector2( -141, -49 )
-
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer"]
-margin_top = 13.0
-margin_right = 286.0
-margin_bottom = 27.0
-text = "Allow BBCode in Chat (start message with %)"
-
-[node name="lucy_bbcode" type="CheckButton" parent="PanelContainer/VBoxContainer/HFlowContainer"]
-unique_name_in_owner = true
-margin_left = 290.0
-margin_right = 366.0
 margin_bottom = 40.0
+text = "BBCode is only visible to LucysTools-compatible users. Allowed BBCode tags:"
 
-[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer"]
+[node name="bbcode_tags" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_left = 370.0
-margin_top = 13.0
-margin_right = 505.0
-margin_bottom = 27.0
-text = "Punch back on Punch"
-
-[node name="lucy_punchback" type="CheckButton" parent="PanelContainer/VBoxContainer/HFlowContainer"]
 unique_name_in_owner = true
-margin_left = 509.0
+margin_top = 44.0
-margin_right = 585.0
-margin_bottom = 40.0
-
-[node name="HFlowContainer3" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 70.0
 margin_right = 786.0
-margin_bottom = 84.0
+margin_bottom = 44.0
 rect_pivot_offset = Vector2( -141, -49 )
 
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer3"]
+[node name="HSeparator2" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_right = 196.0
+margin_top = 48.0
-margin_bottom = 14.0
-text = "Server Allows BBCode in Chat: "
-
-[node name="lucy_srv_allow_bbcode" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer3"]
-unique_name_in_owner = true
-margin_left = 200.0
-margin_right = 218.0
-margin_bottom = 14.0
-text = "No"
-
-[node name="HSeparator3" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 88.0
 margin_right = 786.0
-margin_bottom = 92.0
+margin_bottom = 52.0
 
-[node name="HFlowContainer4" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+[node name="HFlowContainer" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 96.0
+margin_top = 56.0
 margin_right = 786.0
-margin_bottom = 120.0
+margin_bottom = 80.0
 rect_pivot_offset = Vector2( -141, -49 )
 
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer4"]
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer"]
 margin_top = 5.0
 margin_right = 135.0
 margin_bottom = 19.0
-text = "Custom Server Name"
+text = "Punch back on Punch"
+
+[node name="lucy_punchback" type="CheckBox" parent="PanelContainer/VBoxContainer/HFlowContainer"]
+unique_name_in_owner = true
+margin_left = 139.0
+margin_right = 163.0
+margin_bottom = 24.0
+
+[node name="HSeparator3" type="HSeparator" parent="PanelContainer/VBoxContainer"]
+margin_top = 84.0
+margin_right = 786.0
+margin_bottom = 88.0
+
+[node name="HFlowContainer3" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 92.0
+margin_right = 786.0
+margin_bottom = 116.0
+rect_pivot_offset = Vector2( -141, -49 )
+
+[node name="Label5" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer3"]
+margin_top = 5.0
+margin_right = 127.0
+margin_bottom = 19.0
+text = "Custom Lobby Code"
+
+[node name="lucy_lobbycode" type="LineEdit" parent="PanelContainer/VBoxContainer/HFlowContainer3"]
+unique_name_in_owner = true
+margin_left = 131.0
+margin_right = 786.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+max_length = 6
+expand_to_text_length = true
+placeholder_text = "Code (1-6 characters)"
+
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer"]
+margin_top = 120.0
+margin_right = 786.0
+margin_bottom = 134.0
+text = "Custom Server Name - Shown without BBCode for normal users"
+
+[node name="HFlowContainer4" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 138.0
+margin_right = 786.0
+margin_bottom = 162.0
+rect_pivot_offset = Vector2( -141, -49 )
 
 [node name="lucy_servername" type="LineEdit" parent="PanelContainer/VBoxContainer/HFlowContainer4"]
 unique_name_in_owner = true
-margin_left = 139.0
 margin_right = 786.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
@@ -104,9 +112,9 @@ expand_to_text_length = true
 placeholder_text = "Name"
 
 [node name="HFlowContainer6" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 124.0
+margin_top = 166.0
 margin_right = 786.0
-margin_bottom = 138.0
+margin_bottom = 180.0
 rect_pivot_offset = Vector2( -141, -49 )
 
 [node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer6"]
@@ -126,25 +134,24 @@ text = "'s Lobby"
 scroll_active = false
 
 [node name="HSeparator4" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 142.0
+margin_top = 184.0
 margin_right = 786.0
-margin_bottom = 146.0
+margin_bottom = 188.0
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer"]
+margin_top = 192.0
+margin_right = 786.0
+margin_bottom = 206.0
+text = "Server Join Message - Will be shown without BBCode for people without LucysTools"
 
 [node name="HFlowContainer5" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 150.0
+margin_top = 210.0
 margin_right = 786.0
-margin_bottom = 174.0
+margin_bottom = 234.0
 rect_pivot_offset = Vector2( -141, -49 )
 
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer5"]
-margin_top = 5.0
-margin_right = 127.0
-margin_bottom = 19.0
-text = "Server Join Message"
-
 [node name="lucy_servermsg" type="LineEdit" parent="PanelContainer/VBoxContainer/HFlowContainer5"]
 unique_name_in_owner = true
-margin_left = 131.0
 margin_right = 786.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
@@ -152,19 +159,39 @@ expand_to_text_length = true
 placeholder_text = "Message"
 
 [node name="HFlowContainer7" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 178.0
+margin_top = 238.0
 margin_right = 786.0
-margin_bottom = 192.0
+margin_bottom = 252.0
 rect_pivot_offset = Vector2( -141, -49 )
 
 [node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer7"]
-margin_right = 145.0
+margin_right = 109.0
 margin_bottom = 14.0
-text = "Join Message Preview: "
+text = "Normal Preview: "
 
 [node name="lucy_servermsg_preview" type="RichTextLabel" parent="PanelContainer/VBoxContainer/HFlowContainer7"]
 unique_name_in_owner = true
-margin_left = 149.0
+margin_left = 113.0
+margin_right = 786.0
+margin_bottom = 14.0
+size_flags_horizontal = 3
+bbcode_enabled = true
+scroll_active = false
+
+[node name="HFlowContainer10" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 256.0
+margin_right = 786.0
+margin_bottom = 270.0
+rect_pivot_offset = Vector2( -141, -49 )
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer10"]
+margin_right = 97.0
+margin_bottom = 14.0
+text = "Lame Preview: "
+
+[node name="lucy_servermsg_preview2" type="RichTextLabel" parent="PanelContainer/VBoxContainer/HFlowContainer10"]
+unique_name_in_owner = true
+margin_left = 101.0
 margin_right = 786.0
 margin_bottom = 14.0
 size_flags_horizontal = 3
@@ -172,41 +199,111 @@ bbcode_enabled = true
 scroll_active = false
 
 [node name="HSeparator5" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 196.0
+margin_top = 274.0
 margin_right = 786.0
-margin_bottom = 200.0
+margin_bottom = 278.0
 
 [node name="HFlowContainer8" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 204.0
+margin_top = 282.0
 margin_right = 786.0
-margin_bottom = 228.0
+margin_bottom = 306.0
 rect_pivot_offset = Vector2( -141, -49 )
 
 [node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
 margin_top = 5.0
-margin_right = 107.0
+margin_right = 157.0
 margin_bottom = 19.0
-text = "Chat Name Color"
+text = "Chat Name Color (global)"
 
 [node name="lucy_chatcolor_bool" type="CheckBox" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
 unique_name_in_owner = true
-margin_left = 111.0
+margin_left = 161.0
-margin_right = 181.0
+margin_right = 231.0
 margin_bottom = 24.0
 text = "Enable"
 
 [node name="lucy_chatcolor" type="ColorPickerButton" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
 unique_name_in_owner = true
-margin_left = 185.0
+margin_left = 235.0
-margin_right = 227.0
+margin_right = 277.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 42, 0 )
 edit_alpha = false
 
-[node name="HFlowContainer2" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
-margin_top = 232.0
+margin_left = 281.0
+margin_top = 5.0
+margin_right = 475.0
+margin_bottom = 19.0
+text = "    Chat Text Color (LucysTools)"
+
+[node name="lucy_chatcolor_bool2" type="CheckBox" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
+unique_name_in_owner = true
+margin_left = 479.0
+margin_right = 549.0
+margin_bottom = 24.0
+text = "Enable"
+
+[node name="lucy_chatcolor2" type="ColorPickerButton" parent="PanelContainer/VBoxContainer/HFlowContainer8"]
+unique_name_in_owner = true
+margin_left = 553.0
+margin_right = 595.0
+margin_bottom = 24.0
+rect_min_size = Vector2( 42, 0 )
+edit_alpha = false
+
+[node name="HFlowContainer9" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 310.0
 margin_right = 786.0
-margin_bottom = 252.0
+margin_bottom = 324.0
+rect_pivot_offset = Vector2( -141, -49 )
+hint_tooltip = "Must match Steam username"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer9"]
+margin_right = 348.0
+margin_bottom = 14.0
+text = "Custom Name - Must match Steam Name (LucysTools)"
+
+[node name="lucy_namegood" type="RichTextLabel" parent="PanelContainer/VBoxContainer/HFlowContainer9"]
+unique_name_in_owner = true
+margin_left = 352.0
+margin_right = 402.0
+margin_bottom = 14.0
+rect_min_size = Vector2( 50, 0 )
+bbcode_enabled = true
+bbcode_text = "[color=green]Good[/color]"
+text = "Good"
+scroll_active = false
+
+[node name="lucy_name" type="LineEdit" parent="PanelContainer/VBoxContainer"]
+unique_name_in_owner = true
+margin_top = 328.0
+margin_right = 786.0
+margin_bottom = 352.0
+expand_to_text_length = true
+placeholder_text = "Name"
+
+[node name="lucy_name_preview" type="RichTextLabel" parent="PanelContainer/VBoxContainer"]
+unique_name_in_owner = true
+margin_top = 356.0
+margin_right = 786.0
+margin_bottom = 371.0
+rect_min_size = Vector2( 0, 15 )
+size_flags_horizontal = 3
+bbcode_enabled = true
+bbcode_text = "If you see this, modify your custom name"
+text = "If you see this, modify your custom name"
+scroll_active = false
+
+[node name="HSeparator6" type="HSeparator" parent="PanelContainer/VBoxContainer"]
+margin_top = 375.0
+margin_right = 786.0
+margin_bottom = 379.0
+
+[node name="HFlowContainer2" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 383.0
+margin_right = 786.0
+margin_bottom = 403.0
 
 [node name="lucy_clearchat" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 margin_right = 76.0
@@ -214,153 +311,69 @@ margin_bottom = 20.0
 hint_tooltip = "Clears game chat (for you only)"
 text = "Clear Chat"
 
-[node name="lucy_raincloud" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
+[node name="lucy_lobbyrefresh" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 unique_name_in_owner = true
 margin_left = 80.0
-margin_right = 198.0
+margin_right = 180.0
 margin_bottom = 20.0
-text = "Spawn Raincloud"
+text = "Update Lobby"
+
+[node name="lucy_raincloud" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
+unique_name_in_owner = true
+margin_left = 184.0
+margin_right = 267.0
+margin_bottom = 20.0
+text = "Spawn Rain"
 
 [node name="lucy_meteor" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 unique_name_in_owner = true
-margin_left = 202.0
+margin_left = 271.0
-margin_right = 304.0
+margin_right = 373.0
 margin_bottom = 20.0
 text = "Spawn Meteor"
 
+[node name="lucy_void" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
+unique_name_in_owner = true
+margin_left = 377.0
+margin_right = 461.0
+margin_bottom = 20.0
+text = "Spawn Void"
+
 [node name="lucy_freezerain" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 unique_name_in_owner = true
-margin_left = 308.0
+margin_left = 465.0
-margin_right = 394.0
+margin_right = 551.0
 margin_bottom = 20.0
 text = "Freeze Rain"
 
 [node name="lucy_clearrain" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 unique_name_in_owner = true
-margin_left = 398.0
+margin_left = 555.0
-margin_right = 473.0
+margin_right = 630.0
 margin_bottom = 20.0
 text = "Clear Rain"
 
 [node name="lucy_clearmeteor" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 unique_name_in_owner = true
-margin_left = 477.0
+margin_left = 634.0
-margin_right = 571.0
+margin_right = 728.0
 margin_bottom = 20.0
 text = "Clear Meteor"
 
-[node name="HSeparator2" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 256.0
-margin_right = 786.0
-margin_bottom = 260.0
-
-[node name="HSplitContainer" type="HSplitContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 264.0
-margin_right = 786.0
-margin_bottom = 288.0
-split_offset = 100
-
-[node name="HFlowContainer3" type="HFlowContainer" parent="PanelContainer/VBoxContainer/HSplitContainer"]
-margin_right = 218.0
-margin_bottom = 24.0
-
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer3"]
-margin_top = 5.0
-margin_right = 118.0
-margin_bottom = 19.0
-text = "Per Frame Packets"
-
-[node name="lucy_fpackets" type="SpinBox" parent="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer3"]
-unique_name_in_owner = true
-margin_left = 122.0
-margin_right = 196.0
-margin_bottom = 24.0
-max_value = 256.0
-value = 32.0
-rounded = true
-allow_greater = true
-
-[node name="HFlowContainer" type="HFlowContainer" parent="PanelContainer/VBoxContainer/HSplitContainer"]
-margin_left = 230.0
-margin_right = 786.0
-margin_bottom = 24.0
-
-[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer"]
-margin_top = 5.0
-margin_right = 116.0
-margin_bottom = 19.0
-text = "Bulk Read Packets"
-
-[node name="lucy_bpackets" type="SpinBox" parent="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer"]
-unique_name_in_owner = true
-margin_left = 120.0
-margin_right = 194.0
-margin_bottom = 24.0
-max_value = 4096.0
-value = 128.0
-rounded = true
-allow_greater = true
-
-[node name="HSplitContainer2" type="HSplitContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 292.0
-margin_right = 786.0
-margin_bottom = 316.0
-split_offset = 100
-
-[node name="HFlowContainer3" type="HFlowContainer" parent="PanelContainer/VBoxContainer/HSplitContainer2"]
-margin_right = 216.0
-margin_bottom = 24.0
-
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer3"]
-margin_top = 5.0
-margin_right = 116.0
-margin_bottom = 19.0
-text = "Bulk Read Interval"
-
-[node name="lucy_binterval" type="SpinBox" parent="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer3"]
-unique_name_in_owner = true
-margin_left = 120.0
-margin_right = 194.0
-margin_bottom = 24.0
-max_value = 120.0
-step = 0.05
-value = 0.8
-allow_greater = true
-
-[node name="HFlowContainer" type="HFlowContainer" parent="PanelContainer/VBoxContainer/HSplitContainer2"]
-margin_left = 228.0
-margin_right = 786.0
-margin_bottom = 24.0
-
-[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer"]
-margin_top = 5.0
-margin_right = 111.0
-margin_bottom = 19.0
-text = "Full Read Interval"
-
-[node name="lucy_finterval" type="SpinBox" parent="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer"]
-unique_name_in_owner = true
-margin_left = 115.0
-margin_right = 189.0
-margin_bottom = 24.0
-max_value = 120.0
-step = 0.05
-value = 6.4
-allow_greater = true
-
-[connection signal="toggled" from="PanelContainer/VBoxContainer/HFlowContainer/lucy_bbcode" to="." method="_on_lucy_bbcode_toggled"]
 [connection signal="toggled" from="PanelContainer/VBoxContainer/HFlowContainer/lucy_punchback" to="." method="_on_lucy_punchback_toggled"]
+[connection signal="text_changed" from="PanelContainer/VBoxContainer/HFlowContainer3/lucy_lobbycode" to="." method="_on_lucy_lobbycode_text_changed"]
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/HFlowContainer4/lucy_servername" to="." method="_on_lucy_servername_text_changed"]
 [connection signal="text_changed" from="PanelContainer/VBoxContainer/HFlowContainer5/lucy_servermsg" to="." method="_on_lucy_servermsg_text_changed"]
 [connection signal="toggled" from="PanelContainer/VBoxContainer/HFlowContainer8/lucy_chatcolor_bool" to="." method="_on_lucy_chatcolor_bool_toggled"]
 [connection signal="color_changed" from="PanelContainer/VBoxContainer/HFlowContainer8/lucy_chatcolor" to="." method="_on_lucy_chatcolor_color_changed"]
+[connection signal="toggled" from="PanelContainer/VBoxContainer/HFlowContainer8/lucy_chatcolor_bool2" to="." method="_on_lucy_chatcolor_bool2_toggled"]
+[connection signal="color_changed" from="PanelContainer/VBoxContainer/HFlowContainer8/lucy_chatcolor2" to="." method="_on_lucy_chatcolor2_color_changed"]
+[connection signal="text_changed" from="PanelContainer/VBoxContainer/lucy_name" to="." method="_on_lucy_name_text_changed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_clearchat" to="." method="_on_lucy_clearchat_pressed"]
+[connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_lobbyrefresh" to="." method="_on_lucy_lobbyrefresh_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_raincloud" to="." method="_on_lucy_raincloud_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_meteor" to="." method="_on_lucy_meteor_pressed"]
+[connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_void" to="." method="_on_lucy_void_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_freezerain" to="." method="_on_lucy_freezerain_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_clearrain" to="." method="_on_lucy_clearrain_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/HFlowContainer2/lucy_clearmeteor" to="." method="_on_lucy_clearmeteor_pressed"]
-[connection signal="value_changed" from="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer3/lucy_fpackets" to="." method="_on_lucy_fpackets_value_changed"]
-[connection signal="value_changed" from="PanelContainer/VBoxContainer/HSplitContainer/HFlowContainer/lucy_bpackets" to="." method="_on_lucy_bpackets_value_changed"]
-[connection signal="value_changed" from="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer3/lucy_binterval" to="." method="_on_lucy_binterval_value_changed"]
-[connection signal="value_changed" from="PanelContainer/VBoxContainer/HSplitContainer2/HFlowContainer/lucy_finterval" to="." method="_on_lucy_finterval_value_changed"]

Godot/mods/Lucy.LucysTools/main.gd

@@ -1,109 +1,200 @@
 extends Node
 
-const LUCYS_MENU_SCENE = preload("res://mods/Lucy.LucysTools/lucys_menu.tscn")
+const LucysLib_t = preload("res://mods/LucysLib/main.gd")
+var LucysLib: LucysLib_t
+const BBCode_t = preload("res://mods/LucysLib/bbcode.gd")
+const NetManager_t := preload("res://mods/LucysLib/net.gd")
 
-var host_required = true
+const LUCYS_MENU_SCENE = preload("res://mods/Lucy.LucysTools/lucys_menu.tscn")
 
 var lucys_menu = null
 onready var root = get_tree().root
 
-var do_punchback = false setget set_punchback
+var custom_name_enabled: bool = false
-var allow_bbcode = false setget set_bbcode
-var custom_server_name = "" setget set_server_name
-var server_join_message = "[color=#5BCEFA]TRAN[/color][color=#F5A9B8]S RIG[/color][color=#ffffff]HTS![/color]" setget set_join_message
-var frame_packets = 50 setget set_frame_packets
-var bulk_packets = 200 setget set_bulk_packets
-var bulk_interval = 1 setget set_bulk_interval
-var full_interval = 5 setget set_full_interval
-
-var custom_color_enabled = false setget set_custom_color_enabled
-var custom_color = Color("009cd0") setget set_custom_color
-
-var srv_allow_bbcode = false setget set_srv_bbcode
-
-var log_messages = false setget set_log_messages
-
-# Patched Network vars
-# var LUCY_PACKETS_READ = 0
-# var LUCY_BULK_FULL_TIMER = 0
-# var LUCY_FRAME_PACKETS = 32
-# var LUCY_BULK_PACKETS = 128
-# var LUCY_BULK_INTERVAL = 0.8
-# var LUCY_BULK_FULL_INTERVAL = 6.4
-# var LUCY_CHAT_BBCODE
-# var LUCY_SRV_NAME
-# var LUCY_PUNCHED_ME
-# var LUCY_INSTANCE_SENDER
-# var LUCY_CUSTOM_COLOR_B
-# var LUCY_CUSTOM_COLOR
-# var LUCY_LOG_MESSAGES
-
 var ingame = false
 
+# config options
+var do_punchback: bool = false
+var custom_server_name: String = ""
+var server_join_message: String = "[color=#5BCEFA]TRAN[/color][color=#F5A9B8]S RIG[/color][color=#ffffff]HTS![/color]"
+var custom_color_enabled: bool = false
+var custom_color: Color = Color("009cd0") setget set_custom_color
+var log_messages: bool = false setget set_log_messages
+var custom_name: String = ""
+var DEBUG: bool = false setget set_DEBUG
+var custom_text_color: Color = Color("00ff00")
+var custom_text_color_enabled: bool = false
+var lucys_menu_visible: bool = true
+var allowed_bb: Array = BBCode_t.DEFAULT_ALLOWED_TYPES setget set_allowed_bb
+var custom_lobbycode: String = ""
+
+const SAVE_KEYS = [
+	"do_punchback", "allowed_bb",
+	"custom_server_name", "server_join_message",
+	"custom_color_enabled", "custom_color",
+	"log_messages", "custom_name",
+	"DEBUG", "custom_text_color",
+	"custom_text_color_enabled",
+	"lucys_menu_visible", "custom_lobbycode"
+]
+
+func bbcode_changes():
+	if lucys_menu != null: lucys_menu.update()
+func set_allowed_bb(val):
+	var f = []
+	for v in val:
+		if v == BBCode_t.TAG_TYPE.NULL or v == BBCode_t.TAG_TYPE.ROOT:
+			continue
+		if v in BBCode_t.TAG_TYPE.values():
+			f.append(v)
+	allowed_bb = f
+	LucysLib.ALLOWED_TAG_TYPES = f
+	bbcode_changes()
+func set_custom_color(val):
+	custom_color = Color(val) if Color(val) != Color("d5aa73") else Color("739ed5")
+	custom_color.a = 1
 func set_log_messages(val):
 	log_messages = val
-	Network.LUCY_LOG_MESSAGES = val
+	LucysLib.LOG_MESSAGES = val
+func set_DEBUG(val):
+	DEBUG = val
+	LucysLib.DEBUG = val
+	LucysLib.NetManager.DEBUG = val
+	LucysLib.BBCode.DEBUG = val
 
-func set_punchback(punchback):
+func get_user_color() -> Color:
-	do_punchback = punchback
+	var base_color = Color(Globals.cosmetic_data[PlayerData.cosmetics_equipped["primary_color"]]["file"].main_color) * Color(0.95, 0.9, 0.9)
-func set_bbcode(bbcode):
+	var color = custom_color if custom_color_enabled else base_color
-	allow_bbcode = bbcode
+	return color
-	if Network.GAME_MASTER or not host_required: self.srv_allow_bbcode = bbcode
+
-func set_srv_bbcode(bbcode):
+# intercept player message send
-	if Network.GAME_MASTER and not Network.PLAYING_OFFLINE: send_server_sync_actor()
+# we just take over - replicate as 
-	srv_allow_bbcode = bbcode
+# much as i can be bothered to
-	Network.LUCY_CHAT_BBCODE = bbcode if host_required else allow_bbcode
+func process_message(text: String, local: bool, player, playerhud):
-	if lucys_menu != null: lucys_menu.update()
+	if DEBUG:
-func set_server_name(name):
+		var thing = {"text":text,"local":local,"player":player,"playerhud":playerhud,"custom_name":custom_name}
-	custom_server_name = name
+		print("[LUCYSTOOLS process_message] ", thing)
-	Network.LUCY_SRV_NAME = name
+	# is this a host message? (no username)
-func set_join_message(msg):
+	if text.begins_with("%") and (Network.GAME_MASTER or Network.PLAYING_OFFLINE):
-	server_join_message = msg
+		text = text.trim_prefix("%")
-func set_frame_packets(val):
+		var msg := LucysLib.BBCode.parse_bbcode_text(text)
-	frame_packets = val
+		LucysLib.send_message(msg, Color.aqua, false, null, "peers")
-	Network.LUCY_FRAME_PACKETS = val
+		return
-func set_bulk_packets(val):
+	
-	bulk_packets = val
+	# i don't know why the wag stuff toggles multiple times
-	Network.LUCY_BULK_PACKETS = val
+	# and applies anywhere in string
-func set_bulk_interval(val):
+	# i'm doing it once.
-	bulk_interval = val
+	if "/wag" in text:
-	Network.LUCY_BULK_INTERVAL = val
+		PlayerData.emit_signal("_wag_toggle")
-	Network.BULK_PACKET_READ_TIMER = 0
+		text.replace("/wag","")
-func set_full_interval(val):
+	# /me has to be at beginning because i say so
-	full_interval = val
+	var colon: bool = true
-	Network.LUCY_BULK_FULL_INTERVAL = val
+	if text.begins_with("/me "):
-	Network.LUCY_BULK_FULL_TIMER = 0
+		colon = false
-func set_custom_color_enabled(val):
+		text = text.trim_prefix("/me ")
-	custom_color_enabled = val
+	
-	Network.LUCY_CUSTOM_COLOR_B = val
+	# process message into bbcode nodes
-func set_custom_color(val):
+	var msg := LucysLib.BBCode.parse_bbcode_text(text)
-	custom_color = Color(val)
+	
-	custom_color.a = 1
+	# clamp transparency
-	Network.LUCY_CUSTOM_COLOR = Color(custom_color) if Color(custom_color) != Color("d5aa73") else Color("739ed5")
+	if not (Network.GAME_MASTER or Network.PLAYING_OFFLINE):
+		LucysLib.BBCode.clamp_alpha(msg, 0.7)
+	
+	# get drunk params
+	var drunk_chance := 0.0
+	var drunk_max := 0
+	if is_instance_valid(player):
+		drunk_chance = 0.13 * player.drunk_tier
+		drunk_max = player.drunk_tier
+	
+	# spoken text is gonna have different drunk text
+	# i don't want to think about this more
+	# get bbcode tag so it can get sent to the 
+	# same function at least
+	# maybe i'll just add a toggle for hicc
+	var spoken_msg := LucysLib.BBCode.parse_bbcode_text(msg.get_stripped())
+	drunk_text_add(msg, drunk_chance, drunk_max, false)
+	drunk_text_add(spoken_msg, drunk_chance, drunk_max, true)
+	
+	# add text color if it exists
+	if custom_text_color_enabled:
+		var col_tag: BBCode_t.BBCodeColorTag = BBCode_t.tag_creator(BBCode_t.TAG_TYPE.color, "")
+		col_tag.color = custom_text_color
+		col_tag.inner = [msg]
+		msg = col_tag
+	
+	# prefix endcap suffix stuff
+	if colon:
+		msg.inner.push_front("%u: ")
+	else:
+		msg.inner.push_front("(%u ")
+		msg.inner.push_back(")")
+	
+	var name := LucysLib.BBCode.parse_bbcode_text(custom_name) if custom_name_enabled else null
+	if DEBUG:
+		print("[LUCYSTOOLS process_message] ", {"name":name,"msg":msg})
+	
+	LucysLib.send_message(msg, get_user_color(), local, name, "peers")
+	var spoken_text := spoken_msg.get_stripped()
+	if colon and spoken_text != "": playerhud.emit_signal("_message_sent", spoken_text)
+
+# drunk processing. ouch this sucks
+# not quite the same as vanilla
+# if people want drunk text that
+# works better. i will but. ugh
+var line: String = ""
+func drunk_text_add(msg: BBCode_t.BBCodeTag, drunk_chance: float, drunk_max: int, do_hicc: bool):
+	for index in msg.inner.size():
+		if msg.inner[index] is BBCode_t.BBCodeTag:
+			drunk_text_add(msg.inner[index], drunk_chance, drunk_max, do_hicc)
+		else:
+			var lines = msg.inner[index].split(" ")
+			var new: String = ""
+			var linei: int = 0
+			for line in lines:
+				for i in drunk_max:
+					if randf() >= drunk_chance or line == "": break
+					var d_effect = randi() % 5
+					var slot = randi() % line.length()
+					match d_effect:
+						0, 1: line = line.insert(slot, line[slot])
+						2: line = line.insert(slot, "'")
+						3: line = line.insert(slot, ",")
+						4:
+							if do_hicc: line = line.insert(slot, " -*HICC*- ")
+							break
+				if linei > 0: new += " "
+				linei += 1
+				new += line
+			msg.inner[index] = new
+
+func process_packet_player_punch(DATA, PACKET_SENDER, from_host) -> bool:
+	# lucy punchback :3
+	if not DATA.has("nya"): punched(PACKET_SENDER, DATA["punch_type"])
+	# still get punched!
+	return false
 
 func _ready():
-	print("[LUCY] Loaded LucysTools")
+	print("[LUCY] Loaded LucysTools 0.7.0")
+	LucysLib = $"/root/LucysLib"
 	load_settings()
 	root.connect("child_entered_tree", self, "_on_enter")
 	Network.connect("_new_player_join", self, "new_player")
-	PlayerData.connect("_punched", self, "punched")
+	Steam.connect("lobby_created", self, "inject_lobby_data")
-	Network.connect("_instance_actor", self, "_instance_actor")
 	
+	LucysLib.register_bb_msg_support()
+	LucysLib.register_log_msg_support()
+	LucysLib.NetManager.add_network_processor("player_punch", funcref(self, "process_packet_player_punch"), 10)
 
-func send_server_sync_actor(to = "peers"):
+func inject_lobby_data(connect, lobby_id):
-	if not Network.GAME_MASTER: return
+	if connect != 1: return
-	var dict = {"actor_type": "lucy_fake_actor", "at": Vector3.ZERO, "zone": "", "actor_id": 0, "creator_id": Network.STEAM_ID, "data": {
+	if custom_server_name != "":
-		"allow_bbcode": allow_bbcode
+		var bb_name := LucysLib.BBCode.parse_bbcode_text(custom_server_name)
-	}}
+		Steam.setLobbyData(lobby_id, "bbcode_lobby_name", bb_name.get_full(LucysLib.ALLOWED_TAG_TYPES))
-	Network._send_P2P_Packet({"type": "instance_actor", "params": dict}, to, 2)
+		Steam.setLobbyData(lobby_id, "lobby_name", bb_name.get_stripped())
-
+	if custom_lobbycode != "":
-func _instance_actor(dict):
+		Steam.setLobbyData(lobby_id, "code", custom_lobbycode)
-	if dict["actor_type"] != "lucy_fake_actor": return
+		Network.LOBBY_CODE = custom_lobbycode
-	var sender = Network.LUCY_INSTANCE_SENDER
-	Network.LUCY_INSTANCE_SENDER = 0
-	if sender != Network.KNOWN_GAME_MASTER or Network.GAME_MASTER: return
-	var data = dict["data"]
-	self.srv_allow_bbcode = data["allow_bbcode"]
 
 func get_player() -> Actor:
 	for p in get_tree().get_nodes_in_group("player"):
@@ -111,50 +202,36 @@ func get_player() -> Actor:
 			return p
 	return null
 
-func punched(from, type):
+func punched(puncher_id, type):
-	print("[LUCY] punched!")
+	print("[LUCY] punch from ", Network._get_username_from_id(puncher_id))
 	if not do_punchback: return
-	if Network.LUCY_PUNCHED_ME == 0 or Network.LUCY_PUNCHED_ME == Network.STEAM_ID: return
+	if puncher_id == 0 or puncher_id == Network.STEAM_ID: return
-	var punched_me = null
-	for p in get_tree().get_nodes_in_group("player"):
-		if p.owner_id == Network.LUCY_PUNCHED_ME: punched_me = p
-	if punched_me == null: return
-	if punched_me.controlled: return
 	print("[LUCY] punching back...")
-	Network.LUCY_PUNCHED_ME = 0
+	Network._send_P2P_Packet(
-	Network._send_P2P_Packet({"type": "player_punch", "from": get_player().global_transform.origin, "player": Network.STEAM_ID, "punch_type": type, "nya": "nya"}, str(punched_me.owner_id), 2)
+		{"type": "player_punch", "from_pos": get_player().global_transform.origin, "punch_type": type, "nya": "nya"},
-	
+		str(puncher_id), 2, Network.CHANNELS.ACTOR_ACTION)
 
 func new_player(id):
 	print("[LUCY] new player!")
 	if server_join_message.empty() or not Network.GAME_MASTER: return
 	print("[LUCY] sending join message")
-	Network._send_message(server_join_message)
+	var bb_msg := LucysLib.BBCode.parse_bbcode_text(server_join_message)
-	send_server_sync_actor(str(id))
+	LucysLib.send_message(bb_msg, Color.aqua, false, null, "peers")
 
 func _on_enter(node: Node):
+	if DEBUG: print("[LUCY] INSTANCING MENU")
 	if node.name == "main_menu":
 		lucys_menu = LUCYS_MENU_SCENE.instance()
+		lucys_menu.MANAGER = self
 		node.add_child(lucys_menu)
 		ingame = false
-		lucys_menu.setup(self)
+		lucys_menu.setup()
 	if node.name == "playerhud":
 		lucys_menu = LUCYS_MENU_SCENE.instance()
+		lucys_menu.MANAGER = self
 		node.add_child(lucys_menu)
 		ingame = true
-		# retrigger setter
+		lucys_menu.setup()
-		self.srv_allow_bbcode = false
-		self.allow_bbcode = allow_bbcode
-		lucys_menu.setup(self)
-
-const save_keys = [
-	"do_punchback", "allow_bbcode",
-	"custom_server_name", "server_join_message",
-	"frame_packets", "bulk_packets",
-	"bulk_interval", "full_interval",
-	"custom_color_enabled", "custom_color",
-	"log_messages"
-]
 
 func load_settings():
 	print("[LUCY] Loading settings")
@@ -165,16 +242,17 @@ func load_settings():
 		var result = parse.result
 		# trigger setters
 		for key in result.keys():
-			if key in save_keys: self[key] = result[key]
+			if key in SAVE_KEYS: self[key] = result[key]
 
 func save_settings():
 	print("[LUCY] Saving settings")
 	
-	custom_color = Color(custom_color).to_html()
-	
 	var settings = {}
-	for key in save_keys:
+	for key in SAVE_KEYS:
-		settings[key] = self[key]
+		if key in ["custom_color", "custom_text_color"]:
+			settings[key] = self[key].to_html()
+		else:
+			settings[key] = self[key]
 	
 	var file = File.new()
 	if file.open(OS.get_executable_path().get_base_dir().plus_file("GDWeave/configs/LucysTools.json"),File.WRITE) == OK:

LucysTools/.gitignore

@@ -2,6 +2,6 @@
 .vs/
 *.user
 /local
-
+Makefile
 bin/
 obj/

LucysTools/LucysTools.csproj

@@ -14,21 +14,4 @@
     <ItemGroup>
         <None Include="manifest.json" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>
-
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(GDWeavePath)' != ''">
-        <PropertyGroup>
-            <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'">true</IsWindows>
-            <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">true</IsLinux>
-        </PropertyGroup>
-
-        <Exec
-                Command="xcopy /Y /I &quot;$(TargetDir)&quot; &quot;$(GDWeavePath)/mods/$(AssemblyName)&quot;"
-                Condition="'$(IsWindows)' == 'true'" 
-        />
-
-        <Exec
-                Command="cp -r $(TargetDir) '$(GDWeavePath)/mods/$(AssemblyName)/'"
-                Condition="'$(IsLinux)' == 'true'" 
-        />
-    </Target>
 </Project>

LucysTools/manifest.json

@@ -1,5 +1,6 @@
 {
   "Id": "Lucy.LucysTools",
   "AssemblyPath": "LucysTools.dll",
-  "PackPath": "LucysTools.pck"
+  "PackPath": "LucysTools.pck",
+  "Dependencies": [ "LucysLib" ]
 }

README.md

@@ -3,32 +3,31 @@ LucysTools
 Uses GDWeave.
 
 Client Features:
-- Makes the client (tunably) read all packets. This fixes chat messages dropping.
 - Optionally knocks people back when they punch you.
 - Lets you clear gamechat
-- Sends messages on P2P channel 2 (This should make your messages more reliable for users who don't have LucysTools)
+- Allows custom name color (for all users)
-- Only the game host can kick/ban you
+- Allows custom name BBCode (for compatible peers)
-- Allows changing your name's color in chat
+- Allows custom text color (for compatible peers)
+- Allows BBCode in chat (for compatible peers)
 
 Host Features:
-- Lets you set a custom server name and message that will be sent when someone joins.
+- Lets you set a message that will be sent when someone joins.
-- Lets you spawn rainclouds & meteors.
+- Lets you spawn rainclouds, voids, & meteors.
-- Lets you do 'raw' messages & BBCode in messages. If enabled, other players on the server can use BBCode too. (Not secure or anything, implemented client side)
+- As host 'raw' messages can be sent with a % prefix
+- Lets you set a custom server name with BBCode (for compatible peers)
+- Lets you set a custom lobby code
+- Lets you update lobby name & code while running
 
-Log Features:
+Info for Modders:
-- If you enable "log_messages" in the config file, messages, kicks, and bans will be logged to godot.log along with the user who sent the packet.
+- Check out LucysLib (in progress)
+- If you'd like to make things compatible, servers get a "bbcode_lobby_name" property, and messages have additional "bb_msg" and "bb_user" fields. DM me!
 
 More coming soon!
 Probably certainly full of bugs.
 
-Packet options:
-- 'Per Frame Packets' is the number of net packets your client will attempt to read per frame. 
-- 'Bulk Read Packets' is the number of net packets your client will attempt to read per 'Bulk Read Interval' (in seconds)
-- 'Full Read Interval' is how often your client will attempt to read *all* net packets (in seconds).
-
 Compatibility:
-- Works *only* with WEBFISHING 1.08
+- Works *only* with WEBFISHING 1.10
 - I haven't tested any other mods with this, but I'm happy to try to make things compatible, submit a bug report with the incompatible mod! (Only mods that have source available)
 
 Bugs:
-- Make sure your version of LucysTools is the latest release before submitting bug reports, please.
+- Make sure your versions of LucysTools & LucysLib are the latest release before submitting bug reports, please.