0.5.1

CHANGELOG.md

@@ -17,3 +17,24 @@ 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

Godot/mods/Lucy.LucysTools/lucys_menu.gd

@@ -1,49 +1,74 @@
 extends Control
 
-var MANAGER = null
+var MANAGER
 
-func setup(manager):
+func setup():
-	MANAGER = manager
+	get_node("%lucy_bbcode").pressed = MANAGER.allow_bbcode
-	get_node("%lucy_bbcode").pressed = manager.allow_bbcode
+	get_node("%lucy_punchback").pressed = MANAGER.do_punchback
-	get_node("%lucy_punchback").pressed = manager.do_punchback
+	get_node("%lucy_servername").text = MANAGER.custom_server_name
-	get_node("%lucy_servername").text = manager.custom_server_name
+	get_node("%lucy_servername_preview").bbcode_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").text = manager.server_join_message
+	get_node("%lucy_servermsg_preview").bbcode_text = MANAGER.server_join_message
-	get_node("%lucy_servermsg_preview").bbcode_text = manager.server_join_message
+	var srv_m_bb = MANAGER.bbcode_process(MANAGER.server_join_message)
-	get_node("%lucy_fpackets").value = manager.frame_packets
+	get_node("%lucy_servermsg_preview2").bbcode_text = srv_m_bb.stripped
-	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
+	get_node("%lucy_intbbcode").pressed = MANAGER.allow_intrusive_bbcode
-	get_node("%lucy_chatcolor").color = Color(manager.custom_color)
+	
+	get_node("%lucy_chatcolor_bool").pressed = MANAGER.custom_color_enabled
+	get_node("%lucy_chatcolor").color = Color(MANAGER.custom_color)
+	
+	get_node("%lucy_name").text = MANAGER.custom_name
 	
 	update()
+	
 
 func update():
-	get_node("%lucy_srv_allow_bbcode").text = "Yes" if MANAGER.srv_allow_bbcode else "No"
+	_on_lucy_name_text_changed(MANAGER.custom_name)
+	
+
+func _on_lucy_name_text_changed(new_text):
+	var result = MANAGER.bbcode_process(new_text)
+	#print("[fin] ", result.fin)
+	#print("[tags] ", result.tags)
+	#print("[stripped] ", result.stripped)
+	
+	var lol_steam_username = Network.STEAM_USERNAME.replace("[", "").replace("]", "")
+	var good = result.stripped == lol_steam_username
+	get_node("%lucy_name_preview").bbcode_text = result.fin
+	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
 
 func _ready():
 	print("[LUCY] 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_freezerain").disabled = not can_spawn
+	get_node("%lucy_clearrain").disabled = not can_spawn
+	get_node("%lucy_clearmeteor").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)
+		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")
+		var lobby_dat = {"name": name, "lobby_name":lname, "bbcode_lobby_name":bbname, "nm": nm, "code": code, "type": type}
 		print("[LUCY] LOBBY ", lobby_dat)
 
 func _on_lucy_bbcode_toggled(button_pressed):
