From 28f88fddca4edc413f989cb1cdac9ab8e15b31c9 Mon Sep 17 00:00:00 2001 From: alterdekim Date: Wed, 13 Mar 2024 20:09:23 +0300 Subject: [PATCH] luaSerializer patch --- .../java/com/alterdekim/javabot/components/BunkerBot.java | 7 ++++++- .../java/com/alterdekim/javabot/util/LuaSerializer.java | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alterdekim/javabot/components/BunkerBot.java b/src/main/java/com/alterdekim/javabot/components/BunkerBot.java index 6231835..87206e7 100644 --- a/src/main/java/com/alterdekim/javabot/components/BunkerBot.java +++ b/src/main/java/com/alterdekim/javabot/components/BunkerBot.java @@ -196,7 +196,7 @@ public class BunkerBot extends TelegramLongPollingBot { p.setLuggage((Luggage) BotUtils.getRandomFromList(luggs, random)); p.setHobby((Hobby) BotUtils.getRandomFromList(hobbies, random)); p.setHealth((Health) BotUtils.getRandomFromList(healths, random)); - if( random.nextBoolean() ) { + if( random.nextDouble() > 0.6 ) { p.setScripts(Arrays.asList((ActionScript) BotUtils.getRandomFromList(scripts, random))); } else { p.setScripts(new ArrayList<>()); @@ -255,6 +255,11 @@ public class BunkerBot extends TelegramLongPollingBot { Globals globals = JsePlatform.standardGlobals(); globals.set("players", LuaSerializer.serializeObjectList(players)); globals.set("player", LuaSerializer.serializeObject(p)); + globals.set("genders", LuaSerializer.serializeObjectList(bioService.getAllBios())); + globals.set("hobbies", LuaSerializer.serializeObjectList(hobbyService.getAllHobbies())); + globals.set("healths", LuaSerializer.serializeObjectList(healthService.getAllHealth())); + globals.set("luggages", LuaSerializer.serializeObjectList(luggageService.getAllLuggages())); + globals.set("works", LuaSerializer.serializeObjectList(workService.getAllWorks())); LuaValue chunk = globals.load(script.getScriptBody()); chunk.call(); this.players = LuaDeserializer.deserializePlayers(globals.get("players")).stream() diff --git a/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java b/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java index fad20d6..3389e1e 100644 --- a/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java +++ b/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java @@ -17,7 +17,13 @@ import java.util.stream.IntStream; @Slf4j public class LuaSerializer { - public static LuaTable serializeObjectList(List list) { + /* public static LuaTable serializeObjectList(List list) { + LuaTable table = new LuaTable(); + IntStream.range(0, list.size()).forEach(i -> table.set(i, serializeObject(list.get(i)))); + return table; + }*/ + + public static LuaTable serializeObjectList(List list) { LuaTable table = new LuaTable(); IntStream.range(0, list.size()).forEach(i -> table.set(i, serializeObject(list.get(i)))); return table;