Merge branch 'main' of https://github.com/R74nCom/sandboxels

2024-02-17 17:19:34 -05:00 · 2024-02-17 17:19:34 -05:00 · 6557e48ea6
parent 3b25d0e531 612e628478
commit 6557e48ea6
3 changed files with 307 additions and 0 deletions
--- a/mods/fantasy_elements.js
+++ b/mods/fantasy_elements.js
@ -1,6 +1,17 @@
 // 1.3.2 fantasy_elements.js mod
 // adds plode a bomb

+// 1.4 the golem mod
+// frostbite turns pheonx into ice
+// adds plode maximus
+// adds fire golem
+// added snow golem
+// added slush golem
+// added water golem
+// added plasma golem
+// iced pheonix at 700 degrees becomes pheonix
+// added blood golem
+
 elements.dragon_breath = {
    color: "#f94e4e",
    behavior: behaviors.GAS,
@ -30,6 +41,7 @@ elements.frostbite = {
    reactions: {
        "water": { elem1: "ice", elem2: "ice" },
 		"dragon_breath": { elem1: "pulsium", elem2: "pulsium" },
+        "pheonix": { elem1: "ice", elem2: "ice" },
    }
 };

@ -130,6 +142,9 @@ elements.baby_pheonix = {
 elements.iced_pheonix = {
    color: "#34baeb",
    behavior: behaviors.SOLID,
+    temp: -999,
+    tempHigh: 700,
+    stateHigh: "pheonix",
    category: "fantasy",
    state: "solid",
 	breakInto: "ice",
@ -625,3 +640,101 @@ elements.plode = {
    density: 2500,
    excludeRandom: true,
 };
+elements.plode_maximus = {
+    color: "#7f03fc",
+    behavior: [
+        "XX|EX:200>plasma,heat_ray,plasma,fire,fire,plasma,heat_ray,plasma,fire,fire,plasma,heat_ray,plasma,fire,fire,plasma,heat_ray,plasma,fire,fire,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,fire,fire,fire,fire,fire,fire|XX",
+        "XX|XX|XX",
+        "M2|M1 AND EX:200>fire,plasma,fire,fire,heat_ray,fire,fire,plasma,fire,fire,heat_ray,fire,fire,plasma,fire,fire,heat_ray,fire,fire,plasma,fire,fire,heat_ray,fire,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,plasma,fire,fire,fire,fire,fire|M2",
+    ],
+    category: "fantasyweapons",
+    state: "solid",
+    density: 2500,
+    excludeRandom: true,
+};
+
+elements.fire_golem= {
+    "color": "#fc5a03",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:fire|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": 600,
+};
+
+elements.snow_golem= {
+    "color": "#b6ccd4",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:snow|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": -70,
+};
+
+elements.water_golem= {
+    "color": "#4ad2ff",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:water|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": 15,
+};
+
+elements.slush_golem= {
+    "color": "#a7dff2",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:slush|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": 15,
+};
+
+elements.plasma_golem= {
+    "color": "#891af0",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:plasma|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": Infinity,
+};
+
+elements.cold_golem= {
+    "color": ["#00ccff","#0091ff","#00a2ff"],
+    "state": "solid",
+    "behavior": [
+        "XX|CR:cold_fire|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": -999,
+    "templow": -999,
+    "alias": "don't put me out!",
+};
+
+elements.blood_golem= {
+    "color": "#ff0000",
+    "state": "solid",
+    "behavior": [
+        "XX|CR:blood|DL",
+        "XX|FX%0.5|M2%3 AND DL",
+        "XX|M1|XX",
+    ],
+    "category":"fantasy",
+    "temp": 10,
+};
--- a/mods/nousersthings.js
+++ b/mods/nousersthings.js
@ -1498,6 +1498,7 @@ elements.mixer = {
                }
 	},
 	movable: false,
+    noMix: true,
 },
 elements.invisiblesupport = {
 	color: "#000000",
@ -2081,6 +2082,52 @@ textures.transparency = [
    "gggwww",
    "gggwww"
 ]
+textures.steel = [
+    "hHhhd",
+    "Hnnnd",
+    "hnnnd",
+    "hnnnD",
+    "dddDD"
+]
+textures.sponge = [
+    "hddddnnddd",
+    "Ddhddhnhdd",
+    "ddDdnNnNdd",
+    "dddhnnnnnh",
+    "dhdNnhnnnN",
+    "nNnhnNnddd",
+    "dhnNnnddhd",
+    "dDnnnhddDd",
+    "dhnnnNdhdd",
+    "ddddnddDdd"
+]
+textures.copper = [
+    "uuuuum",
+    "unhhnd",
+    "uhhnnD",
+    "uhnnHd",
+    "unnHnD",
+    "mdDdDD"
+]
+textures.gold = [
+    "hnnndbHHHhhnbHHHh",
+    "nnndbhnnnnndDbnnn",
+    "nnddbnnnnnddDbnnn",
+    "dddbnnnddddDDDbnd",
+    "DDDbDDDDDDDDDDbDD",
+    "BBBBBBBBBBBBBBBBB"
+]
+textures.diamond = [
+    "llcccLbLl",
+    "lcccccbbC",
+    "CScccBbCC",
+    "SSScBBBLC",
+    "SSSSLBbLS",
+    "SSSCLbbbL",
+    "BSCCCnbBL",
+    "BBBCnnBBB",
+    "lBBcLnLbL"
+]
 elements.transparency = {
    color: ["#d4d4d4", "#ffffff"],
    colorPattern: textures.transparency,
@ -2091,4 +2138,125 @@ elements.transparency = {
    behavior: behaviors.WALL,
    category: "special",
    state: "solid"
+}
+elements.textured_steel = {
+    color: ["#708196", "#8895ad", "#596B77", "#525D6B", "#404954"],
+    colorPattern: textures.steel,
+    colorKey: {
+        "h": "#708196",
+        "H": "#8895ad",
+        "n": "#596B77",
+        "d": "#525D6B",
+        "D": "#404954"
+    },
+    behavior: behaviors.WALL,
+    category: "solids",
+    state: "solid",
+    tick: function(pixel){
+        if (pixelTicks - pixel.start == 1){
+        pixel.element = "steel"
+        }
+    }
+}
+elements.textured_sponge = {
+    color: ["#ccaa00", "#c1a100", "#967d00", "#b89a00", "#ae9100"],
+    colorPattern: textures.sponge,
+    colorKey: {
+        "n": "#ccaa00",
+        "N": "#c1a100",
+        "h": "#967d00",
+        "d": "#b89a00",
+        "D": "#ae9100"
+    },
+    behavior: behaviors.WALL,
+    category: "solids",
+    state: "solid",
+    tick: function(pixel){
+        if (pixelTicks - pixel.start == 1){
+        pixel.element = "sponge"
+        }
+    }
+}
+elements.textured_copper = {
+    color: ["#772F22", "#AB533F", "#9E3F2D", "#9E3F2D", "#4C1C11"],
+    colorPattern: textures.copper,
+    colorKey: {
+        "u": "#772F22",
+        "H": "#AB533F",
+        "h": "#C0725A",
+        "n": "#9E3F2D",
+        "D": "#4C1C11",
+        "d": "#622516",
+        "m": "#712C1E"
+    },
+    behavior: behaviors.WALL,
+    category: "solids",
+    state: "solid",
+    tick: function(pixel){
+        if (pixelTicks - pixel.start == 1){
+        pixel.element = "copper"
+        }
+    }
+}
+elements.textured_gold = {
+    color: ["#E4B038", "#FFCA59", "#BF8A18", "#7F5A10", "#674611"],
+    colorPattern: textures.gold,
+    colorKey: {
+        "h": "#FFCA59",
+        "H": "#FFFFCC",
+        "n": "#E4B038",
+        "B": "#513412",
+        "b": "#674611",
+        "d": "#BF8A18",
+        "D": "#7F5A10"
+    },
+    behavior: behaviors.WALL,
+    category: "solids",
+    state: "solid",
+    tick: function(pixel){
+        if (pixelTicks - pixel.start == 1){
+        pixel.element = "gold"
+        }
+    }
+}
+elements.solid_diamond = {
+    color: elements.diamond.color,
+    category: "solids",
+    colorPattern: textures.diamond,
+    colorKey: {
+        "c":"#36BDF3",
+        "C": "#7DD1F2",
+        "B": "#4B94ED",
+        "b": "#97BEED",
+        "L":"#C2D5ED",
+        "n": "#7BAEED",
+        "l": "#A2DBF2",
+        "S": "#BDF8FF"
+    },
+    tempHigh: elements.diamond.tempHigh,
+    stateHigh: elements.diamond.stateHigh,
+    state: "solid",
+    denisty: elements.diamond.density,
+    hardness: elements.diamond.hardness
+}
+elements.textured_rose_gold = {
+    color: ["#FF5991", "#E4386F", "#7F1037", "#FFCCCD", "#671133"],
+    colorPattern: textures.gold,
+    colorKey: {
+        "h": "#FF5991",
+        "H": "#FFCCCD",
+        "n": "#E4386F",
+        "B": "#511230",
+        "b": "#671133",
+        "d": "#BF1850",
+        "D": "#7F1037"
+    },
+    behavior: behaviors.WALL,
+    category: "solids",
+    state: "solid",
+    tick: function(pixel){
+        if (pixelTicks - pixel.start == 1){
+        pixel.element = "rose_gold"
+        }
+    }
 }
--- a/mods/weapons.js
+++ b/mods/weapons.js
@ -159,4 +159,30 @@ elements.left_bullet = {
        "XX|XX|M2",
    ],
    category:"weapons",
+},
+    elements.e_gun_left = {
+    color: "#C0C0C0",
+    behavior: behaviors.WALL,
+    behaviorOn: [
+        "XX|XX|XX",
+        "CR:left_bullet|XX|XX",
+        "XX|XX|XX",
+    ],
+    category: "weapons",
+    state: "solid",
+    conduct: 1,
+    density: 1300,
+},
+    elements.e_gun_right = {
+    color: "#C0C0C0",
+    behavior: behaviors.WALL,
+    behaviorOn: [
+        "XX|XX|XX",
+        "XX|XX|CR:right_bullet",
+        "XX|XX|XX",
+    ],
+    category: "weapons",
+    state: "solid",
+    conduct: 1,
+    density: 1300,
 };