Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core 1.5 DefInjected 1 #1652

Merged
merged 5 commits into from
Sep 7, 2024
Merged

Core 1.5 DefInjected 1 #1652

merged 5 commits into from
Sep 7, 2024

Conversation

Elevator89
Copy link
Contributor

@Elevator89 Elevator89 commented Aug 5, 2024

Translate DefInjected 1

Добавил правила социальных взаимодействий для помешанных на кубе поселенцев

Close #1641

-->
<Insult.logRulesInitiator.rulesStrings>
<li>r_logentry->[INITIATOR_nameDef] [insult_adv] [insulted_char] [target_char].</li>
<li>r_logentry->[INITIATOR_nameDef] [insult_adv] [insulted] [target].</li>
<li>r_logentry(p=2)->[INITIATOR_nameDef] [compare_clause].</li>
<li>r_logentry(p=0.5,INITIATOR_cubeInterest==false,RECIPIENT_cubeInterest==true)->[INITIATOR_nameDef] намекает, что [RECIPIENT_nameDef] {RECIPIENT_gender ? тронулся : тронулась} умом из-за золотого куба.</li>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Приведение к единообразию

<GoldenCube.label>золотистый куб</GoldenCube.label>

<GoldenCube.label>золотистый куб</GoldenCube.label>

Suggested change
<li>r_logentry(p=0.5,INITIATOR_cubeInterest==false,RECIPIENT_cubeInterest==true)->[INITIATOR_nameDef] намекает, что [RECIPIENT_nameDef] {RECIPIENT_gender ? тронулся : тронулась} умом из-за золотого куба.</li>
<li>r_logentry(p=0.5,INITIATOR_cubeInterest==false,RECIPIENT_cubeInterest==true)->[INITIATOR_nameDef] намекает, что [RECIPIENT_nameDef] {RECIPIENT_gender ? тронулся : тронулась} умом из-за золотистого куба.</li>

Copy link
Contributor Author

@Elevator89 Elevator89 Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Исправил везде, в том числе в переводе ДЛЦ: там было несколько "золотых кубов"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

там было несколько "золотых кубов"

Там они появились пару месяцев назад прямой правкой.

@Elevator89 Elevator89 force-pushed the 1.5-definjected-1 branch 2 times, most recently from c3be497 to 292fc74 Compare August 25, 2024 20:19
Comment on lines 420 to 431
<li>target_family_gen->отца</li>
<li>target_family_gen->матери</li>
<li>target_family_gen->деда</li>
<li>target_family_gen->бабушки</li>
<li>target_family_gen->сына</li>
<li>target_family_gen->дочери</li>
<li>target_family_gen->брата</li>
<li>target_family_gen->сестры</li>
<li>target_family_gen->племянника</li>
<li>target_family_gen->племянницы</li>
<li>target_family_gen->дяди</li>
<li>target_family_gen->тёти</li>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Думаю, здесь будет уместно утилизировать имеющиеся словари

<li>PersonFamily_masc_gen->Words/Nouns/People_Family_Genitive_Masc</li>
<li>PersonFamily_fem_gen->Words/Nouns/People_Family_Genitive_Female</li>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Сделал

Fix Anomaly.description
Fix ExtinguishFiresNearby.reportString
Use PersonFamily_gen from global rulepack
Use PersonFamily_gen from global rulepack
@Elevator89 Elevator89 merged commit 72b1e62 into master Sep 7, 2024
@Elevator89 Elevator89 deleted the 1.5-definjected-1 branch September 7, 2024 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.5-definjected-1
2 participants