mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-11-30 01:50:50 +01:00
Add voucher limits and amounts
This commit is contained in:
parent
4f5795e9d0
commit
3075228c2e
@ -20,3 +20,15 @@ CREATE TABLE `items_highscore_data` (
|
|||||||
`timestamp` int(11) NOT NULL,
|
`timestamp` int(11) NOT NULL,
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE TABLE `voucher_history` (
|
||||||
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
|
`voucher_id` int(11) NOT NULL,
|
||||||
|
`user_id` int(11) NOT NULL,
|
||||||
|
`timestamp` int(11) NOT NULL,
|
||||||
|
PRIMARY KEY (`id`)
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE `vouchers`
|
||||||
|
ADD COLUMN `amount` int(11) NOT NULL DEFAULT 1,
|
||||||
|
ADD COLUMN `limit` int(11) NOT NULL DEFAULT -1;
|
||||||
|
@ -24,6 +24,7 @@ import com.eu.habbo.messages.outgoing.inventory.AddBotComposer;
|
|||||||
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
|
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
|
||||||
import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
|
import com.eu.habbo.messages.outgoing.inventory.AddPetComposer;
|
||||||
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
|
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
|
||||||
|
import com.eu.habbo.messages.outgoing.modtool.ModToolIssueHandledComposer;
|
||||||
import com.eu.habbo.messages.outgoing.users.AddUserBadgeComposer;
|
import com.eu.habbo.messages.outgoing.users.AddUserBadgeComposer;
|
||||||
import com.eu.habbo.messages.outgoing.users.UserCreditsComposer;
|
import com.eu.habbo.messages.outgoing.users.UserCreditsComposer;
|
||||||
import com.eu.habbo.messages.outgoing.users.UserPointsComposer;
|
import com.eu.habbo.messages.outgoing.users.UserPointsComposer;
|
||||||
@ -31,7 +32,6 @@ import com.eu.habbo.plugin.events.emulator.EmulatorLoadCatalogManagerEvent;
|
|||||||
import com.eu.habbo.plugin.events.users.catalog.UserCatalogFurnitureBoughtEvent;
|
import com.eu.habbo.plugin.events.users.catalog.UserCatalogFurnitureBoughtEvent;
|
||||||
import com.eu.habbo.plugin.events.users.catalog.UserCatalogItemPurchasedEvent;
|
import com.eu.habbo.plugin.events.users.catalog.UserCatalogItemPurchasedEvent;
|
||||||
import gnu.trove.TCollections;
|
import gnu.trove.TCollections;
|
||||||
import gnu.trove.iterator.TIntIterator;
|
|
||||||
import gnu.trove.iterator.TIntObjectIterator;
|
import gnu.trove.iterator.TIntObjectIterator;
|
||||||
import gnu.trove.map.TIntObjectMap;
|
import gnu.trove.map.TIntObjectMap;
|
||||||
import gnu.trove.map.hash.THashMap;
|
import gnu.trove.map.hash.THashMap;
|
||||||
@ -534,9 +534,32 @@ public class CatalogManager {
|
|||||||
public void redeemVoucher(GameClient client, String voucherCode) {
|
public void redeemVoucher(GameClient client, String voucherCode) {
|
||||||
Voucher voucher = Emulator.getGameEnvironment().getCatalogManager().getVoucher(voucherCode);
|
Voucher voucher = Emulator.getGameEnvironment().getCatalogManager().getVoucher(voucherCode);
|
||||||
|
|
||||||
if (voucher != null) {
|
if (voucher == null) {
|
||||||
if (Emulator.getGameEnvironment().getCatalogManager().deleteVoucher(voucher)) {
|
client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.INVALID_CODE));
|
||||||
client.getHabbo().getHabboInfo().addCredits(voucher.credits);
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Habbo habbo = client.getHabbo();
|
||||||
|
if (habbo == null) return;
|
||||||
|
|
||||||
|
if (voucher.isExhausted()) {
|
||||||
|
if (!Emulator.getGameEnvironment().getCatalogManager().deleteVoucher(voucher)) {
|
||||||
|
client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.TECHNICAL_ERROR));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (voucher.hasUserExhausted(habbo.getHabboInfo().getId())) {
|
||||||
|
client.sendResponse(new ModToolIssueHandledComposer("You have exceeded the limit for redeeming this voucher."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
voucher.addHistoryEntry(habbo.getHabboInfo().getId());
|
||||||
|
|
||||||
|
if (voucher.isExhausted()) {
|
||||||
|
if (!Emulator.getGameEnvironment().getCatalogManager().deleteVoucher(voucher)) {
|
||||||
|
client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.TECHNICAL_ERROR));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (voucher.points > 0) {
|
if (voucher.points > 0) {
|
||||||
client.getHabbo().getHabboInfo().addCurrencyAmount(voucher.pointsType, voucher.points);
|
client.getHabbo().getHabboInfo().addCurrencyAmount(voucher.pointsType, voucher.points);
|
||||||
@ -557,12 +580,6 @@ public class CatalogManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
client.sendResponse(new RedeemVoucherOKComposer());
|
client.sendResponse(new RedeemVoucherOKComposer());
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
client.sendResponse(new RedeemVoucherErrorComposer(RedeemVoucherErrorComposer.INVALID_CODE));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,27 +1,24 @@
|
|||||||
package com.eu.habbo.habbohotel.catalog;
|
package com.eu.habbo.habbohotel.catalog;
|
||||||
|
|
||||||
|
import com.eu.habbo.Emulator;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class Voucher {
|
public class Voucher {
|
||||||
|
|
||||||
public final int id;
|
public final int id;
|
||||||
|
|
||||||
|
|
||||||
public final String code;
|
public final String code;
|
||||||
|
|
||||||
|
|
||||||
public final int credits;
|
public final int credits;
|
||||||
|
|
||||||
|
|
||||||
public final int points;
|
public final int points;
|
||||||
|
|
||||||
|
|
||||||
public final int pointsType;
|
public final int pointsType;
|
||||||
|
|
||||||
|
|
||||||
public final int catalogItemId;
|
public final int catalogItemId;
|
||||||
|
public final int amount;
|
||||||
|
public final int limit;
|
||||||
|
private final List<VoucherHistoryEntry> history = new ArrayList<>();
|
||||||
|
|
||||||
public Voucher(ResultSet set) throws SQLException {
|
public Voucher(ResultSet set) throws SQLException {
|
||||||
this.id = set.getInt("id");
|
this.id = set.getInt("id");
|
||||||
@ -30,5 +27,44 @@ public class Voucher {
|
|||||||
this.points = set.getInt("points");
|
this.points = set.getInt("points");
|
||||||
this.pointsType = set.getInt("points_type");
|
this.pointsType = set.getInt("points_type");
|
||||||
this.catalogItemId = set.getInt("catalog_item_id");
|
this.catalogItemId = set.getInt("catalog_item_id");
|
||||||
|
this.amount = set.getInt("amount");
|
||||||
|
this.limit = set.getInt("limit");
|
||||||
|
|
||||||
|
this.loadHistory();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadHistory() {
|
||||||
|
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT * FROM voucher_history")) {
|
||||||
|
try (ResultSet set = statement.executeQuery()) {
|
||||||
|
while (set.next()) {
|
||||||
|
this.history.add(new VoucherHistoryEntry(set));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Emulator.getLogging().logSQLException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasUserExhausted(int userId) {
|
||||||
|
return this.limit > 0 && Math.toIntExact(this.history.stream().filter(h -> h.getUserId() == userId).count()) >= this.limit;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isExhausted() {
|
||||||
|
return this.amount > 0 && this.history.size() >= this.amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addHistoryEntry(int userId) {
|
||||||
|
int timestamp = Emulator.getIntUnixTimestamp();
|
||||||
|
this.history.add(new VoucherHistoryEntry(this.id, userId, timestamp));
|
||||||
|
|
||||||
|
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO voucher_history (`voucher_id`, `user_id`, `timestamp`) VALUES (?, ?, ?)")) {
|
||||||
|
statement.setInt(1, this.id);
|
||||||
|
statement.setInt(2, userId);
|
||||||
|
statement.setInt(3, timestamp);
|
||||||
|
|
||||||
|
statement.execute();
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Emulator.getLogging().logSQLException(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
package com.eu.habbo.habbohotel.catalog;
|
||||||
|
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
|
public class VoucherHistoryEntry {
|
||||||
|
private final int voucherId;
|
||||||
|
private final int userId;
|
||||||
|
private final int timestamp;
|
||||||
|
|
||||||
|
public VoucherHistoryEntry(ResultSet set) throws SQLException {
|
||||||
|
this.voucherId = set.getInt("voucher_id");
|
||||||
|
this.userId = set.getInt("user_id");
|
||||||
|
this.timestamp = set.getInt("timestamp");
|
||||||
|
}
|
||||||
|
|
||||||
|
public VoucherHistoryEntry(int voucherId, int userId, int timestamp) {
|
||||||
|
this.voucherId = voucherId;
|
||||||
|
this.userId = userId;
|
||||||
|
this.timestamp = timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getVoucherId() {
|
||||||
|
return voucherId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTimestamp() {
|
||||||
|
return timestamp;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user