From f396221327ce6bb41a503b896e9bbb8068cc519f Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Mon, 19 Jul 2021 22:21:16 +0200 Subject: [PATCH 1/2] feat: add range to magic staff (#70) --- assets/prefabs/magicStaff.prefab | 5 ++++- .../components/RaycastOnActivateComponent.java | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 src/main/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java diff --git a/assets/prefabs/magicStaff.prefab b/assets/prefabs/magicStaff.prefab index 3d538d3..bc28f0c 100644 --- a/assets/prefabs/magicStaff.prefab +++ b/assets/prefabs/magicStaff.prefab @@ -7,5 +7,8 @@ "icon" : "LightAndShadowResources:magicStaff", "usage": "IN_DIRECTION" }, - "RaycastOnActivate": {} + "Range": { + "value": 30.0 + }, + "FlagDropOnActivate": {} } diff --git a/src/main/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java b/src/main/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java deleted file mode 100644 index 4c0ed62..0000000 --- a/src/main/java/org/terasology/lightandshadowresources/components/RaycastOnActivateComponent.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2021 The Terasology Foundation -// SPDX-License-Identifier: Apache-2.0 -package org.terasology.lightandshadowresources.components; - -import org.terasology.engine.entitySystem.Component; - -public class RaycastOnActivateComponent implements Component { -} From 9788c7e884ee8d93738755d93654de007286df89 Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Mon, 26 Jul 2021 23:38:05 +0200 Subject: [PATCH 2/2] chore: Adjust for changes in MovingBlocks/Terasology#4818 (#73) --- assets/prefabs/magicStaff.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/prefabs/magicStaff.prefab b/assets/prefabs/magicStaff.prefab index bc28f0c..1a56467 100644 --- a/assets/prefabs/magicStaff.prefab +++ b/assets/prefabs/magicStaff.prefab @@ -8,7 +8,7 @@ "usage": "IN_DIRECTION" }, "Range": { - "value": 30.0 + "range": 30.0 }, "FlagDropOnActivate": {} }