Skip to content

Commit

Permalink
Clamp working-tree-encoding to CP1252
Browse files Browse the repository at this point in the history
  • Loading branch information
szapp committed May 3, 2024
1 parent 78c8cb2 commit 511111f
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 52 deletions.
5 changes: 3 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
* text=auto eol=lf

# Checkout Windows-style line endings
# Checkout Windows-style line endings and ensure correct encoding
# See https://forum.worldofplayers.de/forum/threads/1537187/page3
*.[sS][rR][cC] text eol=crlf
*.[dD] text eol=crlf
*.[dD] text working-tree-encoding=CP1252 eol=crlf

# Exclude (semi-) binary resources from linguist stats

Expand Down
16 changes: 8 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file is keeps the GitHub Actions up-to-date
# For more information, visit https://docs.github.com/en/code-security/dependabot
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
# This file is keeps the GitHub Actions up-to-date
# For more information, visit https://docs.github.com/en/code-security/dependabot
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
16 changes: 8 additions & 8 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file excludes bot authors from the automatically generated release notes
# For more information, visit https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes

changelog:
exclude:
authors:
- dependabot
- github-actions
# This file excludes bot authors from the automatically generated release notes
# For more information, visit https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes

changelog:
exclude:
authors:
- dependabot
- github-actions
16 changes: 8 additions & 8 deletions Ninja/FirstMageKit/Content/Spells/Spell_ManaForLife.d
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// Constants.d (adjusted during initialization)
const int SPL_FMKManaForLife = 0;

// Einstellungsmöglichkeinten
// Einstellungsmöglichkeinten
const int SPL_FMKManaForLife_RELATION = 2; // 1 HP entspricht wieviel MP - NO, IT'S REVERSED HERE!
const int SPL_FMKManaForLife_MINHP = 20; // Minimum an HP übrig lassen
const int SPL_FMKManaForLife_MINHP = 20; // Minimum an HP übrig lassen
const int SPL_FMKManaForLife_MAXHP = 400; // Maximum investbare HP
const int SPL_FMKManaForLife_SAYTIME = 50; // Interval zum Stöhnen (pro HP) - OVERWRITTEN BELOW
const int SPL_FMKManaForLife_SAYTIME = 50; // Interval zum Stöhnen (pro HP) - OVERWRITTEN BELOW
const int SPL_FMKManaForLife_SplLevel = 0; // Previously used AI-var AIV_SpellLevel

