Merge branch 'master' into pixote-map-update

# Conflicts:
#	scripts_src/valtcity/vcconnar.ssl

data/text/po/sv.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-07-13:52+0000\n"
-"PO-Revision-Date: 2024-09-29 09:09+0000\n"
+"PO-Revision-Date: 2024-10-06 08:09+0000\n"
 "Last-Translator: tygyh <[email protected]>\n"
 "Language-Team: none\n"
 "Language: sv\n"
@@ -19761,64 +19761,69 @@ msgstr ""
 
 #: dialog/ccquincy.msg:100
 msgid "You see a man in a military uniform."
-msgstr ""
+msgstr "Du ser en man i militäruniform."
 
 #: dialog/ccquincy.msg:101
 msgid "You see Quincy, the mechanic."
-msgstr ""
+msgstr "Du ser Quincy, mekanikern."
 
 #: dialog/ccquincy.msg:102
 msgid ""
 "You see a man in a military uniform. Judging by the grease spots you think\n"
 " he is more of a mechanic than a soldier."
 msgstr ""
+"Du ser en man i militäruniform. Att döma av fettfläckarna tror du\n"
+" att han är mer av en mekaniker än en soldat."
 
 #: dialog/ccquincy.msg:103
 msgid ""
 "Name's Quincy, soldier. Why are you tapping my shoulder and looking lost?"
 msgstr ""
+"Namnet är Quincy, soldat. Varför knackar du på min axel och ser vilsen ut?"
 
 #: dialog/ccquincy.msg:104
 msgid "Me need ask you something."
-msgstr ""
+msgstr "Jag fråga dig en sak."
 
 #: dialog/ccquincy.msg:106
 msgid "Hi. I need to ask you something."
-msgstr ""
+msgstr "Hej. Jag måste fråga dig en sak."
 
 #: dialog/ccquincy.msg:108
 msgid "All right, but make it quick. I have inventory to do."
-msgstr ""
+msgstr "Okej, men det måste gå fort. Jag har en inventering att göra."
 
 #: dialog/ccquincy.msg:109 dialog/epac11.msg:410 dialog/epac12.msg:410
 msgid "What do you need to know?"
-msgstr ""
+msgstr "Vad behöver du veta?"
 
 #: dialog/ccquincy.msg:111
 msgid "Me look for vertibird plans. Where find?"
-msgstr ""
+msgstr "Jag leta Vertibird-ritningar. Var hittar jag?"
 
 #: dialog/ccquincy.msg:112
 msgid "Me told by tech me find vertibird plans here."
-msgstr ""
+msgstr "Jag veta från tekniker jag hitta Vertibird-planer här."
 
 #: dialog/ccquincy.msg:115
 msgid "I'm looking for vertibird plans. Do you know where I can find them?"
-msgstr ""
+msgstr "Jag letar efter Vertibird-ritningar. Vet du var jag kan hitta dem?"
 
 #: dialog/ccquincy.msg:116
 msgid "I was told by a tech that I could find the vertibird plans here."
 msgstr ""
+"Jag fick höra av en tekniker att jag kunde hitta Vertibird-planerna här."
 
 #: dialog/ccquincy.msg:117
 msgid "Well, got to go."
-msgstr ""
+msgstr "Nåväl, jag måste gå."
 
 #: dialog/ccquincy.msg:118
 msgid ""
 "This is maintenance. We repair pretty much anything except for the "
 "vertibirds."
 msgstr ""
+"Det här är underhåll. Vi reparerar i stort sett allt utom vertibirderna."
 
 #: dialog/ccquincy.msg:119
 msgid "Where vertibird get repair?"

data/text/swedish/dialog/ccquincy.msg

