diff --git a/GT_Modulsicht/GalaxyTrucker.vpp b/GT_Modulsicht/GalaxyTrucker.vpp index 431578cdd9d24601b8a0a6545031e96c6a54c81e..5c88b42c499a10c727dc031211ca46b1e3d86334 100644 Binary files a/GT_Modulsicht/GalaxyTrucker.vpp and b/GT_Modulsicht/GalaxyTrucker.vpp differ diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d new file mode 100644 index 0000000000000000000000000000000000000000..556d186b4a376ef22ba5716002778d441fd093dc Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d differ diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d new file mode 100644 index 0000000000000000000000000000000000000000..c65918c439041efc2a6a2a27cfa980bac9219372 Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d differ diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d new file mode 100644 index 0000000000000000000000000000000000000000..0adb62fbfd431c6a82a67870eb3759e8bbc2b938 Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d differ diff --git a/GT_Modulsicht/Gt Model.png b/GT_Modulsicht/Gt Model.png index 930515f2559b183b5f487697e9ef926acbd7fcb4..43961e58e07e2b7f1997710e943e80d67eb0ccbd 100644 Binary files a/GT_Modulsicht/Gt Model.png and b/GT_Modulsicht/Gt Model.png differ diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java index a8dbf0e361d84c5a6b8c5c9acfc812a0239677db..99e30301eb9105b6a55ca0df450a1eed21fd75d0 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java @@ -1,26 +1,55 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons; +import com.galaxytrucker.galaxytruckerreloaded.Model.Ship; + public abstract class Weapon { /** Weapon damage */ private int damage; - /** Weapon coolDown */ + /** Amount of rounds for the weapon to be used again */ private int cooldown; /** Weapon energy */ private int energy; + /** Amount of missiles spent per attack */ private int missileCost; - private float dropchance; - private int crewdamage; - /** - * Amount of shields ignored by attack - */ - private int piercing; - /** - * How many projectiles are fired per burst - */ - private int burst; private float precision; + /** probability of randomly finding this weapon */ + private float dropChance; + /** Amount of shield bars this Weapon can ignore */ + private int shieldPiercing; + /** Probability of causing a breach in the section on hit */ + private float breachChance; + /** Damage taken by crew in the hit section */ + private int crewDamage; + /** How many projectiles are fired per burst */ + private int burst; + + public int getCooldown() { + return cooldown; + } + + public void setCooldown(int cooldown) { + this.cooldown = cooldown; + } + + public int getEnergy() { + return energy; + } + + public void setEnergy(int energy) { + this.energy = energy; + } + + public float getDropChance() { + return dropChance; + } + + public void setDropChance(float dropChance) { + this.dropChance = dropChance; + } + + public void attack(Ship target){} }