forked from Grasscutters/Grasscutter
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Refactor a couple of iterators * Use side-effect instead of second iterator * Make World::onTick return shouldDelete instead of success * Replace Shop iterator with side effects * Scene * Clean up Expeditions * Refactor Expeditions * Clean up Expeditions, Player * Limit Expeditions by AR * Lombokify props Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
- Loading branch information
Showing
23 changed files
with
260 additions
and
708 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 13 additions & 33 deletions
46
src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,24 @@ | ||
package emu.grasscutter.game.expedition; | ||
|
||
import dev.morphia.annotations.Entity; | ||
import emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo; | ||
import lombok.Getter; | ||
import lombok.Setter; | ||
|
||
@Entity | ||
@Getter @Setter | ||
public class ExpeditionInfo { | ||
|
||
public int getState() { | ||
return state; | ||
} | ||
|
||
public void setState(int state) { | ||
this.state = state; | ||
} | ||
|
||
public int getExpId() { | ||
return expId; | ||
} | ||
|
||
public void setExpId(int expId) { | ||
this.expId = expId; | ||
} | ||
|
||
public int getHourTime() { | ||
return hourTime; | ||
} | ||
|
||
public void setHourTime(int hourTime) { | ||
this.hourTime = hourTime; | ||
} | ||
|
||
public int getStartTime() { | ||
return startTime; | ||
} | ||
|
||
public void setStartTime(int startTime) { | ||
this.startTime = startTime; | ||
} | ||
|
||
private int state; | ||
private int expId; | ||
private int hourTime; | ||
private int startTime; | ||
|
||
public AvatarExpeditionInfo toProto() { | ||
return AvatarExpeditionInfo.newBuilder() | ||
.setStateValue(this.getState()) | ||
.setExpId(this.getExpId()) | ||
.setHourTime(this.getHourTime()) | ||
.setStartTime(this.getStartTime()) | ||
.build(); | ||
} | ||
} |
21 changes: 9 additions & 12 deletions
21
src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardData.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
package emu.grasscutter.game.expedition; | ||
|
||
public class ExpeditionRewardData { | ||
private int itemId; | ||
private int minCount; | ||
private int maxCount; | ||
|
||
public int getItemId() { | ||
return itemId; | ||
} | ||
import emu.grasscutter.game.inventory.GameItem; | ||
import emu.grasscutter.utils.Utils; | ||
import lombok.Getter; | ||
|
||
public int getMinCount() { return minCount; } | ||
public class ExpeditionRewardData { | ||
@Getter private int itemId; | ||
@Getter private int minCount; | ||
@Getter private int maxCount; | ||
|
||
public int getMaxCount() { | ||
return maxCount; | ||
public GameItem getReward() { | ||
return new GameItem(itemId, Utils.randomRange(minCount, maxCount)); | ||
} | ||
|
||
} |
21 changes: 13 additions & 8 deletions
21
src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,20 @@ | ||
package emu.grasscutter.game.expedition; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import emu.grasscutter.game.inventory.GameItem; | ||
import lombok.Getter; | ||
|
||
public class ExpeditionRewardDataList { | ||
public int getHourTime() { | ||
return hourTime; | ||
} | ||
public List<ExpeditionRewardData> getExpeditionRewardData() { | ||
return expeditionRewardData; | ||
} | ||
@Getter private int hourTime; | ||
@Getter private List<ExpeditionRewardData> expeditionRewardData; | ||
|
||
private int hourTime; | ||
private List<ExpeditionRewardData> expeditionRewardData; | ||
public List<GameItem> getRewards() { | ||
List<GameItem> rewards = new ArrayList<>(); | ||
if (expeditionRewardData != null) { | ||
expeditionRewardData.forEach(data -> rewards.add(data.getReward())); | ||
} | ||
return rewards; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.