Skip to content

Commit

Permalink
iron out teleportation issues (#1010)
Browse files Browse the repository at this point in the history
* hide mic meshes

* tamb and cowbell fix

* proper platform only

* these are now needed milos

* Revert "these are now needed milos"

This reverts commit 2f7b600.

* Revert "proper platform only"

This reverts commit b2d646c.

* Revert "tamb and cowbell fix"

This reverts commit df27774.

* platform

* add mic script hacks for hiding

* increment the counter

* final glitch fix rev

* update warn
  • Loading branch information
jnackmclain authored Feb 1, 2025
1 parent ecbfbc6 commit ead7b6f
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 23 deletions.
70 changes: 51 additions & 19 deletions _ark/char/char_objects.dta
Original file line number Diff line number Diff line change
Expand Up @@ -416,24 +416,14 @@
{&&
{& $shared_flags kPlayDirectedCut}
{& $shared_flags kGenreAll}
{$a_clip shares_groups $b_clip}
}
;} broken if block found by linting. putting the below $this block inside the if
{$this
generate_transitions
(beat_align 1)
(restrict
{&&
{< $b_start 1}
{< $a_end 2}
}
)
}
}
}
}
)
)
{$a_clip shares_groups $b_clip}}}
{$this
generate_transitions
(beat_align 1)
(restrict
{&&
{< $b_start 1}
{< $a_end 2}})}}}))
#define MAINCHAR_CLIP_COMMON
((pose_resource
{bandchardesc_pose_resource $this}))
Expand Down Expand Up @@ -1678,8 +1668,40 @@
[instrument_type]
mic}
{do
($mic_meshes
(
beta57_logo.mesh
beta57_resource.mesh
beta87_logo.mesh
beta87_resource.mesh
bonesandspikes_resource.mesh
brokenmic_resource.mesh
e935_logo.mesh
e935_resource.mesh
goth_resource.mesh
kms104_logo.mesh
kms104_resource.mesh
knife_resource.mesh
ksm9wireless_logo.mesh
ksm9wireless_resource.mesh
md431ii_logo.mesh
md431ii_resource.mesh
md441u_logo.mesh
md441u_resource.mesh
mic1.mesh
sm57_logo.mesh
sm57_resource.mesh
sm58_logo.mesh
sm58_resource.mesh
)
)
($mic
{instrument find mic.grp})
#ifdef HX_PS3
{instrument find translucent.grp}
#else
{instrument find mic.grp}
#endif
)
($mic_stand
{instrument find mic_stand.grp})
($cowbell
Expand All @@ -1698,9 +1720,19 @@
{==
$inst
"cowbell"})
#ifdef HX_PS3
{if $mic
{foreach $entry $mic_meshes
{if {instrument find $entry}
{{instrument find $entry} set_showing $show_mic}
}
}
}
#else
{if
$mic
{$mic set_showing $show_mic}}
#endif
{if
$mic_stand
{$mic_stand set_showing $show_mic}}
Expand Down
7 changes: 3 additions & 4 deletions _ark/ui/main/main_hub.dta
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,9 @@
{file_exists "dx/gen/guitar_patch.dtb"}
{file_exists "dx/gen/mic_patch.dtb"}
{file_exists "dx/gen/hair_patch.dtb"}
{||
{! {file_exists "dx/gen/mic_patch_2.dtb"}}
{! {file_exists "dx/gen/mic_patch_3.dtb"}}
}
;add revisions below this, ensure the incremented/added revisions
;are present in the patch ark
{! {file_exists "dx/gen/mic_patch_5.dtb"}}
}
{if {! $tele2warned}
{set $tele2warned TRUE}
Expand Down
Binary file modified dependencies/ps3_patcher/rb3_ps3_guitar_glitch_fix.7z
Binary file not shown.

0 comments on commit ead7b6f

Please sign in to comment.