Исправления мелких ошибок в скриптах

rifleman17 · rifleman17 · commit 17ad6ed9ae78 · 2026-01-27T14:36:12.000+03:00
diff --git a/Gui/GlobalMap.fogui b/Gui/GlobalMap.fogui
@@ -600,7 +600,7 @@
               "IsVerticalScroll": false,
               "IsHorizontalScroll": false,
               "Expanded": false,
-              "Selected": true,
+              "Selected": false,
               "Active": true,
               "Name": "GMOverlay",
               "Position": "0, 0",
@@ -1116,7 +1116,7 @@
           "IsVerticalScroll": false,
           "IsHorizontalScroll": false,
           "Expanded": false,
-          "Selected": false,
+          "Selected": true,
           "Active": true,
           "Name": "TimePanel",
           "Position": "640, 4",
@@ -1762,7 +1762,7 @@
                           "IsDisabled": false,
                           "PressedImage": "art/intrface/smallbutton_on.png",
                           "PressedImageLayout": "None",
-                          "HoverImage": "art/intrface/smallbutton_on.png",
+                          "HoverImage": "",
                           "HoverImageLayout": "None",
                           "DisabledImage": "",
                           "DisabledImageLayout": "None",
diff --git a/Items/Custom/exit_grid.foitem b/Items/Custom/exit_grid.foitem
@@ -5,6 +5,7 @@ IsShootThru = True
 IsLightThru = True
 Type = Grid
 IsStatic = True
+IsTrigger = True
 IsScenery = True
 DisableEgg = True
 MultihexGeneration = AnyUnique
diff --git a/Scripts/Behemoth.fos b/Scripts/Behemoth.fos
@@ -381,7 +381,12 @@ bool _BehemothAttacked(Critter cr, Critter attacker)
             attackerName = PlayerRegistration::GetPlayerName(attacker.Id);
         }
         else {
-            attackerName = "@text Dialogs " + STR_NPC_NAME(attacker.DialogId, attacker.ProtoId) + "@";
+            if (attacker.DialogId == EMPTY_HSTRING) {
+                attackerName = "@text Critters " + STR_NPC_PROTO_NAME(attacker.ProtoId) + "@";
+            }
+            else {
+                attackerName = "@text Dialogs " + STR_NPC_NAME_DLG(attacker.DialogId) + "@";
+            }
         }
         Radio::SendChannelRadioMessage(cr.BehemothRadio, TextPackName::Text, 610, "$pname" + attackerName);
     }
