Skip to content

Commit

Permalink
Gray Wave fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mammerla
mammerla committed Jan 24, 2025
1 parent 4c8f8a8 commit b85dd87
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 114 deletions.
2 changes: 1 addition & 1 deletion ...l_creator/gray_wave/behavior_packs/mikeamm_gwve/feature_rules/gray_ore_feature_rules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
},
"distribution": {
"iterations": 20,
"iterations": 10,
"coordinate_eval_order": "zyx",
"x": {
"distribution": "uniform",
Expand Down
10 changes: 5 additions & 5 deletions casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/entity/bow_turret.geo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-7, -4, -7], "size": [14, 18, 14], "uv": [0, 0]},
{"origin": [7, -5, -8], "size": [1, 19, 1], "uv": [32, 67]},
{"origin": [7, -5, 7], "size": [1, 19, 1], "uv": [37, 67]},
{"origin": [-7, 0, -7], "size": [14, 14, 14], "uv": [0, 0]},
{"origin": [7, 0, -8], "size": [1, 14, 1], "uv": [32, 67]},
{"origin": [7, 0, 7], "size": [1, 14, 1], "uv": [37, 67]},
{"origin": [-7, 13, 7], "size": [14, 1, 1], "uv": [33, 80]},
{"origin": [-8.1, 13, -8], "size": [15, 1, 1], "uv": [33, 75]},
{"origin": [7, 12.9, -7], "size": [1, 1, 14], "uv": [34, 81]},
{"origin": [-8, 13, -7], "size": [1, 1, 14], "uv": [34, 78]},
{"origin": [-8, -5, -8], "size": [1, 18, 1], "uv": [42, 67]},
{"origin": [-8, -5, 7], "size": [1, 19, 1], "uv": [47, 67]},
{"origin": [-8, 0, -8], "size": [1, 13, 1], "uv": [42, 67]},
{"origin": [-8, 0, 7], "size": [1, 14, 1], "uv": [47, 67]},
{"origin": [-7, 14, -7], "size": [14, 2, 14], "uv": [3, 77]},
{"origin": [-6, 16, -6], "size": [12, 2, 12], "uv": [15, 81]}
]
Expand Down
174 changes: 75 additions & 99 deletions casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/entity/crossbow_turret.geo.json
View file
Original file line number Diff line number Diff line change
@@ -1,100 +1,76 @@
{
"format_version": "1.12.0",
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.mikeamm_gwve_crossbow_turret",
"texture_width": 96,
"texture_height": 96,
"visible_bounds_width": 4,
"visible_bounds_height": 4,
"visible_bounds_offset": [0, 1, 0]
},
"bones": [
{
"name": "head",
"pivot": [0, 21, 0],
"cubes": [
{ "origin": [-0.6, 21, -7.9], "size": [1, 1, 14], "uv": [0, 43] },
{ "origin": [-1.5, 20.95, -7.9], "size": [1, 1, 0.5], "uv": [25, 59] },
{ "origin": [0.4, 20.95, -7.9], "size": [1, 1, 0.5], "uv": [22, 41] },
{
"origin": [-4.3, 20.95, -7.74],
"size": [3, 1, 0.5],
"pivot": [-1.7, 21.7, -7.4],
"rotation": [0, 30, 0],
"uv": [2, 54]
},
{
"origin": [-6.65, 20.95, -6.35],
"size": [3, 1, 0.5],
"pivot": [-4.05, 21.7, -5.95],
"rotation": [0, 60, 0],
"uv": [2, 40]
},
{
"origin": [0.9, 20.95, -6.64],
"size": [3, 1, 0.5],
"pivot": [3.5, 21.7, -6.3],
"rotation": [0, -30, 0],
"uv": [19, 56]
},
{
"origin": [2.4, 20.95, -4.35],
"size": [3, 1, 0.5],
"pivot": [5, 21.7, -3.95],
"rotation": [0, -60, 0],
"uv": [20, 40]
},
{ "origin": [0, 22, -7.9], "size": [0.1, 0.1, 14], "uv": [1, -9] },
{ "origin": [-0.2, 22, -7.9], "size": [0.1, 0.1, 14], "uv": [-8, -2] }
]
},
{
"name": "base",
"pivot": [0, 0, 0]
},
{
"name": "foundation",
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{ "origin": [-7, -4, -7], "size": [14, 18, 14], "uv": [0, 0] },
{ "origin": [7, -5, -8], "size": [1, 19, 1], "uv": [32, 67] },
{ "origin": [7, -5, 7], "size": [1, 19, 1], "uv": [37, 67] },
{ "origin": [-7, 13, 7], "size": [14, 1, 1], "uv": [33, 80] },
{ "origin": [-8.1, 13, -8], "size": [15, 1, 1], "uv": [33, 75] },
{ "origin": [7, 12.9, -7], "size": [1, 1, 14], "uv": [34, 81] },
{ "origin": [-8, 13, -7], "size": [1, 1, 14], "uv": [34, 78] },
{ "origin": [-8, -5, -8], "size": [1, 18, 1], "uv": [42, 67] },
{ "origin": [-8, -5, 7], "size": [1, 19, 1], "uv": [47, 67] },
{ "origin": [-7, 14, -7], "size": [14, 2, 14], "uv": [3, 77] },
{ "origin": [-6, 16, -6], "size": [12, 2, 12], "uv": [15, 81] }
]
},
{
"name": "joint",
"parent": "base",
"pivot": [0, 9, 0],
"cubes": [
{ "origin": [-2, 18, -0.9], "size": [4, 2, 2], "uv": [26, 18] },
{ "origin": [-1, 18, -1.9], "size": [2, 2, 1], "uv": [18, 25] },
{ "origin": [-1, 18, 1.1], "size": [2, 2, 1], "uv": [2, 22] },
{ "origin": [-1, 20, -0.9], "size": [2, 1, 2], "uv": [14, 16] }
]
},
{
"name": "indicator",
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{ "origin": [-8, 14, 7.1], "size": [1, 3, 1], "uv": [32, 34] },
{ "origin": [7, 14, -7.9], "size": [1, 3, 1], "uv": [32, 34] },
{ "origin": [-8, 14, -7.9], "size": [1, 3, 1], "uv": [32, 34] },
{ "origin": [7, 14, 7.1], "size": [1, 3, 1], "uv": [32, 34] }
]
}
]
}
]
}
"format_version": "1.12.0",
"minecraft:geometry": [
{
"description": {
"identifier": "geometry.mikeamm_gwve_crossbow_turret",
"texture_width": 96,
"texture_height": 96,
"visible_bounds_width": 4,
"visible_bounds_height": 4,
"visible_bounds_offset": [0, 1, 0]
},
"bones": [
{
"name": "head",
"pivot": [0, 21, 0],
"cubes": [
{"origin": [-0.6, 21, -7.9], "size": [1, 1, 14], "uv": [0, 43]},
{"origin": [-1.5, 20.95, -7.9], "size": [1, 1, 0.5], "uv": [25, 59]},
{"origin": [0.4, 20.95, -7.9], "size": [1, 1, 0.5], "uv": [22, 41]},
{"origin": [-4.3, 20.95, -7.74], "size": [3, 1, 0.5], "pivot": [-1.7, 21.7, -7.4], "rotation": [0, 30, 0], "uv": [2, 54]},
{"origin": [-6.65, 20.95, -6.35], "size": [3, 1, 0.5], "pivot": [-4.05, 21.7, -5.95], "rotation": [0, 60, 0], "uv": [2, 40]},
{"origin": [0.9, 20.95, -6.64], "size": [3, 1, 0.5], "pivot": [3.5, 21.7, -6.3], "rotation": [0, -30, 0], "uv": [19, 56]},
{"origin": [2.4, 20.95, -4.35], "size": [3, 1, 0.5], "pivot": [5, 21.7, -3.95], "rotation": [0, -60, 0], "uv": [20, 40]},
{"origin": [0, 22, -7.9], "size": [0.1, 0.1, 14], "uv": [1, -9]},
{"origin": [-0.2, 22, -7.9], "size": [0.1, 0.1, 14], "uv": [-8, -2]}
]
},
{
"name": "base",
"pivot": [0, 0, 0]
},
{
"name": "foundation",
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-7, 0, -7], "size": [14, 14, 14], "uv": [0, 0]},
{"origin": [7, 0, -8], "size": [1, 14, 1], "uv": [32, 67]},
{"origin": [7, 0, 7], "size": [1, 14, 1], "uv": [37, 67]},
{"origin": [-7, 13, 7], "size": [14, 1, 1], "uv": [33, 80]},
{"origin": [-8.1, 13, -8], "size": [15, 1, 1], "uv": [33, 75]},
{"origin": [7, 12.9, -7], "size": [1, 1, 14], "uv": [34, 81]},
{"origin": [-8, 13, -7], "size": [1, 1, 14], "uv": [34, 78]},
{"origin": [-8, 0, -8], "size": [1, 13, 1], "uv": [42, 67]},
{"origin": [-8, 0, 7], "size": [1, 14, 1], "uv": [47, 67]},
{"origin": [-7, 14, -7], "size": [14, 2, 14], "uv": [3, 77]},
{"origin": [-6, 16, -6], "size": [12, 2, 12], "uv": [15, 81]}
]
},
{
"name": "joint",
"parent": "base",
"pivot": [0, 9, 0],
"cubes": [
{"origin": [-2, 18, -0.9], "size": [4, 2, 2], "uv": [26, 18]},
{"origin": [-1, 18, -1.9], "size": [2, 2, 1], "uv": [18, 25]},
{"origin": [-1, 18, 1.1], "size": [2, 2, 1], "uv": [2, 22]},
{"origin": [-1, 20, -0.9], "size": [2, 1, 2], "uv": [14, 16]}
]
},
{
"name": "indicator",
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-8, 14, 7.1], "size": [1, 3, 1], "uv": [32, 34]},
{"origin": [7, 14, -7.9], "size": [1, 3, 1], "uv": [32, 34]},
{"origin": [-8, 14, -7.9], "size": [1, 3, 1], "uv": [32, 34]},
{"origin": [7, 14, 7.1], "size": [1, 3, 1], "uv": [32, 34]}
]
}
]
}
]
}
10 changes: 5 additions & 5 deletions ...al_creator/gray_wave/resource_packs/mikeamm_gwve/models/entity/smfireball_turret.geo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"parent": "base",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-7, -4, -7], "size": [14, 18, 14], "uv": [0, 0]},
{"origin": [7, -5, -8], "size": [1, 19, 1], "uv": [32, 67]},
{"origin": [7, -5, 7], "size": [1, 19, 1], "uv": [37, 67]},
{"origin": [-7, 0, -7], "size": [14, 14, 14], "uv": [0, 0]},
{"origin": [7, 0, -8], "size": [1, 14, 1], "uv": [32, 67]},
{"origin": [7, 0, 7], "size": [1, 14, 1], "uv": [37, 67]},
{"origin": [-7, 13, 7], "size": [14, 1, 1], "uv": [33, 80]},
{"origin": [-8.1, 13, -8], "size": [15, 1, 1], "uv": [33, 75]},
{"origin": [7, 12.9, -7], "size": [1, 1, 14], "uv": [34, 81]},
{"origin": [-8, 13, -7], "size": [1, 1, 14], "uv": [34, 78]},
{"origin": [-8, -5, -8], "size": [1, 18, 1], "uv": [42, 67]},
{"origin": [-8, -5, 7], "size": [1, 19, 1], "uv": [47, 67]},
{"origin": [-8, 0, -8], "size": [1, 13, 1], "uv": [42, 67]},
{"origin": [-8, 0, 7], "size": [1, 14, 1], "uv": [47, 67]},
{"origin": [-7, 14, -7], "size": [14, 2, 14], "uv": [3, 77]},
{"origin": [-6, 16, -6], "size": [12, 2, 12], "uv": [15, 81]}
]
Expand Down
8 changes: 4 additions & 4 deletions casual_creator/gray_wave/scripts/GrayWaveManager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default class GrayWaveManager {
if (i === 0) {
mobToSpawn = "mikeamm_gwve:gray_zombie_leader";
} else {
switch (Math.floor(Math.random() * 3)) {
switch (Math.floor(Math.random() * 5)) {
case 0:
mobToSpawn = "minecraft:zombie";
break;
Expand All @@ -164,10 +164,10 @@ export default class GrayWaveManager {
case 2:
mobToSpawn = "minecraft:skeleton";
break;
case 2:
case 3:
mobToSpawn = "minecraft:evocation_illager";
break;
case 2:
default:
mobToSpawn = "minecraft:pillager";
break;
}
Expand Down Expand Up @@ -249,7 +249,7 @@ export default class GrayWaveManager {

generateNextHordeInterval() {
// every 100-200 seconds
this.nextHordeInterval = Math.floor(Math.random() * 2000 + 2000);
this.nextHordeInterval = Math.floor(Math.random() * 900 + 900);
}

getAllActiveGrayWaveConsumers() {
Expand Down

0 comments on commit b85dd87

Please sign in to comment.