alterwain/JBunker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update done

Browse Source
This commit is contained in:
Michael Wain 2024-03-13 19:50:42 +03:00
parent 3787045a56
commit 2e7fdd7758
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/alterdekim/javabot/components/BunkerBot.java
View File

@ -28,7 +28,6 @@ import org.telegram.telegrambots.meta.api.objects.User;
import org.telegram.telegrambots.meta.api.objects.chatmember.ChatMember; import org.telegram.telegrambots.meta.api.objects.chatmember.ChatMember;
import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
import javax.swing.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -177,7 +176,7 @@ public class BunkerBot extends TelegramLongPollingBot {
private void startGame() { private void startGame() {
if( gameState != GameState.JOINING ) if( gameState != GameState.JOINING )
return; return;
if(players.size() < 1) { if(players.size() < 2) {
sendApi(new SendMessage(groupId, Constants.PLAYERS_LESS_THAN_ZERO)); sendApi(new SendMessage(groupId, Constants.PLAYERS_LESS_THAN_ZERO));
return; return;
} }
@ -197,7 +196,7 @@ public class BunkerBot extends TelegramLongPollingBot {
p.setLuggage((Luggage) BotUtils.getRandomFromList(luggs, random)); p.setLuggage((Luggage) BotUtils.getRandomFromList(luggs, random));
p.setHobby((Hobby) BotUtils.getRandomFromList(hobbies, random)); p.setHobby((Hobby) BotUtils.getRandomFromList(hobbies, random));
p.setHealth((Health) BotUtils.getRandomFromList(healths, random)); p.setHealth((Health) BotUtils.getRandomFromList(healths, random));
if( true ) { // random.nextBoolean() if( random.nextBoolean() ) {
p.setScripts(Arrays.asList((ActionScript) BotUtils.getRandomFromList(scripts, random))); p.setScripts(Arrays.asList((ActionScript) BotUtils.getRandomFromList(scripts, random)));
} else { } else {
p.setScripts(new ArrayList<>()); p.setScripts(new ArrayList<>());
@ -258,14 +257,11 @@ public class BunkerBot extends TelegramLongPollingBot {
globals.set("player", LuaSerializer.serializeObject(p)); globals.set("player", LuaSerializer.serializeObject(p));
LuaValue chunk = globals.load(script.getScriptBody()); LuaValue chunk = globals.load(script.getScriptBody());
chunk.call(); chunk.call();
List<Player> pls = LuaDeserializer.deserializePlayers(globals.get("players")); this.players = LuaDeserializer.deserializePlayers(globals.get("players")).stream()
for(Player p1 : players) { .map(p1 -> {
log.info(p1.toString()); p1.setScripts(getPlayerById(p1.getTelegramId()).getScripts());
} return p1;
log.info("returned:"); }).collect(Collectors.toList());
for(Player p1 : pls) {
log.info(p1.toString());
}
} }
private void processNightButton(CallbackQuery callbackQuery) { private void processNightButton(CallbackQuery callbackQuery) {