Achievement finalizations

This commit is contained in:
Anuken 2022-10-20 13:53:07 -04:00
parent 3ffea4061e
commit b10a146cd9
6 changed files with 47 additions and 27 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -182,6 +182,15 @@ public class EventType{
} }
} }
/** Called when the client sends a chat message. This only fires clientside! */
public static class ClientChatEvent{
public final String message;
public ClientChatEvent(String message){
this.message = message;
}
}
/** Called when a sector is conquered, e.g. a boss or base is defeated. */ /** Called when a sector is conquered, e.g. a boss or base is defeated. */
public static class SectorCaptureEvent{ public static class SectorCaptureEvent{
public final Sector sector; public final Sector sector;

View File

@ -51,7 +51,7 @@ public enum Achievement{
circleConveyor, circleConveyor,
becomeRouter, becomeRouter,
create20Schematics(SStat.schematicsCreated, 20), create20Schematics(SStat.schematicsCreated, 20),
create500Schematics(SStat.schematicsCreated, 50), //TODO - Steam create500Schematics(SStat.schematicsCreated, 50), //TODO - Steam - icon done
survive10WavesNoBlocks, survive10WavesNoBlocks,
captureNoBlocksBroken, captureNoBlocksBroken,
useFlameAmmo, useFlameAmmo,
@ -63,24 +63,24 @@ public enum Achievement{
//TODO new ones //TODO new ones
allTransportOneMap, //TODO - Steam allTransportOneMap, //TODO - Steam - icon done
buildOverdrive, //TODO - Steam buildOverdriveProjector, //TODO - Steam - icon done
buildMendProjector, //TODO - Steam buildMendProjector, //TODO - Steam - icon done
buildWexWater, //TODO - Steam buildWexWater, //TODO - Steam - icon done
have10mItems(SStat.totalCampaignItems, 10_000_000), //TODO - Steam have10mItems(SStat.totalCampaignItems, 10_000_000), //TODO - Steam - icon done
killEclipseDuo, //TODO - Steam killEclipseDuo, //TODO - Steam - icon done
allPresetsErekir, //TODO - Steam allPresetsErekir, //TODO - Steam - icon done
launchCoreSchematic, //TODO - Steam launchCoreSchematic, //TODO - Steam - icon done
nucleusGroundZero, //TODO - Steam nucleusGroundZero, //TODO - Steam - icon done
neoplasmWater, //TODO - Steam neoplasmWater, //TODO - Steam - icon done
blastFrozenUnit, //TODO - Steam blastFrozenUnit, //TODO - Steam - icon done
allBlocksSerpulo, //TODO - Steam allBlocksSerpulo, //TODO - Steam - icon done
allBlocksErekir, //TODO - Steam allBlocksErekir, //TODO - Steam - icon done
//TODO are these necessary? //TODO are these necessary?
//allTurretsSerpulo, //TODO //allTurretsSerpulo, //TODO
@ -88,20 +88,20 @@ public enum Achievement{
//allTechSerpulo, //TODO //allTechSerpulo, //TODO
//allTechErekir, //TODO //allTechErekir, //TODO
breakForceProjector, //TODO - Steam breakForceProjector, //TODO - Steam - icon done
researchLogic, //TODO - Steam researchLogic, //TODO - Steam - icon done
negative10kPower, //TODO - Steam negative10kPower, //TODO - Steam - icon done
positive100kPower, //TODO - Steam positive100kPower, //TODO - Steam - icon done
store1milPower, //TODO - Steam store1milPower, //TODO - Steam - icon done
blastGenerator, //TODO - Steam blastGenerator, //TODO - Steam - icon done
neoplasiaExplosion, //TODO - Steam neoplasiaExplosion, //TODO - Steam - icon done
installMod, //TODO - Steam installMod, //TODO - Steam - icon done
routerLanguage, //TODO - Steam routerLanguage, //TODO - Steam - icon done
joinCommunityServer, //TODO - Steam joinCommunityServer, //TODO - Steam - icon done
openConsole, //TODO - Steam openConsole, //TODO - Steam - icon done
controlTurret, //TODO - Steam - icon done controlTurret, //TODO - Steam - icon done
dropUnitsCoreZone, //TODO - Steam - icon done dropUnitsCoreZone, //TODO - Steam - icon done
@ -116,6 +116,8 @@ public enum Achievement{
shockwaveTowerUse, //TODO - Steam - icon done shockwaveTowerUse, //TODO - Steam - icon done
useAnimdustryEmoji, //TODO - Steam - icon done
; ;
private final SStat stat; private final SStat stat;

View File

@ -204,7 +204,7 @@ public class GameService{
} }
if(e.tile.block() instanceof MendProjector || e.tile.block() instanceof RegenProjector) buildMendProjector.complete(); if(e.tile.block() instanceof MendProjector || e.tile.block() instanceof RegenProjector) buildMendProjector.complete();
if(e.tile.block() instanceof OverdriveProjector) buildOverdrive.complete(); if(e.tile.block() instanceof OverdriveProjector) buildOverdriveProjector.complete();
if(e.tile.block() == Blocks.waterExtractor){ if(e.tile.block() == Blocks.waterExtractor){
if(e.tile.getLinkedTiles(tmpTiles).contains(t -> t.floor().liquidDrop == Liquids.water)){ if(e.tile.getLinkedTiles(tmpTiles).contains(t -> t.floor().liquidDrop == Liquids.water)){
@ -485,6 +485,12 @@ public class GameService{
dropUnitsCoreZone.complete(); dropUnitsCoreZone.complete();
} }
}); });
Events.on(ClientChatEvent.class, e -> {
if(e.message.contains(Iconc.alphaaaa + "")){
useAnimdustryEmoji.complete();
}
});
} }
private void checkUpdate(){ private void checkUpdate(){

View File

@ -14,6 +14,7 @@ import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.game.EventType.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.input.*; import mindustry.input.*;
import mindustry.ui.*; import mindustry.ui.*;
@ -181,6 +182,8 @@ public class ChatFragment extends Table{
history.insert(1, message); history.insert(1, message);
Events.fire(new ClientChatEvent(message));
Call.sendChatMessage(message); Call.sendChatMessage(message);
} }

View File

@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=8793e01874 archash=5a1cbb8b59