@@ -1,23 +1,23 @@
-{100}{}{You see a man in a military uniform.}
-{101}{}{You see Quincy, the mechanic.}
-{102}{}{You see a man in a military uniform. Judging by the grease spots you think
- he is more of a mechanic than a soldier.}
-{103}{}{Name's Quincy, soldier. Why are you tapping my shoulder and looking lost?}
-{104}{}{Me need ask you something.}
+{100}{}{Du ser en man i militäruniform.}
+{101}{}{Du ser Quincy, mekanikern.}
+{102}{}{Du ser en man i militäruniform. Att döma av fettfläckarna tror du
+ att han är mer av en mekaniker än en soldat.}
+{103}{}{Namnet är Quincy, soldat. Varför knackar du på min axel och ser vilsen ut?}
+{104}{}{Jag fråga dig en sak.}
 {105}{}{Ingenting.}
-{106}{}{Hi. I need to ask you something.}
+{106}{}{Hej. Jag måste fråga dig en sak.}
 {107}{}{Never mind.}
-{108}{}{All right, but make it quick. I have inventory to do.}
-{109}{}{What do you need to know?}
+{108}{}{Okej, men det måste gå fort. Jag har en inventering att göra.}
+{109}{}{Vad behöver du veta?}
 {110}{}{What this place?}
-{111}{}{Me look for vertibird plans. Where find?}
-{112}{}{Me told by tech me find vertibird plans here.}
+{111}{}{Jag leta Vertibird-ritningar. Var hittar jag?}
+{112}{}{Jag veta från tekniker jag hitta Vertibird-planer här.}
 {113}{}{Jag gå nu.}
 {114}{}{Vad är det här för ställe?}
-{115}{}{I'm looking for vertibird plans. Do you know where I can find them?}
-{116}{}{I was told by a tech that I could find the vertibird plans here.}
-{117}{}{Well, got to go.}
-{118}{}{This is maintenance. We repair pretty much anything except for the vertibirds.}
+{115}{}{Jag letar efter Vertibird-ritningar. Vet du var jag kan hitta dem?}
+{116}{}{Jag fick höra av en tekniker att jag kunde hitta Vertibird-planerna här.}
+{117}{}{Nåväl, jag måste gå.}
+{118}{}{Det här är underhåll. Vi reparerar i stort sett allt utom vertibirderna.}
 {119}{}{Where vertibird get repair?}
 {120}{}{Where do the vertibirds get repaired?}
 {121}{}{They only fit in the hangar or outdoors. You figure it out from there, okay?}

data/text/swedish/dialog/epac11.msg

@@ -63,7 +63,7 @@
 {400}{}{Need something?}
 {401}{}{How can the Cat be of service?}
 {402}{}{Ja?}
-{410}{}{What do you need to know?}
+{410}{}{Vad behöver du veta?}
 {411}{}{Well, I was trained to use the usual military stuff. Rifles, pistols, SMGs and the like. I prefer laser
  weapons and the like better though. Those have style! But if you give me some brass knuckles or one of those power fists,
  I'll pounce on any flat-footed goons before they know what hit them!}

data/text/swedish/dialog/epac12.msg

@@ -156,7 +156,7 @@
 {376}{}{Ever since the transplant I always felt like I was seeing the past in one eye and the present in the other.
  More so than ever now. And that helps me carry on.}
 {377}{}{We all have our ways of coping.}
-{410}{}{What do you need to know?}
+{410}{}{Vad behöver du veta?}
 {411}{}{I have a black belt in sanshou. I can stab a man to death if the situation calls for it. Pistols, rifles and the like I'm decent with.}
 {420}{}{We need to talk about the distance between us.}
 {421}{}{What's wrong with it?}

scripts_src/valtcity/vcconnar.ssl

@@ -148,41 +148,32 @@ procedure Node994;
 
 
 /* Local variables which do not need to be saved between map changes. */
-variable Only_Once:=0;
-
 
 procedure start begin
 end
 
 /* This procedure will get called each time that the map is first entered. It will
    set up the Team number and AI packet for this critter. This will override the
    default from the prototype, and needs to be set in scripts. */
-/*procedure map_enter_p_proc begin
-   Only_Once:=0;
-   set_self_team(TEAM_VAULT_VILLAGERS);
-   set_self_ai(AI_COWARD);
-end*/
-
 procedure map_enter_p_proc begin
-   Only_Once := 0;
+   if is_loading_game then return;
+
    set_self_team(TEAM_VAULT_VILLAGERS);
-   if (is_loading_game == false) then begin
-      if ( (global_var(GVAR_VAULT_SERVANT) == SERVANT_FINISHED_VIOLENT) or (((game_time - global_var(GVAR_SERVANT_RAID_DATE)) >= ONE_GAME_MONTH) and (((global_var(GVAR_QUEST_VAULT_VILLAGE) < VILLAGE_QUEST_DELIVERED_GUNS) and (global_var(GVAR_QUEST_VAULT_VILLAGE) > 0)) or (global_var(GVAR_QUEST_VAULT_SERVANT) > 0) and (global_var(GVAR_VAULT_SERVANT) != SERVANT_FINISHED_DIPLOMATIC) and (global_var(GVAR_QUEST_VAULT_VILLAGE) < VILLAGE_QUEST_DELIVERED_GUNS))) )  then begin
-         if (cur_map_index == MAP_VAULT_VILLAGE) then begin
-            destroy_object(self_obj);
-         end
-         else if (cur_map_index == MAP_VAULTCITY_DOWNTOWN) then begin
-            set_self_visible; // go vis
-            critter_attempt_placement(self_obj, 13705, 0);
-            set_self_ai(AI_TOUGH_CITIZEN);
-            add_timer_event(self_obj, game_ticks(50), 1);
-         end
-      end else begin
-         if (cur_map_index == MAP_VAULTCITY_DOWNTOWN) then begin
-            set_self_invisible; // go invis
-         end
-         critter_attempt_placement(self_obj, 23707, dude_elevation);
+   if ( (global_var(GVAR_VAULT_SERVANT) == SERVANT_FINISHED_VIOLENT) or (((game_time - global_var(GVAR_SERVANT_RAID_DATE)) >= ONE_GAME_MONTH) and (((global_var(GVAR_QUEST_VAULT_VILLAGE) < VILLAGE_QUEST_DELIVERED_GUNS) and (global_var(GVAR_QUEST_VAULT_VILLAGE) > 0)) or (global_var(GVAR_QUEST_VAULT_SERVANT) > 0) and (global_var(GVAR_VAULT_SERVANT) != SERVANT_FINISHED_DIPLOMATIC) and (global_var(GVAR_QUEST_VAULT_VILLAGE) < VILLAGE_QUEST_DELIVERED_GUNS))) ) then begin
+      if (cur_map_index == MAP_VAULT_VILLAGE) then begin
+         destroy_object(self_obj);
+      end
+      else if (cur_map_index == MAP_VAULTCITY_DOWNTOWN) then begin
+         set_self_visible;
+         critter_attempt_placement(self_obj, 13705, 0);
+         set_self_ai(AI_TOUGH_CITIZEN);
+         add_timer_event(self_obj, game_ticks(50), 1);
+      end
+   end else begin
+      if (cur_map_index == MAP_VAULTCITY_DOWNTOWN) then begin
+         set_self_invisible;
       end
+      critter_attempt_placement(self_obj, 23707, dude_elevation);
    end
 end