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

rnd fix

Browse Source
This commit is contained in:
Michael Wain 2024-04-03 17:27:41 +03:00
parent e11e997d88
commit 81b7a02d23
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/alterdekim/javabot/bot/Player.java
View File

@ -6,6 +6,7 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@ToString @ToString
@ -31,5 +32,6 @@ public class Player {
this.telegramId = telegramId; this.telegramId = telegramId;
this.firstName = name; this.firstName = name;
this.infoSections = new InfoSections(); this.infoSections = new InfoSections();
this.scripts = new ArrayList<>();
} }
} }

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

@ -174,6 +174,10 @@ public class BunkerBot extends TelegramLongPollingBot {
} }
} }
private Boolean isNoOneHasScripts() {
return players.stream().allMatch(p -> p.getScripts().isEmpty());
}
private void startGame() { private void startGame() {
if( gameState != GameState.JOINING ) if( gameState != GameState.JOINING )
return; return;
@ -181,6 +185,7 @@ public class BunkerBot extends TelegramLongPollingBot {
sendApi(new SendMessage(groupId, Constants.PLAYERS_LESS_THAN_ZERO)); sendApi(new SendMessage(groupId, Constants.PLAYERS_LESS_THAN_ZERO));
return; return;
} }
Collections.shuffle(players);
this.gameState = GameState.STARTED; this.gameState = GameState.STARTED;
Disaster d = (Disaster) BotUtils.getRandomFromList(disasterService.getAllDisasters(), random); Disaster d = (Disaster) BotUtils.getRandomFromList(disasterService.getAllDisasters(), random);
sendApi(new SendMessage(groupId, getStringById(d.getDescTextId()))); sendApi(new SendMessage(groupId, getStringById(d.getDescTextId())));
@ -190,19 +195,19 @@ public class BunkerBot extends TelegramLongPollingBot {
List<Hobby> hobbies = hobbyService.getAllHobbies(); List<Hobby> hobbies = hobbyService.getAllHobbies();
List<Health> healths = healthService.getAllHealth(); List<Health> healths = healthService.getAllHealth();
List<ActionScript> scripts = scriptsService.getAllActionScripts(); List<ActionScript> scripts = scriptsService.getAllActionScripts();
for( Player p : players ) { for( int i = 0; i < players.size(); i++ ) {
p.setAge(random.nextInt(57)+18); players.get(i).setAge(random.nextInt(57)+18);
p.setGender((Bio) BotUtils.getRandomFromList(bios, random)); players.get(i).setGender((Bio) BotUtils.getRandomFromList(bios, random));
p.setWork((Work) BotUtils.getRandomFromList(works, random)); players.get(i).setWork((Work) BotUtils.getRandomFromList(works, random));
p.setLuggage((Luggage) BotUtils.getRandomFromList(luggs, random)); players.get(i).setLuggage((Luggage) BotUtils.getRandomFromList(luggs, random));
p.setHobby((Hobby) BotUtils.getRandomFromList(hobbies, random)); players.get(i).setHobby((Hobby) BotUtils.getRandomFromList(hobbies, random));
p.setHealth((Health) BotUtils.getRandomFromList(healths, random)); players.get(i).setHealth((Health) BotUtils.getRandomFromList(healths, random));
if( random.nextInt(100) >= 60 ) { if( random.nextInt(100) >= 60 || (i == (players.size()-1) && isNoOneHasScripts()) ) {
p.setScripts(Arrays.asList((ActionScript) BotUtils.getRandomFromList(scripts, random))); players.get(i).setScripts(Arrays.asList((ActionScript) BotUtils.getRandomFromList(scripts, random)));
} else { } else {
p.setScripts(new ArrayList<>()); players.get(i).setScripts(new ArrayList<>());
} }
SendMessage sendMessage = new SendMessage(p.getTelegramId()+"", BotAccountProfileGenerator.build(textDataValService, p)); SendMessage sendMessage = new SendMessage(players.get(i).getTelegramId()+"", BotAccountProfileGenerator.build(textDataValService, players.get(i)));
sendApi(sendMessage); sendApi(sendMessage);
} }
doNight(); doNight();