Skip to content

Commit

Permalink
Fix some broken death messages + some model tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cart3r1234
Cart3r1234 committed Jun 6, 2023
1 parent 9b32938 commit 70fdedd
Show file tree
Hide file tree
Showing 31 changed files with 81 additions and 18 deletions.
11 changes: 8 additions & 3 deletions src/main/resources/assets/portalcubed/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,15 @@
"portalcubed.midnightconfig.enum.PortalRenderers.FRAMEBUFFER": "Framebuffer",

"death.attack.portalcubed.acid": "%s was dissolved in toxic goo",
"death.attack.portalcubed.fizzle": "%s got fizzled",
"death.attack.portalcubed.vaporization": "%s was vaporized",
"death.attack.portalcubed.acid.player": "%1$s couldn't get 6 extra seconds of cooperation from %2$s",
"death.attack.portalcubed.fizzle": "%s was fizzled",
"death.attack.portalcubed.fizzle.player": "%1$s was pushed into a fizzler by %2$s",
"death.attack.portalcubed.vaporization": "%s was vaporized by a High Energy Pellet",
"death.attack.portalcubed.vaporization.player": "%1$s was pushed into a High Energy Pellet by %2$s",
"death.attack.portalcubed.laser": "%s was thermally discouraged",
"death.attack.portalcubed.cube": "%s was hit on the head by a weighted cube",
"death.attack.portalcubed.laser.player": "%1$s was pushed into a Thermal Discouragement Beam by %2$s",
"death.attack.portalcubed.cube": "%s was hit on the head by a falling Weighted Storage Cube",
"death.attack.portalcubed.cube.player": "%1$s was pushed into a falling Weighted Storage Cube by %2$s",