INSTANCE Spell_FMKManaForLife (/*C_Spell_Proto*/ FMK_C_Spell) {
Expand Down Expand Up @@ -47,7 +47,7 @@ func int Spell_Logic_FMKManaForLife(var int healthInvested) {

/* Wenn NPCs diesen Spell benutzen sollen beachten, dass NPCs normaler-
* weise immer volles Mana haben, siehe B_ReadySpell. Ausserdem muss
* dann der spellFX angepasst werden, weil der ScreenFX ja sonst für den
* dann der spellFX angepasst werden, weil der ScreenFX ja sonst für den
* Spieler zu sehen ist. */

// Einmalige Abfrage zu Anfang
Expand Down Expand Up @@ -79,17 +79,17 @@ func int Spell_Logic_FMKManaForLife(var int healthInvested) {
Npc_ChangeAttribute(self, ATR_MANA, +((healthInvested % SPL_FMKManaForLife_RELATION) == 0));
SPL_FMKManaForLife_SplLevel += 1;

// Stöhnen: Die SVM hole ich manuell, weil B_Say für SC inkorrekt ist.
// Stöhnen: Die SVM hole ich manuell, weil B_Say für SC inkorrekt ist.
var String soundprefix; soundprefix = ConcatStrings(
ConcatStrings("SVM_", IntToString(self.voice)), "_AARGH_");
if (SPL_FMKManaForLife_SplLevel == SPL_FMKManaForLife_SAYTIME*1) {
// B_Say(self, self, "$Aargh_1"); // Nicht korrekt für Hero
// B_Say(self, self, "$Aargh_1"); // Nicht korrekt für Hero
Snd_Play3D(self, ConcatStrings(soundprefix, "1"));
} else if (SPL_FMKManaForLife_SplLevel == SPL_FMKManaForLife_SAYTIME*2) {
// B_Say(self, self, "$Aargh_2"); // Nicht korrekt für Hero
// B_Say(self, self, "$Aargh_2"); // Nicht korrekt für Hero
Snd_Play3D(self, ConcatStrings(soundprefix, "2"));
} else if (SPL_FMKManaForLife_SplLevel == SPL_FMKManaForLife_SAYTIME*3) {
// B_Say(self, self, "$Aargh_3"); // Nicht korrekt für Hero
// B_Say(self, self, "$Aargh_3"); // Nicht korrekt für Hero
Snd_Play3D(self, ConcatStrings(soundprefix, "3"));
SPL_FMKManaForLife_SplLevel = 0;
};
Expand Down
6 changes: 3 additions & 3 deletions Ninja/FirstMageKit/Content/Spells/Spell_PickLock.d
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,22 @@ func int Spell_Logic_FMKPickLock(var int manaInvested) {
return SPL_SENDSTOP;
};

//Für die Wahrnehmung so tun, als würde der Spieler das Mob benutzen
//Für die Wahrnehmung so tun, als würde der Spieler das Mob benutzen
slf.interactMob = slf.focus_vob;
//Die anderen Npcs informieren:
Npc_SendPassivePerc(self, PERC_ASSESSUSEMOB, self, self);
//gegen Kamera zucken sofort wieder auf 0 setzen
slf.interactMob = 0;

//Länge des "RLRLRR"-Strings insgesamt:
//Länge des "RLRLRR"-Strings insgesamt:
var int totalCharCount; totalCharCount = STR_Len(mob.pickLockStr);
//davon schon aufgeschlossen:
var int currCharCount; currCharCount = (mob.bitfield & oCMobLockable_bitfield_pickLockNr) >> 2;

//jetzt einer mehr
currCharCount += 1;

//alten Wert im Bitfeld löschen, neuen reinschreiben:
//alten Wert im Bitfeld löschen, neuen reinschreiben:
mob.bitfield = mob.bitfield & ~oCMobLockable_bitfield_pickLockNr;
mob.bitfield = mob.bitfield | (currCharCount << 2);

Expand Down
46 changes: 23 additions & 23 deletions Ninja/FirstMageKit/Content/localization.d
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func int Patch_FirstMageKit_GuessLocalization() {
return 1;
} else if (Hlp_StrCmp(panName, "Patelnia")) { // PL (Windows 1250)
return 2;
} else if (Hlp_StrCmp(panName, "Ñêîâîðîäà")) { // RU (Windows 1251)
} else if (Hlp_StrCmp(panName, "Ñêîâîðîäà")) { // RU (Windows 1251)
return 3;
};
};
Expand Down Expand Up @@ -46,8 +46,8 @@ func void Patch_FirstMageKit_LocalizeTexts() {
if (lang == 1) { // DE (Windows 1252)
NAME_SPL_FMKManaForLife = "Manasucht";
NAME_SPL_FMKPickLock = "Entriegeln";
Patch_FirstMageKit_PRINT_NeverOpen = "Da lässt sich nichts machen";
Patch_FirstMageKit_PRINT_PICKLOCK_UNLOCK = "Das Schloß ist geknackt";
Patch_FirstMageKit_PRINT_NeverOpen = "Da lässt sich nichts machen";
Patch_FirstMageKit_PRINT_PICKLOCK_UNLOCK = "Das Schloß ist geknackt";
Patch_FirstMageKit_PRINT_Hitpoints = "Lebenspunktkosten:";
Patch_FirstMageKit_PRINT_Mana = "Manasteigerung:";
Patch_FirstMageKit_NAME_MinManakosten = "Manakosten (min):";
Expand All @@ -59,31 +59,31 @@ func void Patch_FirstMageKit_LocalizeTexts() {
Patch_FirstMageKit_NAME_Value = "Wert:";
} else if (lang == 2) { // PL (Windows 1250)
NAME_SPL_FMKManaForLife = "Ofiara krwi";
NAME_SPL_FMKPickLock = "Otwieranie zamków";
Patch_FirstMageKit_PRINT_NeverOpen = "Tego nie da siê otworzyæ.";
NAME_SPL_FMKPickLock = "Otwieranie zamków";
Patch_FirstMageKit_PRINT_NeverOpen = "Tego nie da siê otworzyæ.";
Patch_FirstMageKit_PRINT_PICKLOCK_UNLOCK = "Zamek otwarty.";
Patch_FirstMageKit_PRINT_Hitpoints = "Wydatek punktów trafieñ:";
Patch_FirstMageKit_PRINT_Hitpoints = "Wydatek punktów trafieñ:";
Patch_FirstMageKit_PRINT_Mana = "Premia many:";
Patch_FirstMageKit_NAME_MinManakosten = "Min. wydatek many:";
Patch_FirstMageKit_NAME_MageScroll = "Zwój";
Patch_FirstMageKit_NAME_MageScroll = "Zwój";
Patch_FirstMageKit_NAME_Rune = "Runa";
Patch_FirstMageKit_NAME_Spruchrolle = "Zwój";
Patch_FirstMageKit_NAME_Mag_Circle = "Kr¹g:";
Patch_FirstMageKit_NAME_Spell_Invest = "Zaklêcie sta³e";
Patch_FirstMageKit_NAME_Value = "WartoϾ:";
Patch_FirstMageKit_NAME_Spruchrolle = "Zwój";
Patch_FirstMageKit_NAME_Mag_Circle = "Kr¹g:";
Patch_FirstMageKit_NAME_Spell_Invest = "Zaklêcie sta³e";
Patch_FirstMageKit_NAME_Value = "WartoϾ:";
} else if (lang == 3) { // RU (Windows 1251)
NAME_SPL_FMKManaForLife = "óâåëè÷åíèå ìàíû";
NAME_SPL_FMKPickLock = "Âñêðûòèå çàìêîâ";
Patch_FirstMageKit_PRINT_NeverOpen = "Ýòî ìíå íèêîãäà íå îòêðûòü.";
Patch_FirstMageKit_PRINT_PICKLOCK_UNLOCK = "Çàìîê îòêðûò.";
Patch_FirstMageKit_PRINT_Hitpoints = "Çäîðîâüå:";
Patch_FirstMageKit_PRINT_Mana = "Ìàíà:";
Patch_FirstMageKit_NAME_MinManakosten = "Ðàñõîä ìàíû:";
Patch_FirstMageKit_NAME_MageScroll = "Ñâèòîê";
Patch_FirstMageKit_NAME_Rune = "Ðóíà";
Patch_FirstMageKit_NAME_Spruchrolle = "Ñâèòîê";
Patch_FirstMageKit_NAME_Mag_Circle = "Êðóã:";
NAME_SPL_FMKManaForLife = "óâåëè÷åíèå ìàíû";
NAME_SPL_FMKPickLock = "Âñêðûòèå çàìêîâ";
Patch_FirstMageKit_PRINT_NeverOpen = "Ýòî ìíå íèêîãäà íå îòêðûòü.";
Patch_FirstMageKit_PRINT_PICKLOCK_UNLOCK = "Çàìîê îòêðûò.";
Patch_FirstMageKit_PRINT_Hitpoints = "Çäîðîâüå:";
Patch_FirstMageKit_PRINT_Mana = "Ìàíà:";
Patch_FirstMageKit_NAME_MinManakosten = "Ðàñõîä ìàíû:";
Patch_FirstMageKit_NAME_MageScroll = "Ñâèòîê";
Patch_FirstMageKit_NAME_Rune = "Ðóíà";
Patch_FirstMageKit_NAME_Spruchrolle = "Ñâèòîê";
Patch_FirstMageKit_NAME_Mag_Circle = "Êðóã:";
Patch_FirstMageKit_NAME_Spell_Invest = "Sustainable spell"; // ??? in the Russian scripts
Patch_FirstMageKit_NAME_Value = "Öåíà:";
Patch_FirstMageKit_NAME_Value = "Öåíà:";
}; // Else: Keep default -> English
};

0 comments on commit 511111f

Please sign in to comment.