Исправлены устаревшие лексемы в скриптах.

Испправлен скрипт бармена с поиском игрока по имени за деньги. Исправлено скрипт терминала в репликации, перевод на репл. счет другому игроку.
cvet · Jan 22, 2025 · c87042f · c87042f
1 parent a078cbb
commit c87042f
Show file tree

Hide file tree

Showing 47 changed files with 1,367 additions and 1,259 deletions.
diff --git a/Dialogs/bh_phil.fodlg b/Dialogs/bh_phil.fodlg
@@ -114,13 +114,13 @@ lang=russ engl
 31 31050 @
 32 32000 None 0 #
 32 32010 @
-200 33000 Dialog::dlg_ForSearching 0 #
+200 33000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 33010 #
 201 33020 @
 201 34000 None 0 #
 0 34010 #
 202 34020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 35000 Dialog::dlg_TrySearching 0 #
+202 35000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 35010 &
 
 [russ]

diff --git a/Dialogs/den_billy.fodlg b/Dialogs/den_billy.fodlg
@@ -164,13 +164,13 @@ lang=russ engl
 37 36010 R _param p SexExp + 1 @
 37 37000 None 0 #
 23 37010 @
-200 38000 Dialog::dlg_ForSearching 0 #
+200 38000 DialogBarman::dlg_CheckPlayerExists 0 #
 201 38010 #
 0 38020 @
 201 39000 None 0 #
 0 39010 #
 202 39020 D _item p bottle_caps > 299 R _item p bottle_caps - 300 @
-202 40000 Dialog::dlg_TrySearching 0 #
+202 40000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 40010 &
 
 [russ]

diff --git a/Dialogs/den_leanna.fodlg b/Dialogs/den_leanna.fodlg
@@ -73,13 +73,13 @@ lang=russ engl
 26 25000 None 0 #
 2 25010 #
 0 25020 @
-200 26000 Dialog::dlg_ForSearching 0 #
+200 26000 DialogBarman::dlg_CheckPlayerExists 0 #
 201 26010 #
 0 26020 @
 201 27000 None 0 #
 0 27010 #
 202 27020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 28000 Dialog::dlg_TrySearching 0 #
+202 28000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 28010 &
 
 [russ]

diff --git a/Dialogs/klam_majda.fodlg b/Dialogs/klam_majda.fodlg
@@ -1,15 +1,19 @@
 [comment]
 Ваши комментарии / Your comments.
 
+
+
+
+
 [data]
 lang=russ engl
 
 [dialog]
 &
 1 1000 None 0 #
-5 1010 D _param p Intellect < 4 #
-2 1020 D _script Dialog::IsNotNameMemNpcPlayer 0 R _script Dialog::SetNameMemNpcPlayer 1 true #
-3 1030 D _script Dialog::IsNameMemNpcPlayer 0 @
+5 1010 D Property P Intellect < 4 #
+2 1020 D Script Dialog::IsNotNameMemNpcPlayer 0  R Script Dialog::SetNameMemNpcPlayer 1 true #
+3 1030 D Script Dialog::IsNameMemNpcPlayer 0  @
 2 2000 None 0 #
 6 2010 #
 8 2020 #
@@ -31,7 +35,7 @@ lang=russ engl
 14 6010 #
 10 6020 #
 0 6030 #
-200 6040 D _param p Level > 1 D _param p Intellect > 3 D _param p SkillSpeech > 50 D _param p Karma > 0 #
+200 6040 D Property P Intellect > 3 D Property P SkillSpeech > 50 #
 20 6050 @
 7 7000 None 0 #
 14 7010 #
@@ -59,13 +63,13 @@ lang=russ engl
 14 14000 None 0 #
 0 14010 @
 15 15000 None 0 #
-0 15010 D _item p bottle_caps > 4 R _item n bottle_caps + 5 R _item p bottle_caps - 5 #
-17 15020 D _item p bottle_caps < 5 #
+0 15010 D Item P bottle_caps > 4 R Item P bottle_caps + 5 R Item P bottle_caps - 5 #
+17 15020 D Item P bottle_caps < 5 #
 16 15030 #
 6 15040 @
 16 16000 None 0 #
