Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

Fusion-Flux · Jul 9, 2023 · 69e7d39 · 69e7d39
2 parents 079a018 + de4bd27
commit 69e7d39
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json
@@ -12,8 +12,16 @@
   "subtitles.portalcubed.portal_open": "Portal opens",
   "subtitles.portalcubed.portal_close": "Portal closes",
   "subtitles.portalcubed.portal_fizzle": "Portal fizzles",
+
   "subtitles.portalcubed.material_emancipation": "Something disintegrates",
 
+  "subtitles.portalcubed.laser.activate": "Laser beam activates",
+  "subtitles.portalcubed.laser.ambiance": "Laser beam hums",
+  "subtitles.portalcubed.laser.node_activate": "Laser node activates",
+  "subtitles.portalcubed.laser.node_deactivate": "Laser node deactivates",
+  "subtitles.portalcubed.laser.node_sing": "Laser node sings",
+
+
   "subtitles.portalcubed.pedestal_button_press": "Switch activates",
   "subtitles.portalcubed.pedestal_button_release": "Switch deactivates",
   "subtitles.portalcubed.floor_button_press": "Button activates",
@@ -29,6 +37,8 @@
 
   "subtitles.portalcubed.crowbar_swoosh": "Crowbar swooshes",
 
+  "subtitles.portalcubed.faith_plate": "Faith plate activates",
+
   "item.portalcubed.long_fall_boots": "Long Fall Boots",
   "item.portalcubed.hammer": "Hammer",
   "item.portalcubed.energy_pellet": "High Energy Pellet",

diff --git a/src/main/resources/assets/portalcubed/sounds.json b/src/main/resources/assets/portalcubed/sounds.json
@@ -127,7 +127,8 @@
 	"catapult_launch": {
 		"sounds": [
 			"portalcubed:heavy_metal_stop1"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.faith_plate"
 	},
 
 	"pedestal_button_press": {
@@ -219,42 +220,50 @@
 	"laser/emitter_activate": {
 		"sounds": [
 			"portalcubed:laser/laser_activation_01"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.activate"
 	},
 	"laser/beam_music": {
 		"sounds": [
 			"portalcubed:laser/laser_beam_lp_02"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.ambiance"
 	},
 	"laser/node_music": {
 		"sounds": [
 			"portalcubed:laser/laser_node_lp_01"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_sing"
 	},
 	"laser/node_activate": {
 		"sounds": [
 			"portalcubed:laser/laser_node_power_on"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_activate"
 	},
 	"laser/node_deactivate": {
 		"sounds": [
 			"portalcubed:laser/laser_node_power_off"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_deactivate"
 	},
 	"laser/triple_laser_sound_demo_1": {
 		"sounds": [
 			"portalcubed:laser/sp_a2_triple_laser_l1_01"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_sing"
 	},
 	"laser/triple_laser_sound_demo_2": {
 		"sounds": [
 			"portalcubed:laser/sp_a2_triple_laser_l2_01"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_sing"
 	},
 	"laser/triple_laser_sound_demo_3": {
 		"sounds": [
 			"portalcubed:laser/sp_a2_triple_laser_l3_01"
-		]
+		],
+		"subtitle": "subtitles.portalcubed.laser.node_sing"
 	},
 
 	"pellet/bounce": {