@@ -51,23 +76,19 @@ func _on_lucy_bbcode_toggled(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 result = MANAGER.bbcode_process(new_text)
+	get_node("%lucy_servermsg_preview").bbcode_text = result.fin
+	get_node("%lucy_servermsg_preview2").bbcode_text = result.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_intbbcode_toggled(button_pressed):
+	MANAGER.allow_intrusive_bbcode = button_pressed
 
 func _on_lucy_raincloud_pressed():
 	if not MANAGER.ingame: return
@@ -108,8 +129,7 @@ func _on_lucy_clearrain_pressed():
 		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():

Godot/mods/Lucy.LucysTools/lucys_menu.tscn

@@ -21,82 +21,82 @@ margin_bottom = 393.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.5.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
+margin_bottom = 40.0
+text = "BBCode is only visible to LucysTools-compatible users"
+
+[node name="HFlowContainer" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 44.0
+margin_right = 786.0
+margin_bottom = 84.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_right = 89.0
 margin_bottom = 27.0
-text = "Allow BBCode in Chat (start message with %)"
+text = "Allow BBCode"
 
 [node name="lucy_bbcode" type="CheckButton" parent="PanelContainer/VBoxContainer/HFlowContainer"]
 unique_name_in_owner = true
-margin_left = 290.0
+margin_left = 93.0
-margin_right = 366.0
+margin_right = 169.0
+margin_bottom = 40.0
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer"]
+margin_left = 173.0
+margin_top = 13.0
+margin_right = 323.0
+margin_bottom = 27.0
+text = "Allow Intrusive BBCode"
+
+[node name="lucy_intbbcode" type="CheckButton" parent="PanelContainer/VBoxContainer/HFlowContainer"]
+unique_name_in_owner = true
+margin_left = 327.0
+margin_right = 403.0
 margin_bottom = 40.0
 
 [node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer"]
-margin_left = 370.0
+margin_left = 407.0
 margin_top = 13.0
-margin_right = 505.0
+margin_right = 542.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_left = 546.0
-margin_right = 585.0
+margin_right = 622.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
-rect_pivot_offset = Vector2( -141, -49 )
-
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer3"]
-margin_right = 196.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
 
-[node name="HFlowContainer4" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer"]
 margin_top = 96.0
 margin_right = 786.0
-margin_bottom = 120.0
+margin_bottom = 110.0
-rect_pivot_offset = Vector2( -141, -49 )
+text = "Custom Server Name - Only shown for LucysTools users (base game field for others)"
 
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer4"]
+[node name="HFlowContainer4" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 5.0
+margin_top = 114.0
-margin_right = 135.0
+margin_right = 786.0
-margin_bottom = 19.0
+margin_bottom = 138.0
-text = "Custom Server Name"
+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 +104,9 @@ expand_to_text_length = true
 placeholder_text = "Name"
 
 [node name="HFlowContainer6" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 124.0
+margin_top = 142.0
 margin_right = 786.0
-margin_bottom = 138.0
+margin_bottom = 156.0
 rect_pivot_offset = Vector2( -141, -49 )
 
 [node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer6"]
@@ -126,25 +126,24 @@ text = "'s Lobby"
 scroll_active = false
 
 [node name="HSeparator4" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 142.0
+margin_top = 160.0
 margin_right = 786.0
-margin_bottom = 146.0
+margin_bottom = 164.0
+
+[node name="Label3" type="Label" parent="PanelContainer/VBoxContainer"]
+margin_top = 168.0
+margin_right = 786.0
+margin_bottom = 182.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 = 186.0
 margin_right = 786.0
-margin_bottom = 174.0
+margin_bottom = 210.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 +151,39 @@ expand_to_text_length = true
 placeholder_text = "Message"
 
 [node name="HFlowContainer7" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 178.0
+margin_top = 214.0
 margin_right = 786.0
-margin_bottom = 192.0
+margin_bottom = 228.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 = 232.0
+margin_right = 786.0
+margin_bottom = 246.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 +191,89 @@ bbcode_enabled = true
 scroll_active = false
 
 [node name="HSeparator5" type="HSeparator" parent="PanelContainer/VBoxContainer"]
-margin_top = 196.0
+margin_top = 250.0
 margin_right = 786.0
-margin_bottom = 200.0
+margin_bottom = 254.0
 
 [node name="HFlowContainer8" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 204.0
+margin_top = 258.0
 margin_right = 786.0
-margin_bottom = 228.0
+margin_bottom = 282.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="HFlowContainer9" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
-margin_top = 232.0
+margin_top = 286.0
 margin_right = 786.0
-margin_bottom = 252.0
+margin_bottom = 300.0
+rect_pivot_offset = Vector2( -141, -49 )
+hint_tooltip = "Must match Steam username"
+
+[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HFlowContainer9"]
+margin_right = 379.0
+margin_bottom = 14.0
+text = "Custom Name - Must match Steam Name (LucysTools only)"
+
+[node name="lucy_namegood" type="RichTextLabel" parent="PanelContainer/VBoxContainer/HFlowContainer9"]
+unique_name_in_owner = true
+margin_left = 383.0
+margin_right = 433.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 = 304.0
+margin_right = 786.0
+margin_bottom = 328.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 = 332.0
+margin_right = 786.0
+margin_bottom = 347.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 = 351.0
+margin_right = 786.0
+margin_bottom = 355.0
+
+[node name="HFlowContainer2" type="HFlowContainer" parent="PanelContainer/VBoxContainer"]
+margin_top = 359.0
+margin_right = 786.0
+margin_bottom = 379.0
 
 [node name="lucy_clearchat" type="Button" parent="PanelContainer/VBoxContainer/HFlowContainer2"]
 margin_right = 76.0
@@ -249,118 +316,17 @@ margin_right = 571.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_intbbcode" to="." method="_on_lucy_intbbcode_toggled"]
 [connection signal="toggled" from="PanelContainer/VBoxContainer/HFlowContainer/lucy_punchback" to="." method="_on_lucy_punchback_toggled"]
 [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="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_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_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

@@ -2,108 +2,262 @@ extends Node
 
 const LUCYS_MENU_SCENE = preload("res://mods/Lucy.LucysTools/lucys_menu.tscn")
 
-var host_required = true
-
 var lucys_menu = null
 onready var root = get_tree().root
 
-var do_punchback = false setget set_punchback
+var INCERCEPT_MSG = false
-var allow_bbcode = false setget set_bbcode
+var INCERCEPT_SEND_MSG = false
+
+var do_punchback = false
+var allow_bbcode = false
 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_enabled = false
 var custom_color = Color("009cd0") setget set_custom_color
 
-var srv_allow_bbcode = false setget set_srv_bbcode
+var custom_name_enabled = false
+var real_custom_name = ""
+var custom_name = "" setget set_custom_name
+
+var allow_intrusive_bbcode = false setget set_allow_intrusive_bbcode
 
 var log_messages = false setget set_log_messages
 
-# Patched Network vars
+var lucys_menu_visible = true
-# var LUCY_PACKETS_READ = 0
+
-# var LUCY_BULK_FULL_TIMER = 0
+var allowed_tags = ["b", "i", "u", "s", "color"]
-# var LUCY_FRAME_PACKETS = 32
+var escape_invalid = true
-# var LUCY_BULK_PACKETS = 128
+var bbcode_matcher = null
-# var LUCY_BULK_INTERVAL = 0.8
+
-# var LUCY_BULK_FULL_INTERVAL = 6.4
+func set_custom_name(val):
-# var LUCY_CHAT_BBCODE
+	custom_name = val
-# var LUCY_SRV_NAME
+	var bb = bbcode_process(val)
-# var LUCY_PUNCHED_ME
+	real_custom_name = bb.fin
-# var LUCY_INSTANCE_SENDER
+
-# var LUCY_CUSTOM_COLOR_B
+# i know this sucks
-# var LUCY_CUSTOM_COLOR
+# but i have things to do
-# var LUCY_LOG_MESSAGES
+func bbcode_recurse(text, data):
+	var m = bbcode_matcher.search(text)
+	if m == null:
+		var escaped = text.replace('[lb]','[').replace('[','[lb]') if escape_invalid else text
+		data.fin += escaped
+		data.stripped += escaped
+	else:
+		#print("Found ", m.strings, " in '", text, "'")
+		bbcode_recurse(m.get_string(1), data)
+		var tag = m.get_string(2)
+		var junk = m.get_string(3)
+		var allowed = tag in allowed_tags
+		if allowed:
+			data.fin += "[" + tag + junk + "]"
+		else:
+			data.fin += "[lb]" + tag + junk + "]"
+			data.stripped += "[lb]" + tag + junk + "]"
+		#print("TAG ", m.get_string(2), " JUNK ", m.get_string(3))
+		data.tags.append([tag, junk])
+		bbcode_recurse(m.get_string(4), data)
+		if allowed:
+			data.fin += "[/" + tag + "]"
+		else:
+			data.fin += "[lb]/" + tag + "]"
+			data.stripped += "[lb]/" + tag + "]"
+		bbcode_recurse(m.get_string(5), data)
+
+func bbcode_process(text):
+	bbcode_matcher = RegEx.new()
+	bbcode_matcher.compile("^(.*?)\\[(\\w+?)([^\\]]*)\\](.+?)\\[/\\2\\](.*?)$")
+	#print("processing '", text, "'")
+	var data = {"fin": "", "tags": [], "stripped": ""}
+	bbcode_recurse(text, data)
+	return data
 
 var ingame = false
 
+func get_user_color() -> Color:
+	var base_color = Color(Globals.cosmetic_data[PlayerData.cosmetics_equipped["primary_color"]]["file"].main_color) * Color(0.95, 0.9, 0.9)
+	var color = custom_color if custom_color_enabled else base_color
+	return color
+
+func safe_message(user_id, color, boring_msg, local, lucy_user, lucy_msg):
+	var username = Network._get_username_from_id(user_id) if lucy_user == "" else lucy_user
+	var bb_user = bbcode_process(username)
+	username = bb_user.fin
+	
+	var msg = lucy_msg if lucy_msg != "" else boring_msg
+	var bb_data = bbcode_process(msg)
+	var filter_message = bb_data.fin
+	
+	if bb_user.stripped != Network._get_username_from_id(user_id):
+		filter_message = "(" + Network._get_username_from_id(user_id) + ") " + filter_message
+	
+	if OptionsMenu.chat_filter:
+		filter_message = SwearFilter._filter_string(filter_message)
+	
+	var final_message = filter_message.replace("%u", "[color=#" + str(color) + "]" + username + "[/color]")
+	var thing = {"username":username, "color":color, "filter_message":filter_message,
+		"final_message":final_message,"lucy_user":lucy_user,"lucy_msg":lucy_msg}
+	#print("FUCK2 ", thing)
+	Network._update_chat(final_message, local)
+
+# this is stinky
+func process_message(lit_text, final, prefix, suffix, endcap, spoken_text, local, colon, playerhud):
+	var thing = {
+		"lit_text": lit_text, "final": final, "prefix": prefix, "suffix": suffix,
+		"endcap": endcap,
+		"custom_color_enabled": custom_color_enabled,
+		"custom_name_enabled": custom_name_enabled, "allow_bbcode": allow_bbcode,
+		"allowed_tags": allowed_tags
+	}
+	#print("FUCK ", thing)
+	if Network.GAME_MASTER and lit_text.begins_with("%"):
+		var bb_dat = bbcode_process(lit_text)
+		lucy_send_message(lit_text.trim_prefix('%'), bb_dat.stripped, false)
+		# we sent the message ourself
+		return [true]
+	
+	var msg = final
+	var boring_msg = final
+	var speak = spoken_text
+	if allow_bbcode:
+		var p = bbcode_process(lit_text)
+		if not p.tags.empty():
+			msg = prefix + "%u" + endcap + p.fin + suffix
+			boring_msg = prefix + "%u" + endcap + p.stripped + suffix
+			speak = p.stripped
+		#print("FUCK3 ", {"msg":msg,"boring_msg":boring_msg,"p":p})
+		if msg != "": lucy_send_message(msg, boring_msg, local)
+		
+		if spoken_text != "" and colon: playerhud.emit_signal("_message_sent", speak)
+		# we did it ourselves
+		return [true]
+	
+	# return the custom color
+	return [false, get_user_color().to_html()]
+
+var LUCYSTOOLS_USERS = []
+
+func lucy_send_message(message, boring_msg, local = false):
+	if not Network._message_cap(Network.STEAM_ID):
+		Network._update_chat("Sending too many messages too quickly!", false)
+		Network._update_chat("Sending too many messages too quickly!", true)
+		return
+	
+	var msg_pos = Network.MESSAGE_ORIGIN.round()
+	
+	var lucy_user = real_custom_name if custom_name_enabled else ""
+	var color = get_user_color().to_html()
+	
+	safe_message(Network.STEAM_ID, color, boring_msg, local, lucy_user, message)
+	Network._send_P2P_Packet(
+		{"type": "message", "message": boring_msg, "color": color, "local": local,
+			"position": Network.MESSAGE_ORIGIN, "zone": Network.MESSAGE_ZONE,
+			"zone_owner": PlayerData.player_saved_zone_owner,
+			"bb_user": lucy_user, "bb_msg": message},
+		"peers", 2, Network.CHANNELS.GAME_STATE)
+	
+
+
+func process_read(DATA, PACKET_SENDER, from_host):
+	match DATA["type"]:
+		"lucy_packet":
+			print("[LUCY PACKET]")
+			if not PACKET_SENDER in LUCYSTOOLS_USERS: LUCYSTOOLS_USERS.append(PACKET_SENDER)
+			return true
+		
+		"message":
+			if DATA.has("message"):
+				if typeof(DATA["message"]) == TYPE_STRING:
+					if not "%u" in DATA["message"] and not from_host:
+						DATA["message"] = "(%u)" + DATA["message"]
+			if DATA.has("bb_msg"):
+				if typeof(DATA["bb_msg"]) == TYPE_STRING:
+					if not "%u" in DATA["bb_msg"] and not from_host:
+						DATA["bb_msg"] = "(%u)" + DATA["bb_msg"]
+			
+			if DATA.has("bb_msg") or DATA.has("bb_user"):
+				if not PACKET_SENDER in LUCYSTOOLS_USERS:
+					LUCYSTOOLS_USERS.append(PACKET_SENDER)
+			else:
+				return false
+			# yay! this is a lucy user :3
+			if PlayerData.players_muted.has(PACKET_SENDER) or PlayerData.players_hidden.has(PACKET_SENDER): return 
+			
+			if not Network._validate_packet_information(DATA,
+				["message", "color", "local", "position", "zone", "zone_owner", "bb_user", "bb_msg"],
+				[TYPE_STRING, TYPE_STRING, TYPE_BOOL, TYPE_VECTOR3, TYPE_STRING, TYPE_INT, TYPE_STRING, TYPE_STRING]):
+					return
+			
+			if not Network._message_cap(PACKET_SENDER): return 
+			
+			var user_id: int = PACKET_SENDER
+			var user_color: String = DATA["color"]
+			var user_message: String = DATA["message"]
+			var lucy_user: String = DATA["bb_user"]
+			var lucy_msg: String = DATA["bb_msg"]
+			
+			
+			if not DATA["local"]:
+				safe_message(user_id, user_color, user_message, false, lucy_user, lucy_msg)
+			else :
+				var dist = DATA["position"].distance_to(Network.MESSAGE_ORIGIN)
+				if DATA["zone"] == Network.MESSAGE_ZONE and DATA["zone_owner"] == PlayerData.player_saved_zone_owner:
+					if dist < 25.0: safe_message(user_id, user_color, user_message, true, lucy_user, lucy_msg)
+			
+			# don't process it again!
+			return true
+		
+		# lucy punchback :3
+		"player_punch":
+			if not DATA.has("nya"): punched(PACKET_SENDER, DATA["punch_type"])
+			# still get punched!
+			return false
+		
+	# fall through to default code
+	return false
+
+func bbcode_changes():
+	if allow_intrusive_bbcode:
+		allowed_tags = [
+		"b", "i", "u", "s", "color",
+		"wave", "rainbow", "shake", "tornado", "font"]
+	else:
+		allowed_tags = [
+		"b", "i", "u", "s", "color"]
+	if lucys_menu != null: lucys_menu.update()
+
 func set_log_messages(val):
 	log_messages = val
 	Network.LUCY_LOG_MESSAGES = val
 
-func set_punchback(punchback):
+func set_allow_intrusive_bbcode(bbcode):
-	do_punchback = punchback
+	allow_intrusive_bbcode = bbcode
-func set_bbcode(bbcode):
+	bbcode_changes()
-	allow_bbcode = bbcode
-	if Network.GAME_MASTER or not host_required: self.srv_allow_bbcode = bbcode
-func set_srv_bbcode(bbcode):
-	if Network.GAME_MASTER and not Network.PLAYING_OFFLINE: send_server_sync_actor()
-	srv_allow_bbcode = bbcode
-	Network.LUCY_CHAT_BBCODE = bbcode if host_required else allow_bbcode
-	if lucys_menu != null: lucys_menu.update()
 func set_server_name(name):
 	custom_server_name = name
 	Network.LUCY_SRV_NAME = name
 func set_join_message(msg):
 	server_join_message = msg
-func set_frame_packets(val):
-	frame_packets = val
-	Network.LUCY_FRAME_PACKETS = val
-func set_bulk_packets(val):
-	bulk_packets = val
-	Network.LUCY_BULK_PACKETS = val
-func set_bulk_interval(val):
-	bulk_interval = val
-	Network.LUCY_BULK_INTERVAL = val
-	Network.BULK_PACKET_READ_TIMER = 0
-func set_full_interval(val):
-	full_interval = val
-	Network.LUCY_BULK_FULL_INTERVAL = val
-	Network.LUCY_BULK_FULL_TIMER = 0
-func set_custom_color_enabled(val):
-	custom_color_enabled = val
-	Network.LUCY_CUSTOM_COLOR_B = val
 func set_custom_color(val):
-	custom_color = Color(val)
+	custom_color = Color(val) if Color(val) != Color("d5aa73") else Color("739ed5")
 	custom_color.a = 1
-	Network.LUCY_CUSTOM_COLOR = Color(custom_color) if Color(custom_color) != Color("d5aa73") else Color("739ed5")
 
 func _ready():
 	print("[LUCY] Loaded LucysTools")
 	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")
+
+func inject_lobby_data(connect, lobby_id):
+	if connect != 1: return
 	
+	if custom_server_name != "":
+		Steam.setLobbyData(lobby_id, "bbcode_lobby_name", custom_server_name)
 
-func send_server_sync_actor(to = "peers"):
+func send_lucy_sync(to = "peers"):
 	if not Network.GAME_MASTER: return
-	var dict = {"actor_type": "lucy_fake_actor", "at": Vector3.ZERO, "zone": "", "actor_id": 0, "creator_id": Network.STEAM_ID, "data": {
+	Network._send_P2P_Packet({"type": "lucy_packet"}, to, Network.CHANNELS.GAME_STATE)
-		"allow_bbcode": allow_bbcode
-	}}
-	Network._send_P2P_Packet({"type": "instance_actor", "params": dict}, to, 2)
-
-func _instance_actor(dict):
-	if dict["actor_type"] != "lucy_fake_actor": return
-	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,49 +265,42 @@ 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({"type": "player_punch", "from_pos": get_player().global_transform.origin, "punch_type": type, "nya": "nya"}, str(puncher_id), 2, Network.CHANNELS.ACTOR_ACTION)
-	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)
-	
 
 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 = bbcode_process(server_join_message)
-	send_server_sync_actor(str(id))
+	lucy_send_message(bb_msg.fin, bb_msg.stripped, false)
+	send_lucy_sync(str(id))
 
 func _on_enter(node: Node):
 	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
+		self.allow_intrusive_bbcode = allow_intrusive_bbcode
-		self.srv_allow_bbcode = false
+		lucys_menu.setup()
-		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"
+	"log_messages", "custom_name",
+	"allow_intrusive_bbcode"
 ]
 
 func load_settings():

README.md

@@ -3,31 +3,25 @@ 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 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 do 'raw' messages & BBCode in messages. If enabled, other players on the server can use BBCode too. (Not secure or anything, implemented client side)
+- If intrusive BBCode is enabled, as host 'raw' messages can be sent with a % prefix
 
-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.
+- 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.09
 - 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: