diff --git a/data.mv.db b/data.mv.db index f6c3032..22f5f10 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/bartlomiejpluta/demo/entity/Enemy.java b/src/main/java/com/bartlomiejpluta/demo/entity/Enemy.java index c895980..94361b4 100644 --- a/src/main/java/com/bartlomiejpluta/demo/entity/Enemy.java +++ b/src/main/java/com/bartlomiejpluta/demo/entity/Enemy.java @@ -11,6 +11,7 @@ import com.bartlomiejpluta.base.util.random.DiceRoller; import com.bartlomiejpluta.demo.ai.*; import com.bartlomiejpluta.demo.event.EnemyDiedEvent; import com.bartlomiejpluta.demo.runner.DemoRunner; +import com.bartlomiejpluta.demo.world.weapon.Ammunition; import com.bartlomiejpluta.demo.world.weapon.MeleeWeapon; import com.bartlomiejpluta.demo.world.weapon.RangedWeapon; import lombok.Getter; @@ -42,7 +43,6 @@ public class Enemy extends Creature implements NPC { setSpeed(speed); setAnimationSpeed(speed / 2.0f); setBlocking(template.isBlocking()); - var runner = (DemoRunner) context.getGameRunner(); var meleeWeaponTemplate = template.getMeleeWeapon(); var rangedWeaponTemplate = template.getRangedWeapon(); @@ -51,7 +51,10 @@ public class Enemy extends Creature implements NPC { } if (rangedWeaponTemplate != null) { - this.rangedWeapon = new RangedWeapon(rangedWeaponTemplate); + var split = rangedWeaponTemplate.split(","); + + this.rangedWeapon = new RangedWeapon(split[0]); + setAmmunition(new Ammunition(split[1], DiceRoller.of(split[2]).roll())); } this.dieAnimation = new SimpleAnimationRunner(A.animations.get(template.getDieAnimation()).uid); diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java b/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java index 2695e7d..9019372 100644 --- a/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java +++ b/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java @@ -1,10 +1,13 @@ package com.bartlomiejpluta.demo.gui; +import DB.EnemyDAO; +import DB.dao; import com.bartlomiejpluta.base.api.context.Context; import com.bartlomiejpluta.base.api.gui.Component; import com.bartlomiejpluta.base.api.gui.GUI; import com.bartlomiejpluta.base.api.gui.Inflatable; import com.bartlomiejpluta.base.api.gui.Ref; +import com.bartlomiejpluta.base.lib.db.Relop; import com.bartlomiejpluta.base.lib.gui.VOptionChoice; import lombok.Getter;