projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Fix loot radials appearing twice"

Browse Source 
This reverts commit f2715b1161.
This commit is contained in:
Ziggy
2022-04-15 17:00:19 +02:00
parent 7278dd99cf
commit 4d4b346dd0
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/support/objects/radial/object/AIObjectRadial.java
+6
View File
@@ -21,7 +21,13 @@ public class AIObjectRadial implements RadialHandlerInterface {
@Override
public void getOptions(Collection<RadialOption> options, Player player, SWGObject target) {
AIObject ai = (AIObject) target;
if (ai.getPosture() != Posture.DEAD) {
return;
}
options.add(RadialOption.create(RadialItem.LOOT, RadialOption.create(RadialItem.LOOT_ALL)));
}
@Override
src/test/java/com/projectswg/holocore/services/support/objects/radials/TestRadialService.java
+24
View File
@@ -27,6 +27,7 @@
package com.projectswg.holocore.services.support.objects.radials;
import com.projectswg.common.data.encodables.tangible.Posture;
import com.projectswg.common.data.radial.RadialItem;
import com.projectswg.common.data.radial.RadialOption;
import com.projectswg.common.network.packets.swg.zone.object_controller.ObjectMenuRequest;
@@ -34,6 +35,7 @@ import com.projectswg.common.network.packets.swg.zone.object_controller.ObjectMe
import com.projectswg.holocore.intents.support.global.network.InboundPacketIntent;
import com.projectswg.holocore.resources.support.objects.swg.SWGObject;
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject;
import com.projectswg.holocore.resources.support.objects.swg.custom.AIObject;
import com.projectswg.holocore.resources.support.objects.swg.tangible.TangibleObject;
import com.projectswg.holocore.test.runners.TestRunnerSimulatedWorld;
import com.projectswg.holocore.test.resources.GenericCreatureObject;
@@ -78,6 +80,28 @@ public class TestRadialService extends TestRunnerSimulatedWorld {
Assert.assertEquals(RadialItem.ITEM_DESTROY, response.getOptions().get(1).getType());
}
@Test
public void testReplaceLootRadial() {
GenericCreatureObject creature = new GenericCreatureObject(getUniqueId());
AIObject dead = new AIObject(getUniqueId());
registerObject(creature, dead);
dead.setPosture(Posture.DEAD);
sendRequest(creature, dead, RadialItem.LOOT, RadialItem.EXAMINE);
ObjectMenuResponse response = creature.getOwner().getNextPacket(ObjectMenuResponse.class);
Assert.assertNotNull(response);
Assert.assertEquals(creature.getObjectId(), response.getRequestorId());
Assert.assertEquals(dead.getObjectId(), response.getTargetId());
Assert.assertEquals(2, response.getOptions().size());
Assert.assertEquals(RadialItem.LOOT, response.getOptions().get(0).getType());
Assert.assertEquals(RadialItem.EXAMINE, response.getOptions().get(1).getType());
Assert.assertEquals(1, response.getOptions().get(0).getChildren().size());
Assert.assertEquals(RadialItem.LOOT_ALL, response.getOptions().get(0).getChildren().get(0).getType());
}
private void sendRequest(CreatureObject source, SWGObject target, RadialItem ... items) {
ObjectMenuRequest request = new ObjectMenuRequest(source.getObjectId());
request.setTargetId(target.getObjectId());