Skip to content

Commit

Permalink
Merge branch 'pr/133' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
uotalkie committed Jan 11, 2024
2 parents 0d2f593 + 19217ea commit 1f57aa9
Show file tree
Hide file tree
Showing 15 changed files with 3,572 additions and 3,586 deletions.
510 changes: 255 additions & 255 deletions game/overworld-town/loc-park/main.twee

Large diffs are not rendered by default.

458 changes: 229 additions & 229 deletions game/overworld-town/loc-park/robin.twee

Large diffs are not rendered by default.

353 changes: 176 additions & 177 deletions game/overworld-town/loc-park/run.twee

Large diffs are not rendered by default.

170 changes: 85 additions & 85 deletions game/overworld-town/loc-park/widgets.twee

Large diffs are not rendered by default.

84 changes: 37 additions & 47 deletions game/overworld-town/loc-temple/bailey.twee
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
:: Temple Bailey Intro Nod
<<effects>>

You nod, and Bailey relaxes <<person1>><<his>> grip. <<He>> turns back to Jordan. "I'll visit to check up on <<phim>>," <<he>> says. "Say, once a week."
당신은 고개를 끄덕이고, 베일리는 <<person1>><<his_ yi>> 손을 풀어준다. <<He_ nun>> 조던에게 돌아간다. "<<phim_ ul>> 확인하러 방문할게요," <<he_ ga>> 말한다. "일주일에 한번씩요."
<br><br>

<<if $temple_bailey_known is 1>>
A look of pain darken's Jordan's face. "Is that-" <<person2>><<he>> begins to asks, but the <<bishop_hands>> turn to <<him>> in unison.
조던의 얼굴이 고통스러운 표정으로 어두워졌다. "그거-" <<person2>><<he_ ga>> 묻기 시작하자, <<bishop_hands_ i>> 일제히 <<himPost "에게로">> 향한다.
<br>
"Remember your promise."
"약속을 잊지마세요."
<br>
"Don't forget your vow."
"서약을 잊지마세요."
<br>
"But I spoke with <<phim>> outside the dark one's home, and-"
"하지만 전 어두운 집 밖에서 <<phim_ gwa>> 이야기를 나누었고, 그리고-"
<br>
"Your vow cannot be broken."
"당신의 맹세는 깨질 수 없습니다."
<br>
"Think of what's at stake."
"무엇이 위태로운지 생각해보세요."
<br><br>
Jordan swallows <<his>> words. "I'm- I'm sorry child." <<He>> buries <<his>> face in <<his>> hands, and runs away.
조던은 말을 아낀다. "미- 미안하다, 아이야." <<He_ ga>> <<his_ yi>> 얼굴을 손에 묻고 도망친다.
<br><br>

<<link [[다음|Temple Bailey Intro Refuse 2]]>><</link>>
<br>
<<else>>
Jordan nods. <<person2>>"It's good to stay in contact with family. You're welcome here whenever you like."
조던이 고개를 끄덕인다. <<person2>>"가족과 계속 연락하는 건 좋은 일이죠 . 당신이 원할 때 언제든 여기에 오셔도 좋습니다."
<br><br>

Satisfied, Bailey strides down the centre aisle, and leaves the temple.
만족한 베일리는 중앙 통로를 따라 걸으며 사원을 떠난다.
<br><br>

<<link [[다음|Temple Bailey Intro Question]]>><</link>>
Expand All @@ -37,28 +37,28 @@ You nod, and Bailey relaxes <<person1>><<his>> grip. <<He>> turns back to Jordan
<<effects>>

<<if $temple_bailey_known is 1>>
A look of pain darken's Jordan's face. "Is that-" <<person2>><<he>> begins to asks, but the <<bishop_hands>> turn to <<him>> in unison.
조던의 얼굴이 고통스러운 표정으로 어두워졌다. "그거-" <<person2>><<he_ ga>> 묻기 시작하자, <<bishop_hands_ i>> 일제히 <<himPost "에게로">> 향한다.
<br>
"Remember your promise."
"약속을 잊지마세요."
<br>
"Don't forget your vow."
"서약을 잊지마세요."
<br>
"But I spoke with <<phim>> outside the dark one's home, and-"
"하지만 전 어두운 집 밖에서 <<phim_ gwa>> 이야기를 나누었고, 그리고-"
<br>
"Your vow cannot be broken."
"당신의 맹세는 깨질 수 없습니다."
<br>
"Think of what's at stake."
"무엇이 위태로운지 생각해보세요."
<br><br>
Jordan swallows <<his>> words. "I'm- I'm sorry child." <<He>> buries <<his>> face in <<his>> hands, and runs away.
조던은 말을 아낀다. "미- 미안하다, 아이야." <<He_ ga>> <<his_ yi>> 얼굴을 손에 묻고 도망친다.
<br><br>

