Skip to content

Commit

Permalink
Re-added the WholeFamily Mart's music (teaconmc#271)
Browse files Browse the repository at this point in the history 
* Add NeoMTR models of ohl

* Fix accidently modifying the two ohl back
  • Loading branch information
@SteveNotSet
SteveNotSet authored Jan 2, 2025
1 parent b5a7424 commit c939233
Show file tree
Hide file tree
Showing 5 changed files with 535 additions and 1 deletion.
4 changes: 3 additions & 1 deletion jiachen/assets/mtr/sounds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
"onix152_rub":{ "sounds": [{ "name": "mtr:onix152/rub", "attenuation_distance": 32 }] },
"onix152_run":{ "sounds": [{ "name": "mtr:onix152/run", "attenuation_distance": 32 }] },

"ann_aml_est_arr": {"sounds": ["mtr:ann/aml_est_arr"]}, "ann_aml_est_next": {"sounds": ["mtr:ann/aml_est_next"]}, "ann_aml_npp_arr_term": {"sounds": ["mtr:ann/aml_npp_arr_term"]}, "ann_aml_npp_next_term": {"sounds": ["mtr:ann/aml_npp_next_term"]}, "ann_aml_nzr_arr": {"sounds": ["mtr:ann/aml_nzr_arr"]}, "ann_aml_nzr_next": {"sounds": ["mtr:ann/aml_nzr_next"]}, "ann_aml_nzr_next_specdep": {"sounds": ["mtr:ann/aml_nzr_next_specdep"]}, "ann_aml_wyu_arr": {"sounds": ["mtr:ann/aml_wyu_arr"]}, "ann_aml_wyu_next_thru": {"sounds": ["mtr:ann/aml_wyu_next_thru"]}, "ann_aml_xwm_arr": {"sounds": ["mtr:ann/aml_xwm_arr"]}, "ann_aml_xwm_next": {"sounds": ["mtr:ann/aml_xwm_next"]}, "ann_aml_ybr_arr": {"sounds": ["mtr:ann/aml_ybr_arr"]}, "ann_aml_ybr_next": {"sounds": ["mtr:ann/aml_ybr_next"]}, "ann_rel_exc_arr": {"sounds": ["mtr:ann/rel_exc_arr"]}, "ann_rel_exc_next": {"sounds": ["mtr:ann/rel_exc_next"]}, "ann_rel_sob_arr": {"sounds": ["mtr:ann/rel_sob_arr"]}, "ann_rel_sob_next": {"sounds": ["mtr:ann/rel_sob_next"]}, "ann_rel_syr_arr": {"sounds": ["mtr:ann/rel_syr_arr"]}, "ann_rel_syr_next": {"sounds": ["mtr:ann/rel_syr_next"]}, "ann_rel_wyu_arr": {"sounds": ["mtr:ann/rel_wyu_arr"]}, "ann_rel_wyu_arr_term": {"sounds": ["mtr:ann/rel_wyu_arr_term"]}, "ann_rel_wyu_next": {"sounds": ["mtr:ann/rel_wyu_next"]}, "ann_rel_wyu_next_term": {"sounds": ["mtr:ann/rel_wyu_next_term"]}, "ann_rel_wyu_next_thru": {"sounds": ["mtr:ann/rel_wyu_next_thru"]}, "ann_rel_xwm_arr": {"sounds": ["mtr:ann/rel_xwm_arr"]}, "ann_rel_xwm_next": {"sounds": ["mtr:ann/rel_xwm_next"]}, "ann_rel_xwm_next_specdep": {"sounds": ["mtr:ann/rel_xwm_next_specdep"]}, "ann_rel_yfp_arr": {"sounds": ["mtr:ann/rel_yfp_arr"]}, "ann_rel_yfp_next": {"sounds": ["mtr:ann/rel_yfp_next"]}, "ann_rel_yfp_next_specdep": {"sounds": ["mtr:ann/rel_yfp_next_specdep"]}
"wholefamily":{ "sounds": [{ "name": "mtr:wholefamily", "attenuation_distance": 32 }] },

