Fretux/linuxdistro-roguelite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update some strings

Browse Source
This commit is contained in:
fretuks
2026-07-08 08:49:28 +02:00
parent 131eedb626
commit 8725c34fc6
5 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/.idea.linuxdistrosbuttheyarebreedable/.idea/workspace.xml
Generated
+68 -70
View File
@@ -11,29 +11,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4222a6b8-add3-4f43-9c42-fd6bb5a76169" name="Changes" comment=""> <list default="true" id="4222a6b8-add3-4f43-9c42-fd6bb5a76169" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/Assets/Resources/TerminalScrollbars.uss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/DistroVersionCatalog.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/GachaTuning.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/PullResolver.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/VersionUpgrader.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.linuxdistrosbuttheyarebreedable/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.linuxdistrosbuttheyarebreedable/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/CombatScene.uss" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/CombatScene.uss" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Resources/CombatScene.uss" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/CombatScene.uss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Combat/CardEffects.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Combat/CardEffects.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Combat/CombatManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Combat/CombatManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Combat/CombatantState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Combat/CombatantState.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Combat/DamagePipeline.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Combat/DamagePipeline.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Combat/DeckController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Combat/DeckController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Meta/PlayerCollection.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/PlayerCollection.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Meta/SaveService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Meta/SaveService.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Run/RunConfig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Run/RunConfig.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Run/RunContext.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Run/RunContext.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/CollectionScreenController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/CollectionScreenController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/CombatSceneController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/CombatSceneController.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/CombatSceneController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/CombatSceneController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/GachaScreenController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/GachaScreenController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UI/CollectionScreen.uxml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UI/CollectionScreen.uxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UI/MainMenu.uss" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UI/MainMenu.uss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UI/MainMenu.uxml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UI/MainMenu.uxml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,7 +21,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="EmbeddingIndexingInfo"> <component name="EmbeddingIndexingInfo">
<option name="cachedIndexableFilesCount" value="41" /> <option name="cachedIndexableFilesCount" value="44" />
<option name="fileBasedEmbeddingIndicesEnabled" value="true" /> <option name="fileBasedEmbeddingIndicesEnabled" value="true" />
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@@ -90,23 +70,23 @@
<component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" /> <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
<component name="NextEditCompletionFeaturesState"> <component name="NextEditCompletionFeaturesState">
<decayedCancelled> <decayedCancelled>
<entry key="MS100" value="1.42846046364743" /> <entry key="MS100" value="1.026460791011334" />
<entry key="MS500" value="3.1473272504526837" /> <entry key="MS500" value="1.4860095350060054" />
<entry key="S2" value="4.406032316795342" /> <entry key="S2" value="2.6444467846038227" />
<entry key="S5" value="7.013900503844766" /> <entry key="S5" value="4.842254075216646" />
<entry key="S10" value="16.21402635518147" /> <entry key="S10" value="6.468439791164836" />
<entry key="S30" value="38.90401123450886" /> <entry key="S30" value="8.038810318782259" />
<entry key="S60" value="52.53282462788902" /> <entry key="S60" value="9.594633537295994" />
<entry key="M2" value="76.41615227872627" /> <entry key="M2" value="20.243382686476437" />
<entry key="M5" value="125.46422729844767" /> <entry key="M5" value="63.58627499290541" />
<entry key="M10" value="158.76574582237612" /> <entry key="M10" value="123.19334985734534" />
<entry key="M15" value="176.22359481016986" /> <entry key="M15" value="169.67982802867456" />
<entry key="M30" value="217.72508392110834" /> <entry key="M30" value="263.8069798782453" />
<entry key="H1" value="328.4135925429288" /> <entry key="H1" value="405.314020833015" />
<entry key="H2" value="583.9663964386095" /> <entry key="H2" value="674.2556828746846" />
<entry key="H4" value="1000.6154353482859" /> <entry key="H4" value="1106.1957697237865" />
<entry key="D1" value="2163.2750640427894" /> <entry key="D1" value="2326.0084884842904" />
<entry key="W1" value="2591.3632929927458" /> <entry key="W1" value="2780.8343863258788" />
</decayedCancelled> </decayedCancelled>
<decayedSelected> <decayedSelected>
<entry key="MS100" value="0.0" /> <entry key="MS100" value="0.0" />
@@ -114,37 +94,37 @@
<entry key="S2" value="0.0" /> <entry key="S2" value="0.0" />
<entry key="S5" value="0.0" /> <entry key="S5" value="0.0" />
<entry key="S10" value="0.0" /> <entry key="S10" value="0.0" />
<entry key="S30" value="4.679335776173224E-152" /> <entry key="S30" value="2.6792133394898083E-170" />
<entry key="S60" value="2.163177241044572E-76" /> <entry key="S60" value="1.636830272047101E-85" />
<entry key="M2" value="1.4707743678227887E-38" /> <entry key="M2" value="4.045775910807539E-43" />
<entry key="M5" value="7.362383250718034E-16" /> <entry key="M5" value="1.1035721441393251E-17" />
<entry key="M10" value="2.713371196633097E-8" /> <entry key="M10" value="3.322005635364477E-9" />
<entry key="M15" value="9.029689298894987E-6" /> <entry key="M15" value="2.2263848764463433E-6" />
<entry key="M30" value="0.0030049451106002496" /> <entry key="M30" value="0.0014921080092110655" />
<entry key="H1" value="0.05487126235349662" /> <entry key="H1" value="0.03866578312125709" />
<entry key="H2" value="0.24684605257568554" /> <entry key="H2" value="0.20721305616718577" />
<entry key="H4" value="0.6791773688385119" /> <entry key="H4" value="0.6222697235055645" />
<entry key="D1" value="2.788815988774459" /> <entry key="D1" value="2.7484368986677024" />
<entry key="W1" value="3.7939461251078934" /> <entry key="W1" value="3.786049516239156" />
</decayedSelected> </decayedSelected>
<decayedShown> <decayedShown>
<entry key="MS100" value="1.36580045961104" /> <entry key="MS100" value="1.0049797369168623" />
<entry key="MS500" value="3.120980742316745" /> <entry key="MS500" value="1.478503669631289" />
<entry key="S2" value="4.3968676938883835" /> <entry key="S2" value="2.6407224963924176" />
<entry key="S5" value="7.008354689811898" /> <entry key="S5" value="4.839408734689747" />
<entry key="S10" value="16.20802261033003" /> <entry key="S10" value="6.466516334385955" />
<entry key="S30" value="38.89936714660714" /> <entry key="S30" value="8.038007761765067" />
<entry key="S60" value="52.52966542050411" /> <entry key="S60" value="9.594143833655684" />
<entry key="M2" value="76.41373653537866" /> <entry key="M2" value="20.2428233697882" />
<entry key="M5" value="125.46254176247474" /> <entry key="M5" value="63.585521817921595" />
<entry key="M10" value="158.76465401645888" /> <entry key="M10" value="123.19258340133266" />
<entry key="M15" value="176.22278439428334" /> <entry key="M15" value="169.67910745780532" />
<entry key="M30" value="217.72754364072628" /> <entry key="M30" value="263.80787472691503" />
<entry key="H1" value="328.467843705019" /> <entry key="H1" value="405.352065646138" />
<entry key="H2" value="584.2123911751798" /> <entry key="H2" value="674.4620834608667" />
<entry key="H4" value="1001.293731005342" /> <entry key="H4" value="1106.8171811444822" />
<entry key="D1" value="2166.063508996286" /> <entry key="D1" value="2328.7565510850786" />
<entry key="W1" value="2595.1571734947097" /> <entry key="W1" value="2784.6203691164433" />
</decayedShown> </decayedShown>
</component> </component>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
@@ -233,7 +213,7 @@
<workItem from="1783330590375" duration="18451000" /> <workItem from="1783330590375" duration="18451000" />
<workItem from="1783371975450" duration="26000" /> <workItem from="1783371975450" duration="26000" />
<workItem from="1783372397891" duration="989000" /> <workItem from="1783372397891" duration="989000" />
<workItem from="1783410502976" duration="10247000" /> <workItem from="1783410502976" duration="13134000" />
</task> </task>
<task id="LOCAL-00001" summary="implement main screen"> <task id="LOCAL-00001" summary="implement main screen">
<option name="closed" value="true" /> <option name="closed" value="true" />
@@ -363,7 +343,23 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1783421764662</updated> <updated>1783421764662</updated>
</task> </task>
<option name="localTasksCounter" value="17" /> <task id="LOCAL-00017" summary="Implement animations, pipeline for duplicates and merging.">
<option name="closed" value="true" />
<created>1783426233186</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1783426233186</updated>
</task>
<task id="LOCAL-00018" summary="make some small changes to merging">
<option name="closed" value="true" />
<created>1783427430046</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1783427430046</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -394,7 +390,9 @@
<MESSAGE value="fix some stuff" /> <MESSAGE value="fix some stuff" />
<MESSAGE value="Implement too many changes to list" /> <MESSAGE value="Implement too many changes to list" />
<MESSAGE value="implement scaling rewards per wave completed in combat mode" /> <MESSAGE value="implement scaling rewards per wave completed in combat mode" />
<option name="LAST_COMMIT_MESSAGE" value="implement scaling rewards per wave completed in combat mode" /> <MESSAGE value="Implement animations, pipeline for duplicates and merging." />
<MESSAGE value="make some small changes to merging" />
<option name="LAST_COMMIT_MESSAGE" value="make some small changes to merging" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
Assets/Scripts/Meta/GachaService.cs
+2 -2
View File
@@ -273,8 +273,8 @@ namespace KernelPanic.Meta
{ {
return currencyType switch return currencyType switch
{ {
GachaCurrencyType.LimitedPull => "Compute Credits", GachaCurrencyType.LimitedPull => "Root Credits",
_ => "Bandwidth" _ => "Commits"
}; };
} }
Assets/Scripts/UI/CombatSceneController.cs
+3 -3
View File
@@ -39,7 +39,7 @@ namespace KernelPanic.UI
private Label entropyLabel; private Label entropyLabel;
private Label bitsLabel; private Label bitsLabel;
private Label bandwidthLabel; private Label bandwidthLabel;
private Label computeCreditsLabel; private Label rootCreditsLabel;
private Label seedLabel; private Label seedLabel;
private VisualElement playerPanel; private VisualElement playerPanel;
private VisualElement interpreterStrip; private VisualElement interpreterStrip;
@@ -309,7 +309,7 @@ namespace KernelPanic.UI
bitsLabel = AddStatusReadout(bar, "bits", "0", false); bitsLabel = AddStatusReadout(bar, "bits", "0", false);
entropyLabel = AddStatusReadout(bar, "entropy", "0", false); entropyLabel = AddStatusReadout(bar, "entropy", "0", false);
bandwidthLabel = AddStatusReadout(bar, "bandwidth", "0", false); bandwidthLabel = AddStatusReadout(bar, "bandwidth", "0", false);
computeCreditsLabel = AddStatusReadout(bar, "compute credits", "TODO", false); rootCreditsLabel = AddStatusReadout(bar, "root credits", "TODO", false);
VisualElement spacer = new(); VisualElement spacer = new();
spacer.AddToClassList("status-spacer"); spacer.AddToClassList("status-spacer");
@@ -383,7 +383,7 @@ namespace KernelPanic.UI
bitsLabel.text = runManager.Bits.ToString(); bitsLabel.text = runManager.Bits.ToString();
entropyLabel.text = FormatWalletWithAccrual(data.entropyBalance, runManager.AccruedEntropy); entropyLabel.text = FormatWalletWithAccrual(data.entropyBalance, runManager.AccruedEntropy);
bandwidthLabel.text = FormatWalletWithAccrual(data.standardPullCurrency, runManager.AccruedBandwidth); bandwidthLabel.text = FormatWalletWithAccrual(data.standardPullCurrency, runManager.AccruedBandwidth);
computeCreditsLabel.text = "TODO"; rootCreditsLabel.text = "TODO";
seedLabel.text = $"seed {config?.RunSeed ?? 0}"; seedLabel.text = $"seed {config?.RunSeed ?? 0}";
} }
Assets/Scripts/UI/GachaScreenController.cs
+2 -2
View File
@@ -159,7 +159,7 @@ namespace KernelPanic.UI
_bannerDetail.Add(BuildInfoLine("entropy", _wallet == null ? "--" : _wallet.Balance.ToString())); _bannerDetail.Add(BuildInfoLine("entropy", _wallet == null ? "--" : _wallet.Balance.ToString()));
_bannerDetail.Add(BuildInfoLine("pulls", $"{state.totalPulls}/{GachaService.BeginnerMaxPulls}")); _bannerDetail.Add(BuildInfoLine("pulls", $"{state.totalPulls}/{GachaService.BeginnerMaxPulls}"));
_bannerDetail.Add(BuildInfoLine("4-star pity", $"{state.pityCounter}/{GachaService.FourStarHardPity}")); _bannerDetail.Add(BuildInfoLine("4-star pity", $"{state.pityCounter}/{GachaService.FourStarHardPity}"));
_bannerDetail.Add(BuildInfoLine("ten pull", $"{GachaService.BeginnerTenPullCost} Bandwidth for 10 pulls")); _bannerDetail.Add(BuildInfoLine("ten pull", $"{GachaService.BeginnerTenPullCost} Commits for 10 pulls"));
_bannerDetail.Add(BuildInfoLine("guarantees", FormatBeginnerGuarantees())); _bannerDetail.Add(BuildInfoLine("guarantees", FormatBeginnerGuarantees()));
Label rules = new("Base result is a 3-star equipment cache. A 4-star equipment cache or starter distro can appear early, with one 4-star+ result guaranteed every 10 pulls."); Label rules = new("Base result is a 3-star equipment cache. A 4-star equipment cache or starter distro can appear early, with one 4-star+ result guaranteed every 10 pulls.");
@@ -348,7 +348,7 @@ namespace KernelPanic.UI
prompt.AddToClassList("gacha-entropy-prompt"); prompt.AddToClassList("gacha-entropy-prompt");
int entropyCost = _pendingMissingTokens * GachaService.EntropyPerPullToken; int entropyCost = _pendingMissingTokens * GachaService.EntropyPerPullToken;
Label copy = new($"missing {_pendingMissingTokens} Bandwidth. spend {entropyCost} entropy to complete git pull?"); Label copy = new($"missing {_pendingMissingTokens} Commits. spend {entropyCost} entropy to complete git pull?");
copy.AddToClassList("gacha-result"); copy.AddToClassList("gacha-result");
prompt.Add(copy); prompt.Add(copy);
Assets/Scripts/UI/MainMenuController.cs
+1 -1
View File
@@ -822,7 +822,7 @@ namespace KernelPanic.UI
_rootCreditsToEntropyButton?.SetEnabled(true); _rootCreditsToEntropyButton?.SetEnabled(true);
bool showPullTokens = IsGachaVisible(); bool showPullTokens = IsGachaVisible();
_pullTokensLabel.text = showPullTokens _pullTokensLabel.text = showPullTokens
? $"bandwidth={_gachaService.PullTokens} compute-credits={_gachaService.LimitedPullTokens} distro-merges={GetTotalDistroMerges()}" ? $"commits={_gachaService.PullTokens} root-credits={_gachaService.LimitedPullTokens} distro-merges={GetTotalDistroMerges()}"
: string.Empty; : string.Empty;
_pullTokensLabel.EnableInClassList(HiddenClassName, !showPullTokens); _pullTokensLabel.EnableInClassList(HiddenClassName, !showPullTokens);
} }