Skip to content

Dynamic shops v2 Electric Boogaloo #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Dynamic shops v2 Electric Boogaloo #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d2c1ec
adding pagination to shop to allow for more items
TheDanDLion Aug 13, 2023
646f160
applying relic discounts, only setting isPurchased when it's not a st…
TheDanDLion Aug 14, 2023
79a3bab
setting y position for store relic/potion so they can be in either ro…
TheDanDLion Aug 14, 2023
098ae04
Merge branch 'daviscook477:master' into dynamic-shops
TheDanDLion Jan 18, 2024
bc4a03b
cleaning up shop pagination
TheDanDLion Jan 19, 2024
a466a17
maybe fixed it, also added custom pages
TheDanDLion Jan 19, 2024
244005a
bruh
TheDanDLion Jan 19, 2024
11eeacb
finally fixed spacing, now gotta do alignment
TheDanDLion Jan 19, 2024
667afdf
fleshed out commands, fixed alignment
TheDanDLion Jan 20, 2024
d8ff4de
added commands and some other stuff
TheDanDLion Jan 20, 2024
a0e724c
add debug box, add special case to use normal Y position when row = 2
TheDanDLion Jan 20, 2024
1e0fd4a
fix some things, mainly the page stuff
TheDanDLion Jan 20, 2024
385f67f
fix default spacing issue
TheDanDLion Jan 20, 2024
13a86bd
whelp
TheDanDLion Jan 20, 2024
1face0d
fixing bugs in commands and patches
TheDanDLion Jan 21, 2024
a6d0bb3
making more resilient
TheDanDLion Jan 21, 2024
99c3497
modify text and gold rendering so it looks better
TheDanDLion Jan 21, 2024
4b42625
add price tag when grid is dense, fixed pricing
TheDanDLion Jan 22, 2024
c0dd53b
fix up commands, disable patches for incompatible potions/relics
TheDanDLion Jan 22, 2024
bb47f35
fix compatiblity issue, fix page removal issue
TheDanDLion Jan 22, 2024
8b894da
fix weird edge case
TheDanDLion Jan 22, 2024
4ab7954
polishing up custom shop item, nav button
TheDanDLion Feb 3, 2024
ee6b678
dont set potion & storePotion to null
TheDanDLion Feb 9, 2024
12e6246
tweaks to make it compatible with SpicyShops
TheDanDLion Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions mod/src/main/java/basemod/BaseMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ public class BaseMod {
private static ArrayList<PostDungeonInitializeSubscriber> postDungeonInitializeSubscribers;
private static ArrayList<PostEnergyRechargeSubscriber> postEnergyRechargeSubscribers;
private static ArrayList<PostInitializeSubscriber> postInitializeSubscribers;
private static ArrayList<PostGridInitializeSubscriber> postGridInitializeSubscribers;
private static ArrayList<PostShopInitializeSubscriber> postShopInitializeSubscribers;
private static ArrayList<PreMonsterTurnSubscriber> preMonsterTurnSubscribers;
private static ArrayList<RenderSubscriber> renderSubscribers;
private static ArrayList<PreRenderSubscriber> preRenderSubscribers;
Expand Down Expand Up @@ -461,6 +463,8 @@ private static void initializeSubscriptions() {
postDungeonInitializeSubscribers = new ArrayList<>();
postEnergyRechargeSubscribers = new ArrayList<>();
postInitializeSubscribers = new ArrayList<>();
postGridInitializeSubscribers = new ArrayList<>();
postShopInitializeSubscribers = new ArrayList<>();
preMonsterTurnSubscribers = new ArrayList<>();
renderSubscribers = new ArrayList<>();
preRenderSubscribers = new ArrayList<>();
Expand Down Expand Up @@ -2308,6 +2312,26 @@ public static void publishPostInitialize() {
unsubscribeLaterHelper(PostInitializeSubscriber.class);
}

// publishPostGridInitialize -
public static void publishPostGridInitialize() {
logger.info("publishPostGridInitialize");

for (PostGridInitializeSubscriber sub : postGridInitializeSubscribers) {
sub.receivePostGridInitialize();
}
unsubscribeLaterHelper(PostGridInitializeSubscriber.class);
}

// publishPostShopInitialize -
public static void publishPostShopInitialize() {
logger.info("publishPostShopInitialize");

for (PostShopInitializeSubscriber sub : postShopInitializeSubscribers) {
sub.receivePostShopInitialize();
}
unsubscribeLaterHelper(PostShopInitializeSubscriber.class);
}

// publishPreMonsterTurn - false skips monster turn
public static boolean publishPreMonsterTurn(AbstractMonster m) {
logger.info("publishPreMonsterTurn");
Expand Down Expand Up @@ -2874,6 +2898,7 @@ public static void subscribe(ISubscriber sub) {
subscribeIfInstance(postDungeonInitializeSubscribers, sub, PostDungeonInitializeSubscriber.class);
subscribeIfInstance(postEnergyRechargeSubscribers, sub, PostEnergyRechargeSubscriber.class);
subscribeIfInstance(postInitializeSubscribers, sub, PostInitializeSubscriber.class);
subscribeIfInstance(postShopInitializeSubscribers, sub, PostShopInitializeSubscriber.class);
subscribeIfInstance(preMonsterTurnSubscribers, sub, PreMonsterTurnSubscriber.class);
subscribeIfInstance(renderSubscribers, sub, RenderSubscriber.class);
subscribeIfInstance(preRenderSubscribers, sub, PreRenderSubscriber.class);
Expand Down Expand Up @@ -2937,6 +2962,8 @@ public static void subscribe(ISubscriber sub, Class<? extends ISubscriber> addit
postEnergyRechargeSubscribers.add((PostEnergyRechargeSubscriber) sub);
} else if (additionClass.equals(PostInitializeSubscriber.class)) {
postInitializeSubscribers.add((PostInitializeSubscriber) sub);
} else if (additionClass.equals(PostShopInitializeSubscriber.class)) {
postShopInitializeSubscribers.add((PostShopInitializeSubscriber) sub);
} else if (additionClass.equals(PreMonsterTurnSubscriber.class)) {
preMonsterTurnSubscribers.add((PreMonsterTurnSubscriber) sub);
} else if (additionClass.equals(RenderSubscriber.class)) {
Expand Down Expand Up @@ -3033,6 +3060,7 @@ public static void unsubscribe(ISubscriber sub) {
unsubscribeIfInstance(postDungeonInitializeSubscribers, sub, PostDungeonInitializeSubscriber.class);
unsubscribeIfInstance(postEnergyRechargeSubscribers, sub, PostEnergyRechargeSubscriber.class);
unsubscribeIfInstance(postInitializeSubscribers, sub, PostInitializeSubscriber.class);
unsubscribeIfInstance(postShopInitializeSubscribers, sub, PostShopInitializeSubscriber.class);
unsubscribeIfInstance(preMonsterTurnSubscribers, sub, PreMonsterTurnSubscriber.class);
unsubscribeIfInstance(renderSubscribers, sub, RenderSubscriber.class);
unsubscribeIfInstance(preRenderSubscribers, sub, PreRenderSubscriber.class);
Expand Down Expand Up @@ -3095,6 +3123,8 @@ public static void unsubscribe(ISubscriber sub, Class<? extends ISubscriber> rem
postEnergyRechargeSubscribers.remove(sub);
} else if (removalClass.equals(PostInitializeSubscriber.class)) {
postInitializeSubscribers.remove(sub);
} else if (removalClass.equals(PostInitializeSubscriber.class)) {
postShopInitializeSubscribers.remove(sub);
} else if (removalClass.equals(PreMonsterTurnSubscriber.class)) {
preMonsterTurnSubscribers.remove(sub);
} else if (removalClass.equals(RenderSubscriber.class)) {
Expand Down
Loading