Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added unlock messages for all content

Browse Source
This commit is contained in:
Anuken
2019-01-16 19:52:58 -05:00
parent 6510d83524
commit 4344af1f02
6 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/game/EventType.java
View File

@@ -60,9 +60,9 @@ public class EventType{
}
public static class UnlockEvent implements Event{
public final Content content;
public final UnlockableContent content;
public UnlockEvent(Content content){
public UnlockEvent(UnlockableContent content){
this.content = content;
}
}

12
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@@ -57,23 +57,17 @@ public class GlobalData{
* Makes this piece of content 'unlocked', if possible.
* If this piece of content is already unlocked or cannot be unlocked due to dependencies, nothing changes.
* Results are not saved until you call {@link #save()}.
*
* @return whether or not this content was newly unlocked.
*/
public boolean unlockContent(UnlockableContent content){
if(!content.canBeUnlocked() || content.alwaysUnlocked()) return false;
boolean ret = unlocked.getOr(content.getContentType(), ObjectSet::new).add(content.getContentName());
public void unlockContent(UnlockableContent content){
if(!content.canBeUnlocked() || content.alwaysUnlocked()) return;
//fire unlock event so other classes can use it
if(ret){
if(unlocked.getOr(content.getContentType(), ObjectSet::new).add(content.getContentName())){
modified = true;
content.onUnlock();
Events.fire(new UnlockEvent(content));
save();
}
return ret;
}
/** Clears all unlocked content. Automatically saves.*/