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

Apply BASE engine improvemenst #2

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-22 17:58:23 +02:00
parent d51a425b28
commit 1253139bfe
10 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java
View File

@@ -4,7 +4,7 @@ import java.util.Random;
import lombok.*;
import org.joml.Vector2i;
import com.bartlomiejpluta.base.api.context.Context;
import com.bartlomiejpluta.base.api.context.*;
import com.bartlomiejpluta.base.lib.animation.*;
import com.bartlomiejpluta.base.util.random.DiceRoller;
@@ -25,8 +25,12 @@ public class MeleeWeapon implements Weapon {
@Getter
private int cooldown;
public MeleeWeapon(@NonNull Context context, @NonNull DB.model.MeleeWeaponModel template) {
this.context = context;
public MeleeWeapon(@NonNull String id) {
this(DB.dao.melee_weapon.find(id));
}
public MeleeWeapon(@NonNull DB.model.MeleeWeaponModel template) {
this.context = ContextHolder.INSTANCE.getContext();
this.name = template.getName();
this.roller = DiceRoller.of(template.getDamage());
this.cooldown = template.getCooldown();

10
src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java
View File

@@ -3,7 +3,7 @@ package com.bartlomiejpluta.demo.world.weapon;
import java.util.Random;
import lombok.*;
import com.bartlomiejpluta.base.api.context.Context;
import com.bartlomiejpluta.base.api.context.*;
import com.bartlomiejpluta.base.api.entity.Entity;
import com.bartlomiejpluta.base.api.animation.Animation;
import com.bartlomiejpluta.base.api.move.*;
@@ -33,8 +33,12 @@ public class RangedWeapon implements Weapon {
@Getter
private int cooldown;
public RangedWeapon(@NonNull Context context, @NonNull DB.model.RangedWeaponModel template) {
this.context = context;
public RangedWeapon(@NonNull String id) {
this(DB.dao.ranged_weapon.find(id));
}
public RangedWeapon(@NonNull DB.model.RangedWeaponModel template) {
this.context = ContextHolder.INSTANCE.getContext();
this.name = template.getName();
this.dmgRoller = DiceRoller.of(template.getDamage());
this.rangeRoller = DiceRoller.of(template.getRange());