Skip to content

Commit 32acf3a

Browse files
jaj22jaj22
authored
Fix towns on Napf and Napf Winter (#3554)
1 parent a88576b commit 32acf3a

File tree

3 files changed

+145
-4
lines changed

3 files changed

+145
-4
lines changed

‎A3A/addons/config_fixes/Napf/config.cpp‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
//IslaDuala3 - config.cpp
2+
3+
#include "..\script_component.hpp"
4+
5+
6+
class CfgPatches
7+
{
8+
class PATCHNAME(Napf)
9+
{
10+
name = COMPONENT_NAME;
11+
units[] = {};
12+
weapons[] = {};
13+
requiredVersion = REQUIRED_VERSION;
14+
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","Napf"};
15+
skipWhenMissingDependencies = 1;
16+
author = AUTHOR;
17+
authors[] = { AUTHORS };
18+
authorUrl = "";
19+
VERSION_CONFIG;
20+
};
21+
};
22+
class CfgWorlds {
23+
class CAWorld;
24+
class Napf : CAWorld {
25+
class Names {
26+
// These are marked as "Name". Fix to "NameVillage".
27+
class vil_Bunig {
28+
name = "Bunig";
29+
position[] = {12578.2,14238.8};
30+
radiusA = 200; // I think these are supposed to be outer/inner radius but Antistasi uses them as X/Y. Probably a bug.
31+
radiusB = 200;
32+
type = "NameVillage"; // NameCity also works, I don't think Antistasi cares
33+
};
34+
class vil_Magden {
35+
name = "Magden";
36+
position[] = {10742.6,17071.8};
37+
radiusA = 100;
38+
radiusB = 100;
39+
type = "NameVillage";
40+
};
41+
class vil_Malters {
42+
name = "Malters";
43+
position[] = {13595.8,13989.5};
44+
radiusA = 100;
45+
radiusB = 100;
46+
type = "NameVillage";
47+
};
48+
class vil_Seltishafen {
49+
name = "Seltishafen";
50+
position[] = {5466.87,15935};
51+
radiusA = 150;
52+
radiusB = 150;
53+
type = "NameVillage";
54+
};
55+
class vil_Abach {
56+
name = "Abach";
57+
position[] = {6491.27,15964.4};
58+
radiusA = 100;
59+
radiusB = 100;
60+
type = "NameVillage";
61+
};
62+
class vil_Wasen {
63+
name = "Wasen";
64+
position[] = {7385.5,15887};
65+
radiusA = 150;
66+
radiusB = 150;
67+
type = "NameVillage";
68+
};
69+
};
70+
};
71+
class NapfWinter : CAWorld {
72+
class Names {
73+
// These are marked as "Name". Fix to "NameVillage".
74+
class vil_Bunig {
75+
name = "Bunig";
76+
position[] = {12578.2,14238.8};
77+
radiusA = 200; // I think these are supposed to be outer/inner radius but Antistasi uses them as X/Y. Probably a bug.
78+
radiusB = 200;
79+
type = "NameVillage"; // NameCity also works, I don't think Antistasi cares
80+
};
81+
class vil_Magden {
82+
name = "Magden";
83+
position[] = {10742.6,17071.8};
84+
radiusA = 100;
85+
radiusB = 100;
86+
type = "NameVillage";
87+
};
88+
class vil_Malters {
89+
name = "Malters";
90+
position[] = {13595.8,13989.5};
91+
radiusA = 100;
92+
radiusB = 100;
93+
type = "NameVillage";
94+
};
95+
class vil_Seltishafen {
96+
name = "Seltishafen";
97+
position[] = {5466.87,15935};
98+
radiusA = 150;
99+
radiusB = 150;
100+
type = "NameVillage";
101+
};
102+
class vil_Abach {
103+
name = "Abach";
104+
position[] = {6491.27,15964.4};
105+
radiusA = 100;
106+
radiusB = 100;
107+
type = "NameVillage";
108+
};
109+
class vil_Wasen {
110+
name = "Wasen";
111+
position[] = {7385.5,15887};
112+
radiusA = 150;
113+
radiusB = 150;
114+
type = "NameVillage";
115+
};
116+
};
117+
};
118+
119+
};

‎A3A/addons/maps/Antistasi_Napf.Napf/mapInfo.hpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
class Napf {
22
population[] = {
3-
{"vil_Lenzburg",584},{"vil_Trueb",148},{"vil_Seltisberg",129},{"vil_NeueWelt",144},{"vil_Bubendorf",124},{"vil_Seewen",46},{"vil_Huttwil",134},{"lw_Ruchfeld",34},{"lw_Hagacher",16},{"vil_Oberdorf",69},{"vil_Muttenz",386},{"farm_HofHorn",11},{"lw_Lochacker",239},{"farm_Elbishof",21},{"farm_Rossbode",31},{"vil_Muenchenstein",368},{"vil_Chatzbach",163},{"vil_Bruderholz",36},{"farm_Aegerifeld",16},{"ind_Saegewerk",44},{"vil_Freidorf",83},{"vil_Olten",205},{"vil_Ruemlingen",184},{"Hof_KleineEgg",16},{"farm_Eichmatt",10},{"vil_Hirsegg",59},{"Insel_Hasenmatt",5},{"vil_Lausen",121},{"farm_Ey",16},{"farm_Rorighof",6},{"farm_Arxhof",11},{"farm_Ramsebode",12},{"vil_Unterdorf",94},{"vil_Luzern",750},{"vil_Emmen",422},{"vil_Wolhusen",151},{"vil_Horw",152},{"vil_Romoos",48},{"vil_Meggen",68},{"vil_Liestal",274},{"vil_Sachseln",91},{"vil_Sissach",104},{"vil_Buckten",35},{"vil_Eggwil",48},{"Insel_Pfeffikon",36},{"Insel_Suhrenfeld",54},{"vil_Signau",88},{"vil_Schangen",186},{"vil_Hasle",58},{"vil_Worb",458},{"vil_Munsingen",144},{"vil_Ittingen",152},{"vil_Hindelbank",91},{"castle_Homburg",46},{"for_Teufelsgraben",23},{"Hof_Goms",39},{"LandMark_Hubel",0},{"Hof_Hungerschwand",12},{"vil_Farnen",38},{"vil_Sorenberg",107},{"Island_Feldmoos",10},{"farm_Alpnach",15},{"vil_Giswil",44},{"pass_Rorenpass",7},{"Hof_Waldegg",10},{"mil_SouthAirstrip",13},{"Castle_Froburg",20},{"vil_Brienz",98},{"vil_Nordstern",55},{"Island_Bernerplatte",0},{"vil_Goldwil",20}
3+
{"vil_Lenzburg",584},{"vil_Trueb",148},{"vil_Seltisberg",129},{"vil_NeueWelt",144},{"vil_Bubendorf",124},{"vil_Seewen",46},
4+
{"vil_Huttwil",134},{"lw_Hagacher",16},{"vil_Oberdorf",69},{"vil_Muttenz",386},{"farm_HofHorn",11},
5+
{"farm_Elbishof",21},{"farm_Rossbode",31},{"vil_Muenchenstein",368},{"vil_Chatzbach",163},{"vil_Bruderholz",36},{"farm_Aegerifeld",16},
6+
{"vil_Freidorf",83},{"vil_Olten",205},{"vil_Ruemlingen",184},{"Hof_KleineEgg",16},{"farm_Eichmatt",10},
7+
{"vil_Hirsegg",59},{"Insel_Hasenmatt",5},{"vil_Lausen",121},{"farm_Ey",16},{"farm_Rorighof",6},{"farm_Arxhof",11},{"farm_Ramsebode",12},
8+
{"vil_Unterdorf",94},{"vil_Luzern",750},{"vil_Emmen",422},{"vil_Wolhusen",151},{"vil_Horw",152},{"vil_Romoos",48},{"vil_Meggen",68},
9+
{"vil_Liestal",274},{"vil_Sachseln",91},{"vil_Sissach",104},{"vil_Buckten",35},{"vil_Eggwil",48},{"Insel_Pfeffikon",36},
10+
{"vil_Signau",88},{"vil_Schangen",186},{"vil_Hasle",58},{"vil_Worb",458},{"vil_Munsingen",144},{"vil_Ittingen",152},{"vil_Hindelbank",91},
11+
{"Hof_Goms",39},{"Hof_Hungerschwand",12},{"vil_Farnen",38},{"vil_Sorenberg",107},{"farm_Alpnach",15},{"vil_Giswil",44},
12+
{"pass_Rorenpass",7},{"Hof_Waldegg",10},{"vil_Brienz",98},{"vil_Nordstern",55},{"vil_Goldwil",20},{"vil_Magden",52},
13+
{"vil_Bunig", 100},{"vil_Malters",55},{"vil_Wasen",41},{"vil_Seltishafen",53},{"vil_Abach",46}
414
};
515
disabledTowns[] = {
6-
"mil_SouthAirstrip","Island_Feldmoos","Island_Bernerplatte","castle_Homburg","Homburg","Castle_Froburg","Froburg"
16+
"mil_SouthAirstrip","Island_Feldmoos","Island_Bernerplatte","castle_Homburg","Castle_Froburg","ind_Saegewerk",
17+
"for_Teufelsgraben","lw_Ruchfeld","lw_Lochacker","LandMark_Hubel","Insel_Suhrenfeld","Insel_Hasenmatt"
718
};
819
antennas[] = {
920
{10987.7,9465.01,0.0774231},{9135.95,11027.4,-0.783722},{7672.83,9772.95,0.00149536},{8994.92,7573.55,0.0384521},{8994.92,7573.55,-0.444763},{6202.3,10639,-0.000984192},{6186.1,12025.9,-0.0628891},{7919.53,14442.1,0.219131},{15117.9,12586.8,0.00614929},{10898,4404.76,-0.135315},{9393.43,16246.8,-0.00434494},{9393.61,16247,0.0274506},{7021.62,4662.36,0.158585},{5852.23,15093.9,-0.0428619},{9676.3,2933.88,-0.334412},{5258.93,4510.2,-1.52588e-005},{698.401,6726.06,-0.179443},{16327.5,18434.2,-0.105293},{18743.5,2148.42,-0.226135}

‎A3A/addons/maps/Antistasi_NapfWinter.NapfWinter/mapInfo.hpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
class NapfWinter {
22
population[] = {
3-
{"vil_Lenzburg",584},{"vil_Trueb",148},{"vil_Seltisberg",129},{"vil_NeueWelt",144},{"vil_Bubendorf",124},{"vil_Seewen",46},{"vil_Huttwil",134},{"lw_Ruchfeld",34},{"lw_Hagacher",16},{"vil_Oberdorf",69},{"vil_Muttenz",386},{"farm_HofHorn",11},{"lw_Lochacker",239},{"farm_Elbishof",21},{"farm_Rossbode",31},{"vil_Muenchenstein",368},{"vil_Chatzbach",163},{"vil_Bruderholz",36},{"farm_Aegerifeld",16},{"ind_Saegewerk",44},{"vil_Freidorf",83},{"vil_Olten",205},{"vil_Ruemlingen",184},{"Hof_KleineEgg",16},{"farm_Eichmatt",10},{"vil_Hirsegg",59},{"Insel_Hasenmatt",5},{"vil_Lausen",121},{"farm_Ey",16},{"farm_Rorighof",6},{"farm_Arxhof",11},{"farm_Ramsebode",12},{"vil_Unterdorf",94},{"vil_Luzern",750},{"vil_Emmen",422},{"vil_Wolhusen",151},{"vil_Horw",152},{"vil_Romoos",48},{"vil_Meggen",68},{"vil_Liestal",274},{"vil_Sachseln",91},{"vil_Sissach",104},{"vil_Buckten",35},{"vil_Eggwil",48},{"Insel_Pfeffikon",36},{"Insel_Suhrenfeld",54},{"vil_Signau",88},{"vil_Schangen",186},{"vil_Hasle",58},{"vil_Worb",458},{"vil_Munsingen",144},{"vil_Ittingen",152},{"vil_Hindelbank",91},{"castle_Homburg",46},{"for_Teufelsgraben",23},{"Hof_Goms",39},{"LandMark_Hubel",0},{"Hof_Hungerschwand",12},{"vil_Farnen",38},{"vil_Sorenberg",107},{"Island_Feldmoos",10},{"farm_Alpnach",15},{"vil_Giswil",44},{"pass_Rorenpass",7},{"Hof_Waldegg",10},{"mil_SouthAirstrip",13},{"Castle_Froburg",20},{"vil_Brienz",98},{"vil_Nordstern",55},{"Island_Bernerplatte",0},{"vil_Goldwil",20}
3+
{"vil_Lenzburg",584},{"vil_Trueb",148},{"vil_Seltisberg",129},{"vil_NeueWelt",144},{"vil_Bubendorf",124},{"vil_Seewen",46},
4+
{"vil_Huttwil",134},{"lw_Hagacher",16},{"vil_Oberdorf",69},{"vil_Muttenz",386},{"farm_HofHorn",11},
5+
{"farm_Elbishof",21},{"farm_Rossbode",31},{"vil_Muenchenstein",368},{"vil_Chatzbach",163},{"vil_Bruderholz",36},{"farm_Aegerifeld",16},
6+
{"vil_Freidorf",83},{"vil_Olten",205},{"vil_Ruemlingen",184},{"Hof_KleineEgg",16},{"farm_Eichmatt",10},
7+
{"vil_Hirsegg",59},{"Insel_Hasenmatt",5},{"vil_Lausen",121},{"farm_Ey",16},{"farm_Rorighof",6},{"farm_Arxhof",11},{"farm_Ramsebode",12},
8+
{"vil_Unterdorf",94},{"vil_Luzern",750},{"vil_Emmen",422},{"vil_Wolhusen",151},{"vil_Horw",152},{"vil_Romoos",48},{"vil_Meggen",68},
9+
{"vil_Liestal",274},{"vil_Sachseln",91},{"vil_Sissach",104},{"vil_Buckten",35},{"vil_Eggwil",48},{"Insel_Pfeffikon",36},
10+
{"vil_Signau",88},{"vil_Schangen",186},{"vil_Hasle",58},{"vil_Worb",458},{"vil_Munsingen",144},{"vil_Ittingen",152},{"vil_Hindelbank",91},
11+
{"Hof_Goms",39},{"Hof_Hungerschwand",12},{"vil_Farnen",38},{"vil_Sorenberg",107},{"farm_Alpnach",15},{"vil_Giswil",44},
12+
{"pass_Rorenpass",7},{"Hof_Waldegg",10},{"vil_Brienz",98},{"vil_Nordstern",55},{"vil_Goldwil",20},{"vil_Magden",52},
13+
{"vil_Bunig", 100},{"vil_Malters",55},{"vil_Wasen",41},{"vil_Seltishafen",53},{"vil_Abach",46}
414
};
515
disabledTowns[] = {
6-
"mil_SouthAirstrip","Island_Feldmoos","Island_Bernerplatte","castle_Homburg","Homburg","Castle_Froburg","Froburg"
16+
"mil_SouthAirstrip","Island_Feldmoos","Island_Bernerplatte","castle_Homburg","Castle_Froburg","ind_Saegewerk",
17+
"for_Teufelsgraben","lw_Ruchfeld","lw_Lochacker","LandMark_Hubel","Insel_Suhrenfeld","Insel_Hasenmatt"
718
};
819
antennas[] = {
920
{10987.7,9465.01,0.0774231},{9135.95,11027.4,-0.783722},{7672.83,9772.95,0.00149536},{8994.92,7573.55,0.0384521},{8994.92,7573.55,-0.444763},{6202.3,10639,-0.000984192},{6186.1,12025.9,-0.0628891},{7919.53,14442.1,0.219131},{15117.9,12586.8,0.00614929},{10898,4404.76,-0.135315},{9393.43,16246.8,-0.00434494},{9393.61,16247,0.0274506},{7021.62,4662.36,0.158585},{5852.23,15093.9,-0.0428619},{9676.3,2933.88,-0.334412},{5258.93,4510.2,-1.52588e-005},{698.401,6726.06,-0.179443},{16327.5,18434.2,-0.105293},{18743.5,2148.42,-0.226135}

0 commit comments

Comments
 (0)