EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-07-31 04:05:26 +02:00
Code Issues Projects Releases Wiki Activity

Oppdaterer lasere for å ta hensyn til alle mulige situasjoner. Closes #69

Browse Source 
Det tas nå hensyn til enkle lasere som skyter mot doble lasere,
enkle lasere som krysser doble lasere, lasere som krysser triple lasere,
og egentlig alle situasjoner som kan tenkes.
This commit is contained in:
Kristian Knarvik
2020-04-25 14:45:38 +02:00
parent fca361b750
commit 232d2d9a8a
4 changed files with 130 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/inf112/fiasko/roborally/elementproperties/ParticleType.java
View File

@@ -7,19 +7,39 @@ public enum ParticleType {
/**
* The beam emitting from a single laser
*/
LASER_BEAM_SINGLE(1),
LASER_BEAM_SINGLE(10),
/**
* The beam emitting from a double laser
*/
LASER_BEAM_DOUBLE(2),
LASER_BEAM_DOUBLE(20),
/**
* The beam emitting if a single laser shoots in the opposite direction of a double laser
*/
LASER_BEAM_TRIPLE(30),
/**
* The beam emitted where two single beams cross
*/
LASER_BEAM_SINGLE_CROSS(3),
LASER_BEAM_SINGLE_CROSS(11),
/**
* The beam emitted where two double beams cross
*/
LASER_BEAM_DOUBLE_CROSS(4);
LASER_BEAM_DOUBLE_CROSS(22),
/**
* The beam emitted where two triple beams cross
*/
LASER_BEAM_TRIPLE_CROSS(33),
/**
* The beam emitted where a single beam crosses a double beam
*/
LASER_BEAM_SINGLE_DOUBLE_CROSS(12),
/**
* The beam emitted where a single beam crosses a triple beam
*/
LASER_BEAM_SINGLE_TRIPLE_CROSS(13),
/**
* The beam emitted where a double beam crosses a triple beam
*/
LASER_BEAM_DOUBLE_TRIPLE_CROSS(23);
private final int particleTypeID;