"key.portalcubed.category" : "Portal\u00b3",
"key.portalcubed.grab" : "Grab",
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/portalcubed/models/block/light_bridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{
"from": [2, 1, 0],
"to": [14, 2, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 1], "texture": "#1", "cullface": "north"},
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/light_bridge_emitter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"name": "emission",
"from": [2.01, -0.02851, -1.46694],
"to": [14.01, 3.97149, -1.46694],
"shade": false,
"rotation": {"angle": 22.5, "axis": "x", "origin": [10.51, 1.47149, -1.71694]},
"faces": {
"north": {"uv": [10.032, 13.484, 16, 11.516], "texture": "#0"}
Expand All @@ -56,6 +57,7 @@
"name": "emission",
"from": [2.01, 0.02851, -1.46694],
"to": [14.01, 4.02851, -1.46694],
"shade": false,
"rotation": {"angle": -22.5, "axis": "x", "origin": [10.51, 2.52851, -1.71694]},
"faces": {
"north": {"uv": [10.016, 15.484, 15.984, 13.516], "texture": "#0"}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_active.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"name": "emission",
"from": [2.01, -0.02851, -1.46694],
"to": [14.01, 3.97149, -1.46694],
"shade": false,
"rotation": {"angle": 22.5, "axis": "x", "origin": [10.51, 1.47149, -1.71694]},
"faces": {
"north": {"uv": [10.032, 13.484, 16, 11.516], "texture": "#2"}
Expand All @@ -57,6 +58,7 @@
"name": "emission",
"from": [2.01, 0.02851, -1.46694],
"to": [14.01, 4.02851, -1.46694],
"shade": false,
"rotation": {"angle": -22.5, "axis": "x", "origin": [10.51, 2.52851, -1.71694]},
"faces": {
"north": {"uv": [10.016, 15.484, 15.984, 13.516], "texture": "#2"}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/old_aperture_death_fizzler_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.25, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/old_aperture_death_fizzler_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.25, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/portalcubed/models/block/old_aperture_fizzler_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.25, 16, 16],
"to": [8.1, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/old_aperture_fizzler_emitter_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
{
"from": [7.49, 3.715, -5.26],
"to": [9.51, 5.735, -5.24],
"shade": false,
"rotation": {"angle": -45, "axis": "z", "origin": [8, 5.225, -5]},
"faces": {
"north": {"uv": [7.532, 10.484, 8.484, 9.532], "texture": "#3"}
Expand All @@ -86,6 +87,7 @@
{
"from": [7.49, 13.715, -5.26],
"to": [9.51, 15.735, -5.24],
"shade": false,
"rotation": {"angle": -45, "axis": "z", "origin": [8, 15.225, -5]},
"faces": {
"north": {"uv": [7.532, 10.484, 8.484, 9.532], "texture": "#3"}
Expand All @@ -94,6 +96,7 @@
{
"from": [5.4, 0, -3.075],
"to": [10.55, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8.516, 8.016, 10.984, 15.984], "texture": "#2"},
Expand All @@ -105,6 +108,7 @@
"name": "cube inverted",
"from": [10.5, 16, -1],
"to": [5.5, 0, -3],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [11.984, 15.984, 11.016, 8.016], "texture": "#2"},
Expand All @@ -115,6 +119,7 @@
{
"from": [8, 0, -2],
"to": [8, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 11, -1]},
"faces": {
"east": {"uv": [8.032, 7.984, 8.484, 0], "texture": "#2"},
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/old_aperture_fizzler_emitter_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
{
"from": [8, 0, -2],
"to": [8, 10, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 11, -1]},
"faces": {
"east": {"uv": [8.032, 7.984, 8.484, 3.016], "texture": "#2"},
Expand All @@ -55,6 +56,7 @@
{
"from": [5.4, 0, -3.075],
"to": [10.55, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8.516, 0.016, 10.984, 7.968], "texture": "#2"},
Expand All @@ -66,6 +68,7 @@
"name": "cube inverted",
"from": [10.5, 16, -1],
"to": [5.5, 0, -3],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [11.984, 7.968, 11.016, 0.016], "texture": "#2"},
Expand Down Expand Up @@ -102,6 +105,7 @@
{
"from": [7.49, 8.64, -5.26],
"to": [9.51, 10.66, -5.24],
"shade": false,
"rotation": {"angle": -45, "axis": "z", "origin": [8, 10.15, -5]},
"faces": {
"north": {"uv": [7.532, 10.484, 8.484, 9.532], "texture": "#3"}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/old_aperture_fizzler_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.25, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_1_fizzler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.25, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_1_fizzler_emitter_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
{
"from": [5.49, -0.01, -3.01],
"to": [10.51, 16.01, 0.01],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, -16]},
"faces": {
"north": {"uv": [0, 8, 2.5, 16], "texture": "#2"},
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_1_fizzler_emitter_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
{
"from": [5.49, -0.01, -3.01],
"to": [10.51, 16.01, 0.01],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 16, -16]},
"faces": {
"north": {"uv": [0, 16, 2.5, 8], "texture": "#2"},
Expand All @@ -46,6 +47,7 @@
{
"from": [5.465, 3.99, -3.035],
"to": [6.485, 5.01, -2.015],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [15.475, 19, -16.025]},
"faces": {
"north": {"uv": [3.5, 9.5, 3, 9], "texture": "#2"},
Expand All @@ -59,6 +61,7 @@
{
"from": [5.465, 1.99, -3.035],
"to": [6.485, 3.01, -2.015],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [15.475, 17, -16.025]},
"faces": {
"north": {"uv": [3.5, 9.5, 3, 9], "texture": "#2"},
Expand All @@ -72,6 +75,7 @@
{
"from": [9.515, 3.99, -3.035],
"to": [10.535, 5.01, -2.015],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.525, 19, -16.025]},
"faces": {
"north": {"uv": [3, 9.5, 3.5, 9], "texture": "#2"},
Expand All @@ -85,6 +89,7 @@
{
"from": [9.515, 1.99, -3.035],
"to": [10.535, 3.01, -2.015],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.525, 17, -16.025]},
"faces": {
"north": {"uv": [3, 9.5, 3.5, 9], "texture": "#2"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_death_fizzler_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_death_fizzler_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_fizzler_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_2_fizzler_emitter_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
{
"from": [8, 0, -4],
"to": [8, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 16, 0]},
"faces": {
"east": {"uv": [5.516, 8, 6.984, 0.016], "texture": "#3"},
Expand All @@ -61,6 +62,7 @@
{
"from": [7.475, 0, -4],
"to": [8.525, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [4.016, 7.984, 5.484, 0.016], "texture": "#2"},
Expand All @@ -71,6 +73,7 @@
"name": "cube inverted",
"from": [8.575, 16, -1],
"to": [7.425, 0, -4],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [5.484, 0.016, 4.016, 7.984], "texture": "#2"},
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_2_fizzler_emitter_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
{
"from": [8, 0, -4],
"to": [8, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]},
"faces": {
"east": {"uv": [5.516, 0.016, 6.984, 8], "texture": "#3"},
Expand All @@ -60,6 +61,7 @@
{
"from": [7.475, 0, -4],
"to": [8.525, 16, -1],
"shade": false,
"faces": {
"east": {"uv": [4.016, 0.016, 5.484, 7.984], "texture": "#2"},
"west": {"uv": [5.484, 0.016, 4.016, 7.984], "texture": "#2"}
Expand All @@ -69,6 +71,7 @@
"name": "cube inverted",
"from": [8.575, 16, -1],
"to": [7.425, 0, -4],
"shade": false,
"faces": {
"east": {"uv": [5.484, 7.984, 4.016, 0.016], "texture": "#2"},
"west": {"uv": [4.016, 7.984, 5.484, 0.016], "texture": "#2"}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_fizzler_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_laser_field_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_2_laser_field_emitter_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
{
"from": [8, 0, -4],
"to": [8, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 16, 0]},
"faces": {
"east": {"uv": [14.532, 7.984, 16, 0], "texture": "#3"},
Expand All @@ -79,6 +80,7 @@
{
"from": [7.475, 0, -4],
"to": [8.525, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [13.016, 7.968, 14.484, 0], "texture": "#2"},
Expand All @@ -89,6 +91,7 @@
"name": "cube inverted",
"from": [8.575, 16, -1],
"to": [7.425, 0, -4],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"east": {"uv": [14.484, 0, 13.016, 7.968], "texture": "#2"},
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/portalcubed/models/block/portal_2_laser_field_emitter_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
{
"from": [8, 0, -4],
"to": [8, 16, -1],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]},
"faces": {
"east": {"uv": [14.532, 0, 16, 7.984], "texture": "#3"},
Expand All @@ -78,6 +79,7 @@
{
"from": [7.475, 0, -4],
"to": [8.525, 16, -1],
"shade": false,
"faces": {
"east": {"uv": [13.016, 0, 14.484, 7.968], "texture": "#2"},
"west": {"uv": [14.484, 0, 13.016, 7.968], "texture": "#2"}
Expand All @@ -87,6 +89,7 @@
"name": "cube inverted",
"from": [8.575, 16, -1],
"to": [7.425, 0, -4],
"shade": false,
"faces": {
"east": {"uv": [14.484, 7.968, 13.016, 0], "texture": "#2"},
"west": {"uv": [13.016, 7.968, 14.484, 0], "texture": "#2"}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/portalcubed/models/block/portal_2_laser_field_top.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
3 changes: 2 additions & 1 deletion ...n/resources/assets/portalcubed/models/block/portal_2_matter_inquisition_field_bottom.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"elements": [
{
"from": [7.9, 0, 0],
"to": [8.15, 16, 16],
"to": [8.1, 16, 16],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 0, 0]},
"faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
Expand Down
Loading

0 comments on commit 70fdedd

Please sign in to comment.