"ann_aml_est_arr": {"sounds": ["mtr:ann/aml_est_arr"]}, "ann_aml_est_next": {"sounds": ["mtr:ann/aml_est_next"]}, "ann_aml_npp_arr_term": {"sounds": ["mtr:ann/aml_npp_arr_term"]}, "ann_aml_npp_next_term": {"sounds": ["mtr:ann/aml_npp_next_term"]}, "ann_aml_nzr_arr": {"sounds": ["mtr:ann/aml_nzr_arr"]}, "ann_aml_nzr_next": {"sounds": ["mtr:ann/aml_nzr_next"]}, "ann_aml_nzr_next_specdep": {"sounds": ["mtr:ann/aml_nzr_next_specdep"]}, "ann_aml_wyu_arr": {"sounds": ["mtr:ann/aml_wyu_arr"]}, "ann_aml_wyu_next_thru": {"sounds": ["mtr:ann/aml_wyu_next_thru"]}, "ann_aml_xwm_arr": {"sounds": ["mtr:ann/aml_xwm_arr"]}, "ann_aml_xwm_next": {"sounds": ["mtr:ann/aml_xwm_next"]}, "ann_aml_ybr_arr": {"sounds": ["mtr:ann/aml_ybr_arr"]}, "ann_aml_ybr_next": {"sounds": ["mtr:ann/aml_ybr_next"]}, "ann_rel_exc_arr": {"sounds": ["mtr:ann/rel_exc_arr"]}, "ann_rel_exc_next": {"sounds": ["mtr:ann/rel_exc_next"]}, "ann_rel_sob_arr": {"sounds": ["mtr:ann/rel_sob_arr"]}, "ann_rel_sob_next": {"sounds": ["mtr:ann/rel_sob_next"]}, "ann_rel_syr_arr": {"sounds": ["mtr:ann/rel_syr_arr"]}, "ann_rel_syr_next": {"sounds": ["mtr:ann/rel_syr_next"]}, "ann_rel_wyu_arr": {"sounds": ["mtr:ann/rel_wyu_arr"]}, "ann_rel_wyu_arr_term": {"sounds": ["mtr:ann/rel_wyu_arr_term"]}, "ann_rel_wyu_next": {"sounds": ["mtr:ann/rel_wyu_next"]}, "ann_rel_wyu_next_term": {"sounds": ["mtr:ann/rel_wyu_next_term"]}, "ann_rel_wyu_next_thru": {"sounds": ["mtr:ann/rel_wyu_next_thru"]}, "ann_rel_xwm_arr": {"sounds": ["mtr:ann/rel_xwm_arr"]}, "ann_rel_xwm_next": {"sounds": ["mtr:ann/rel_xwm_next"]}, "ann_rel_xwm_next_specdep": {"sounds": ["mtr:ann/rel_xwm_next_specdep"]}, "ann_rel_yfp_arr": {"sounds": ["mtr:ann/rel_yfp_arr"]}, "ann_rel_yfp_next": {"sounds": ["mtr:ann/rel_yfp_next"]}, "ann_rel_yfp_next_specdep": {"sounds": ["mtr:ann/rel_yfp_next_specdep"]}
}
Binary file removed jiachen/assets/mtr/sounds/familymart.ogg
View file
Binary file not shown.
Binary file added jiachen/assets/mtr/sounds/wholefamily.ogg
View file
Binary file not shown.
108 changes: 108 additions & 0 deletions jiachen/assets/mtrsteamloco/eyecandies/ohl_support/ohl_support_1_pull.obj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,59 @@ vt 0.292893 0.453082
vt 0.386729 0.453082
s 1
usemtl insulator
<<<<<<< HEAD
f 73/147/38 74/148/38 76/149/39 75/150/39
f 75/151/39 76/152/39 78/153/40 77/154/40
f 77/154/40 78/153/40 80/155/41 79/156/41
f 79/157/41 80/158/41 82/159/42 81/160/42
f 81/160/42 82/159/42 84/161/43 83/162/43
f 83/163/43 84/164/43 86/165/44 85/166/44
f 76/167/45 74/168/45 88/169/45 86/170/45 84/171/45 82/172/45 80/173/45 78/174/45
f 85/166/44 86/165/44 88/175/46 87/176/46
f 87/176/46 88/175/46 74/177/38 73/178/38
f 73/179/47 75/180/47 77/181/47 79/182/47 81/183/47 83/184/47 85/185/47 87/186/47
f 89/187/38 90/188/38 92/189/39 91/190/39
f 91/152/39 92/191/39 94/192/40 93/193/40
f 93/193/40 94/192/40 96/194/41 95/195/41
f 95/196/41 96/197/41 98/198/42 97/199/42
f 97/199/42 98/198/42 100/200/43 99/201/43
f 99/202/43 100/203/43 102/204/44 101/205/44
f 92/206/45 90/207/45 104/208/45 102/209/45 100/210/45 98/211/45 96/212/45 94/213/45
f 101/205/44 102/204/44 104/214/46 103/215/46
f 103/216/46 104/217/46 90/188/38 89/187/38
f 89/218/47 91/219/47 93/220/47 95/221/47 97/222/47 99/223/47 101/224/47 103/225/47
f 105/226/38 106/227/38 108/228/39 107/229/39
f 107/230/39 108/231/39 110/232/40 109/233/40
f 109/233/40 110/232/40 112/234/41 111/235/41
f 111/236/41 112/237/41 114/238/42 113/239/42
f 113/239/42 114/238/42 116/240/43 115/241/43
f 115/242/43 116/243/43 118/244/44 117/245/44
f 108/246/45 106/247/45 120/248/45 118/249/45 116/250/45 114/251/45 112/252/45 110/253/45
f 117/245/44 118/244/44 120/254/46 119/255/46
f 119/256/46 120/257/46 106/227/38 105/226/38
f 105/258/47 107/259/47 109/260/47 111/261/47 113/262/47 115/263/47 117/264/47 119/265/47
f 121/266/38 122/267/38 124/268/39 123/269/39
f 123/269/39 124/268/39 126/270/40 125/271/40
f 125/272/40 126/273/40 128/274/41 127/275/41
f 127/276/41 128/277/41 130/278/42 129/279/42
f 129/279/42 130/278/42 132/280/43 131/202/43
f 131/281/43 132/282/43 134/283/44 133/284/44
f 124/285/45 122/286/45 136/287/45 134/288/45 132/289/45 130/290/45 128/291/45 126/292/45
f 133/284/44 134/283/44 136/197/46 135/293/46
f 135/294/46 136/295/46 122/267/38 121/266/38
f 121/296/47 123/297/47 125/298/47 127/299/47 129/300/47 131/301/47 133/302/47 135/303/47
f 137/304/38 138/305/38 140/306/39 139/307/39
f 139/307/39 140/306/39 142/308/40 141/309/40
f 141/310/40 142/311/40 144/312/41 143/313/41
f 143/314/41 144/315/41 146/316/42 145/317/42
f 145/317/42 146/316/42 148/318/43 147/319/43
f 147/319/43 148/318/43 150/320/44 149/321/44
f 140/322/45 138/323/45 152/324/45 150/325/45 148/326/45 146/327/45 144/328/45 142/329/45
f 149/330/44 150/331/44 152/332/46 151/333/46
f 151/334/46 152/335/46 138/305/38 137/304/38
f 137/336/47 139/337/47 141/338/47 143/339/47 145/340/47 147/341/47 149/342/47 151/343/47
o insulator.001
=======
f 1/1/1 2/2/1 4/3/2 3/4/2
f 3/5/2 4/6/2 6/7/3 5/8/3
f 5/8/3 6/7/3 8/9/4 7/10/4
Expand Down Expand Up @@ -342,6 +395,7 @@ f 77/184/7 78/185/7 80/186/9 79/187/9
f 79/188/9 80/189/9 66/159/1 65/158/1
f 65/190/10 67/191/10 69/192/10 71/193/10 73/194/10 75/195/10 77/196/10 79/197/10
o insulator.003
>>>>>>> b5a7424b974ec8e5e650746645d1e0847b5d1cfe
v -2.155000 1.950000 -0.150000
v -2.005000 1.950000 -0.150000
v -2.155000 1.843934 -0.106066
Expand Down Expand Up @@ -631,6 +685,59 @@ vt 0.292893 0.453082
vt 0.386729 0.453082
s 1
usemtl insulator
<<<<<<< HEAD
f 153/344/48 154/345/48 156/346/49 155/347/49
f 155/348/49 156/349/49 158/350/50 157/351/50
f 157/351/50 158/350/50 160/352/51 159/353/51
f 159/354/51 160/355/51 162/356/52 161/357/52
f 161/357/52 162/356/52 164/358/53 163/359/53
f 163/360/53 164/361/53 166/362/54 165/363/54
f 156/364/55 154/365/55 168/366/55 166/367/55 164/368/55 162/369/55 160/370/55 158/371/55
f 165/363/54 166/362/54 168/372/56 167/373/56
f 167/373/56 168/372/56 154/374/48 153/375/48
f 153/376/57 155/377/57 157/378/57 159/379/57 161/380/57 163/381/57 165/382/57 167/383/57
f 169/384/48 170/385/48 172/386/49 171/387/49
f 171/349/49 172/388/49 174/389/50 173/390/50
f 173/390/50 174/389/50 176/391/51 175/392/51
f 175/393/51 176/394/51 178/395/52 177/396/52
f 177/396/52 178/395/52 180/397/53 179/398/53
f 179/399/53 180/400/53 182/401/54 181/402/54
f 172/403/55 170/404/55 184/405/55 182/406/55 180/407/55 178/408/55 176/409/55 174/410/55
f 181/402/54 182/401/54 184/411/56 183/412/56
f 183/413/56 184/414/56 170/385/48 169/384/48
f 169/415/57 171/416/57 173/417/57 175/418/57 177/419/57 179/420/57 181/421/57 183/422/57
f 185/423/48 186/424/48 188/425/49 187/426/49
f 187/427/49 188/428/49 190/429/50 189/430/50
f 189/430/50 190/429/50 192/431/51 191/432/51
f 191/433/51 192/434/51 194/435/52 193/436/52
f 193/436/52 194/435/52 196/437/53 195/438/53
f 195/439/53 196/440/53 198/441/54 197/442/54
f 188/443/55 186/444/55 200/445/55 198/446/55 196/447/55 194/448/55 192/449/55 190/450/55
f 197/442/54 198/441/54 200/451/56 199/452/56
f 199/453/56 200/454/56 186/424/48 185/423/48
f 185/455/57 187/456/57 189/457/57 191/458/57 193/459/57 195/460/57 197/461/57 199/462/57
f 201/463/48 202/464/48 204/465/49 203/466/49
f 203/466/49 204/465/49 206/467/50 205/468/50
f 205/469/50 206/470/50 208/471/51 207/472/51
f 207/473/51 208/474/51 210/475/52 209/476/52
f 209/476/52 210/475/52 212/477/53 211/399/53
f 211/478/53 212/479/53 214/480/54 213/481/54
f 204/482/55 202/483/55 216/484/55 214/485/55 212/486/55 210/487/55 208/488/55 206/489/55
f 213/481/54 214/480/54 216/394/56 215/490/56
f 215/491/56 216/492/56 202/464/48 201/463/48
f 201/493/57 203/494/57 205/495/57 207/496/57 209/497/57 211/498/57 213/499/57 215/500/57
f 217/501/48 218/502/48 220/503/49 219/504/49
f 219/504/49 220/503/49 222/505/50 221/506/50
f 221/507/50 222/508/50 224/509/51 223/510/51
f 223/511/51 224/512/51 226/513/52 225/514/52
f 225/514/52 226/513/52 228/515/53 227/516/53
f 227/516/53 228/515/53 230/517/54 229/518/54
f 220/519/55 218/520/55 232/521/55 230/522/55 228/523/55 226/524/55 224/525/55 222/526/55
f 229/527/54 230/528/54 232/529/56 231/530/56
f 231/531/56 232/532/56 218/502/48 217/501/48
f 217/533/57 219/534/57 221/535/57 223/536/57 225/537/57 227/538/57 229/539/57 231/540/57
o pole
=======
f 81/198/11 82/199/11 84/200/12 83/201/12
f 83/202/12 84/203/12 86/204/13 85/205/13
f 85/205/13 86/204/13 88/206/14 87/207/14
Expand Down Expand Up @@ -998,6 +1105,7 @@ f 208/537/57 210/538/56 232/539/56 230/540/57
f 207/532/55 197/526/52 219/527/52 229/533/55
f 190/506/53 208/537/57 230/540/57 212/507/53
o pole.001
>>>>>>> b5a7424b974ec8e5e650746645d1e0847b5d1cfe
v -3.000000 -5.000000 -0.250000
v -3.000000 4.000000 -0.250000
v -2.823223 -5.000000 -0.176777
Expand Down
Loading

0 comments on commit c939233

Please sign in to comment.