lore disabled" : ""}
if (!aHasKeyword && bHasKeyword) return 1;
return 0;
}
-
if (find === 'guntech') {
tech.tech.sort((a, b) => {
if (a.isGunTech && b.isGunTech) {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
}
if (a.isGunTech && !b.isGunTech) return -1; //sort to the top
if (!a.isGunTech && b.isGunTech) return 1; //sort to the bottom
@@ -538,30 +536,30 @@ ${simulation.isCheating ? "
lore disabled" : ""}
} else if (find === 'fieldtech') {
tech.tech.sort((a, b) => {
if (a.isFieldTech && b.isFieldTech) {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
}
if (a.isFieldTech && !b.isFieldTech) return -1; //sort to the top
if (!a.isFieldTech && b.isFieldTech) return 1; //sort to the bottom
return 0;
});
} else if (find === 'allowed') {
+ // tech.tech.sort((a, b) => {
+ // if (a.allowed() > !b.allowed()) return -1; //sort to the top
+ // if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ // return 0;
+ // });
tech.tech.sort((a, b) => {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
- return 0;
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
});
} else if (find === 'have') {
tech.tech.sort((a, b) => {
- if (a.count > b.count) return -1; //sort to the top
- if (!a.count < b.count) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
return 0;
});
} else if (find === 'heal') {
tech.tech.sort((a, b) => {
if (a.isHealTech && b.isHealTech) {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
}
if (a.isHealTech && !b.isHealTech) return -1; //sort to the top
if (!a.isHealTech && b.isHealTech) return 1; //sort to the bottom
@@ -570,8 +568,7 @@ ${simulation.isCheating ? "
lore disabled" : ""}
} else if (find === 'bot') {
tech.tech.sort((a, b) => {
if (a.isBotTech && b.isBotTech) {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
}
if (a.isBotTech && !b.isBotTech) return -1; //sort to the top
if (!a.isBotTech && b.isBotTech) return 1; //sort to the bottom
@@ -580,8 +577,7 @@ ${simulation.isCheating ? "
lore disabled" : ""}
} else if (document.getElementById("sort-input").value === 'skin') {
tech.tech.sort((a, b) => {
if (a.isSkin && b.isSkin) {
- if (a.allowed() > b.allowed()) return -1; //sort to the top
- if (!a.allowed() < b.allowed()) return 1; //sort to the bottom
+ return (a.allowed() === b.allowed()) ? 0 : a.allowed() ? -1 : 1;
}
if (a.isSkin && !b.isSkin) return -1; //sort to the top
if (!a.isSkin && b.isSkin) return 1; //sort to the bottom
diff --git a/js/level.js b/js/level.js
index 3e00aba..3f1401f 100644
--- a/js/level.js
+++ b/js/level.js
@@ -19,16 +19,18 @@ const level = {
// simulation.enableConstructMode() //tech.giveTech('motion sickness') //used to build maps in testing mode
// simulation.isHorizontalFlipped = true
// tech.giveTech("performance")
- // level.difficultyIncrease(3 * 4) //30 is near max on hard //60 is near max on why
+ // level.difficultyIncrease(1 * 4) //30 is near max on hard //60 is near max on why
// spawn.setSpawnList();
// spawn.setSpawnList();
// m.maxHealth = m.health = 100
+ // m.maxEnergy = m.energy = 10000000
// tech.isRerollDamage = true
// powerUps.research.changeRerolls(99999)
// m.immuneCycle = Infinity //you can't take damage
// tech.tech[297].frequency = 100
// m.couplingChange(10)
// m.setField("grappling hook") //1 standing wave 2 perfect diamagnetism 3 negative mass 4 molecular assembler 5 plasma torch 6 time dilation 7 metamaterial cloaking 8 pilot wave 9 wormhole 10 grappling hook
+ // tech.isHookWire = true
// m.energy = 0
// simulation.molecularMode = 2
// m.damage(0.1);
@@ -36,10 +38,8 @@ const level = {
// b.giveGuns("harpoon") //0 nail gun 1 shotgun 2 super balls 3 wave 4 missiles 5 grenades 6 spores 7 drones 8 foam 9 harpoon 10 mine 11 laser
// b.guns[8].ammo = 100000000
// requestAnimationFrame(() => { tech.giveTech("MACHO") });
- // for (let i = 0; i < 1; ++i) tech.giveTech("electrostatic induction")
- // for (let i = 0; i < 1; ++i) tech.giveTech("grappling hook")
- // for (let i = 0; i < 1; ++i) tech.giveTech("superdeterminism")
- // for (let i = 0; i < 1; ++i) tech.giveTech("fine-structure constant")
+ // for (let i = 0; i < 1; ++i) tech.giveTech("autonomous defense")
+ // for (let i = 0; i < 1; ++i) tech.giveTech("rupture")
// for (let i = 0; i < 1; ++i) tech.giveTech("nail-bot upgrade")
// requestAnimationFrame(() => { for (let i = 0; i < 30; i++) tech.giveTech("laser-bot") });
// for (let i = 0; i < 1; i++) tech.giveTech("laser-bot upgrade")
@@ -47,11 +47,11 @@ const level = {
// for (let i = 0; i < 1; ++i) tech.giveTech("mechanical resonance")
// for (let i = 0; i < 3; i++) powerUps.directSpawn(450, -50, "tech");
// for (let i = 0; i < 10; i++) powerUps.directSpawn(1750, -500, "research");
- // for (let i = 0; i < 10; i++) powerUps.directSpawn(1750, -500, "coupling");
+ // for (let i = 0; i < 100; i++) powerUps.directSpawn(1750, -500, "coupling");
// level.testing();
// for (let i = 0; i < 4; ++i) spawn.hopMother(1900, -500)
- // for (let i = 0; i < 0; ++i) spawn.hopper(1900, -500)
+ // for (let i = 0; i < 5; ++i) spawn.starter(1900, -500)
// for (let i = 0; i < 1; ++i) spawn.shooterBoss(1900, -2500)
// spawn.beetleBoss(1900, -500, 25)
// spawn.slasher2(2000, -1150)
@@ -63,7 +63,8 @@ const level = {
// for (let i = 0; i < 40; ++i) tech.giveTech()
level[simulation.isTraining ? "walk" : "intro"]() //normal starting level **************************************************
-
+ // spawn.bodyRect(2425, -120, 200, 200);
+ // console.log(body[body.length - 1].mass)
// simulation.isAutoZoom = false; //look in close
// simulation.zoomScale *= 0.5;
// simulation.setZoom();
diff --git a/js/player.js b/js/player.js
index f269256..459438c 100644
--- a/js/player.js
+++ b/js/player.js
@@ -2496,7 +2496,6 @@ const m = {
// set pick up target for when mouse is released
if (body[grabbing.targetIndex]) {
m.holdingTarget = body[grabbing.targetIndex];
- //
ctx.beginPath(); //draw on each valid body
let vertices = m.holdingTarget.vertices;
ctx.moveTo(vertices[0].x, vertices[0].y);
@@ -2588,6 +2587,8 @@ const m = {
return `+${(4 * couple).toFixed(0)}%block collision damage`
case 9: //wormhole
return `after eating blocks+${(2 * couple).toFixed(0)}energy`
+ case 10: //grappling hook
+ return `${powerUps.orb.ammo(1)} give ${(4 * couple).toFixed(0)}% more ammo`
}
},
couplingChange(change = 0) {
@@ -2659,12 +2660,6 @@ const m = {
}
}
},
- //
- //
1
- //
2
- //
3
- //
4
- //
{
name: "standing wave",
//deflecting protects you in every direction
@@ -3083,7 +3078,20 @@ const m = {
for (let i = 0, len = who.length; i < len; ++i) {
sub = Vector.sub(who[i].position, m.pos);
dist = Vector.magnitude(sub);
- if (dist < range) who[i].force.y -= who[i].mass * (simulation.g * mag);
+ if (dist < range) {
+ who[i].force.y -= who[i].mass * (simulation.g * mag); //add a bit more then standard gravity
+ if (input.left) { //blocks move horizontally with the same force as the player
+ who[i].force.x -= m.FxAir * who[i].mass / 10; // move player left / a
+ } else if (input.right) {
+ who[i].force.x += m.FxAir * who[i].mass / 10; //move player right / d
+ }
+ }
+
+
+
+ // sub = Vector.sub(who[i].position, m.pos);
+ // dist = Vector.magnitude(sub);
+ // if (dist < range) who[i].force.y -= who[i].mass * (simulation.g * mag);
}
}
//control horizontal acceleration
@@ -3825,7 +3833,8 @@ const m = {
}
if (tech.isRewindField) {
this.rewindCount = 0
- m.grabPowerUpRange2 = 300000
+ m.grabPowerUpRange2 = 300000// m.grabPowerUpRange2 = 200000;
+
m.hold = function () {
// console.log(m.fieldCDcycle)
m.grabPowerUp();
@@ -4944,25 +4953,64 @@ const m = {
{
name: "grappling hook",
// description: `use energy to pull yourself towards the map generate 6energy per second`,
- description: `use energy to fire a hook that attaches to map, pulls player, damages mobs, and destroys blocks generate 6energy per second`,
+ description: `use energy to fire a hook that pulls player damages mobs and destroys blocks generate 6energy per second`,
effect: () => {
m.fieldFire = true;
// m.holdingMassScale = 0.01; //can hold heavier blocks with lower cost to jumping
m.fieldMeterColor = "#333"
m.eyeFillColor = m.fieldMeterColor
- m.fieldHarmReduction = 0.45; //55% reduction
+ m.grabPowerUpRange2 = 300000 //m.grabPowerUpRange2 = 200000;
+ // m.fieldHarmReduction = 0.45; //55% reduction
m.hold = function () {
- if (input.field) {
+ if (m.isHolding) {
+ m.drawHold(m.holdingTarget);
+ m.holding();
+ m.throwBlock();
+ } else if (input.field) {
+ m.holdingTarget = null; //clears holding target (this is so you only pick up right after the field button is released and a hold target exists)
if (m.fieldCDcycle < m.cycle) {
if (m.energy > 0.02) m.energy -= 0.02
- const where = { x: m.pos.x + 40 * Math.cos(m.angle), y: m.pos.y + 40 * Math.sin(m.angle) }
- b.grapple(where, m.angle)
+ b.grapple({ x: m.pos.x + 40 * Math.cos(m.angle), y: m.pos.y + 40 * Math.sin(m.angle) }, m.angle)
if (m.fieldCDcycle < m.cycle + 20) m.fieldCDcycle = m.cycle + 20
}
m.grabPowerUp();
+ } else {
+ m.holdingTarget = null; //clears holding target (this is so you only pick up right after the field button is released and a hold target exists)
+ if (tech.isHookDefense && m.energy > 0.33 && m.fieldCDcycle < m.cycle) {
+ const maxCount = 6 //scale the number of hooks fired
+ let count = maxCount
+ const range = 300
+ for (let i = 0; i < mob.length; i++) {
+ if (!mob[i].isBadTarget &&
+ !mob[i].isInvulnerable &&
+ Vector.magnitude(Vector.sub(m.pos, mob[i].position)) < range &&
+ Matter.Query.ray(map, m.pos, mob[i].position).length === 0
+ ) {
+ count--
+ m.energy -= 0.2
+ if (m.fieldCDcycle < m.cycle + 30) m.fieldCDcycle = m.cycle + 30
+ const angle = Math.atan2(mob[i].position.y - player.position.y, mob[i].position.x - player.position.x);
+ b.harpoon(m.pos, mob[i], angle, 0.75, true, 20) // harpoon(where, target, angle = m.angle, harpoonSize = 1, isReturn = false, totalCycles = 35, isReturnAmmo = true, thrust = 0.1) {
+ bullet[bullet.length - 1].drain = 0
+ for (; count > 0; count--) {
+ b.harpoon(m.pos, mob[i], angle + count * 2 * Math.PI / maxCount, 0.75, true, 10)
+ bullet[bullet.length - 1].drain = 0
+ }
+ break
+ }
+ }
+ ctx.beginPath();
+ ctx.arc(m.pos.x, m.pos.y, range, 0, 2 * Math.PI);
+ ctx.strokeStyle = "#000";
+ ctx.lineWidth = 0.25;
+ ctx.setLineDash([10, 30]);
+ ctx.stroke();
+ ctx.setLineDash([]);
+ }
}
m.drawRegenEnergy()
+ //look for nearby mobs and fire harpoons at them
}
}
},
diff --git a/js/powerup.js b/js/powerup.js
index 1b27ff1..6ffd71b 100644
--- a/js/powerup.js
+++ b/js/powerup.js
@@ -621,17 +621,18 @@ const powerUps = {
return 17;
},
effect() {
+ const couplingExtraAmmo = m.fieldMode === 10 ? 1 + 0.04 * m.coupling : 1
if (b.inventory.length > 0) {
powerUps.animatePowerUpGrab('rgba(68, 102, 119,0.25)')
if (tech.isAmmoForGun && b.activeGun !== null) { //give extra ammo to one gun only with tech logistics
const target = b.guns[b.activeGun]
if (target.ammo !== Infinity) {
if (tech.ammoCap) {
- const ammoAdded = Math.ceil(target.ammoPack * 0.7 * tech.ammoCap * 0.8) //0.7 is average
+ const ammoAdded = Math.ceil(target.ammoPack * 0.7 * tech.ammoCap * 0.8 * couplingExtraAmmo) //0.7 is average
target.ammo = ammoAdded
// simulation.makeTextLog(`${target.name}.ammo= ${ammoAdded}`)
} else {
- const ammoAdded = Math.ceil((0.7 * Math.random() + 0.7 * Math.random()) * target.ammoPack * 0.8)
+ const ammoAdded = Math.ceil((0.7 * Math.random() + 0.7 * Math.random()) * target.ammoPack * 0.8 * couplingExtraAmmo)
target.ammo += ammoAdded
// simulation.makeTextLog(`${target.name}.ammo+= ${ammoAdded}`)
}
@@ -642,11 +643,12 @@ const powerUps = {
const target = b.guns[b.inventory[i]]
if (target.ammo !== Infinity) {
if (tech.ammoCap) {
- const ammoAdded = Math.ceil(target.ammoPack * 0.45 * tech.ammoCap) //0.45 is average
+ const ammoAdded = Math.ceil(target.ammoPack * 0.45 * tech.ammoCap * couplingExtraAmmo) //0.45 is average
target.ammo = ammoAdded
// textLog += `${target.name}.ammo= ${ammoAdded} `
- } else {
- const ammoAdded = Math.ceil((0.45 * Math.random() + 0.45 * Math.random()) * target.ammoPack) //Math.ceil(Math.random() * target.ammoPack)
+ } else { //default ammo behavior
+ const ammoAdded = Math.ceil((0.45 * Math.random() + 0.45 * Math.random()) * target.ammoPack * couplingExtraAmmo) //Math.ceil(Math.random() * target.ammoPack)
+ // console.log(ammoAdded, Math.ceil((0.45 * Math.random() + 0.45 * Math.random()) * target.ammoPack))
target.ammo += ammoAdded
// textLog += `${target.name}.ammo+= ${ammoAdded} `
}
@@ -1270,24 +1272,25 @@ const powerUps = {
}
for (let i = 0; i < localSettings.entanglement.techIndexes.length; i++) { //add tech
let choose = localSettings.entanglement.techIndexes[i]
- const isCount = tech.tech[choose].count > 0 ? `(${tech.tech[choose].count + 1}x)` : "";
-
- if (choose === null || tech.tech[choose].count + 1 > tech.tech[choose].maxCount || !tech.tech[choose].allowed()) {
- // text += `
${tech.tech[choose].name} - incoherent
`
- text += powerUps.incoherentTechText(choose)
- } else {
- if (tech.tech[choose].isFieldTech) {
- text += powerUps.fieldTechText(choose, `powerUps.choose('tech',${choose})`)
- } else if (tech.tech[choose].isGunTech) {
- text += powerUps.gunTechText(choose, `powerUps.choose('tech',${choose})`)
- } else if (tech.tech[choose].isLore) {
- text += `