-6 16010 D _item p bottle_caps > 29 R _item p bottle_caps - 30 R _item n bottle_caps + 30 #
-17 16020 D _item p bottle_caps < 30 #
+6 16010 D Item P bottle_caps > 29 R Item P bottle_caps - 30 R Item P bottle_caps + 30 #
+17 16020 D Item P bottle_caps < 30 #
 15 16030 @
 17 17000 None 0 #
 0 17010 #
@@ -77,14 +81,14 @@ lang=russ engl
 22 19020 @
 22 20000 None 0 #
 0 20010 @
-200 21000 Dialog::dlg_ForSearching 0 #
+200 21000 DialogBarman::dlg_CheckPlayerExists 1 #
 15 21010 #
 201 21020 #
 0 21030 @
 201 22000 None 0 #
 0 22010 #
-202 22020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 23000 Dialog::dlg_TrySearching 0 #
+202 22020 D Item P bottle_caps > 199 R Item P bottle_caps - 200 @
+202 23000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 23010 &
 
 [russ]
@@ -177,7 +181,7 @@ lang=russ engl
 {23010}{}{Ну, я пойду...}
 {100000200}{}{Не знаю никакого @lex Victim@, ничего о нём не @lex BarmanGen@.}
 {100000201}{}{Эй, да ты у нас шутни@sex@|к||ца|!..@@Шутить удумал@sex@|||а|?!}
-{100000202}{}{@lex Victim@... Конечно знаю, только @lex Gender@ сейчас где-то по пустоши скитается.}
+{100000202}{}{@lex Victim@... Конечно знаю,  сейчас где-то по пустоши скитается.}
 {100000203}{}{@lex Victim@? Да здесь @lex Gender@ где-то... @lex Place@.}
 {100000204}{}{@lex Victim@ говоришь? @lex Place@. Знаешь это место? Так вот, @lex Gender@ там был.}
 {100000205}{}{@lex Victim@? Не знаю, но от людей @lex BarmanGen@. @lex Place@. Знаешь где это? Так вот, @lex Gender@ там был.}

diff --git a/Dialogs/mod_rose.fodlg b/Dialogs/mod_rose.fodlg
@@ -72,14 +72,14 @@ lang=russ engl
 31 18010 @
 31 19000 None 0 #
 0 19010 @
-200 20000 Dialog::dlg_ForSearching 0 #
+200 20000 DialogBarman::dlg_CheckPlayerExists 0 #
 5 20010 #
 201 20020 #
 0 20030 @
 201 21000 None 0 #
 0 21010 #
 202 21020 D _item p bottle_caps > 99 R _item p bottle_caps - 100 @
-202 22000 Dialog::dlg_TrySearching 0 #
+202 22000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 22010 &
 
 [russ]

diff --git a/Dialogs/ncr_barmen_dasty.fodlg b/Dialogs/ncr_barmen_dasty.fodlg
@@ -122,13 +122,13 @@ lang=russ engl
 70 46010 @
 70 47000 None 0 #
 0 47010 @
-200 48000 Dialog::dlg_ForSearching 0 #
+200 48000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 48010 #
 201 48020 @
 201 49000 None 0 #
 0 49010 #
 202 49020 D _item p bottle_caps > 149 R _item p bottle_caps - 150 @
-202 50000 Dialog::dlg_TrySearching 0 #
+202 50000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 50010 &
 
 [russ]

diff --git a/Dialogs/ncr_barmen_mira.fodlg b/Dialogs/ncr_barmen_mira.fodlg
@@ -122,13 +122,13 @@ lang=russ engl
 53 37030 D _item p bottle_empty > 19 R _script Dialog::r_TimeoutSet 1 300 R _item p bottle_caps + 100 R _item p bottle_empty - 20 R _param p Experience + 500 @
 53 38000 None 0 #
 0 38010 @
-200 39000 Dialog::dlg_ForSearching 0 #
+200 39000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 39010 #
 201 39020 @
 201 40000 None 0 #
 0 40010 #
 202 40020 D _item p bottle_caps > 99 R _item p bottle_caps - 100 @
