From f969ccaf030b39b878791e4c06b9b87c338d3f31 Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Mon, 20 May 2024 19:16:03 -0700 Subject: [PATCH] 096 now gets panicked if someone looks at his face --- mods/scp.js | 173 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 117 insertions(+), 56 deletions(-) diff --git a/mods/scp.js b/mods/scp.js index db64a288..0ffa3075 100644 --- a/mods/scp.js +++ b/mods/scp.js @@ -33,9 +33,9 @@ window.addEventListener("load", () => { }) window.addEventListener("load", () => { document.getElementById("elementButton-mad_682")?.remove() -}) +}) -// Coding junk past this point +// Coding junk above this point // also hi jonny ray @@ -58,22 +58,22 @@ elements.SCP_008 = { reactions: { "head": { elem1:null, elem2:"z_head" , chance:0.5 }, "body": { elem1:null, elem2:"z_body" , chance:0.5 }, - "skin": { elem1:null, elem2: ["infected_skin","infected_skin","infected_meat"] , chance:0.3 }, - "blood": { elem1:null, elem2:"infection" , chance:0.6 }, - "meat": { elem1:null, elem2:"infected_meat" , chance:0.4 }, - "rotten_meat": { elem1:null, elem2:"infected_meat" , chance:0.5 }, - "frozen_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.3 }, + "skin": { elem1:null, elem2: ["infected_skin","infected_skin","infected_meat"] , chance:0.3 }, + "blood": { elem1:null, elem2:"infection" , chance:0.6 }, + "meat": { elem1:null, elem2:"infected_meat" , chance:0.4 }, + "rotten_meat": { elem1:null, elem2:"infected_meat" , chance:0.5 }, + "frozen_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.3 }, "frog": { elem2:"SCP_008" , chance:0.5 }, "ant": { elem2:"SCP_008" , chance:0.5 }, "bee": { elem2:"SCP_008" , chance:0.5 }, "fish": { elem2:"SCP_008" , chance:0.5 }, "firefly": { elem2:"SCP_008" , chance:0.5 }, - "chlorine": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, - "liquid_chlorine": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, - "light": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, + "chlorine": { elem1: null , chance:0.01 }, + "liquid_chlorine": { elem1: null , chance:0.01 }, + "light": { elem1: null , chance:0.01 }, }, tempHigh: 750, - stateHigh: [null,null,null,null,null,null,null,null,"anomalous_essence"], + stateHigh: null, tempLow: -100, stateLow: "frozen_008", category: "scp", @@ -85,20 +85,20 @@ elements.frozen_008 = { color: "#242424", behavior: [ "XX|XX|XX", - "XX|DL%0.001|X", - "XX|M1%1.0|XX", + "M2%0.001|DL%0.001|M2%0.001", + "M2%0.01|M1%1.0|M2%0.01", ], reactions: { "head": { elem1:null, elem2:"z_head" , chance:0.4 }, "body": { elem1:null, elem2:"z_body" , chance:0.4 }, - "skin": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, - "blood": { elem1:null, elem2:"infection" , chance:0.6 }, - "meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, - "rotten_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.5 }, - "frozen_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, - "chlorine": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, - "liquid_chlorine": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, - "light": { elem1: [null,null,null,null,null,null,null,null,"anomalous_essence"] , chance:0.01 }, + "skin": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, + "blood": { elem1:null, elem2:"infection" , chance:0.6 }, + "meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, + "rotten_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.5 }, + "frozen_meat": { elem1:null, elem2:"frozen_infected_meat" , chance:0.4 }, + "chlorine": { elem1: null , chance:0.01 }, + "liquid_chlorine": { elem1: null , chance:0.01 }, + "light": { elem1: null , chance:0.01 }, }, temp: -50, tempHigh: 0, @@ -109,12 +109,12 @@ elements.frozen_008 = { }, elements.infected_skin = { - color: ["#11111f","#75816B","#4D6B53"], + color: ["#75816B","#4D6B53"], singleColor: true, behavior: [ - "XX|CR:stench,stench,stench,SCP_008,fly%0.05 AND CH:meat>infected_meat%1|XX", - "CH:meat>infected_meat%1|XX|CH:meat>infected_meat%1", - "M2%1.0|M1%1.0 AND CH:meat>infected_meat%1|M2%1.0", + "XX|CR:stench,stench,stench,SCP_008,fly%0.05 AND CH:skin>infected_skin%25|XX", + "CH:skin>infected_skin%25|CH:infected_meat%0.5|CH:skin>infected_skin%25", + "M2%1|M1%1.0 AND CH:skin>infected_skin%25|M2%1", ], tick: function(pixel) { if (pixel.temp > 40 && Math.random() < 0.003) { @@ -140,12 +140,16 @@ elements.infected_skin = { pixel2.color = pixelColorPick(pixel2,RGBToHex(pixel1.color.match(/\d+/g))) if (pixel1.origColor) { pixel2.origColor = pixel1.origColor } } }, - "skin": { chance:0.01, func:function(pixel1,pixel2){ - changePixel(pixel2,"infected_skin"); - pixel2.color = pixelColorPick(pixel2,RGBToHex(pixel1.color.match(/\d+/g))) - if (pixel1.origColor) { pixel2.origColor = pixel1.origColor } - } }, - "blood": { elem2:"infection" , chance:0.6 }, + "water": { elem2:"dirty_water" }, + "salt_water": { elem2:"dirty_water" , chance:0.5 }, + "sugar_water": { elem2:"dirty_water" }, + "seltzer": { elem2:"dirty_water" }, + "meat": { elem2:"infected_meat", chance:0.5 }, + "rotten_meat": { elem2:"infected_meat", chance:0.5 }, + "frozen_meat": { elem2:"frozen_infected_meat", chance:0.5 }, + "fly": { elem2: ["dead_bug","dead_bug","SCP_008"] , chance:0.2}, + "blood": { elem2:"infection" , chance:0.6 }, + "skin": { elem2:"infected_skin" , chance:0.6 }, "acid": { elem1:"infection" }, "soap": { elem1:null, elem2:null, chance:0.005 }, "light": { stain1:"#825043" }, @@ -179,19 +183,21 @@ elements.infected_skin = { elements.infected_meat = { color: ["#b8b165","#b89765"], behavior: [ - "XX|CR:stench,stench,stench,SCP_008,fly%0.25 AND CH:rotten_meat,meat>infected_meat%1|XX", - "SP%99 AND CH:rotten_meat,meat>infected_meat%1|XX|SP%99 AND CH:rotten_meat,meat>infected_meat%1", - "XX|M1 AND CH:rotten_meat,meat>infected_meat%1|XX", + "XX|CR:stench,stench,stench,SCP_008,fly%0.25 AND CH:skin>infected_skin%1|XX", + "SP%25 AND CH:skin>infected_skin%1|XX|SP%25 AND CH:skin>infected_skin%1", + "M2%0.5|M1 AND CH:meat>infected_meat%1|M2%0.5", ], reactions: { "water": { elem2:"dirty_water" }, - "salt_water": { elem2:"dirty_water" }, + "salt_water": { elem2:"dirty_water" , chance:0.5 }, "sugar_water": { elem2:"dirty_water" }, - "dirty_water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, "seltzer": { elem2:"dirty_water" }, - "fly": { elem1: [null,null,"SCP_008"] , elem2: ["dead_bug","dead_bug","SCP_008"] , chance:0.2}, - "blood": { elem2:"infection" , chance:0.6 }, - "skin": { elem2:"infected_skin" , chance:0.6 }, + "meat": { elem2:"infected_meat", chance:0.5 }, + "rotten_meat": { elem2:"infected_meat", chance:0.5 }, + "frozen_meat": { elem2:"frozen_infected_meat", chance:0.5 }, + "fly": { elem2: ["dead_bug","dead_bug","SCP_008"] , chance:0.2}, + "blood": { elem2:"infection" , chance:0.6 }, + "skin": { elem2:"infected_skin" , chance:0.6 }, }, tempHigh: 300, stateHigh: ["SCP_008","ash","ammonia"], @@ -209,19 +215,22 @@ elements.infected_meat = { }, elements.frozen_infected_meat = { - color: "#242424", + color: ["#82AEC0","#80808F","#9CAC98"], behavior: [ - "XX|CH:rotten_meat,frozen_meat>frozen_infected_meat%1|XX", - "SP%99 AND CH:rotten_meat,frozen_meat>frozen_infected_meat%1|XX|SP%99 AND CH:rotten_meat,frozen_meat>frozen_infected_meat%1", - "XX|M1 AND CH:rotten_meat,frozen_meat>frozen_infected_meat%1|XX", + "XX|XX|XX", + "SP%95|XX|SP%95", + "XX|M1 AND CH:frozen_meat,meat>frozen_infected_meat%1|XX", ], reactions: { "water": { elem2:"dirty_water" }, "salt_water": { elem1:"infected_meat",elem2:"dirty_water" , chance:0.5 }, "sugar_water": { elem2:"dirty_water" }, "seltzer": { elem2:"dirty_water" }, - "fly": { elem2: ["dead_bug","dead_bug","SCP_008"] , chance:0.2}, - "blood": { elem2:"infection" , chance:0.6 }, + "meat": { elem2:"frozen_infected_meat", chance:0.5 }, + "rotten_meat": { elem2:"frozen_infected_meat", chance:0.5 }, + "frozen_meat": { elem2:"frozen_infected_meat", chance:0.5 }, + "fly": { elem2: ["dead_bug","dead_bug","SCP_008"] , chance:0.2}, + "blood": { elem2:"infection" , chance:0.6 }, }, temp: -20, tempHigh: 10, @@ -523,9 +532,9 @@ elements.SCP_055 = { color: "#00000f", excludeRandom: true, behavior: [ - ["XX","XX","XX"], - ["XX","CH:REDACTED","XX"], - ["XX","XX","XX"] + "XX","XX","XX", + "XX","CH:REDACTED","XX", + "XX","XX","XX" ], category: "scp", state: "solid", @@ -538,9 +547,9 @@ elements.REDACTED = { color: "#00000f", excludeRandom: true, behavior: [ - ["XX","xx","XX"], - ["XX","EX","XX"], - ["XX","XX","XX"] + "XX|CL|XX", + "CL|EX:10000000000>REDACTED|CL", + "XX|CL|XX", ], category: "scp", state: "solid", @@ -1030,7 +1039,8 @@ elements.shy_body = { properties: { dead: false, dir: 1, - panic: 0 + panic: 0, + anger: 0 }, tick: function(pixel) { if (tryMove(pixel, pixel.x, pixel.y+1)) { // Fall @@ -1111,7 +1121,58 @@ elements.shy_body = { if (pixel.temp > 37) { pixel.temp -= 1; } else if (pixel.temp < 37) { pixel.temp += 1; } } - + if (pixel.dir == 1) { + if (!isEmpty(pixel.x+2, pixel.y-1, true) && pixelMap[pixel.x+2][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+3, pixel.y-1, true) && pixelMap[pixel.x+2][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+4, pixel.y-1, true) && pixelMap[pixel.x+4][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+5, pixel.y-1, true) && pixelMap[pixel.x+5][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+5, pixel.y-1, true) && pixelMap[pixel.x+5][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+6, pixel.y-1, true) && pixelMap[pixel.x+6][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+7, pixel.y-1, true) && pixelMap[pixel.x+7][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x+8, pixel.y-1, true) && pixelMap[pixel.x+8][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + } + else if (pixel.dir == -1) { + if (!isEmpty(pixel.x-2, pixel.y-1, true) && pixelMap[pixel.x-2][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-3, pixel.y-1, true) && pixelMap[pixel.x-3][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-4, pixel.y-1, true) && pixelMap[pixel.x-4][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-5, pixel.y-1, true) && pixelMap[pixel.x-5][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-5, pixel.y-1, true) && pixelMap[pixel.x-5][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-6, pixel.y-1, true) && pixelMap[pixel.x-6][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-7, pixel.y-1, true) && pixelMap[pixel.x-7][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + else if (!isEmpty(pixel.x-8, pixel.y-1, true) && pixelMap[pixel.x-8][pixel.y-1].element == "head") { + pixel.panic += 0.1; + } + } }, density: 1080, state: "solid", @@ -1322,8 +1383,8 @@ elements.hyper_tickle_monster = { reactions: { "sugar_water": { elem2 : "water" }, "dirty_water": { elem2 : "water" }, - "candy": { elem2 : null }, - "sugar": { elem2 : null }, + "candy": { elem2 : null }, + "sugar": { elem2 : null }, "sauce": { elem2 : null }, "salt": { elem2 : null }, "cheese": { elem2 : null }, @@ -1350,7 +1411,7 @@ elements.hyper_tickle_monster = { "melted_chocolate": { elem2 : null }, "alchohol": { elem2 : null }, "pilk": { elem2 : null }, - "soda": { elem2 : null }, + "soda": { elem2 : null }, "coffee": { elem2 : null }, "seltzer": { elem2 : null }, },