diff --git a/Scripts/ClientMain.fos b/Scripts/ClientMain.fos
@@ -1059,12 +1059,12 @@ string critter_description(Critter& cr, CritterLookTypes lookType)
         bool defaultText = false;
 
         if (lookType == CritterLookTypes::OnlyName) {
-            result = Game.GetText(TextPackName::Dialogs, STR_NPC_NAME(dlgId, npcPid));
+            result = MsgStr::NpcName(dlgId, npcPid);
         }
         // Short info
         else if (lookType == CritterLookTypes::LookShort) {
             if (cr.IsAlive() && Game.IsTextPresent(TextPackName::Dialogs, STR_NPC_INFO_LIFE(dlgId, npcPid))) {
-                result += Game.GetText(TextPackName::Dialogs, STR_NPC_INFO_LIFE(dlgId, npcPid));
+                result += MsgStr::NpcDesc(dlgId, npcPid);
             }
             else if (cr.IsKnockout() && Game.IsTextPresent(TextPackName::Dialogs, STR_NPC_INFO_KO(dlgId, npcPid))) {
                 result += Game.GetText(TextPackName::Dialogs, STR_NPC_INFO_KO(dlgId, npcPid));
@@ -1078,8 +1078,8 @@ string critter_description(Critter& cr, CritterLookTypes lookType)
         }
         // Full info
         else {
-            if (cr.IsAlive() && Game.IsTextPresent(TextPackName::Dialogs, STR_NPC_FULL_INFO_LIFE(dlgId, npcPid))) {
-                result += Game.GetText(TextPackName::Dialogs, STR_NPC_FULL_INFO_LIFE(dlgId, npcPid));
+            if (cr.IsAlive()) {
+                result += MsgStr::NpcDesc(dlgId, npcPid);
             }
             else if (cr.IsKnockout() && Game.IsTextPresent(TextPackName::Dialogs, STR_NPC_FULL_INFO_KO(dlgId, npcPid))) {
                 result += Game.GetText(TextPackName::Dialogs, STR_NPC_FULL_INFO_KO(dlgId, npcPid));
@@ -1094,21 +1094,15 @@ string critter_description(Critter& cr, CritterLookTypes lookType)
 
         if (defaultText) {
             // Check standart text
-            if (Game.IsTextPresent(TextPackName::Dialogs, STR_NPC_NAME(dlgId, npcPid))) {
+            if (MsgStr::NpcName(dlgId, npcPid) != "") {
                 if (cr.IsAlive()) {
-                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookLife),
-                                               "NAME",
-                                               Game.GetText(TextPackName::Dialogs, STR_NPC_NAME(dlgId, npcPid)));
+                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookLife), "NAME", MsgStr::NpcName(dlgId, npcPid));
                 }
                 else if (cr.IsKnockout()) {
-                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookKo),
-                                               "NAME",
-                                               Game.GetText(TextPackName::Dialogs, STR_NPC_NAME(dlgId, npcPid)));
+                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookKo), "NAME", MsgStr::NpcName(dlgId, npcPid));
                 }
                 else if (cr.IsDead()) {
-                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookDead),
-                                               "NAME",
-                                               Game.GetText(TextPackName::Dialogs, STR_NPC_NAME(dlgId, npcPid)));
+                    result += Game.ReplaceText(Game.GetText(TextPackName::Game, MsgStr::StrCritLookDead), "NAME", MsgStr::NpcName(dlgId, npcPid));
                 }
             }
             // Set default text
@@ -1287,13 +1281,13 @@ void critter_action(bool localCall, Critter cr, CritterAction action, int action
             cr.Animate(CritterStateAnim::None, CritterActionAnim::PrepareWeapon);
 
             Effects::PlayWeaponSound(SOUND_WEAPON_USE, _WeaponSoundId(proto, use), use != 1 ? '1' : '2');
-            cr.Animate(CritterStateAnim::None, _WeaponActionAnim(proto, use), item);
+            cr.Animate(CritterStateAnim::None, _WeaponActionAnim(proto, use), item, true);
 
             if (fail) {
                 cr.Animate(CritterStateAnim::None, CritterActionAnim::DamageFront, item);
             }
             else {
-                cr.Animate(CritterStateAnim::None, CritterActionAnim::TurnOffWeapon);
+                cr.Animate(CritterStateAnim::None, CritterActionAnim::TurnOffWeapon, item, true);
             }
         }
         break;
diff --git a/Scripts/Combat.fos b/Scripts/Combat.fos
@@ -2242,13 +2242,15 @@ void CriticalFailure(Critter cr, AbstractItem weap, int weaponUse, ProtoItem amm
         tookDamage = true;
     }
 