-202 41000 Dialog::dlg_TrySearching 0 #
+202 41000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 41010 &
 
 [russ]

diff --git a/Dialogs/nr_barmen.fodlg b/Dialogs/nr_barmen.fodlg
@@ -22,13 +22,13 @@ lang=russ engl
 4 4000 None 0 #
 65506 4010 #
 0 4020 @
-200 5000 Dialog::dlg_ForSearching 0 #
+200 5000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 5010 #
 201 5020 @
 201 6000 None 0 #
 0 6010 #
 202 6020 D _item p bottle_caps > 299 R _item p bottle_caps - 300 @
-202 7000 Dialog::dlg_TrySearching 0 #
+202 7000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 7010 &
 
 [russ]

diff --git a/Dialogs/nr_barmen_desp.fodlg b/Dialogs/nr_barmen_desp.fodlg
@@ -21,13 +21,13 @@ lang=russ engl
 4 3000 None 0 #
 65506 3010 #
 0 3020 @
-200 4000 Dialog::dlg_ForSearching 0 #
+200 4000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 4010 #
 201 4020 @
 201 5000 None 0 #
 0 5010 #
 202 5020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 6000 Dialog::dlg_TrySearching 0 #
+202 6000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 6010 @
 5 7000 None 0 #
 6 7010 #

diff --git a/Dialogs/redd_lou.fodlg b/Dialogs/redd_lou.fodlg
@@ -46,13 +46,13 @@ lang=russ engl
 11 11010 #
 11 11020 #
 0 11030 @
-200 12000 Dialog::dlg_ForSearching 0 #
+200 12000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 12010 #
 201 12020 @
 201 13000 None 0 #
 0 13010 #
 202 13020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 14000 Dialog::dlg_TrySearching 0 #
+202 14000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 14010 &
 
 [russ]

diff --git a/Dialogs/repl_terminal.fodlg b/Dialogs/repl_terminal.fodlg
@@ -9,6 +9,8 @@
 
 
 
+
+
 [data]
 lang=russ engl
 
@@ -36,7 +38,7 @@ lang=russ engl
 7 7000 ReplicationTerminal::dlg_ChoosePlayer 1 #
 65505 7010 #
 0 7020 R Script ReplicationTerminal::r_ChoosePlayerResult 0  @
-8 8000 ReplicationTerminal::dlg_Reset 1 #
+8 8000 None 1 #
 4 8010 #
 5 8020 #
 65505 8030 #

diff --git a/Dialogs/sf_barmen_slim.fodlg b/Dialogs/sf_barmen_slim.fodlg
@@ -30,13 +30,13 @@ lang=russ engl
 14 5060 D _param p SFSlimSidnancy = 3 @
 6 6000 None 0 #
 0 6010 @
-200 7000 Dialog::dlg_ForSearching 0 #
+200 7000 DialogBarman::dlg_CheckPlayerExists 0 #
 0 7010 #
 201 7020 @
 201 8000 None 0 #
 0 8010 #
 202 8020 D _item p bottle_caps > 99 R _item p bottle_caps - 100 @
-202 9000 Dialog::dlg_TrySearching 0 #
+202 9000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 9010 @
 7 10000 None 0 #
 0 10010 #

diff --git a/Dialogs/vc_barman_lidia.fodlg b/Dialogs/vc_barman_lidia.fodlg
@@ -66,14 +66,14 @@ lang=russ engl
 15 15000 None 0 #
 0 15010 #
 0 15020 @
-200 16000 Dialog::dlg_ForSearching 0 #
+200 16000 DialogBarman::dlg_CheckPlayerExists 0 #
 3 16010 #
 0 16020 #
 201 16030 @
 201 17000 None 0 #
 0 17010 #
 202 17020 D _item p bottle_caps > 199 R _item p bottle_caps - 200 @
-202 18000 Dialog::dlg_TrySearching 0 #
+202 18000 DialogBarman::dlg_FindPlayerOnline 0 #
 0 18010 &
 
 [russ]

