Skip to content

Commit

Permalink
fix: closes #39 (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
@OctoD
OctoD authored Oct 3, 2023
1 parent 5efda83 commit 2a3d242
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 64 deletions.
40 changes: 20 additions & 20 deletions addons/godot_gameplay_systems/attributes_and_abilities/plugin.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ const EFFECTED_AREA2D = "EffectedArea2D"
const EFFECTED_AREA3D = "EffectedArea3D"
const STOP_EFFECT_IF0_RESOURCE_NAME = "StopEffectIfAttributeIs0"

const attribute_spec_script = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/objects/attribute_spec.gd")
const ability_container_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/nodes/ability_container.gd")
const activation_event_script = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/objects/activation_event.gd")
const attributes_table_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/resources/attribute_table.gd")
const attribute_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/resources/attribute.gd")
const attribute_effect_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/resources/attribute_effect.gd")
const attribute_effect_condition_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/resources/attribute_effect_condition.gd")
const effected_area2d = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/nodes/effected_area2d.gd")
const effected_area3d = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/nodes/effected_area3d.gd")
const gameplay_effect = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/nodes/gameplay_effect.gd")
const gameplay_attribute_map = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/nodes/gameplay_attribute_map.gd")
const stop_effect_if0_resource = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/resources/stop_effect_if_0.gd")
const attribute_spec_script = preload("./objects/attribute_spec.gd")
const ability_container_resource = preload("./nodes/ability_container.gd")
const activation_event_script = preload("./objects/activation_event.gd")
const attributes_table_resource = preload("./resources/attribute_table.gd")
const attribute_resource = preload("./resources/attribute.gd")
const attribute_effect_resource = preload("./resources/attribute_effect.gd")
const attribute_effect_condition_resource = preload("./resources/attribute_effect_condition.gd")
const effected_area2d = preload("./nodes/effected_area2d.gd")
const effected_area3d = preload("./nodes/effected_area3d.gd")
const gameplay_effect = preload("./nodes/gameplay_effect.gd")
const gameplay_attribute_map = preload("./nodes/gameplay_attribute_map.gd")
const stop_effect_if0_resource = preload("./resources/stop_effect_if_0.gd")

const attribute_inspector_plugin_script = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/inspector/gameplay_attribute_map_inspector_plugin.gd")
const effect_inspector_plugin_script = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/inspector/gameplay_effect_inspector_plugin.gd")
const attribute_inspector_plugin_script = preload("./inspector/gameplay_attribute_map_inspector_plugin.gd")
const effect_inspector_plugin_script = preload("./inspector/gameplay_effect_inspector_plugin.gd")


var attribute_inspector_plugin: EditorInspectorPlugin
Expand All @@ -39,17 +39,17 @@ func _enter_tree():
add_custom_type(ACTIVATION_EVENT_NAME, "RefCounted", activation_event_script, null)
add_custom_type(ATTRIBUTE_SPEC_NAME, "RefCounted", attribute_spec_script, null)