<<link [[다음|Temple Bailey Intro Refuse 2]]>><</link>>
<br>
<<else>>
Jordan nods. <<person2>>"It's good to stay in contact with family. You're welcome here whenever you like."
조던이 고개를 끄덕인다. <<person2>>"가족과 계속 연락하는 건 좋은 일이죠. 당신이 원할 때 언제든 여기에 오셔도 좋습니다."
<br><br>

Satisfied, Bailey strides down the centre aisle, and leaves the temple.
만족한 베일리는 중앙 통로를 따라 걸으며 사원을 떠난다.
<br><br>

<<link [[다음|Temple Bailey Intro Question]]>><</link>>
Expand All @@ -68,24 +68,14 @@ You nod, and Bailey relaxes <<person1>><<his>> grip. <<He>> turns back to Jordan
:: Temple Bailey Intro Refuse
<<effects>>

You pull away from Bailey.
당신은 베일리에게서 멀어진다.

<<if $speech_attitude is "meek">>
"Please leave," you say. "I don't want you disturbing the worshipers."
<<elseif $speech_attitude is "bratty">>
"You can't barge in here like this," you say. "It's sacred ground."
<<else>>
"You have no power over me here," you say.
<</if>>
<br><br>
Anger flashes across Bailey's face, but it's gone so fast you might have imagined it.
<br><br>

Jordan watches, <<person2>><<his>> gentle eyes giving nothing away. <<He>> opens <<his>> mouth to speak to Bailey, but the <<bishop_hands>> turn to <<person2>><<him>> in unison.
<br>
"No interference."
"경전을 기억하세요."
<br>
"Follow the scripture."
"서약을 기억하세요."
<br><br>

Jordan nods. "You will handle it?" At the right <<person3>><<priest>>'s nod, Jordan gives you another smile, then turns and walks away.
Expand Down Expand Up @@ -129,12 +119,12 @@ Jordan looks at you with a worried expression. "Is everything okay <<sister>>?"

Before you can respond, the <<bishop_hands>> turn to Jordan in unison.
<br>
"Remember the scripture."
"경전을 기억하세요."
<br>
"Remember your vow."
"서약을 기억하세요."
<br><br>

Jordan nods, and closes <<person2>><<his>> eyes. "I'm sure your guardian wants what's best for you." <<He>> turns and walks away, and the pair follow suit, albeit in opposite directions.
조던은 고개를 끄덕이며, <<person2>><<his_ yi>> 눈을 감는다. "당신의 보호자는 당신에게 최선이 되는 것을 바란다는 것을 확신합니다." <<He_ ga>> 돌아서서 걸어 나가고, 두 사람은 서로 반대 방향이지만, 그 뒤를 따른다.
<br><br>

<<link [[다음|Temple]]>><<endevent>><</link>>
Expand All @@ -145,13 +135,13 @@ Jordan nods, and closes <<person2>><<his>> eyes. "I'm sure your guardian wants w

<<rentpay>>

The pair watch Bailey stride from the temple.
두 사람은 사원에서 베일리가 걸어가는 모습을 지켜본다.
<br><br>
"A nuisance."
"골칫거리네."
<br>
"Worse than <<person1>><<he>> in this world."
"이 세상에서 <<person1>><<he>>보다 나쁜 것 같네."
<br><br>
They bow to you, then turn and disappear, side-by-side, down one of the many passages surrounding the hall.
그들은 당신에 목례를 한 다음, 홀을 둘러싼 여러 통로 중 하나를 따라 나란히 돌아서서 사라진다.
<br><br>

<<link [[다음|Temple]]>><<endevent>><</link>>
Expand All @@ -163,23 +153,23 @@ They bow to you, then turn and disappear, side-by-side, down one of the many pas
<<set $baileyRefusedToPay += 1>>

