Skip to content

Commit

Permalink
Sounds.json changes, asset tweaks, new advancement
Browse files Browse the repository at this point in the history
- Reorganized and reformatted sounds.json
-- Sound events are now in alphabetical order
-- The order in which fields are used per-sound is now consistent
-- Inconsistent spacing, indentation, and newlines have been fixed
- Adjusted the volume of some sounds that were made quieter prior to blanketcon.  This includes lasers, buttons, and a few others that were nearly inaudible even at maximum ingame volume
- Added subtitles for the sounds made when a portal gun is used to pick up or drop an object
- Adjusted the size of the LEGO Portal Gun when thrown on the ground to be consistent with other portal gun skins
- Added a new advancement: Heartbreaker - Fizzle a companion cube
- Fixed an issue with the emissives on doors that caused certain states to render darker when using smooth lighting
- Added the glass tube to the portal gun frame's item model, as it was forgotten when I updated the others.  The recipe now includes a glass pane.
- Fixed a culling issue on the rocket turret base
  • Loading branch information
Cart3r1234 committed Oct 19, 2023
1 parent 7f5031c commit b518151
Show file tree
Hide file tree
Showing 10 changed files with 611 additions and 522 deletions.
15 changes: 12 additions & 3 deletions src/main/resources/assets/portalcubed/emissives.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,23 +138,32 @@
"block/auto_portal_lower": "block/auto_portal_e",
"block/auto_portal_upper": "block/auto_portal_e",


"block/portal_1_door_bottom_left": "block/portal_1_door_e",
"block/portal_1_door_bottom_left_open": "block/portal_1_door_e",
"block/portal_1_door_bottom_right": "block/portal_1_door_e",
"block/portal_1_door_bottom_right_open": "block/portal_1_door_e",
"block/portal_1_door_bottom_left": "block/portal_1_door_e",
"block/portal_1_door_bottom_left_open": "block/portal_1_door_e",
"block/portal_1_door_top_right": "block/portal_1_door_e",
"block/portal_1_door_top_right_open": "block/portal_1_door_e",
"block/portal_1_door_top_left": "block/portal_1_door_e",
"block/portal_1_door_top_left_open": "block/portal_1_door_e",

"block/portal_2_door_bottom_right": "block/portal_2_door_e",
"block/portal_2_door_bottom_right_open": "block/portal_2_door_e",
"block/portal_2_door_bottom_left": "block/portal_2_door_e",
"block/portal_2_door_bottom_left_open": "block/portal_2_door_e",
"block/portal_2_door_top_right": "block/portal_2_door_e",
"block/portal_2_door_top_right_open": "block/portal_2_door_e",
"block/portal_2_door_top_left": "block/portal_2_door_e",
"block/portal_2_door_top_left_open": "block/portal_2_door_e",

"block/octopus_door_bottom_right": "block/octopus_door_e",
"block/octopus_door_bottom_right_open": "block/octopus_door_e",
"block/octopus_door_bottom_left": "block/octopus_door_e",
"block/octopus_door_bottom_left_open": "block/octopus_door_e",
"block/octopus_door_top_right": "block/octopus_door_e",
"block/octopus_door_top_right_open": "block/octopus_door_e",
"block/octopus_door_top_left": "block/octopus_door_e",
"block/octopus_door_top_left_open": "block/octopus_door_e",

"item/floor_button": "block/floor_button_e",
"block/floor_button": "block/floor_button_e",
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/portalcubed/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"subtitles.portalcubed.portal_gun_primary_fire": "Portal gun shoots primary portal",
"subtitles.portalcubed.portal_invalid_surface": "Portal gun shot fails",

"subtitles.portalcubed.object_pickup": "Portal gun picks up object",
"subtitles.portalcubed.object_drop": "Portal gun releases object",

"subtitles.portalcubed.portal_open": "Portal opens",
"subtitles.portalcubed.portal_close": "Portal closes",
"subtitles.portalcubed.portal_fizzle": "Portal fizzles",
Expand Down Expand Up @@ -77,6 +80,8 @@

"advancement.portalcubed.fizzler.title": "Fizzle Me This",
"advancement.portalcubed.fizzler.description": "Walk through a Material Emancipation Grill",
"advancement.portalcubed.heartbreaker.title": "Heartbreaker",
"advancement.portalcubed.heartbreaker.description": "Fizzle your faithful companion cube. You monster.",

"advancement.portalcubed.pellet.title": "Handle With Care",
"advancement.portalcubed.pellet.description": "Obtain a High Energy Pellet",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"to": [16.01, 17.01, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]},
"faces": {
"north": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
"east": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
"south": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
"west": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"},
"north": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "north"},
"east": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "east"},
"south": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "south"},
"west": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "west"},
"up": {"uv": [0.008, 0.008, 3.992, 3.992], "texture": "#0"}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@
},
"ground": {
"rotation": [12, 0, 0],
"translation": [0, 6, 0]
"translation": [0, 3, 0],
"scale": [0.64844, 0.64844, 0.64844]
},
"gui": {
"rotation": [26.75, 43, 0],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"texture_size": [32, 32],
"textures": {
"0": "portalcubed:item/portal_gun",
"1": "portalcubed:item/portal_gun_dyeable",
"particle": "portalcubed:item/portal_gun"
},
"elements": [
Expand Down Expand Up @@ -97,9 +98,29 @@
"north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
"east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
"south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"},
"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"},
"down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
"up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}
}
},
{
"name": "cube inverted inverted",
"from": [7.04, 2.4, 5.025],
"to": [9.04, 4.4, 8.975],
"rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]},
"faces": {
"west": {"uv": [8.484, 4.984, 7.516, 3.016], "rotation": 90, "texture": "#0"},
"down": {"uv": [8.484, 4.984, 7.516, 3.016], "texture": "#0"}
}
},
{
"name": "transparent",
"from": [7, 2.4, 5],
"to": [9, 4.4, 9],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 3.4, 2.575]},
"faces": {
"east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"},
"west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#1"},
"up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"},
"down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#1"}
}
}
],
Expand Down Expand Up @@ -138,5 +159,8 @@
"rotation": [0, -87.75, 0],
"translation": [0, 4.75, -1.25]
}
},
"portalcubed:render_types": {
"translucent": ["transparent"]
}
}
Loading

0 comments on commit b518151

Please sign in to comment.