Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -125,6 +125,10 @@ public class BulletType extends Content implements Cloneable{
|
|||||||
/** Whether to move the bullet back depending on delta to fix some delta-time related issues.
|
/** Whether to move the bullet back depending on delta to fix some delta-time related issues.
|
||||||
* Do not change unless you know what you're doing. */
|
* Do not change unless you know what you're doing. */
|
||||||
public boolean backMove = true;
|
public boolean backMove = true;
|
||||||
|
/** If true, the angle param in create is ignored. */
|
||||||
|
public boolean ignoreSpawnAngle = false;
|
||||||
|
/** Chance for this bullet to be created. */
|
||||||
|
public float createChance = 1;
|
||||||
/** Bullet range positive override. */
|
/** Bullet range positive override. */
|
||||||
public float maxRange = -1f;
|
public float maxRange = -1f;
|
||||||
/** When > 0, overrides range even if smaller than base range. */
|
/** When > 0, overrides range even if smaller than base range. */
|
||||||
@@ -736,6 +740,8 @@ public class BulletType extends Content implements Cloneable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public @Nullable Bullet create(@Nullable Entityc owner, @Nullable Entityc shooter, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY){
|
public @Nullable Bullet create(@Nullable Entityc owner, @Nullable Entityc shooter, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data, @Nullable Mover mover, float aimX, float aimY){
|
||||||
|
if(!Mathf.chance(createChance)) return null;
|
||||||
|
if(ignoreSpawnAngle) angle = 0;
|
||||||
if(spawnUnit != null){
|
if(spawnUnit != null){
|
||||||
//don't spawn units clientside!
|
//don't spawn units clientside!
|
||||||
if(!net.client()){
|
if(!net.client()){
|
||||||
|
|||||||
@@ -180,6 +180,10 @@
|
|||||||
"address": ["event.baseduser.eu.org"],
|
"address": ["event.baseduser.eu.org"],
|
||||||
"prioritized": true
|
"prioritized": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "LifeTime",
|
||||||
|
"address": ["srv3.godlike.club:28561"]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "Cyandustry",
|
"name": "Cyandustry",
|
||||||
"address": ["91.218.66.162:6568"],
|
"address": ["91.218.66.162:6568"],
|
||||||
|
|||||||
Reference in New Issue
Block a user