Skip to content

Commit

Permalink
Update glow crystals to new coloured blocks palette (#894)
Browse files Browse the repository at this point in the history
* Update glowcrystal texture, update to new coloured block palette, start on special textures

* Fixes + more work on special textures

* Tweak special textures and emmision vlalues

* Tweaks

* Final edit

* Geen

* Revert glass changes
  • Loading branch information
careeoki authored Jan 7, 2025
1 parent a85237b commit 7631be2
Show file tree
Hide file tree
Showing 88 changed files with 60 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x808080,
.emittedLight = 0x16a7da,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/gray",
.texture = "cubyz:glow_crystal/aqua",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/black.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x111111,
.emittedLight = 0x262626,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/black",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/blue.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x0000ff,
.emittedLight = 0x236dc3,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/blue",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/brown.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x804000,
.emittedLight = 0x694227,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/brown",
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x800000,
.emittedLight = 0x961b1e,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/dark_red",
.texture = "cubyz:glow_crystal/crimson",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/cyan.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x00ffb0,
.emittedLight = 0x39dfce,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/cyan",
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x444444,
.emittedLight = 0x414141,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/dark_gray",
.texture = "cubyz:glow_crystal/dark_grey",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/green.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x00ff00,
.emittedLight = 0x269926,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/green",
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x008000,
.emittedLight = 0xc1c1c1,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/dark_green",
.texture = "cubyz:glow_crystal/grey",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/glow_crystal/indigo.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x2f3e92,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/indigo",
}
8 changes: 0 additions & 8 deletions assets/cubyz/blocks/glow_crystal/light_blue.zig.zon

This file was deleted.

8 changes: 8 additions & 0 deletions assets/cubyz/blocks/glow_crystal/lime.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x5fc12f,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/lime",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/glow_crystal/magenta.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0xf260ca,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/magenta",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/orange.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0xff8000,
.emittedLight = 0xee7c11,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/orange",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/glow_crystal/pink.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0xfa97cf,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/pink",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/purple.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0xff00ff,
.emittedLight = 0x7c2995,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/purple",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/red.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0xff0000,
.emittedLight = 0xd52929,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/red",
}
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/glow_crystal/violet.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x8000ff,
.emittedLight = 0xb93cba,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/violet",
}
8 changes: 8 additions & 0 deletions assets/cubyz/blocks/glow_crystal/viridian.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.{
.class = .stone,
.hardness = 2,
.drops = .{},
.emittedLight = 0x0f6529,
.model = "cubyz:cube",
.texture = "cubyz:glow_crystal/viridian",
}
Binary file added assets/cubyz/blocks/textures/glow_crystal/aqua.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/blue.png_emission.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/brown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/brown.png_emission.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/cyan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/cyan.png_emission.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/cubyz/blocks/textures/glow_crystal/dark_gray.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Binary file removed assets/cubyz/blocks/textures/glow_crystal/gray.png
Diff not rendered.
Binary file modified assets/cubyz/blocks/textures/glow_crystal/green.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/green.png_emission.png
Binary file added assets/cubyz/blocks/textures/glow_crystal/grey.png
Binary file added assets/cubyz/blocks/textures/glow_crystal/indigo.png
Diff not rendered.
Diff not rendered.
Binary file added assets/cubyz/blocks/textures/glow_crystal/lime.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/orange.png
Binary file added assets/cubyz/blocks/textures/glow_crystal/pink.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/purple.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/red.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/red.png_emission.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/violet.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/white.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/white.png_emission.png
Binary file modified assets/cubyz/blocks/textures/glow_crystal/yellow.png
6 changes: 3 additions & 3 deletions src/server/terrain/chunkgen/CrystalGenerator.zig
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ pub const priority = 65537;
pub const generatorSeed = 0x9b450ffb0d415317;

const crystalColor = [_][]const u8 {
"red", "orange", "yellow", "green", "cyan", "blue", "violet", "purple", // 8 Base colors
"dark_red", "dark_green", "light_blue", "brown", // 4 darker colors
"white", "gray", "dark_gray", "black", // 4 grayscale colors
"red", "orange", "yellow", "lime", "green", "cyan", "aqua", "blue", "pink", "magenta", "violet", // 8 Base colors
"crimson", "viridian", "indigo", "purple", "brown", // 5 darker colors
"white", "grey", "dark_grey", "black", // 4 grayscale colors
};
var glowCrystals: [crystalColor.len]u16 = undefined;

Expand Down

0 comments on commit 7631be2

Please sign in to comment.