Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 17:53:21 +08:00
Code Issues Projects Releases Wiki Activity

Fixed genesis crystals not being given to player

Browse Source
This commit is contained in:
Melledy 2022-04-27 10:42:50 -07:00
parent 1586bab5d7
commit 8bf17a8bdc
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/game/inventory/Inventory.java
View File

@ -249,6 +249,9 @@ public class Inventory implements Iterable<GameItem> {
case 202: // Mora case 202: // Mora
getPlayer().setMora(player.getMora() + count); getPlayer().setMora(player.getMora() + count);
break; break;
case 203: // Genesis Crystals
getPlayer().setCrystals(player.getCrystals() + count);
break;
} }
} }

1
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
View File

@ -923,6 +923,7 @@ public class InventoryManager {
break; break;
} }
// Welkin
if (useItem.getItemId() == 1202) { if (useItem.getItemId() == 1202) {
player.rechargeMoonCard(); player.rechargeMoonCard();
used = 1; used = 1;

15
src/main/java/emu/grasscutter/game/player/Player.java
View File

@ -295,6 +295,15 @@ public class Player {
this.sendPacket(new PacketPlayerPropNotify(this, PlayerProperty.PROP_PLAYER_SCOIN)); this.sendPacket(new PacketPlayerPropNotify(this, PlayerProperty.PROP_PLAYER_SCOIN));
} }
public int getCrystals() {
return this.getProperty(PlayerProperty.PROP_PLAYER_MCOIN);
}
public void setCrystals(int crystals) {
this.setProperty(PlayerProperty.PROP_PLAYER_MCOIN, crystals);
this.sendPacket(new PacketPlayerPropNotify(this, PlayerProperty.PROP_PLAYER_MCOIN));
}
private int getExpRequired(int level) { private int getExpRequired(int level) {
PlayerLevelData levelData = GameData.getPlayerLevelDataMap().get(level); PlayerLevelData levelData = GameData.getPlayerLevelDataMap().get(level);
return levelData != null ? levelData.getExp() : 0; return levelData != null ? levelData.getExp() : 0;
@ -550,11 +559,7 @@ public class Player {
} }
public void rechargeMoonCard() { public void rechargeMoonCard() {
LinkedList<GameItem> items = new LinkedList<GameItem>(); inventory.addItem(new GameItem(203, 300));
for (int i = 0; i < 300; i++) {
items.add(new GameItem(203));
}
inventory.addItems(items);
if (!moonCard) { if (!moonCard) {
moonCard = true; moonCard = true;
Date now = new Date(); Date now = new Date();

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
View File

@ -32,7 +32,7 @@ public class HandlerBuyGoodsReq extends PacketHandler {
if (sg.getHcoin() > 0 && session.getPlayer().getPrimogems() < buyGoodsReq.getBoughtNum() * sg.getHcoin()) { if (sg.getHcoin() > 0 && session.getPlayer().getPrimogems() < buyGoodsReq.getBoughtNum() * sg.getHcoin()) {
return; return;
} }
if (sg.getMcoin() > 0 && session.getPlayer().getProperty(PlayerProperty.PROP_PLAYER_MCOIN) < buyGoodsReq.getBoughtNum() * sg.getMcoin()) { if (sg.getMcoin() > 0 && session.getPlayer().getCrystals() < buyGoodsReq.getBoughtNum() * sg.getMcoin()) {
return; return;
} }
@ -46,7 +46,7 @@ public class HandlerBuyGoodsReq extends PacketHandler {
session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin()); session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin()); session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
session.getPlayer().setProperty(PlayerProperty.PROP_PLAYER_MCOIN, session.getPlayer().getProperty(PlayerProperty.PROP_PLAYER_MCOIN) - buyGoodsReq.getBoughtNum() * sg.getMcoin()); session.getPlayer().setCrystals(session.getPlayer().getCrystals() - buyGoodsReq.getBoughtNum() * sg.getMcoin());
if (!itemsCache.isEmpty()) { if (!itemsCache.isEmpty()) {
for (GameItem gi : itemsCache.keySet()) { for (GameItem gi : itemsCache.keySet()) {