Merge pull request #655 from Jayd-Rubies/main

This commit is contained in:
slweeb 2024-05-23 18:47:45 -04:00 committed by GitHub
commit fcde55245a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 258 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -75,6 +75,7 @@ elements.left_missile = {
"M1 AND EX:10|XX|EX:10",
"M2|EX:10|XX",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -87,6 +88,7 @@ elements.right_missile = {
"EX:10|XX|M1 AND EX:10",
"XX|EX:10|M2",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -99,6 +101,7 @@ elements.up_missile = {
"EX:10|XX|EX:10",
"XX|EX:10|XX",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -167,6 +170,7 @@ elements.left_bullet = {
"M1 AND EX:5|XX|XX",
"M2|XX|XX",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -179,6 +183,7 @@ elements.left_bullet = {
"XX|XX|M1 AND EX:5",
"XX|XX|M2",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -239,6 +244,7 @@ elements.left_rocket = {
"M1 AND EX:10|XX|XX",
"XX|XX|XX",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -251,6 +257,7 @@ elements.left_rocket = {
"XX|XX|M1 AND EX:10",
"XX|XX|XX",
],
state: "solid",
category:"ammunition",
density: 1300,
excludeRandom: true,
@ -609,8 +616,6 @@ elements.fast_bomb = {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x, pixel.y+1)) {
if (!isEmpty(pixel.x, pixel.y+1,true)) {
var newPixel = pixelMap[pixel.x][pixel.y+1];
if (newPixel.element === "fast_bomb") { break; }
}
}
}
@ -734,4 +739,68 @@ elements.tank_right = {
"XX|XX|M1",
"XX|M1|M1",
],
},
elements.realistic_missle_left = {
color: "#524c41",
category: "weapons",
state: "solid",
behavior: [
"XX|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|XX",
"EX:20>missile_shrapnel|XX|XX|XX|XX|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|M2|XX|XX|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|M1|XX|XX|CR:smoke|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|M2|XX|XX|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|XX|XX|XX|XX|EX:20>missile_shrapnel",
"XX|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|XX",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x-1, pixel.y)) {
if (!isEmpty(pixel.x-1, pixel.y,true)) {
}
}
}
},
density: 1300,
excludeRandom: true,
cooldown: defaultCooldown
},
elements.realistic_missle_right = {
color: "#524c41",
category: "weapons",
state: "solid",
behavior: [
"XX|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|XX",
"EX:20>missile_shrapnel|XX|XX|XX|XX|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|XX|XX|M2|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|CR:smoke|XX|XX|M1|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|XX|XX|M2|XX|EX:20>missile_shrapnel",
"EX:20>missile_shrapnel|XX|XX|XX|XX|XX|EX:20>missile_shrapnel",
"XX|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|EX:20>missile_shrapnel|XX",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x+1, pixel.y)) {
if (!isEmpty(pixel.x+1, pixel.y,true)) {
}
}
}
},
density: 1300,
excludeRandom: true,
cooldown: defaultCooldown
},
elements.missile_shrapnel = {
color: "#71797E",
behavior: [
"XX|XX|XX",
"XX|EX:5 %20|XX",
"M2%20|M1%20|M2%20",
],
burn: 90,
burnTime: 100,
density: 2000,
conduct: 1,
state: "solid",
category: "ammunition"
}