-
Notifications
You must be signed in to change notification settings - Fork 549
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.
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
Room: First Spell Part #6044
Draft
Hanmac
wants to merge
14
commits into
master
Choose a base branch
from
roomDsk
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Room: First Spell Part #6044
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
6d94f81
Room: First Spell Part
Hanmac 38e81f3
Add Unlock Static Action
Hanmac 7bcf8a9
Update dollmakers_shop_porcelain_gallery.txt
tool4ever ccc8e17
~ fix sorcery speed
Hanmac 6d52f58
Fix unlock original state with Copy Enchantment
9730937
Fix noname room crash
773066f
Fix script
6cc3b4d
Update TriggerUnlockDoor.java
Hanmac 4544995
Update TriggerUnlockDoor.java
Hanmac afbfa09
Card: add lockRoom
Hanmac 0c855a1
Use ApiType for UnlockDoor
Hanmac 91fb705
~ add ghostly keybearer
Hanmac a6269af
~ fix import
Hanmac 689ca55
Update ghostly_keybearer.txt
tool4ever File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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
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
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
76 changes: 76 additions & 0 deletions
76
forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.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 |
---|---|---|
@@ -0,0 +1,76 @@ | ||
package forge.game.ability.effects; | ||
|
||
import java.util.Map; | ||
|
||
import com.google.common.collect.Lists; | ||
import com.google.common.collect.Maps; | ||
|
||
import forge.StaticData; | ||
import forge.card.CardStateName; | ||
import forge.card.ICardFace; | ||
import forge.game.Game; | ||
import forge.game.ability.SpellAbilityEffect; | ||
import forge.game.card.Card; | ||
import forge.game.card.CardCollection; | ||
import forge.game.card.CardLists; | ||
import forge.game.player.Player; | ||
import forge.game.spellability.SpellAbility; | ||
import forge.game.zone.ZoneType; | ||
import forge.util.Localizer; | ||
|
||
public class UnlockDoorEffect extends SpellAbilityEffect { | ||
|
||
@Override | ||
public void resolve(SpellAbility sa) { | ||
final Card source = sa.getHostCard(); | ||
final Game game = source.getGame(); | ||
final Player activator = sa.getActivatingPlayer(); | ||
|
||
CardCollection list; | ||
|
||
if (sa.hasParam("Choices")) { | ||
Player chooser = activator; | ||
String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : Localizer.getInstance().getMessage("lblChoose") + " "; | ||
|
||
CardCollection choices = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), sa.getParam("Choices"), activator, source, sa); | ||
|
||
Card c = chooser.getController().chooseSingleEntityForEffect(choices, sa, title, Maps.newHashMap()); | ||
if (c == null) { | ||
return; | ||
} | ||
list = new CardCollection(c); | ||
} else { | ||
list = getTargetCards(sa); | ||
} | ||
|
||
for (Card c : list) { | ||
switch (sa.getParamOrDefault("Mode", "ThisDoor")) { | ||
case "ThisDoor": | ||
c.unlockRoom(activator, sa.getCardStateName()); | ||
break; | ||
case "Unlock": | ||
//List<ICardFace> faces = c.getLockedRoomNames().stream().map(face -> StaticData.instance().getCommonCards().getFaceByName(face)).collect(Collectors.toList()); | ||
|
||
Map<ICardFace, CardStateName> map = Maps.newHashMap(); | ||
|
||
for (CardStateName faceStateName : c.getLockedRooms()) { | ||
if (!c.hasState(faceStateName)) { | ||
continue; | ||
} | ||
String faceName = c.getState(faceStateName).getName(); | ||
ICardFace face = StaticData.instance().getCommonCards().getFaceByName(faceName); | ||
map.put(face, faceStateName); | ||
} | ||
|
||
// need to choose Room Name | ||
ICardFace chosen = activator.getController().chooseSingleCardFace(sa, Lists.newArrayList(map.keySet()), "Choose Room to unlock"); | ||
if (chosen == null) { | ||
continue; | ||
} | ||
c.unlockRoom(activator, map.get(chosen)); | ||
break; | ||
} | ||
} | ||
} | ||
|
||
} |
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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like at least on Desktop
GuiChoose
should accept a list of CardStateView just fine...might be worth a shot to see how it'd display, then doing it without the Map seems possible 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need to be careful with that, because for Network, the object needs to be Serializeable
if you can get CardStateView working, then you could try this too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it does extend TrackableObject so like all View classes I except it can be serialized