From 9d0671ecedebe52af5353544cea790df37acd3a2 Mon Sep 17 00:00:00 2001
From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com>
Date: Sun, 2 Apr 2023 03:45:14 +0300
Subject: [PATCH] spikes -> thorns
---
.idea/workspace.xml | 30 ++--
.../com/nokia/mid/appl/boun/BounceGame.java | 14 +-
.../java/com/nokia/mid/appl/boun/TileIDs.java | 8 +-
src/main/java/com/nokia/mid/appl/boun/b.java | 144 +++++++++---------
src/main/java/com/nokia/mid/appl/boun/e.java | 2 +-
src/main/java/com/nokia/mid/appl/boun/f.java | 8 +-
6 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f3b481c..45f67eb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -64,22 +64,22 @@
- {
+ "keyToString": {
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "git-widget-placeholder": "master",
+ "ignore.virus.scanning.warn.message": "true",
+ "jdk.selected.JAVA_MODULE": "17",
+ "last_opened_file_path": "C:/dev/nokia-bounce-decomp",
+ "project.structure.last.edited": "Artifacts",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.2",
+ "run.code.analysis.last.selected.profile": "pProject Default"
}
-}]]>
+}
diff --git a/src/main/java/com/nokia/mid/appl/boun/BounceGame.java b/src/main/java/com/nokia/mid/appl/boun/BounceGame.java
index b1e2bc1..f7b0aa8 100644
--- a/src/main/java/com/nokia/mid/appl/boun/BounceGame.java
+++ b/src/main/java/com/nokia/mid/appl/boun/BounceGame.java
@@ -344,7 +344,7 @@ public void WriteToStore(int what) {
byte b2;
byte b3;
byte b4;
- byte spike;
+ byte thorn;
switch (what) {
case 1 -> dataOutputStream.writeByte(this.MaxLevels);
case 2 -> dataOutputStream.writeInt(this.HighScore);
@@ -397,12 +397,12 @@ public void WriteToStore(int what) {
dataOutputStream.writeByte(arrayOfInt[b4][2]);
}
arrayOfInt = null;
- dataOutputStream.writeByte(this.v.SpikeStarsCount);
- for (spike = 0; spike < this.v.SpikeStarsCount; spike++) {
- dataOutputStream.writeShort(this.v.w[spike].x);
- dataOutputStream.writeShort(this.v.w[spike].y);
- dataOutputStream.writeShort(this.v.ae[spike].x);
- dataOutputStream.writeShort(this.v.ae[spike].y);
+ dataOutputStream.writeByte(this.v.DynThornsCount);
+ for (thorn = 0; thorn < this.v.DynThornsCount; thorn++) {
+ dataOutputStream.writeShort(this.v.w[thorn].x);
+ dataOutputStream.writeShort(this.v.w[thorn].y);
+ dataOutputStream.writeShort(this.v.ae[thorn].x);
+ dataOutputStream.writeShort(this.v.ae[thorn].y);
}
dataOutputStream.writeLong(RECORD_STORE_MAGIC);
}
diff --git a/src/main/java/com/nokia/mid/appl/boun/TileIDs.java b/src/main/java/com/nokia/mid/appl/boun/TileIDs.java
index fbec006..1cf25e0 100644
--- a/src/main/java/com/nokia/mid/appl/boun/TileIDs.java
+++ b/src/main/java/com/nokia/mid/appl/boun/TileIDs.java
@@ -4,10 +4,10 @@ public final class TileIDs {
public static final int EMPTY = 0;
public static final int BRICK_WALL = 1;
public static final int RUBBER_WALL = 2;
- public static final int SPIKES_UP = 3;
- public static final int SPIKES_RIGHT = 4;
- public static final int SPIKES_DOWN = 5;
- public static final int SPIKES_LEFT = 6;
+ public static final int THORNS_UP = 3;
+ public static final int THORNS_RIGHT = 4;
+ public static final int THORNS_DOWN = 5;
+ public static final int THORNS_LEFT = 6;
public static final int CRYSTAL = 7;
public static final int CRYSTAL_ACTIVE = 8;
diff --git a/src/main/java/com/nokia/mid/appl/boun/b.java b/src/main/java/com/nokia/mid/appl/boun/b.java
index 8b16855..89326ed 100644
--- a/src/main/java/com/nokia/mid/appl/boun/b.java
+++ b/src/main/java/com/nokia/mid/appl/boun/b.java
@@ -42,15 +42,15 @@ public static final class SpriteIDs {
public static final int BRICK_WALL = 0;
public static final int RUBBER_WALL = 1;
- public static final int SPIKES_UP = 2;
- public static final int SPIKES_DOWN = 3;
- public static final int SPIKES_LEFT = 4;
- public static final int SPIKES_RIGHT = 5;
+ public static final int THORNS_UP = 2;
+ public static final int THORNS_DOWN = 3;
+ public static final int THORNS_LEFT = 4;
+ public static final int THORNS_RIGHT = 5;
- public static final int SPIKES_WATER_UP = 6;
- public static final int SPIKES_WATER_DOWN = 7;
- public static final int SPIKES_WATER_LEFT = 8;
- public static final int SPIKES_WATER_RIGHT = 9;
+ public static final int THORNS_WATER_UP = 6;
+ public static final int THORNS_WATER_DOWN = 7;
+ public static final int THORNS_WATER_LEFT = 8;
+ public static final int THORNS_WATER_RIGHT = 9;
/**
* A.K.A. Checkpoint
@@ -88,7 +88,7 @@ public static final class SpriteIDs {
*/
public static final int CRYSTAL_BALL = 45;
- public static final int SPIKE_STAR_QUARTER = 46;
+ public static final int DYN_THORN_QUARTER = 46;
public static final int BALL = 47;
public static final int POPPED_BALL = 48;
@@ -149,11 +149,11 @@ public static final class SpriteIDs {
public int HoopsTotal;
- public int SpikeStarsCount;
+ public int DynThornsCount;
- public Vec2S[] SpikeStarsBottomLeft;
+ public Vec2S[] DynThornsBottomLeft;
- public Vec2S[] SpikeStartTopRight;
+ public Vec2S[] DynThornsTopRight;
public Vec2S[] ae;
@@ -163,7 +163,7 @@ public static final class SpriteIDs {
public Graphics[] an;
- public Image spriteSpikeStar;
+ public Image spriteDynThorn;
public Image imageBall;
@@ -245,9 +245,9 @@ public void LoadLevelId(int levelId) {
for (byte j = 0; j < this.TODO_width; j++)
this.LevelTiles[i][j] = (short) levelDIS.read();
}
- this.SpikeStarsCount = levelDIS.read();
- if (this.SpikeStarsCount != 0)
- LoadLevelSpikeStars(levelDIS);
+ this.DynThornsCount = levelDIS.read();
+ if (this.DynThornsCount != 0)
+ LoadLevelDynThorns(levelDIS);
levelDIS.close();
} catch (IOException iOException) {
}
@@ -289,45 +289,45 @@ public static Image ModifyImage(Image paramImage, int manipulation) {
return image;
}
- public void LoadLevelSpikeStars(DataInputStream levelDIS) throws IOException {
- this.SpikeStarsBottomLeft = new Vec2S[this.SpikeStarsCount];
- this.SpikeStartTopRight = new Vec2S[this.SpikeStarsCount];
- this.ae = new Vec2S[this.SpikeStarsCount];
- this.w = new Vec2S[this.SpikeStarsCount];
- this.r = new Image[this.SpikeStarsCount];
- this.an = new Graphics[this.SpikeStarsCount];
- for (byte spike = 0; spike < this.SpikeStarsCount; spike++) {
+ public void LoadLevelDynThorns(DataInputStream levelDIS) throws IOException {
+ this.DynThornsBottomLeft = new Vec2S[this.DynThornsCount];
+ this.DynThornsTopRight = new Vec2S[this.DynThornsCount];
+ this.ae = new Vec2S[this.DynThornsCount];
+ this.w = new Vec2S[this.DynThornsCount];
+ this.r = new Image[this.DynThornsCount];
+ this.an = new Graphics[this.DynThornsCount];
+ for (byte thorn = 0; thorn < this.DynThornsCount; thorn++) {
short x, y;
x = (short) levelDIS.read();
y = (short) levelDIS.read();
- this.SpikeStarsBottomLeft[spike] = new Vec2S(x, y);
+ this.DynThornsBottomLeft[thorn] = new Vec2S(x, y);
x = (short) levelDIS.read();
y = (short) levelDIS.read();
- this.SpikeStartTopRight[spike] = new Vec2S(x, y);
+ this.DynThornsTopRight[thorn] = new Vec2S(x, y);
x = (short) levelDIS.read();
y = (short) levelDIS.read();
- this.ae[spike].x = (short) levelDIS.read();
- this.ae[spike].y = (short) levelDIS.read();
+ this.ae[thorn].x = (short) levelDIS.read();
+ this.ae[thorn].y = (short) levelDIS.read();
x = (short) levelDIS.read();
y = (short) levelDIS.read();
- this.w[spike].x = x;
- this.w[spike].y = y;
+ this.w[thorn].x = x;
+ this.w[thorn].y = y;
}
- this.spriteSpikeStar = Image.createImage(24, 24);
- Graphics graphics = this.spriteSpikeStar.getGraphics();
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKE_STAR_QUARTER], 0, 0, Graphics.TOP | Graphics.LEFT);
- graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.SPIKE_STAR_QUARTER], ImageManipulation.FLIP_HORIZONTAL), 12, 0, Graphics.TOP | Graphics.LEFT);
- graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.SPIKE_STAR_QUARTER], ImageManipulation.ROTATE_180), 12, 12, Graphics.TOP | Graphics.LEFT);
- graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.SPIKE_STAR_QUARTER], ImageManipulation.FLIP_VERTICAL), 0, 12, Graphics.TOP | Graphics.LEFT);
+ this.spriteDynThorn = Image.createImage(24, 24);
+ Graphics graphics = this.spriteDynThorn.getGraphics();
+ graphics.drawImage(this.Sprites[SpriteIDs.DYN_THORN_QUARTER], 0, 0, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.DYN_THORN_QUARTER], ImageManipulation.FLIP_HORIZONTAL), 12, 0, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.DYN_THORN_QUARTER], ImageManipulation.ROTATE_180), 12, 12, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(ModifyImage(this.Sprites[SpriteIDs.DYN_THORN_QUARTER], ImageManipulation.FLIP_VERTICAL), 0, 12, Graphics.TOP | Graphics.LEFT);
graphics = null;
}
public void RunGarbageCollector() {
- for (byte i = 0; i < this.SpikeStarsCount; i++) {
+ for (byte i = 0; i < this.DynThornsCount; i++) {
this.r[i] = null;
this.an[i] = null;
}
@@ -338,14 +338,14 @@ public void RunGarbageCollector() {
}
public void o() {
- for (byte b1 = 0; b1 < this.SpikeStarsCount; b1++) {
- short s1 = this.SpikeStarsBottomLeft[b1].x;
- short s2 = this.SpikeStarsBottomLeft[b1].y;
+ for (byte b1 = 0; b1 < this.DynThornsCount; b1++) {
+ short s1 = this.DynThornsBottomLeft[b1].x;
+ short s2 = this.DynThornsBottomLeft[b1].y;
short s3 = this.w[b1].x;
short s4 = this.w[b1].y;
this.w[b1].x = (short) (this.w[b1].x + this.ae[b1].x);
- int n = (this.SpikeStartTopRight[b1].x - s1 - 2) * 12;
- int i1 = (this.SpikeStartTopRight[b1].y - s2 - 2) * 12;
+ int n = (this.DynThornsTopRight[b1].x - s1 - 2) * 12;
+ int i1 = (this.DynThornsTopRight[b1].y - s2 - 2) * 12;
if (this.w[b1].x < 0) {
this.w[b1].x = 0;
} else if (this.w[b1].x > n) {
@@ -386,11 +386,11 @@ public void o() {
}
}
- public int TestPointInsideSpikeStars(int x, int y) {
- for (byte spike = 0; spike < this.SpikeStarsCount; spike++) {
- if (x >= this.SpikeStarsBottomLeft[spike].x && x < this.SpikeStartTopRight[spike].x
- && y >= this.SpikeStarsBottomLeft[spike].y && y < this.SpikeStartTopRight[spike].y)
- return spike;
+ public int TestPointInsideDynThorns(int x, int y) {
+ for (byte thorn = 0; thorn < this.DynThornsCount; thorn++) {
+ if (x >= this.DynThornsBottomLeft[thorn].x && x < this.DynThornsTopRight[thorn].x
+ && y >= this.DynThornsBottomLeft[thorn].y && y < this.DynThornsTopRight[thorn].y)
+ return thorn;
}
return -1;
}
@@ -415,33 +415,33 @@ public void CreateTiles(int paramInt1, int paramInt2, int paramInt3, int paramIn
case TileIDs.EMPTY -> graphics.fillRect(paramInt3, paramInt4, 12, 12);
case TileIDs.RUBBER_WALL ->
graphics.drawImage(this.Sprites[SpriteIDs.RUBBER_WALL], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
- case TileIDs.SPIKES_UP -> {
+ case TileIDs.THORNS_UP -> {
if (isInWater) {
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_WATER_UP], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_WATER_UP], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
break;
}
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_UP], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_UP], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
}
- case TileIDs.SPIKES_RIGHT -> {
+ case TileIDs.THORNS_RIGHT -> {
if (isInWater) {
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_WATER_RIGHT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_WATER_RIGHT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
break;
}
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_RIGHT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_RIGHT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
}
- case TileIDs.SPIKES_DOWN -> {
+ case TileIDs.THORNS_DOWN -> {
if (isInWater) {
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_WATER_DOWN], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_WATER_DOWN], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
break;
}
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_DOWN], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_DOWN], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
}
- case TileIDs.SPIKES_LEFT -> {
+ case TileIDs.THORNS_LEFT -> {
if (isInWater) {
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_WATER_LEFT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_WATER_LEFT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
break;
}
- graphics.drawImage(this.Sprites[SpriteIDs.SPIKES_LEFT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
+ graphics.drawImage(this.Sprites[SpriteIDs.THORNS_LEFT], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
}
case TileIDs.CRYSTAL ->
graphics.drawImage(this.Sprites[SpriteIDs.CRYSTAL], paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
@@ -461,16 +461,16 @@ public void CreateTiles(int paramInt1, int paramInt2, int paramInt3, int paramIn
this.z = true;
}
case 10 -> {
- j = TestPointInsideSpikeStars(paramInt1, paramInt2);
+ j = TestPointInsideDynThorns(paramInt1, paramInt2);
if (j != -1) {
- k = (paramInt1 - this.SpikeStarsBottomLeft[j].x) * 12;
- int m = (paramInt2 - this.SpikeStarsBottomLeft[j].y) * 12;
+ k = (paramInt1 - this.DynThornsBottomLeft[j].x) * 12;
+ int m = (paramInt2 - this.DynThornsBottomLeft[j].y) * 12;
int n = this.w[j].x - k;
int i1 = this.w[j].y - m;
if ((n > -36 && n < 12) || (i1 > -36 && i1 < 12)) {
this.J.setColor(BounceColors.SKY);
this.J.fillRect(0, 0, 12, 12);
- this.J.drawImage(this.spriteSpikeStar, n, i1, Graphics.TOP | Graphics.LEFT);
+ this.J.drawImage(this.spriteDynThorn, n, i1, Graphics.TOP | Graphics.LEFT);
graphics.drawImage(this.I, paramInt3, paramInt4, Graphics.TOP | Graphics.LEFT);
break;
}
@@ -704,14 +704,14 @@ public void LoadSpriteSheet() {
this.Sprites = new Image[67];
this.Sprites[SpriteIDs.BRICK_WALL] = CreateTiles(ss, 1, 0); // Brick wall
this.Sprites[SpriteIDs.RUBBER_WALL] = CreateTiles(ss, 1, 2); // Rubber wall
- this.Sprites[SpriteIDs.SPIKES_UP] = CreateTiles(ss, 0, 3, BounceColors.SKY_ALPHA); // Spikes Up
- this.Sprites[SpriteIDs.SPIKES_DOWN] = ModifyImage(this.Sprites[SpriteIDs.SPIKES_UP], ImageManipulation.FLIP_VERTICAL); // Spikes Down
- this.Sprites[SpriteIDs.SPIKES_LEFT] = ModifyImage(this.Sprites[SpriteIDs.SPIKES_UP], ImageManipulation.ROTATE_90); // Spikes Left
- this.Sprites[SpriteIDs.SPIKES_RIGHT] = ModifyImage(this.Sprites[SpriteIDs.SPIKES_UP], ImageManipulation.ROTATE_270); // Spikes Right
- this.Sprites[SpriteIDs.SPIKES_WATER_UP] = CreateTiles(ss, 0, 3, BounceColors.WATER_ALPHA);
- this.Sprites[SpriteIDs.SPIKES_WATER_DOWN] = ModifyImage(this.Sprites[6], ImageManipulation.FLIP_VERTICAL);
- this.Sprites[SpriteIDs.SPIKES_WATER_LEFT] = ModifyImage(this.Sprites[6], ImageManipulation.ROTATE_90);
- this.Sprites[SpriteIDs.SPIKES_WATER_RIGHT] = ModifyImage(this.Sprites[6], ImageManipulation.ROTATE_270);
+ this.Sprites[SpriteIDs.THORNS_UP] = CreateTiles(ss, 0, 3, BounceColors.SKY_ALPHA); // Thorns Up
+ this.Sprites[SpriteIDs.THORNS_DOWN] = ModifyImage(this.Sprites[SpriteIDs.THORNS_UP], ImageManipulation.FLIP_VERTICAL); // Thorns Down
+ this.Sprites[SpriteIDs.THORNS_LEFT] = ModifyImage(this.Sprites[SpriteIDs.THORNS_UP], ImageManipulation.ROTATE_90); // Thorns Left
+ this.Sprites[SpriteIDs.THORNS_RIGHT] = ModifyImage(this.Sprites[SpriteIDs.THORNS_UP], ImageManipulation.ROTATE_270); // Thorns Right
+ this.Sprites[SpriteIDs.THORNS_WATER_UP] = CreateTiles(ss, 0, 3, BounceColors.WATER_ALPHA);
+ this.Sprites[SpriteIDs.THORNS_WATER_DOWN] = ModifyImage(this.Sprites[6], ImageManipulation.FLIP_VERTICAL);
+ this.Sprites[SpriteIDs.THORNS_WATER_LEFT] = ModifyImage(this.Sprites[6], ImageManipulation.ROTATE_90);
+ this.Sprites[SpriteIDs.THORNS_WATER_RIGHT] = ModifyImage(this.Sprites[6], ImageManipulation.ROTATE_270);
this.Sprites[SpriteIDs.CRYSTAL] = CreateTiles(ss, 0, 4);
this.Sprites[SpriteIDs.CRYSTAL_ACTIVE] = CreateTiles(ss, 3, 4);
this.Sprites[SpriteIDs.EXIT] = MirrorExitTile(CreateTiles(ss, 2, 3));
@@ -748,7 +748,7 @@ public void LoadSpriteSheet() {
this.Sprites[43] = ModifyImage(this.Sprites[41], ImageManipulation.FLIP_HORIZONTAL);
this.Sprites[44] = ModifyImage(this.Sprites[42], ImageManipulation.FLIP_HORIZONTAL);
this.Sprites[SpriteIDs.CRYSTAL_BALL] = CreateTiles(ss, 3, 3);
- this.Sprites[SpriteIDs.SPIKE_STAR_QUARTER] = CreateTiles(ss, 1, 3);
+ this.Sprites[SpriteIDs.DYN_THORN_QUARTER] = CreateTiles(ss, 1, 3);
this.Sprites[SpriteIDs.BALL] = CreateTiles(ss, 2, 0);
this.Sprites[SpriteIDs.POPPED_BALL] = CreateTiles(ss, 0, 1);
this.Sprites[SpriteIDs.BIG_BALL] = Mirror16x16Tile(CreateTiles(ss, 3, 0));
diff --git a/src/main/java/com/nokia/mid/appl/boun/e.java b/src/main/java/com/nokia/mid/appl/boun/e.java
index d58bf8e..42cfc19 100644
--- a/src/main/java/com/nokia/mid/appl/boun/e.java
+++ b/src/main/java/com/nokia/mid/appl/boun/e.java
@@ -279,7 +279,7 @@ public void Tick() {
this.aq.c = j;
this.aq.b = k;
}
- if (this.SpikeStarsCount != 0)
+ if (this.DynThornsCount != 0)
o();
if (this.HoopsScored == this.HoopsTotal)
this.TODO_ExitUnlocked = true;
diff --git a/src/main/java/com/nokia/mid/appl/boun/f.java b/src/main/java/com/nokia/mid/appl/boun/f.java
index efa8e68..c83f490 100644
--- a/src/main/java/com/nokia/mid/appl/boun/f.java
+++ b/src/main/java/com/nokia/mid/appl/boun/f.java
@@ -461,17 +461,17 @@ public boolean a(int paramInt1, int paramInt2, int y, int x) {
}
}
case 10 -> {
- k = this.n.TestPointInsideSpikeStars(x, y);
+ k = this.n.TestPointInsideDynThorns(x, y);
if (k != -1) {
- int m = this.n.SpikeStarsBottomLeft[k].x * 12 + this.n.w[k].x;
- int n = this.n.SpikeStarsBottomLeft[k].y * 12 + this.n.w[k].y;
+ int m = this.n.DynThornsBottomLeft[k].x * 12 + this.n.w[k].x;
+ int n = this.n.DynThornsBottomLeft[k].y * 12 + this.n.w[k].y;
if (a(paramInt1 - this.p + 1, paramInt2 - this.p + 1, paramInt1 + this.p - 1, paramInt2 + this.p - 1, m + 1, n + 1, m + 24 - 1, n + 24 - 1)) {
bool = false;
KillBall();
}
}
}
- case TileIDs.SPIKES_UP, TileIDs.SPIKES_RIGHT, TileIDs.SPIKES_DOWN, TileIDs.SPIKES_LEFT -> {
+ case TileIDs.THORNS_UP, TileIDs.THORNS_RIGHT, TileIDs.THORNS_DOWN, TileIDs.THORNS_LEFT -> {
if (b(paramInt1, paramInt2, y, x, tileId)) {
bool = false;
KillBall();