Projects information

Chunk

Conflicting content
private int flashTime = 0; //stats! <<<<<<< HEAD public int strength = 2; public int defense = 1; ======= public int strength = 3; public int defense = 3; >>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806 public double crit = 0.01; private int bounceTime = 0;

Conflicting content

	private int flashTime = 0;
	
	//stats!
<<<<<<< HEAD
	public int strength = 2;
	public int defense = 1;
=======
	public int strength = 3;
	public int defense = 3;
>>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806
	public double crit = 0.01;

	private int bounceTime = 0;

Solution content
private int flashTime = 0; //stats! public int strength = 3; public int defense = 3; public double crit = 0.01; private int bounceTime = 0;

File
Mob.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
BoundingBox playerbb = bullet.getBoundingBox(); if(mybb.intersects(playerbb)) { bullet.remove(); <<<<<<< HEAD hurt(bullet.damage); ======= hurt(Combat.bulletDamage(bullet.damage, bullet.crit, 0)); >>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806 } }

Conflicting content

				BoundingBox playerbb = bullet.getBoundingBox();
				if(mybb.intersects(playerbb)) {
					bullet.remove();
<<<<<<< HEAD
					hurt(bullet.damage);
=======
					hurt(Combat.bulletDamage(bullet.damage, bullet.crit, 0));
					
>>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806
				}
		}

Solution content
BoundingBox playerbb = bullet.getBoundingBox(); if(mybb.intersects(playerbb)) { bullet.remove(); hurt(Combat.bulletDamage(bullet.damage, bullet.crit, 0)); } }

File
MobSpawner.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content
mana = maxmana; <<<<<<< HEAD strength = 3; defense = 1; ======= strength = 4; defense = 2; >>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806 crit = 0.2; walkTime = 0;

Solution content
mana = maxmana; strength = 4; defense = 2; crit = 0.2; walkTime = 0;

File
Player.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
} public void tick() { <<<<<<< HEAD if(mana < 100 && rand.nextDouble() > 0.93) ======= if(health <= 0) level.gameOver(); if(mana < maxmana && rand.nextDouble() > 0.93) >>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806 mana++; BoundingBox mybb = getBoundingBox();

Conflicting content

	}
	
	public void tick() {
<<<<<<< HEAD
		if(mana < 100 && rand.nextDouble() > 0.93)
=======
		if(health <= 0)
			level.gameOver();
		if(mana < maxmana && rand.nextDouble() > 0.93)
>>>>>>> 4bc654a2bf655b3fbf88cff6241ea786bf697806
			mana++;
		
		BoundingBox mybb = getBoundingBox();

Solution content
} public void tick() { if(mana < maxmana && rand.nextDouble() > 0.93) mana++; BoundingBox mybb = getBoundingBox();

File
Player.java

Developer's decision
Combination

Kind of conflict
If statement

Projects >> zdungeon >>6964059c8135cae6a7b86ed233651a6c027c11a0