Merge branch 'develop'

uotalkie · Dec 7, 2024 · 74bc9d0 · 74bc9d0
2 parents 1fbd7a8 + 35bcfe5
commit 74bc9d0
Show file tree

Hide file tree

Showing 11 changed files with 337 additions and 304 deletions.
diff --git a/game/03-JavaScript/kotrans.js b/game/03-JavaScript/kotrans.js
@@ -1,6 +1,6 @@
 /* Korean translation information */
 window.koTrans = {
-	"version": "0.1.2024.1201",
+	"version": "0.1.2024.1207",
 
 	"info": 
 		'<br>'+

diff --git a/game/base-debug/custom-testroom.twee b/game/base-debug/custom-testroom.twee
@@ -91,11 +91,8 @@ T.bottomUnder : name = _bottomUnder.name, trResult = <<bottomUnderNamePost "을"
 bottomsPost: <<bottomsPost "을">><br>
 <<street6>><br>
 <br>
-<<npc Whitney>><<person1>>
-<<script>>
-T.test = trNpcClothes("lower", 0, "을");
-<</script>>
-T.test = <<print _test>>, trResult = <<trNpcClothes "lower" 0 "을">>_trResult<br><<endevent>>
+<<npc "Great Hawk">><<person1>><<your_bird_textPost "는">><<endevent>><br>
+[[custom Test1]]
 <br>
 [[Robin Trick Hall]]<br>
 <<generatem1>><<person1>><<trNPCdesc $NPCList[0].fullDescription "이">>_trResult<br>
@@ -146,7 +143,11 @@ pregnancyTesting : <span id="preg-test"><<print ($pregnancyTesting ? "true":"fal
 [[Bedroom]]
 
 :: custom Test1 [nobr exitCheckBypass]
-abc
+<<npc Whitney>><<person1>>
+<<outfitChecks>>
+<<link [[자극한다|Street Bully Flash]]>><<set $phase2 to 2>><<npcincr Whitney dom -1>><<npcincr Whitney lust 10>><</link>><br>
+<<link [[과시한다|Street Bully Flash]]>><<set $phase2 to 1>><<npcincr Whitney love 1>><<npcincr Whitney dom 1>><</link>><br>
+<<link [[응한다|Street Bully Flash]]>><<set $phase2 to 0>><<sub 1>><<npcincr Whitney dom 1>><<trauma 6>><<stress 6>><</link>><<gtrauma>><<gstress>><<gdom>><br>
 [[abcd|custom Testroom]]
 
 :: customTest Get All Feats [exitCheckBypass]

diff --git a/game/base-system/translate/Post/EasyPost.js b/game/base-system/translate/Post/EasyPost.js
@@ -624,6 +624,8 @@ const EasyPostMacroList = [
 	{ name: "temple_Title_", orig_name: "temple_titlePost", is_print: 0},
 
 	{ name: "changingRoomGender_", orig_name: "changingRoomGenderPost", is_print: 0},
+
+	{ name: "your_bird_text_", orig_name: "your_bird_textPost", is_print: 0},
 
 	// outfitNamePost
 	{ name: "top_name", orig_name: "topNamePost", is_print: 0},

diff --git a/game/base-system/translate/Post/otherPost.twee b/game/base-system/translate/Post/otherPost.twee
@@ -992,4 +992,27 @@
 	<<else>>
 		<<set _trResult to "<span class='red'>에러: changingRoomGenderPost: 정의되지 않음: " + $_changingRoomGender + "</span>">>
 	<</if>>
-<</silently>><<print _trResult>><</widget>>
+<</silently>><<print _trResult>><</widget>>
+
+<<widget "your_bird_textPost">><<silently>>	/* overworld-plains/loc-bird/widgets.twee */
+	<<if _args[0] is undefined or _args[0].substring(0,1).search("[가-힣]") gte 0>>
+		<<set $_post to _args[0]>><<set $_sep to _args[1]>>
+	<<else>>
+		<<set $_post to _args[1]>><<set $_sep to _args[2]>>	/* ignore "cap" */
+	<</if>>
+
+	<<if $syndromebird is 1>>
+		<<if $monster is 1>>
+			<<beasttypePost $_post $_sep>><<set $_birdText to either("당신의 배우자", "당신의 _trResult")>>
+		<<else>>
+			<<beasttypePost $_post $_sep>><<set $_birdText to "당신의 " + _trResult>>
+		<</if>>
+	<<else>>
+		<<beasttypePost $_post $_sep>>
+		<<set $_birdText to "그 " + _trResult>>
+	<</if>>
+	<<if $_birdText eq "당신의 배우자" and $_post>>
+		<<trPost 1 $_post $_sep>>
+	<</if>>
+	<<set _trResult to $_birdText>>
+<</silently>><<print _trResult>><</widget>>
diff --git a/game/base-system/translate/translate_Info.md b/game/base-system/translate/translate_Info.md
@@ -1782,6 +1782,13 @@
         <<changingRoomGenderPost "을">>               // 남학생들을
     ```
 
+   ```
+    <<your_bird_textPost>>
+        <<your_bird_text>>의 대체 위젯. 조사를 붙일 수 있다.
+       + <<charlesPost>>와 용도 및 방식 같음. 생략
+    ```
+
+
 * outfitNamePost
     ```
     <<topNamePost>>
@@ -3204,7 +3211,7 @@
 		```
 	- otherPost 계열
 		```
-		<<charles_ (조사)>>, <<theowner_ (조사)>>, <<someone_ (조사)>>, <<spouse_ (조사)>>, <<father_ (조사)>>, <<Father_ (조사)>>, <<mummy_ (조사)>>, <<Mummy_ (조사)>>, 
+		<<charles_ (조사)>>, <<theowner_ (조사)>>, <<someone_ (조사)>>, <<someones_ (조사)>>,  <<their_ (조사)>>, <<spouse_ (조사)>>, <<father_ (조사)>>, <<Father_ (조사)>>, <<mummy_ (조사)>>, <<Mummy_ (조사)>>, 
 		<<girl_ (조사)>>, <<lady_ (조사)>>, <<gentleman_ (조사)>>, <<girls_ (조사)>>, <<girlfriend_ (조사)>>, <<friend_ (조사)>>, <<wife_ (조사)>>, <<Wife_ (조사)>>, 
 		<<sister_ (조사)>>, <<Sister_ (조사)>>, <<sister_npc_ (조사)>>, <<Sister_npc_ (조사)>>,
 		<<victimgirl_ (조사)>>, <<victimgirls_ (조사)>>, <<lass_ (조사)>>, <<gender_ (조사)>>, <<bitch_ (조사)>>, <<bitch_pirate_ (조사)>>, <<whore_ (조사)>>, <<slut_ (조사)>>, <<semen_ (조사)>>, <<prostate_ (조사)>>, 
@@ -3216,7 +3223,7 @@
 		<<handtool_ (조사)>>, <<lefttool_ (조사)>>, <<righttool_ (조사)>>, <<pcpetname_ (조사)>>, <<pcPetname_ (조사)>>, 
 		<<struggle_appendage_ (조사)>>, <<plant_details_ (조사)>>, <<Plant_details_ (조사)>>, <<tower_creature_text_ (조사)>>, <<pound_text_ (조사)>>,
 		<<kylar_pet_name_ (조사)>>, <<virgin_ (조사)>>, <<getfluidsfromgroup_ (조사)>>, <<condomDesc_ (조사)>>, <<office_manager_ (조사)>>, <<temple_title_ (조사)>>, <<temple_Title_ (조사)>>, <<changingRoomGender_ (조사)>>,
-		<<someones_ (조사)>>,  <<their_ (조사)>>, 
+		<<your_bird_text_ (조사)>>, 
 		```
 	
 	- outfitNamePost 계열