an attempt at hills

diff --git a/layout/ours.m4 b/layout/ours.m4
index 61c9b8c9829d398e9a11888a8ab7a2a4f5078faa..9716cf2098b0eebcc1ae942e26b19754bba62886 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -42,10 +42,10 @@ rel l2_ptl l3_ptl 0 -37
 rel l3_ptl l4_ptl 0 -37
 rel l4_ptl l5_ptl 0 -37
 
-extend -midx_bl -scj_a len 10 315
-part scj pt_peco_sr a
+extend -midx_bl -j8sc_a len 10 315
+part j8sc pt_peco_sl a
 
-extend -scj_c -l0_jbl_b parallel demos!right_main_up 315
+extend -j8sc_c -l0_jbl_b parallel demos!right_main_up 315
 part l0_jbl ^pt_main_r b
 
 extend -l0_jbl_c l0_lst uptoang 90 315
@@ -163,20 +163,33 @@ extend staplat_near_4 staplat_far_4 upto sta_far_4
 extend staplat_near_5 staplat_far_5 upto sta_far_5
 
 layer =
+
 join l5_cl sta_near_5 352
 
-extend l4_j3s_b -l3s_jth_a len 20
-part l3s_jth pt_peco_sr a
+rel sta_near_4 sta_near_3s 15 -37 -10
+part l3s_jsc pt_peco_sr c -sta_near_3s
+join l4_j3s_b -l3s_jsc_a 230
+
+extend sta_near_3s l3s_jyard_c uptoang 3.5 -230
+part l3s_jyard pt_peco_sl c
+
+extend l3s_jsc_b -sc_m uptoang 90 300
+
+extend l3s_jyard_b l3s_jh_c ang 1 -230
+part l3s_jh pt_peco_sl c
+extend l3s_jh_b h_8b ang 90 -230
+
+#extend l4_j3s_b -l3s_jth_a len 20
+#part l3s_jth pt_peco_sr a
 
-rel sta_near_4 sta_near_3s 0 -37
-join -l3s_jth_c sta_near_3s 230 arcline
+#join -l3s_jth_c sta_near_3s 230 arcline
 
-part l3s_jplat pt_peco_sl c sta_near_3s
+#part l3s_jsc pt_peco_sl c sta_near_3s
 
 #---------- train houses
 
 
-extend l3s_jth_b l3th_m ang 135 230
+#extend l3s_jth_b l3th_m ang 135 230
 
 
 
@@ -229,8 +242,8 @@ layer 20
 #rel l0_jbl_c -h_pbl_c 0 -45
 #rel l0_jbl_b -h_pbl_b 0 -45
 #join h_pbl_b h_pbl_c 230
-#extend -h_pbl_b -scj_p ang 40 -270
-#join scj_b scj_p 230
+#extend -h_pbl_b -j8sc_p ang 40 -270
+#join j8sc_b j8sc_p 230
 
 #extend h_pbl_c h_ub upto h_brh 270
 #join h_ub h_8b 230