-    int ammoRound = _WeaponRound(weapon, weaponUse);
-    if (ammoRound > 0 && valid(realWeapon) && !cr.IsUnlimitedAmmo) {
-        if (realWeapon.AmmoCount <= ammoRound || FLAG(eff, MF_LOST_REST_OF_AMMO)) {
-            realWeapon.AmmoCount = 0;
-        }
-        else {
-            realWeapon.AmmoCount -= ammoRound;
+    if (valid(realWeapon)) {
+        int ammoRound = _WeaponRound(weapon, weaponUse);
+        if (ammoRound > 0 && !cr.IsUnlimitedAmmo) {
+            if (realWeapon.AmmoCount <= ammoRound || FLAG(eff, MF_LOST_REST_OF_AMMO)) {
+                realWeapon.AmmoCount = 0;
+            }
+            else {
+                realWeapon.AmmoCount -= ammoRound;
+            }
         }
     }
 
diff --git a/Scripts/FighterQuest.fos b/Scripts/FighterQuest.fos
@@ -134,7 +134,13 @@ class FighterQuest
 
         npc.TeamId = TeamIdFight;
         NpcPlanes::AddAttackPlane(npc, FightPriority, player, MinHp);
-        string lex = "$npcname@text Dialogs " + STR_NPC_NAME(npc.DialogId, npc.ProtoId) + "@";
+        string lex;
+        if (npc.DialogId == EMPTY_HSTRING) {
+            lex = "$npcname@text Critters " + STR_NPC_PROTO_NAME(npc.ProtoId) + "@";
+        }
+        else {
+            lex = "$npcname@text Dialogs " + STR_NPC_NAME_DLG(npc.DialogId) + "@";
+        }
         Messaging::Info(player, TextPackName::Text, STR_FIGHT_BEGIN, lex);
     }
 
@@ -155,9 +161,15 @@ class FighterQuest
         if (PlayerId != ZERO_IDENT) {
             string lex = "$npcname ";
             Critter npc = Game.GetCritter(NpcId);
-            if (valid(npc) && npc.DialogId != EMPTY_HSTRING) {
-                lex = "$npcname@text Dialogs " + STR_NPC_NAME(npc.DialogId, npc.ProtoId) + "@";
+            if (valid(npc)) {
+                if (npc.DialogId == EMPTY_HSTRING) {
+                    lex = "$npcname@text Critters " + STR_NPC_PROTO_NAME(npc.ProtoId) + "@";
+                }
+                else {
+                    lex = "$npcname@text Dialogs " + STR_NPC_NAME_DLG(npc.DialogId) + "@";
+                }
             }
+
             Critter cr = Game.GetCritter(PlayerId);
             if (valid(cr)) {
                 cr.SetAsInt(VarNum, STATUS_WIN);
@@ -178,11 +190,15 @@ class FighterQuest
     {
         DL("player loose called");
         if (PlayerId != ZERO_IDENT) {
-            DL("var passed");
             string lex = "$npcname a";
             Critter npc = Game.GetCritter(NpcId);
-            if (valid(npc) && npc.DialogId != EMPTY_HSTRING) {
-                lex = "$npcname@text Dialogs " + STR_NPC_NAME(npc.DialogId, npc.ProtoId) + "@";
+            if (valid(npc)) {
+                if (npc.DialogId == EMPTY_HSTRING) {
+                    lex = "$npcname@text Critters " + STR_NPC_PROTO_NAME(npc.ProtoId) + "@";
+                }
+                else {
+                    lex = "$npcname@text Dialogs " + STR_NPC_NAME_DLG(npc.DialogId) + "@";
+                }
             }
             DL(lex);
             Critter cr = Game.GetCritter(PlayerId);
diff --git a/Scripts/GuiScreens.fos b/Scripts/GuiScreens.fos
@@ -4473,7 +4473,6 @@ namespace GlobalMap
             SetPosition(7, 7);
             SetSize(15, 16);
             SetPressedImage("art/intrface/smallbutton_on.png");
-            SetHoverImage("art/intrface/smallbutton_on.png");
         }
 
         void OnLMouseClick() override
diff --git a/Scripts/ItemMovement.fos b/Scripts/ItemMovement.fos
@@ -130,6 +130,14 @@ void OnCritterItemMoved(Critter cr, Item item, CritterItemSlot fromSlot)
         cr.CurrentArmorPerk = toSlot == CritterItemSlot::Armor ? item.Armor_Perk : 0;
     }
 
+    if (item.Type == ItemType::Weapon && fromSlot == CritterItemSlot::Outside) {
+        if (item.Weapon_MaxAmmoCount > 0 && item.AmmoCount == 0) {
+            if (item.AmmoPid == EMPTY_HSTRING) {
+                item.AmmoPid = item.Weapon_DefaultAmmoPid;
+            }
+            item.AmmoCount = item.Weapon_MaxAmmoCount;
+        }
+    }
     // Todo: Slot modifiers, Armor_Perk
     // SLOT_PERK_MIRROR_SHADES // +1 charisma
     // SLOT_PERK_COSMETIC_CASE // +1 charisma to female
diff --git a/Scripts/Location.fos b/Scripts/Location.fos
@@ -125,7 +125,7 @@ bool IsKnownLoc(Critter cr, hstring locPid)
 // Делает локацию видимой для криттера.
 void SetKnownLoc(Critter cr, ident locId)
 {
-    if (locId == ZERO_IDENT) {
+    if (locId == ZERO_IDENT || IsKnownLoc(cr, locId)) {
         return;
     }
 
diff --git a/Scripts/MsgStr.fos b/Scripts/MsgStr.fos
@@ -643,7 +643,6 @@ const int StrGameCredits = 2000001010;
 
 #define STR_NPC_PROTO_NAME              #(pid)(CRSTR(pid, 0))
 #define STR_NPC_PROTO_DESC              #(pid)(CRSTR(pid, hstring("Desc").uhash))
-#define STR_NPC_NAME                    #(dlg, pid)((dlg.hash) != 0 ? (dlg.hash) + 10 : STR_NPC_PROTO_NAME(pid))
 #define STR_NPC_NAME_DLG                #(dlg)((dlg.hash) + 10)
 #define STR_NPC_AVATAR                  #(dlg)((dlg.hash) != 0 ? (dlg.hash) + 11 : 0)
 #define STR_NPC_INFO_LIFE               #(dlg, pid)((dlg.hash) != 0 ? (dlg.hash) + 20 : STR_NPC_PROTO_DESC(pid))
@@ -706,5 +705,25 @@ const int StrCombatNeedDmgArm = 106;
 // ***************************************************************************************
 // ***************************************************************************************
 // ***************************************************************************************
+#if CLIENT
+string NpcName(hstring dlg, hstring pid)
+{
+    if (dlg != EMPTY_HSTRING && Game.IsTextPresent(TextPackName::Dialogs, dlg.uhash + 10)) {
+        return Game.GetText(TextPackName::Dialogs, dlg.uhash + 10);
+    }
+    else {
+        return Game.GetText(TextPackName::Critters, pid.uhash);
+    }
+}
 
+string NpcDesc(hstring dlg, hstring pid)
+{
+    if (dlg != EMPTY_HSTRING && Game.IsTextPresent(TextPackName::Dialogs, dlg.uhash + 21)) {
+        return Game.GetText(TextPackName::Dialogs, dlg.uhash + 21);
+    }
+    else {
+        return Game.GetText(TextPackName::Critters, pid.uhash + hstring("Desc").uhash);
+    }
+}
+#endif
 }
diff --git a/Scripts/NpcBags.fos b/Scripts/NpcBags.fos
@@ -237,7 +237,7 @@ BagInfo GetBag(string bagName)
 
 void FillCritterBag(Critter cr)
 {
-    if (cr.BagId > 0) {
+    if (cr.BagId > 1) {
         BagInfo bag = GetBag(cr.BagId);
 
         if (!valid(bag)) {
diff --git a/Scripts/NpcPlanes.fos b/Scripts/NpcPlanes.fos
@@ -361,6 +361,11 @@ int ProcessAi(Critter npc)
                     break;
                 }
 
+                if (realMainItem != null && realWeapon == null) {
+                    CritterActions::MoveInvItem(npc, realMainItem.Id, CritterItemSlot::Inventory);
+                    break;
+                }
+
                 if (realWeapon != null) {
                     Parameters::SetWeaponMode(realWeapon, _WeaponModeMake(use, 0));
                 }
@@ -372,7 +377,7 @@ int ProcessAi(Critter npc)
                 if (realWeapon != null) {
                     if (!npc.IsUnlimitedAmmo && realWeapon.Weapon_MaxAmmoCount > 0 && realWeapon.AmmoCount == 0) {
                         Item ammo = FindAmmoForWeapon(npc, realWeapon);
-                        if (ammo != null) {
+                        if (ammo == null) {
                             if (realWeapon.AmmoPid == EMPTY_HSTRING) {
                                 realWeapon.AmmoPid = realWeapon.Weapon_DefaultAmmoPid;
                             }
diff --git a/Scripts/PatternSniper.fos b/Scripts/PatternSniper.fos
@@ -272,7 +272,7 @@ class SniperPattern : PatternCommon::CommonPattern
 }
 
 #ifndef _NoBaseInstance
-SniperPattern pattern; // Для наследников нужно определить _NoBaseInstance
+SniperPattern pattern = SniperPattern(); // Для наследников нужно определить _NoBaseInstance
 #endif
 
 // Установка параметров криттера
diff --git a/Scripts/Purgatory.fos b/Scripts/Purgatory.fos
@@ -18,7 +18,7 @@ namespace Purgatory // Sort 3
 #define STAGE_FIGHT           (3) // Открытие дверей во внутренний двор. Начало сражение.
 #define STAGE_FINISH          (4) // Открытие дверей во внешний мир, бой закончен
 
-#define _PlayerName           #(cr)(cr.ControlledByPlayer ? PlayerRegistration::GetPlayerName(cr.Id) : "@text Dialogs " + STR_NPC_NAME(cr.DialogId, cr.ProtoId) + "@")
+#define _PlayerName           #(cr)(cr.ControlledByPlayer ? PlayerRegistration::GetPlayerName(cr.Id) : "@text Dialogs " + STR_NPC_NAME_DLG(cr.DialogId) + "@")
 
 #define ANSWER_CONFIRM_INVITE (0)
 #define ANSWER_REJECT_INVITE  (1)
diff --git a/Scripts/VcLynnet.fos b/Scripts/VcLynnet.fos
@@ -14,7 +14,7 @@ namespace VcLynnet // Sort 2
 #define STR_KILLER_DEAD (7100) // Вот сука черномазая, говорила – легкая мишень…
 #define STR_KILLER_KILL (7101) // Ха, как эта черная сука и обещала – раз плюнуть…
 
-void _KillerInit(Critter cr, bool firstTime)
+void KillerInit(Critter cr, bool firstTime)
 {
     PatternSniper::_SniperInit(cr, firstTime);
     if (firstTime) {
diff --git a/Scripts/Worldmap.fos b/Scripts/Worldmap.fos
@@ -621,6 +621,29 @@ class CEncounterTable
     }
 };
 
+//~run Worldmap::TestEncounter 10055760
+void TestEncounter(Critter cr, int strNum)
+{
+    for (int j = 0, k = EncounterTables.length(); j < k; j++) {
+        for (int i = 0, l = EncounterTables[j].Encounters.length(); i < l; i++) {
+            if (EncounterTables[j].Encounters[i].StrNum == strNum) {
+                auto enc = EncounterTables[j].Encounters[i];
+                int zx = cr.WorldPos.x / ZONE_LENGTH;
+                int zy = cr.WorldPos.y / ZONE_LENGTH;
+                CZone zone = WorldmapGround[zy * ZONE_COUNT_X + zx];
+                auto foundedEnc = CreateFoundedEncounter(false, cr.WorldPos.x, cr.WorldPos.y, enc, zone.Table.LocationPids, cr.Id, false);
+                Critter[] group = {cr};
+                ident mapId;
+                mpos hex;
+                uint8 dir;
+                InviteToEncounter(group, null, foundedEnc.Index, 0, mapId, hex, dir);
+                Entrance::CritterTransferToMapEntry(cr, mapId, hstring("0"));
+                return;
+            }
+        }
+    }
+}
+
 class CZone
 {
     int Difficulty;
@@ -1523,7 +1546,7 @@ void WorldmapInit()
 
     for (int i = 0; i < ZONE_COUNT_X * ZONE_COUNT_Y; i++) {
         WorldmapGround[i] = CZone();
-        WorldmapGround[i] = CZone();
+        WorldmapWater[i] = CZone();
     }
 
     CEncounterGroup group;
@@ -4192,7 +4215,7 @@ void WorldmapInit()
     group.TeamNum = 0;
     group.Position = POSITION_CONE;
     group.Spacing = 2;
-    group.AddCritter(Content::Critter::NCRRangerMale).Ratio(100).Dialog(Content::Dialog::vc_killer).Script(VcLynnet::_KillerInit);
+    group.AddCritter(Content::Critter::NCRRangerMale).Ratio(100).Dialog(Content::Dialog::vc_killer).Script(VcLynnet::KillerInit);
     // Carlos Jackals
     group = EncounterGroups[GROUP_QUEST_Carlos_Jackals];
     group.TeamNum = 8;
diff --git a/TLA.fomain b/TLA.fomain
@@ -136,7 +136,7 @@ Cursor = 0 # CursorType::Default
 DraggableCursor = 0 # CursorType::Default
 CursorData = 0
 RunAnimBaseSpeed = 120
-RunAnimStartSpeed = 80
+RunAnimStartSpeed = 81
 WalkAnimBaseSpeed = 60
 CritterHeadTurnFactor = 0.4
 DisableAudio = False

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,12 @@ bool _BehemothAttacked(Critter cr, Critter attacker)`
`381`	`381`	`attackerName = PlayerRegistration::GetPlayerName(attacker.Id);`
`382`	`382`	`}`
`383`	`383`	`else {`
`384`		`- attackerName = "@text Dialogs " + STR_NPC_NAME(attacker.DialogId, attacker.ProtoId) + "@";`
	`384`	`+ if (attacker.DialogId == EMPTY_HSTRING) {`
	`385`	`+ attackerName = "@text Critters " + STR_NPC_PROTO_NAME(attacker.ProtoId) + "@";`
	`386`	`+ }`
	`387`	`+ else {`
	`388`	`+ attackerName = "@text Dialogs " + STR_NPC_NAME_DLG(attacker.DialogId) + "@";`
	`389`	`+ }`
`385`	`390`	`}`
`386`	`391`	`Radio::SendChannelRadioMessage(cr.BehemothRadio, TextPackName::Text, 610, "$pname" + attackerName);`
`387`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4473,7 +4473,6 @@ namespace GlobalMap`
`4473`	`4473`	`SetPosition(7, 7);`
`4474`	`4474`	`SetSize(15, 16);`
`4475`	`4475`	`SetPressedImage("art/intrface/smallbutton_on.png");`
`4476`		`- SetHoverImage("art/intrface/smallbutton_on.png");`
`4477`	`4476`	`}`
`4478`	`4477`
`4479`	`4478`	`void OnLMouseClick() override`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ bool IsKnownLoc(Critter cr, hstring locPid)`
`125`	`125`	`// Делает локацию видимой для криттера.`
`126`	`126`	`void SetKnownLoc(Critter cr, ident locId)`
`127`	`127`	`{`
`128`		`- if (locId == ZERO_IDENT) {`
	`128`	`+ if (locId == ZERO_IDENT \|\| IsKnownLoc(cr, locId)) {`
`129`	`129`	`return;`
`130`	`130`	`}`
`131`	`131`