Ramtin/HW-04-JAVA-KNIGHT-Ramtin
1
0
Fork 0
forked from AdvancedProgramming1404/HW-04-JAVA-KNIGHT
Code Pull Requests 1 Activity

Develop #1

Open
Ramtin wants to merge 35 commits from develop into main
pull from: develop
merge into: :main
Conversation 0 Commits 35 Files Changed 64
+17 -17
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76baf0f2cf - Show all commits
Java-Knight/src/main/java/org/project/Interface/IAttachable.java
+2 -2
View File
@@ -3,6 +3,6 @@ package org.project.Interface;
import org.project.entity.Entity; import org.project.entity.Entity;
public interface IAttachable { public interface IAttachable {
public void AttachTo(Entity entity); public void AttachTo(Entity entity, boolean fromInventory);
public void DeattachFrom(Entity entity); public void DeattachFrom(Entity entity, boolean toInventory);
} }
Java-Knight/src/main/java/org/project/item/Accessory/Accessory.java
+3 -3
View File
@@ -45,13 +45,13 @@ public abstract class Accessory extends SellableItem implements IDamageable, IAt
@Override @Override
public void HandleZeroHealth() { public void HandleZeroHealth() {
this.DeattachFrom(this.Owner); this.DeattachFrom(this.Owner, false);
this.Owner.Inventory.remove(this); this.Owner.Inventory.remove(this);
} }
@Override @Override
public abstract void AttachTo(Entity entity); public abstract void AttachTo(Entity entity, boolean fromInventory);
@Override @Override
public abstract void DeattachFrom(Entity entity); public abstract void DeattachFrom(Entity entity, boolean toInventory);
} }
Java-Knight/src/main/java/org/project/item/Accessory/Costume.java
+4 -4
View File
@@ -35,14 +35,14 @@ public class Costume extends Accessory implements IDefender {
} }
@Override @Override
public void AttachTo(Entity entity) { public void AttachTo(Entity entity, boolean fromInventory) {
entity.RemoveFromInventory(this); if (fromInventory) entity.RemoveFromInventory(this);
entity.Costume = this; entity.Costume = this;
} }
@Override @Override
public void DeattachFrom(Entity entity) { public void DeattachFrom(Entity entity, boolean toInventory) {
entity.Costume = null; entity.Costume = null;
entity.AddToInventory(this); if (toInventory) entity.AddToInventory(this);
} }
} }
Java-Knight/src/main/java/org/project/item/Accessory/Shield.java
+4 -4
View File
@@ -35,14 +35,14 @@ public class Shield extends Accessory implements IDefender {
} }
@Override @Override
public void AttachTo(Entity entity) { public void AttachTo(Entity entity, boolean fromInventory) {
entity.RemoveFromInventory(this); if (fromInventory) entity.RemoveFromInventory(this);
entity.Shield = this; entity.Shield = this;
} }
@Override @Override
public void DeattachFrom(Entity entity) { public void DeattachFrom(Entity entity, boolean toInventory) {
entity.Shield = null; entity.Shield = null;
entity.AddToInventory(this); if (toInventory) entity.AddToInventory(this);
} }
} }
Java-Knight/src/main/java/org/project/item/Accessory/Weapon.java
+4 -4
View File
@@ -17,14 +17,14 @@ public class Weapon extends Accessory implements IDamageUtil {
} }
@Override @Override
public void AttachTo(Entity entity) { public void AttachTo(Entity entity, boolean fromInventory) {
entity.RemoveFromInventory(this); if (fromInventory) entity.RemoveFromInventory(this);
entity.Weapon = this; entity.Weapon = this;
} }
@Override @Override
public void DeattachFrom(Entity entity) { public void DeattachFrom(Entity entity, boolean toInventory) {
entity.Weapon = null; entity.Weapon = null;
entity.AddToInventory(this); if (toInventory) entity.AddToInventory(this);
} }
} }