add_custom_type(ATTRIBUTE_RESOURCE_NAME, "Resource", attribute_resource, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(ATTRIBUTE_TABLE_RESOURCE_NAME, "Resource", attributes_table_resource, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(ATTRIBUTE_EFFECT_RESOURCE_NAME, "Resource", attribute_effect_resource, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(ATTRIBUTE_RESOURCE_NAME, "Resource", attribute_resource, preload("./assets/[email protected]"))
add_custom_type(ATTRIBUTE_TABLE_RESOURCE_NAME, "Resource", attributes_table_resource, preload("./assets/[email protected]"))
add_custom_type(ATTRIBUTE_EFFECT_RESOURCE_NAME, "Resource", attribute_effect_resource, preload("./assets/[email protected]"))
add_custom_type(ATTRIBUTE_EFFECT_CONDITION_RESOURCE_NAME, "Resource", attribute_effect_condition_resource, null)
add_custom_type(GAMEPLAY_ATTRIBUTE_MAP_NAME, "Node", gameplay_attribute_map, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(GAMEPLAY_EFFECT_NAME, "Node", gameplay_effect, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(GAMEPLAY_ATTRIBUTE_MAP_NAME, "Node", gameplay_attribute_map, preload("./assets/[email protected]"))
add_custom_type(GAMEPLAY_EFFECT_NAME, "Node", gameplay_effect, preload("./assets/[email protected]"))
add_custom_type(EFFECTED_AREA2D, "Area2D", effected_area2d, null)
add_custom_type(EFFECTED_AREA3D, "Area3D", effected_area3d, null)
add_custom_type(STOP_EFFECT_IF0_RESOURCE_NAME, ATTRIBUTE_EFFECT_CONDITION_RESOURCE_NAME, stop_effect_if0_resource, null)

add_custom_type(ABILITY_CONTAINER_NAME, "Node", ability_container_resource, preload("res://addons/godot_gameplay_systems/attributes_and_abilities/assets/[email protected]"))
add_custom_type(ABILITY_CONTAINER_NAME, "Node", ability_container_resource, preload("./assets/[email protected]"))

attribute_inspector_plugin = attribute_inspector_plugin_script.new()
effect_inspector_plugin = effect_inspector_plugin_script.new()
Expand Down
2 changes: 1 addition & 1 deletion addons/godot_gameplay_systems/camera_shake/plugin.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extends EditorPlugin


func _enter_tree() -> void:
add_custom_type("CameraShake", "Node", load("res://addons/godot_gameplay_systems/camera_shake/nodes/camera_shake.gd"), null)
add_custom_type("CameraShake", "Node", load("./nodes/camera_shake.gd"), null)


func _exit_tree() -> void:
Expand Down
4 changes: 2 additions & 2 deletions addons/godot_gameplay_systems/extended_character_nodes/plugin.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ extends EditorPlugin


func _enter_tree() -> void:
add_custom_type("PointAndClick2D", "Node2D", load("res://addons/godot_gameplay_systems/extended_character_nodes/nodes/2d/point_and_click_2d.gd"), null)
add_custom_type("PointAndClick3D", "Node3D", load("res://addons/godot_gameplay_systems/extended_character_nodes/nodes/3d/point_and_click_3d.gd"), null)
add_custom_type("PointAndClick2D", "Node2D", load("./nodes/2d/point_and_click_2d.gd"), null)
add_custom_type("PointAndClick3D", "Node3D", load("./nodes/3d/point_and_click_3d.gd"), null)


func _exit_tree() -> void:
Expand Down
12 changes: 6 additions & 6 deletions addons/godot_gameplay_systems/interactables/plugin.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ extends EditorPlugin


func _enter_tree() -> void:
add_custom_type("InteractableArea2D", "Area2D", load("res://addons/godot_gameplay_systems/interactables/nodes/2d/interactable_area_2d.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractableArea2D.png"))
add_custom_type("InteractableArea3D", "Area3D", load("res://addons/godot_gameplay_systems/interactables/nodes/3d/interactable_area_3d.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractableArea2D.png"))
add_custom_type("InteractionRayCast2D", "RayCast2D", load("res://addons/godot_gameplay_systems/interactables/nodes/2d/interaction_raycast_2d.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractionRayCast2DIcon.png"))
add_custom_type("InteractionRayCast3D", "RayCast3D", load("res://addons/godot_gameplay_systems/interactables/nodes/3d/interaction_raycast_3d.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractionRayCast3DIcon.png"))
add_custom_type("InteractionManager", "Node", load("res://addons/godot_gameplay_systems/interactables/nodes/interaction_manager.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractionIcon.png"))
add_custom_type("Interaction", "Resource", load("res://addons/godot_gameplay_systems/interactables/resources/interaction.gd"), load("res://addons/godot_gameplay_systems/interactables/assets/InteractionIcon.png"))
add_custom_type("InteractableArea2D", "Area2D", load("./nodes/2d/interactable_area_2d.gd"), load("./assets/InteractableArea2D.png"))
add_custom_type("InteractableArea3D", "Area3D", load("./nodes/3d/interactable_area_3d.gd"), load("./assets/InteractableArea2D.png"))
add_custom_type("InteractionRayCast2D", "RayCast2D", load("./nodes/2d/interaction_raycast_2d.gd"), load("./assets/InteractionRayCast2DIcon.png"))
add_custom_type("InteractionRayCast3D", "RayCast3D", load("./nodes/3d/interaction_raycast_3d.gd"), load("./assets/InteractionRayCast3DIcon.png"))
add_custom_type("InteractionManager", "Node", load("./nodes/interaction_manager.gd"), load("./assets/InteractionIcon.png"))
add_custom_type("Interaction", "Resource", load("./resources/interaction.gd"), load("./assets/InteractionIcon.png"))


func _exit_tree() -> void:
Expand Down
46 changes: 23 additions & 23 deletions addons/godot_gameplay_systems/inventory_system/plugin.gd
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
extends EditorPlugin


const equipment_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/equipment.gd")
const equipped_item_3d = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/equipped_item_3d.gd")
const inventory_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/inventory.gd")
const item_script = preload("res://addons/godot_gameplay_systems/inventory_system/resources/item.gd")
const item_activation_event_script = preload("res://addons/godot_gameplay_systems/inventory_system/objects/item_activation_event.gd")
const pickable_item_2d = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/pickable_item_2d.gd")
const pickable_item_3d = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/pickable_item_3d.gd")
const drop_group_script = preload("res://addons/godot_gameplay_systems/inventory_system/resources/drop_group.gd")
const drop_table_script = preload("res://addons/godot_gameplay_systems/inventory_system/resources/drop_table.gd")
const drop_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/drop.gd")
const drop_2d_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/drop_2d.gd")
const drop_3d_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/drop_3d.gd")
const radial_menu_script = preload("res://addons/godot_gameplay_systems/inventory_system/nodes/radial_menu_container.gd")
const equipment_script = preload("./nodes/equipment.gd")
const equipped_item_3d = preload("./nodes/equipped_item_3d.gd")
const inventory_script = preload("./nodes/inventory.gd")
const item_script = preload("./resources/item.gd")
const item_activation_event_script = preload("./objects/item_activation_event.gd")
const pickable_item_2d = preload("./nodes/pickable_item_2d.gd")
const pickable_item_3d = preload("./nodes/pickable_item_3d.gd")
const drop_group_script = preload("./resources/drop_group.gd")
const drop_table_script = preload("./resources/drop_table.gd")
const drop_script = preload("./nodes/drop.gd")
const drop_2d_script = preload("./nodes/drop_2d.gd")
const drop_3d_script = preload("./nodes/drop_3d.gd")
const radial_menu_script = preload("./nodes/radial_menu_container.gd")


func _enter_tree() -> void:
add_custom_type("Item", "Resource", item_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/ItemIcon.png"))
add_custom_type("Drop", "Node", drop_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/DropIcon.png"))
add_custom_type("Drop2D", "Node2D", drop_2d_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/DropNode2D.png"))
add_custom_type("Drop3D", "Node3D", drop_3d_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/DropNode3D.png"))
add_custom_type("DropGroup", "Resource", drop_group_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/DropGroupIcon.png"))
add_custom_type("DropTable", "Resource", drop_table_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/DropTableIcon.png"))
add_custom_type("Item", "Resource", item_script, preload("./assets/ItemIcon.png"))
add_custom_type("Drop", "Node", drop_script, preload("./assets/DropIcon.png"))
add_custom_type("Drop2D", "Node2D", drop_2d_script, preload("./assets/DropNode2D.png"))
add_custom_type("Drop3D", "Node3D", drop_3d_script, preload("./assets/DropNode3D.png"))
add_custom_type("DropGroup", "Resource", drop_group_script, preload("./assets/DropGroupIcon.png"))
add_custom_type("DropTable", "Resource", drop_table_script, preload("./assets/DropTableIcon.png"))
add_custom_type("ItemActivationEvent", "RefCounted", item_activation_event_script, null)
add_custom_type("Inventory", "Node", inventory_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/InventoryIcon.png"))
add_custom_type("Equipment", "Node", equipment_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/EquipmentIcon.png"))
add_custom_type("EquippedItem3D", "Node3D", equipped_item_3d, preload("res://addons/godot_gameplay_systems/inventory_system/assets/Equipped3DIcon.png"))
add_custom_type("Inventory", "Node", inventory_script, preload("./assets/InventoryIcon.png"))
add_custom_type("Equipment", "Node", equipment_script, preload("./assets/EquipmentIcon.png"))
add_custom_type("EquippedItem3D", "Node3D", equipped_item_3d, preload("./assets/Equipped3DIcon.png"))
add_custom_type("PickableArea2D", "Area2D", pickable_item_2d, null)
add_custom_type("PickableArea3D", "Area3D", pickable_item_3d, null)
add_custom_type("RadialMenuContainer", "Container", radial_menu_script, preload("res://addons/godot_gameplay_systems/inventory_system/assets/RadialMenuIcon.png"))
add_custom_type("RadialMenuContainer", "Container", radial_menu_script, preload("./assets/RadialMenuIcon.png"))


func _exit_tree() -> void:
Expand Down
14 changes: 7 additions & 7 deletions addons/godot_gameplay_systems/plugin.gd
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@tool
extends EditorPlugin

const attributes_and_abilities_plugin_script = preload("res://addons/godot_gameplay_systems/attributes_and_abilities/plugin.gd")
const camera_shake_plugin_script = preload("res://addons/godot_gameplay_systems/camera_shake/plugin.gd")
const extended_character_nodes_script = preload("res://addons/godot_gameplay_systems/extended_character_nodes/plugin.gd")
const inventory_system_script = preload("res://addons/godot_gameplay_systems/inventory_system/plugin.gd")
const interactables_script = preload("res://addons/godot_gameplay_systems/interactables/plugin.gd")
const slideshow_script = preload("res://addons/godot_gameplay_systems/slideshow/plugin.gd")
const turn_based_script = preload("res://addons/godot_gameplay_systems/turn_based/plugin.gd")
const attributes_and_abilities_plugin_script = preload("./attributes_and_abilities/plugin.gd")
const camera_shake_plugin_script = preload("./camera_shake/plugin.gd")
const extended_character_nodes_script = preload("./extended_character_nodes/plugin.gd")
const inventory_system_script = preload("./inventory_system/plugin.gd")
const interactables_script = preload("./interactables/plugin.gd")
const slideshow_script = preload("./slideshow/plugin.gd")
const turn_based_script = preload("./turn_based/plugin.gd")


var attributes_and_abilities_plugin: EditorPlugin
Expand Down
2 changes: 1 addition & 1 deletion addons/godot_gameplay_systems/slideshow/plugin.gd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extends EditorPlugin


const slideshow_script = preload("res://addons/godot_gameplay_systems/slideshow/slide_show.gd")
const slideshow_script = preload("./slide_show.gd")


func _enter_tree() -> void:
Expand Down
6 changes: 3 additions & 3 deletions addons/godot_gameplay_systems/turn_based/plugin.gd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
extends EditorPlugin


const TurnBasedGameScript = preload("res://addons/godot_gameplay_systems/turn_based/nodes/TurnBasedGame.gd")
const TurnSubscriberScript = preload("res://addons/godot_gameplay_systems/turn_based/nodes/TurnSubscriber.gd")
const TurnBasedGameScript = preload("./nodes/TurnBasedGame.gd")
const TurnSubscriberScript = preload("./nodes/TurnSubscriber.gd")


func _enter_tree() -> void:
add_autoload_singleton("TurnManager", "res://addons/godot_gameplay_systems/turn_based/autoloads/turn_manager.gd")
add_autoload_singleton("TurnManager", "./autoloads/turn_manager.gd")
add_custom_type("TurnBasedGame", "Node", TurnBasedGameScript, null)
add_custom_type("TurnSubscriber", "Node", TurnSubscriberScript, null)

Expand Down
2 changes: 1 addition & 1 deletion project.godot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ config/icon="res://icon.svg"

[autoload]

TurnManager="*res://addons/godot_gameplay_systems/turn_based/autoloads/turn_manager.gd"
TurnManager="*res://addons/godot_gameplay_systems/turn_based/./autoloads/turn_manager.gd"

[display]

Expand Down

0 comments on commit 2a3d242

Please sign in to comment.