Siphalor/what-a-storage
1
0
Fork 0
Code Issues Releases Activity

Rename selling to delivering

Browse Source
This commit is contained in:
Siphalor
2020-07-09 20:34:32 +02:00
parent 216973da78
commit 0180da46a8
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/siphalor/was/WhatAStorage.java
View File

@@ -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); Quest quest = quests.get(questIndex);
if (quest != null && quest.getType() == Quest.Type.OUT) { if (quest != null && quest.getType() == Quest.Type.OUT) {
return quest.getProduct().equals(storage.get(x, y).front()); return quest.getProduct().equals(storage.get(x, y).front());
@@ -186,10 +186,10 @@ public class WhatAStorage {
return false; return false;
} }
public boolean sellProduct(int questIndex, int x, int y) { public boolean deliverProduct(int questIndex, int x, int y) {
if (canSellProduct(questIndex, x, y)) { if (canDeliverProduct(questIndex, x, y)) {
int z = storage.get(x, y).pop(); 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); quests.remove(questIndex);
visual.onQuestRemoved(questIndex); visual.onQuestRemoved(questIndex);
visual.onProductCleared(x, y, z); visual.onProductCleared(x, y, z);

2
src/main/java/de/siphalor/was/game/Balance.java
View File

@@ -41,7 +41,7 @@ public class Balance {
} }
public enum Transaction { public enum Transaction {
ABANDON, DESTROY, MOVE, NOOP, SELL, STORE; ABANDON, DESTROY, MOVE, NOOP, DELIVER, STORE;
public String getTranslationKey() { public String getTranslationKey() {
return "game.balance.history.type." + name().toLowerCase(Locale.ENGLISH); return "game.balance.history.type." + name().toLowerCase(Locale.ENGLISH);

4
src/main/java/de/siphalor/was/visual/jfx/QuestController.java
View File

@@ -51,7 +51,7 @@ public class QuestController {
DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT); DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT);
if (product instanceof DraggedProduct.Slot) { if (product instanceof DraggedProduct.Slot) {
DraggedProduct.Slot slot = (DraggedProduct.Slot) product; 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.acceptTransferModes(TransferMode.MOVE);
dragEvent.consume(); dragEvent.consume();
} }
@@ -66,7 +66,7 @@ public class QuestController {
DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT); DraggedProduct product = (DraggedProduct) dragboard.getContent(DraggedProduct.FORMAT);
if (product instanceof DraggedProduct.Slot) { if (product instanceof DraggedProduct.Slot) {
DraggedProduct.Slot slot = (DraggedProduct.Slot) product; 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.setDropCompleted(true);
dragEvent.consume(); dragEvent.consume();
return; return;

2
src/main/resources/content/lang/de_de.lang
View File

@@ -18,7 +18,7 @@ game.balance.history.type.abandon = Auftrag abgelehnt
game.balance.history.type.destroy = Produkt zerst\u00f6rt game.balance.history.type.destroy = Produkt zerst\u00f6rt
game.balance.history.type.move = Produkt bewegt game.balance.history.type.move = Produkt bewegt
game.balance.history.type.noop = NOOP 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.history.type.store = Produkt eingelagert
game.balance.chart = Bilanz game.balance.chart = Bilanz
game.balance.chart.line = Budget game.balance.chart.line = Budget

2
src/main/resources/content/lang/en_us.lang
View File

@@ -18,7 +18,7 @@ game.balance.history.type.abandon = Quest abandoned
game.balance.history.type.destroy = Product destroy game.balance.history.type.destroy = Product destroy
game.balance.history.type.move = Product moved game.balance.history.type.move = Product moved
game.balance.history.type.noop = NOOP 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.history.type.store = Product stored
game.balance.chart = Balance game.balance.chart = Balance
game.balance.chart.line = Budget game.balance.chart.line = Budget