diff --git a/src/main/java/de/siphalor/was/WhatAStorage.java b/src/main/java/de/siphalor/was/WhatAStorage.java index 07cfe89..c707510 100644 --- a/src/main/java/de/siphalor/was/WhatAStorage.java +++ b/src/main/java/de/siphalor/was/WhatAStorage.java @@ -178,7 +178,7 @@ public class WhatAStorage { } } - public boolean canSellProduct(int questIndex, int x, int y) { + public boolean canDeliverProduct(int questIndex, int x, int y) { Quest quest = quests.get(questIndex); if (quest != null && quest.getType() == Quest.Type.OUT) { return quest.getProduct().equals(storage.get(x, y).front()); @@ -186,10 +186,10 @@ public class WhatAStorage { return false; } - public boolean sellProduct(int questIndex, int x, int y) { - if (canSellProduct(questIndex, x, y)) { + public boolean deliverProduct(int questIndex, int x, int y) { + if (canDeliverProduct(questIndex, x, y)) { int z = storage.get(x, y).pop(); - addTransaction(Balance.Transaction.SELL, quests.get(questIndex).getReward()); + addTransaction(Balance.Transaction.DELIVER, quests.get(questIndex).getReward()); quests.remove(questIndex); visual.onQuestRemoved(questIndex); visual.onProductCleared(x, y, z); diff --git a/src/main/java/de/siphalor/was/game/Balance.java b/src/main/java/de/siphalor/was/game/Balance.java index 2b36bcc..c6eef5d 100644 --- a/src/main/java/de/siphalor/was/game/Balance.java +++ b/src/main/java/de/siphalor/was/game/Balance.java @@ -41,7 +41,7 @@ public class Balance { } public enum Transaction { - ABANDON, DESTROY, MOVE, NOOP, SELL, STORE; + ABANDON, DESTROY, MOVE, NOOP, DELIVER, STORE; public String getTranslationKey() { return "game.balance.history.type." + name().toLowerCase(Locale.ENGLISH); diff --git a/src/main/java/de/siphalor/was/visual/jfx/QuestController.java b/src/main/java/de/siphalor/was/visual/jfx/QuestController.java index 475fbce..b67a1c4 100644 --- a/src/main/java/de/siphalor/was/visual/jfx/QuestController.java +++ b/src/main/java/de/siphalor/was/visual/jfx/QuestController.java @@ -51,7 +51,7 @@ public class QuestController { DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT); if (product instanceof DraggedProduct.Slot) { DraggedProduct.Slot slot = (DraggedProduct.Slot) product; - if (WhatAStorage.getInstance().canSellProduct(getIndex(), slot.x, slot.y)) { + if (WhatAStorage.getInstance().canDeliverProduct(getIndex(), slot.x, slot.y)) { dragEvent.acceptTransferModes(TransferMode.MOVE); dragEvent.consume(); } @@ -66,7 +66,7 @@ public class QuestController { DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT); if (product instanceof DraggedProduct.Slot) { DraggedProduct.Slot slot = (DraggedProduct.Slot) product; - if (WhatAStorage.getInstance().sellProduct(getIndex(), slot.x, slot.y)) { + if (WhatAStorage.getInstance().deliverProduct(getIndex(), slot.x, slot.y)) { dragEvent.setDropCompleted(true); dragEvent.consume(); return; diff --git a/src/main/resources/content/lang/de_de.lang b/src/main/resources/content/lang/de_de.lang index 9e020fa..f18f817 100644 --- a/src/main/resources/content/lang/de_de.lang +++ b/src/main/resources/content/lang/de_de.lang @@ -18,7 +18,7 @@ game.balance.history.type.abandon = Auftrag abgelehnt game.balance.history.type.destroy = Produkt zerst\u00f6rt game.balance.history.type.move = Produkt bewegt game.balance.history.type.noop = NOOP -game.balance.history.type.sell = Produkt ausgelagert +game.balance.history.type.deliver = Produkt ausgelagert game.balance.history.type.store = Produkt eingelagert game.balance.chart = Bilanz game.balance.chart.line = Budget diff --git a/src/main/resources/content/lang/en_us.lang b/src/main/resources/content/lang/en_us.lang index d1e1101..9107308 100644 --- a/src/main/resources/content/lang/en_us.lang +++ b/src/main/resources/content/lang/en_us.lang @@ -18,7 +18,7 @@ game.balance.history.type.abandon = Quest abandoned game.balance.history.type.destroy = Product destroy game.balance.history.type.move = Product moved game.balance.history.type.noop = NOOP -game.balance.history.type.sell = Product sold +game.balance.history.type.deliver = Product delivered game.balance.history.type.store = Product stored game.balance.chart = Balance game.balance.chart.line = Budget