diff --git a/GameShit/ItemHandlers/base/evilium.tres b/GameShit/ItemHandlers/base/evilium.tres new file mode 100644 index 0000000..8ba8459 --- /dev/null +++ b/GameShit/ItemHandlers/base/evilium.tres @@ -0,0 +1,12 @@ +[gd_resource type="Resource" script_class="ItemData" format=3 uid="uid://cjdrlgjtalrit"] + +[ext_resource type="Script" uid="uid://cjb16s8q73wkx" path="res://GameShit/PlayerController/Hotbar/ItemData.gd" id="1_uohj2"] +[ext_resource type="Texture2D" uid="uid://cisnwwf0h8n20" path="res://Assets/grass.jpg" id="2_wtvso"] + +[resource] +script = ExtResource("1_uohj2") +Name = "Evilium" +ID = "base:evilium" +description = "tis an evil kitty" +texture = ExtResource("2_wtvso") +metadata/_custom_type_script = "uid://cjb16s8q73wkx" diff --git a/GameShit/PlayerController/ChatSystem/ChatBox.gd b/GameShit/PlayerController/ChatSystem/ChatBox.gd index ed7289f..cba7fe5 100644 --- a/GameShit/PlayerController/ChatSystem/ChatBox.gd +++ b/GameShit/PlayerController/ChatSystem/ChatBox.gd @@ -7,21 +7,31 @@ extends Control ## if you are looking for chat var storage ## they are in GameShit/ChatSystem/ChatBox.gd + +## This dict holds a reference to all command IDs and their corresponding call var Commands : Dictionary = { "give": CommandHandler.registerCommand("base:giveItem").new(), "say": CommandHandler.registerCommand("base:say").new() } +## load the language manager var language = LanguageManager.loadLanguage() +## parse message func _parseMessage(): + + ## get the contents var messageContents : String = %Input.text + ## handle if its a command if messageContents.begins_with("/"): + ## strip out the / var command = messageContents.right(-1) + ## run the command runCommand(command) %Input.text = "" MainGame.hideChatbox.emit() + ## if its not a command, send the message and reset the field and hide the box else: sendMessage(messageContents) %Input.text = "" diff --git a/WorldObjects/base/evilium.tscn b/WorldObjects/base/evilium.tscn new file mode 100644 index 0000000..3ab79f9 --- /dev/null +++ b/WorldObjects/base/evilium.tscn @@ -0,0 +1,36 @@ +[gd_scene format=3 uid="uid://cq3k4evus3crp"] + +[sub_resource type="GDScript" id="GDScript_c3ak7"] +script/source = "extends StaticBody3D + +func _destroy(): + get_parent().queue_free() + +" + +[sub_resource type="SphereShape3D" id="SphereShape3D_c3ak7"] + +[sub_resource type="SphereMesh" id="SphereMesh_l56mc"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_woch8"] +albedo_color = Color(1, 0, 0, 1) +metallic = 1.0 +metallic_specular = 0.18 +roughness = 0.13 +emission_enabled = true +emission = Color(0.95445794, 3.6098063e-06, 1.347661e-06, 1) +emission_energy_multiplier = 10000.0 +refraction_scale = 1.0 + +[node name="Evilium" type="Node3D" unique_id=1080277171] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) + +[node name="Collider" type="StaticBody3D" parent="." unique_id=1271626654] +script = SubResource("GDScript_c3ak7") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collider" unique_id=145644631] +shape = SubResource("SphereShape3D_c3ak7") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=156585554] +mesh = SubResource("SphereMesh_l56mc") +surface_material_override/0 = SubResource("StandardMaterial3D_woch8") diff --git a/WorldObjects/base/scripts/test_machine.gd b/WorldObjects/base/scripts/MachineBuiltins.gd similarity index 100% rename from WorldObjects/base/scripts/test_machine.gd rename to WorldObjects/base/scripts/MachineBuiltins.gd diff --git a/WorldObjects/base/scripts/MachineBuiltins.gd.uid b/WorldObjects/base/scripts/MachineBuiltins.gd.uid new file mode 100644 index 0000000..e9dfb04 --- /dev/null +++ b/WorldObjects/base/scripts/MachineBuiltins.gd.uid @@ -0,0 +1 @@ +uid://c3tgp5r2kwpdp diff --git a/WorldObjects/base/scripts/test_machine.gd.uid b/WorldObjects/base/scripts/test_machine.gd.uid deleted file mode 100644 index 5ef834d..0000000 --- a/WorldObjects/base/scripts/test_machine.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://06qp61kpmfr3 diff --git a/WorldObjects/base/testMachine.tscn b/WorldObjects/base/testMachine.tscn index a0015c1..c247ab9 100644 --- a/WorldObjects/base/testMachine.tscn +++ b/WorldObjects/base/testMachine.tscn @@ -1,10 +1,10 @@ [gd_scene format=3 uid="uid://bt5an8h7itk1d"] -[ext_resource type="Script" uid="uid://06qp61kpmfr3" path="res://WorldObjects/base/scripts/test_machine.gd" id="1_e1b2x"] [ext_resource type="Script" uid="uid://lnl2novjwc5x" path="res://WorldObjects/base/scripts/test_machine.torch" id="1_e42so"] [ext_resource type="PackedScene" uid="uid://b1cwggrpop0lm" path="res://Objects/ILed.tscn" id="2_q3u4y"] [ext_resource type="PackedScene" uid="uid://c4skbeito3suj" path="res://Objects/ISwitch.tscn" id="3_2f3vd"] [ext_resource type="PackedScene" uid="uid://dsf43ptd66s8u" path="res://Objects/SUpdate.tscn" id="4_2lqy0"] +[ext_resource type="Script" uid="uid://c3tgp5r2kwpdp" path="res://WorldObjects/base/scripts/MachineBuiltins.gd" id="5_e42so"] [sub_resource type="BoxMesh" id="BoxMesh_i18b1"] @@ -32,10 +32,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.18054277, 0.29619968, 0.393 [node name="SUpdate" parent="." unique_id=2038046630 groups=["saveable"] instance=ExtResource("4_2lqy0")] isActive = true -[node name="Script" type="StaticBody3D" parent="." unique_id=913681642 groups=["saveable"]] -script = ExtResource("1_e1b2x") +[node name="Collider" type="StaticBody3D" parent="." unique_id=913681642 groups=["saveable"]] +script = ExtResource("5_e42so") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Script" unique_id=505912246 groups=["saveable"]] +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collider" unique_id=505912246 groups=["saveable"]] shape = SubResource("BoxShape3D_e1b2x") [connection signal="castUpdate" from="SUpdate" to="." method="_on_s_update_cast_update"] diff --git a/addons/xlib/main.gd b/addons/xlib/main.gd new file mode 100644 index 0000000..8ecc6d4 --- /dev/null +++ b/addons/xlib/main.gd @@ -0,0 +1,22 @@ +@tool +extends EditorPlugin + + +func _enable_plugin() -> void: + # Add autoloads here. + pass + + +func _disable_plugin() -> void: + # Remove autoloads here. + pass + + +func _enter_tree() -> void: + # Initialization of the plugin goes here. + pass + + +func _exit_tree() -> void: + # Clean-up of the plugin goes here. + pass diff --git a/addons/xlib/main.gd.uid b/addons/xlib/main.gd.uid new file mode 100644 index 0000000..88514b8 --- /dev/null +++ b/addons/xlib/main.gd.uid @@ -0,0 +1 @@ +uid://ca2vhil7w317x diff --git a/addons/xlib/plugin.cfg b/addons/xlib/plugin.cfg new file mode 100644 index 0000000..254e9e4 --- /dev/null +++ b/addons/xlib/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="XLib" +description="XLibrary plugin developed for Factory47" +author="Xtimhedi" +version="1.1" +script="main.gd" diff --git a/project.godot b/project.godot index f720614..da2074c 100644 --- a/project.godot +++ b/project.godot @@ -32,7 +32,7 @@ window/size/viewport_height=768 [editor_plugins] -enabled=PackedStringArray("res://addons/ninetailsrabbit.terrainy/plugin.cfg", "res://addons/savekit/plugin.cfg") +enabled=PackedStringArray("res://addons/ninetailsrabbit.terrainy/plugin.cfg", "res://addons/savekit/plugin.cfg", "res://addons/xlib/plugin.cfg") [file_customization]