bartek/base-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ammo to enemies

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-25 23:27:49 +02:00
parent fe828f9026
commit dadb48e6d6
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data.mv.db
View File

Binary file not shown.

7
src/main/java/com/bartlomiejpluta/demo/entity/Enemy.java
View File

@@ -11,6 +11,7 @@ import com.bartlomiejpluta.base.util.random.DiceRoller;
import com.bartlomiejpluta.demo.ai.*; import com.bartlomiejpluta.demo.ai.*;
import com.bartlomiejpluta.demo.event.EnemyDiedEvent; import com.bartlomiejpluta.demo.event.EnemyDiedEvent;
import com.bartlomiejpluta.demo.runner.DemoRunner; 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.MeleeWeapon;
import com.bartlomiejpluta.demo.world.weapon.RangedWeapon; import com.bartlomiejpluta.demo.world.weapon.RangedWeapon;
import lombok.Getter; import lombok.Getter;
@@ -42,7 +43,6 @@ public class Enemy extends Creature implements NPC {
setSpeed(speed); setSpeed(speed);
setAnimationSpeed(speed / 2.0f); setAnimationSpeed(speed / 2.0f);
setBlocking(template.isBlocking()); setBlocking(template.isBlocking());
var runner = (DemoRunner) context.getGameRunner();
var meleeWeaponTemplate = template.getMeleeWeapon(); var meleeWeaponTemplate = template.getMeleeWeapon();
var rangedWeaponTemplate = template.getRangedWeapon(); var rangedWeaponTemplate = template.getRangedWeapon();
@@ -51,7 +51,10 @@ public class Enemy extends Creature implements NPC {
} }
if (rangedWeaponTemplate != null) { 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); this.dieAnimation = new SimpleAnimationRunner(A.animations.get(template.getDieAnimation()).uid);

3
src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java
View File

@@ -1,10 +1,13 @@
package com.bartlomiejpluta.demo.gui; package com.bartlomiejpluta.demo.gui;
import DB.EnemyDAO;
import DB.dao;
import com.bartlomiejpluta.base.api.context.Context; import com.bartlomiejpluta.base.api.context.Context;
import com.bartlomiejpluta.base.api.gui.Component; import com.bartlomiejpluta.base.api.gui.Component;
import com.bartlomiejpluta.base.api.gui.GUI; import com.bartlomiejpluta.base.api.gui.GUI;
import com.bartlomiejpluta.base.api.gui.Inflatable; import com.bartlomiejpluta.base.api.gui.Inflatable;
import com.bartlomiejpluta.base.api.gui.Ref; import com.bartlomiejpluta.base.api.gui.Ref;
import com.bartlomiejpluta.base.lib.db.Relop;
import com.bartlomiejpluta.base.lib.gui.VOptionChoice; import com.bartlomiejpluta.base.lib.gui.VOptionChoice;
import lombok.Getter; import lombok.Getter;