Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn item id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 11:38:32 +01:00
parent a4c079c2e8
commit 4efd356cbf
50 changed files with 790 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -21,6 +21,7 @@ package server.partyquest;
import client.Character;
import constants.game.GameConstants;
import constants.id.ItemId;
import server.TimerManager;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionType;
@@ -180,8 +181,8 @@ public class AriantColiseum {
}
chr.setAriantColiseum(null);
int shards = chr.countItem(4031868);
chr.getAbstractPlayerInteraction().removeAll(4031868);
int shards = chr.countItem(ItemId.ARPQ_SPIRIT_JEWEL);
chr.getAbstractPlayerInteraction().removeAll(ItemId.ARPQ_SPIRIT_JEWEL);
chr.updateAriantScore(shards);
}
}
@@ -241,7 +242,7 @@ public class AriantColiseum {
}
runnerups.remove(firstTop);
if (isUnfairMatch(firstTop, secondTop, map.getDroppedItemsCountById(4031868) + lostShards, runnerups)) {
if (isUnfairMatch(firstTop, secondTop, map.getDroppedItemsCountById(ItemId.ARPQ_SPIRIT_JEWEL) + lostShards, runnerups)) {
rewardTier.put(winner, 1);
}
}

9
src/main/java/server/partyquest/Pyramid.java
View File

@@ -23,6 +23,7 @@
package server.partyquest;
import client.Character;
import constants.id.ItemId;
import net.server.world.Party;
import server.ItemInformationProvider;
import server.TimerManager;
@@ -186,7 +187,7 @@ public class Pyramid extends PartyQuest {
buffcount++;
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (Character chr : getParticipants()) {
ii.getItemEffect(2022585).applyTo(chr);
ii.getItemEffect(ItemId.PHARAOHS_BLESSING_1).applyTo(chr);
}
} else if (buffcount == 1 && total >= 500) {
@@ -195,7 +196,7 @@ public class Pyramid extends PartyQuest {
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022586).applyTo(chr);
ii.getItemEffect(ItemId.PHARAOHS_BLESSING_2).applyTo(chr);
}
} else if (buffcount == 2 && total >= 1000) {
buffcount++;
@@ -203,7 +204,7 @@ public class Pyramid extends PartyQuest {
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022587).applyTo(chr);
ii.getItemEffect(ItemId.PHARAOHS_BLESSING_3).applyTo(chr);
}
} else if (buffcount == 3 && total >= 1500) {
skill++;
@@ -214,7 +215,7 @@ public class Pyramid extends PartyQuest {
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022588).applyTo(chr);
ii.getItemEffect(ItemId.PHARAOHS_BLESSING_4).applyTo(chr);
}
} else if (buffcount == 5 && total >= 2500) {
skill++;