diff --git a/Gui/Dialog.fogui b/Gui/Dialog.fogui
@@ -12,7 +12,7 @@
   "IsVerticalScroll": false,
   "IsHorizontalScroll": false,
   "Expanded": true,
-  "Selected": false,
+  "Selected": true,
   "Active": true,
   "Name": "Dialog",
   "Position": "0, 0",
@@ -22,8 +22,8 @@
   "IsDraggable": false,
   "IsNotHittable": false,
   "CheckTransparentOnHit": false,
-  "GlobalScope": "string[]@ SplitParams(string param)\r\n{\r\n        return cast< string[]@ >(param.split( \"\\n\" ));\r\n}",
-  "ClassFields": "bool TalkerIsNpc;\r\nident TalkerId;\r\nstring Text;\r\nstring[] Answers = {};\r\nuint TalkTime;\r\nuint TalkStartTick;",
+  "GlobalScope": "string[]@ SplitParams(string param)\r\n{\r\n        return cast< string[]@ >(param.split( \"\\n\" ));\r\n}\r\n    ",
+  "ClassFields": "bool TalkerIsNpc;\r\nident TalkerId;\r\nstring Text;\r\nstring[] Answers = {};\r\nuint TalkTime;\r\nuint TalkStartTick;\r\n\r\nvoid SetDialogText(string msg)\r\n{\r\n    auto panel = FindPanel(\"SpeechPanel\");\r\n    auto text  = panel.FindText( \"SpeechText\" );\r\n    if(text != null)\r\n    {\r\n        text.SetText( msg );\r\n    }\r\n}",
   "OnInit": null,
   "OnShow": "TalkerIsNpc   = params[ \"TalkerIsNpc\" ];\r\nTalkerId      = params[ \"TalkerId\" ];\r\nText          = params[ \"Text\" ];\r\nAnswers       = SplitParams(params[ \"Answers\" ]);\r\nTalkTime      = params[ \"TalkTime\" ];\r\nTalkStartTick = Game.GetTick();",
   "OnHide": " Game.HideScreen(CLIENT_SCREEN_BARTER);",
@@ -524,7 +524,7 @@
       "IsVerticalScroll": false,
       "IsHorizontalScroll": false,
       "Expanded": true,
-      "Selected": true,
+      "Selected": false,
       "Active": true,
       "Name": "SayButton",
       "Position": "589, 211",

diff --git a/Gui/Say.fogui b/Gui/Say.fogui
@@ -12,7 +12,7 @@
   "IsVerticalScroll": false,
   "IsHorizontalScroll": false,
   "Expanded": true,
-  "Selected": false,
+  "Selected": true,
   "Active": true,
   "Name": "Say",
   "Position": "0, 0",
@@ -25,7 +25,7 @@
   "GlobalScope": null,
   "ClassFields": "// Окно вызвано из интерфейса диалога\r\nbool FromDialog;\r\n//Признак: не выводить введенный текст в лог\r\nbool DontShowMessage;\r\nbool TalkerIsNpc;\r\nident TalkerId;",
   "OnInit": null,
-  "OnShow": "if(!(params is null))\r\n{\r\n        TalkerIsNpc = params[ \"TalkerIsNpc\" ] == \"true\";\r\n     FromDialog  = params[ \"FromDialog\" ] == \"true\";\r\n     TalkerId    = params[ \"TalkerId\" ];\r\n}",
+  "OnShow": "if(!(params is null))\r\n{\r\n    TalkerIsNpc = params[ \"TalkerIsNpc\" ] == \"1\";\r\n     FromDialog  = params[ \"FromDialog\" ] == \"true\";\r\n     TalkerId    = params[ \"TalkerId\" ];\r\n}",
   "OnHide": null,
   "OnAppear": null,
   "OnDisappear": null,
@@ -188,7 +188,7 @@
       "IsVerticalScroll": false,
       "IsHorizontalScroll": false,
       "Expanded": true,
-      "Selected": true,
+      "Selected": false,
       "Active": true,
       "Name": "DoneButton",
       "Position": "38, 58",
@@ -410,4 +410,4 @@
       ]
     }
   ]
-}
+}