<<if $speech_attitude is "meek">>
"I'm not paying you," you say. "You can't make me. Not here."
"돈 안줄거야," 당신이 말한다. "당신은 여기서 돈 못 받아."
<<elseif $speech_attitude is "bratty">>
"Piss off," you say. "Or my <<brothers_and_sisters>> will beat the shit out of you."
"꺼져," 당신이 말한다. "안 그러면 내 <<brothers_and_sisters>>들이 널 두들겨 패버릴 거야."
<<else>>
"Go away," You say. "You're not gonna start a fight here."
"저리가," 당신이 말한다. "여기서 싸움을 시작하면 안돼."
<</if>>
<br><br>
"So be it," Bailey snarls.
"그럼, 그렇게 하자." 베일리가 으르렁거린다.
<br><br>
The pair watch <<person1>><<him>> leave. "<<Sister>>," they say in unison.
두 사람은 <<person1>><<him_ ga>> 떠나는 모습을 지켜본다. "<<Sister>>," 라고 그들은 한 목소리로 말한다.
<br>
"We can't make enemies of humankind."
"우리는 인류를 적으로 만들 수 없습니다."
<br>
"We must endure their abuses."
"우리는 그들의 학대를 견뎌내야 합니다."
<br><br>

With that, they turn as one, and leave the hall.
그리고는 모두 하나가 되어 홀을 떠난다.
<br><br>

<<link [[다음|Temple]]>><<endevent>><</link>>
Expand Down
16 changes: 8 additions & 8 deletions game/overworld-town/loc-temple/bunk.twee
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<<bedclotheson "Temple Bunk Bed">>
<<effects>>

You are beside your bunk in the temple quarters. There's a cupboard for your clothes, and a small space behind a screen for dressing.
당신은 사원 숙소의 침대 옆에 있다. 옷을 보관할 수 있는 옷장과 옷을 입을 수 있는 가림막 뒤의 작은 공간이 있다.
<br><br>

<<if Time.dayState is "night">>
The bunks are full and the rooms are silent save for an occasional snore.
밤이 깊어 침실은 고요하다. 가끔씩 들리는 코골이 소리를 제외하고는 아무 소리도 들리지 않는다.
<<elseif Time.dayState is "day">>
Initiates are hard at work dusting and cleaning.
수련생들은 열심히 먼지 털고 청소하고 있다.
<<elseif Time.dayState is "dawn">>
The monks and nuns are already up and active.
수도사들과 수녀들은 이미 일어나서 활동하고 있다.
<<elseif Time.dayState is "dusk">>
Some of the monks and nuns are preparing for bed.
몇몇 수도사와 수녀들이 잠자리에 들 준비를 하고 있다.
<</if>>
<br><br>
<<if $earSlime.event and $earSlime.noSleep>>
Expand All @@ -23,13 +23,13 @@ You are beside your bunk in the temple quarters. There's a cupboard for your clo
<</if>>
<br>
<<else>>
<<bedicon>><<link [[Strip and get in bed|Temple Bunk Bed]]>><<undressSleep "Temple Bunk Bed">><</link>>
<<bedicon>><<link [[벌거벗고 침대에 눕는다|Temple Bunk Bed]]>><<undressSleep "Temple Bunk Bed">><</link>>
<br>
<<listsleepoutfits "Temple Bunk Bed">>
<br>
<</if>>
<<roomoptions>>
<<wardrobeicon>><<link [[Wardrobe|Temple Wardrobe]]>><</link>>
<<wardrobeicon>><<link [[옷장|Temple Wardrobe]]>><</link>>
<br>
<<mirroricon>><<link [[거울|Temple Mirror]]>><<preMirror>><<endevent>><</link>>
<br><br>
Expand Down Expand Up @@ -75,7 +75,7 @@ You are beside your bunk in the temple quarters. There's a cupboard for your clo

<<nightmareCheck "Temple Sleep">>
<<generateSleepLinks "Temple Sleep">>
<<link [[Climb out of bed|Temple Bunk]]>><<storeon "Temple Bunk Bed">><<set $wardrobe_location to "temple">><<loadTempHairStyle>><<endevent>><</link>>
<<link [[침대에서 일어난다|Temple Bunk]]>><<storeon "Temple Bunk Bed">><<set $wardrobe_location to "temple">><<loadTempHairStyle>><<endevent>><</link>>

:: Temple Sleep
<<set _autosavehere to true>>
Expand Down
Loading

0 comments on commit 1f57aa9

Please sign in to comment.