Skip to content

Commit 84f9934

Browse files
Standing-StormStanding-Storm
authored
LIXA adjustments (#82765)
1 parent 4cd9f22 commit 84f9934

File tree

6 files changed

+119
-52
lines changed

6 files changed

+119
-52
lines changed

‎data/json/mapgen/LIXA_mapgen.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@
104104
}
105105
},
106106
"place_item": [ { "item": "microwave", "x": 41, "y": 33, "chance": 1 }, { "item": "id_LIXA", "x": 14, "y": 14, "chance": 1 } ],
107+
"place_monster": [
108+
{ "monster": "mon_zombie_soldier_lixa_police", "x": [ 1, 13 ], "y": [ 14, 23 ], "chance": 50 },
109+
{ "monster": "mon_zombie_soldier_lixa_police", "x": [ 35, 45 ], "y": [ 4, 15 ], "chance": 50 },
110+
{ "monster": "mon_zombie_soldier_lixa_police", "x": [ 25, 37 ], "y": [ 25, 42 ], "chance": 50 },
111+
{ "monster": "mon_zombie_soldier_lixa_police", "x": [ 40, 46 ], "y": [ 25, 32 ], "chance": 50 }
112+
],
107113
"place_monsters": [
108114
{ "monster": "GROUP_MIL_STRONG", "x": [ 1, 13 ], "y": [ 14, 23 ], "density": 0.1 },
109115
{ "monster": "GROUP_MIL_STRONG", "x": [ 35, 45 ], "y": [ 4, 15 ], "density": 0.1 },

‎data/json/monsterdrops/zombie_soldier.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,46 @@
146146
{ "group": "mon_zombie_soldier_death_drops", "prob": 10 },
147147
{ "group": "mon_zombie_cop_death_drops", "prob": 10 }
148148
]
149+
},
150+
{
151+
"id": "mon_zombie_soldier_lixa_police_death_drops",
152+
"type": "item_group",
153+
"subtype": "collection",
154+
"magazine": 100,
155+
"ammo": 60,
156+
"entries": [
157+
{
158+
"distribution": [
159+
{ "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] },
160+
{ "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] }
161+
]
162+
},
163+
{
164+
"distribution": [
165+
{ "group": "military_standard_assault_rifles", "prob": 65, "damage": [ 0, 4 ], "dirt": [ 0, 6000 ] },
166+
{
167+
"group": "military_standard_lmgs",
168+
"contents-item": "shoulder_strap",
169+
"prob": 4,
170+
"damage": [ 0, 4 ],
171+
"dirt": [ 0, 6000 ]
172+
},
173+
{
174+
"group": "military_standard_lmgs",
175+
"contents-item": [ "shoulder_strap", "acog_scope" ],
176+
"prob": 6,
177+
"damage": [ 0, 4 ],
178+
"dirt": [ 0, 6000 ]
179+
}
180+
],
181+
"prob": 10
182+
},
183+
{ "group": "infantry_common_gear" },
184+
{ "group": "wallets", "prob": 10 },
185+
{ "group": "pocket_cigar", "prob": 15 },
186+
{ "group": "misc_smoking_legal", "prob": 30 },
187+
{ "item": "dog_tag", "prob": 40 },
188+
{ "item": "id_LIXA_mil", "prob": 75 }
189+
]
149190
}
150191
]

‎data/json/monsters/LIXA_monsters.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
[
2+
{
3+
"id": "mon_zombie_soldier_lixa_police",
4+
"type": "MONSTER",
5+
"copy-from": "mon_zombie_soldier",
6+
"looks_like": "mon_zombie_soldier",
7+
"name": { "str": "zombie military police" },
8+
"description": "Once a soldier, it is dressed head to toe in combat gear and carries itself rather steadily for a zombie. Over its uniform is a vest reading \"military police\".",
9+
"death_drops": "mon_zombie_soldier_lixa_police_death_drops"
10+
},
211
{
312
"id": "LIXA_spit_light",
413
"type": "ITEM",

‎data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@
507507
{
508508
"id": "MISSION_ROBOFAC_INTERCOM_3_ADVICE_Location",
509509
"type": "talk_topic",
510-
"dynamic_line": "I don't believe I'm cleared to-\" You hear brief chatter. \"Apologies; I was mistaken. The manufacturer was, technically speaking, kept secret from the public. As a result, it operated using an office tower as a front, and was located underground. An elevator in the back of the building led to the basement, but it was likely destroyed in the damage - as a result, you will need to find a way down yourself. While there were stairs as well, it's highly likely that they have been destroyed.\"\n\n\"We advise bringing a way to safely enter and exit the lower level; a grappling hook would work well for this purpose. Given the damage, the elevator shaft itself probably remains intact, and would be your likeliest point of entry to the underground portion of the building."
510+
"//": "Restore previous dialogue if we ever get multi-story rappelling. If so, make sure to leave at least one elevator as the teleporting elevator trap",
511+
"dynamic_line": "I don't believe I'm cleared to-\" You hear brief chatter. \"Apologies; I was mistaken. The manufacturer was, technically speaking, kept secret from the public. As a result, it operated using an office tower as a front, and was located underground. An elevator in the back of the building led to the basement, but it was likely destroyed in the damage and the shaft may well be inaccessible - as a result, you will need to find a way down yourself. There is a maintenance staircase in the compound, which may provide a means of entry should you be able to find an access card on the premises."
511512
},
512513
{
513514
"id": [

‎data/json/overmap/overmap_special/specials.json‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6405,54 +6405,55 @@
64056405
"id": "physics_lab_LIXA",
64066406
"locations": [ "wilderness" ],
64076407
"overmaps": [
6408-
{ "point": [ 0, 0, 0 ], "overmap": "LIXA_surface_1a_north" },
6409-
{ "point": [ 1, 0, 0 ], "overmap": "LIXA_surface_1b_north" },
6410-
{ "point": [ 0, 1, 0 ], "overmap": "LIXA_surface_2a_north" },
6411-
{ "point": [ 1, 1, 0 ], "overmap": "LIXA_surface_2b_north" },
6412-
{ "point": [ 0, 0, 1 ], "overmap": "LIXA_roof_1a_north" },
6413-
{ "point": [ 1, 0, 1 ], "overmap": "LIXA_roof_1b_north" },
6414-
{ "point": [ 0, 1, 1 ], "overmap": "LIXA_roof_2a_north" },
6415-
{ "point": [ 1, 1, 1 ], "overmap": "LIXA_roof_2b_north" },
6416-
{ "point": [ 0, 0, -1 ], "overmap": "LIXA_stairshaft_1a_north" },
6417-
{ "point": [ 1, 0, -1 ], "overmap": "LIXA_stairshaft_1b_north" },
6418-
{ "point": [ 0, 1, -1 ], "overmap": "LIXA_stairshaft_1c_north" },
6419-
{ "point": [ 1, 1, -1 ], "overmap": "LIXA_stairshaft_1d_north" },
6420-
{ "point": [ 0, 0, -2 ], "overmap": "LIXA_stairshaft_2a_north" },
6421-
{ "point": [ 1, 0, -2 ], "overmap": "LIXA_stairshaft_2b_north" },
6422-
{ "point": [ 0, 1, -2 ], "overmap": "LIXA_stairshaft_2c_north" },
6423-
{ "point": [ 1, 1, -2 ], "overmap": "LIXA_stairshaft_2d_north" },
6424-
{ "point": [ 0, 0, -3 ], "overmap": "LIXA_workfloor_1a_north" },
6425-
{ "point": [ 1, 0, -3 ], "overmap": "LIXA_workfloor_1b_north" },
6426-
{ "point": [ 0, 1, -3 ], "overmap": "LIXA_workfloor_2a_north" },
6427-
{ "point": [ 1, 1, -3 ], "overmap": "LIXA_workfloor_2b_north" },
6428-
{ "point": [ 1, 2, -3 ], "overmap": "LIXA_device_2_roof_north" },
6429-
{ "point": [ 1, 3, -3 ], "overmap": "LIXA_device_3_roof_north" },
6430-
{ "point": [ 1, 1, -4 ], "overmap": "LIXA_device_1_north" },
6431-
{ "point": [ 1, 2, -4 ], "overmap": "LIXA_device_2_north" },
6432-
{ "point": [ 1, 3, -4 ], "overmap": "LIXA_device_3_north" },
6433-
{ "point": [ 1, 0, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6434-
{ "point": [ 1, 1, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6435-
{ "point": [ 1, 2, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6436-
{ "point": [ 1, 3, -8 ], "overmap": "LIXA_device_unfolded_A_north" },
6437-
{ "point": [ 1, 4, -8 ], "overmap": "LIXA_device_unfolded_B_north" },
6438-
{ "point": [ 1, 5, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6439-
{ "point": [ 1, 6, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6440-
{ "point": [ 1, 7, -8 ], "overmap": "LIXA_device_unfolded_noaccess_north" },
6441-
{ "point": [ 0, 2, 0 ], "overmap": "LIXA_entry_1_north" },
6442-
{ "point": [ 1, 2, 0 ], "overmap": "LIXA_entry_2_north" },
6443-
{ "point": [ 1, 3, 0 ], "overmap": "LIXA_road_north" },
6444-
{ "point": [ 1, 4, 0 ], "overmap": "LIXA_road_north" },
6445-
{ "point": [ 1, 5, 0 ], "overmap": "LIXA_road_north" },
6446-
{ "point": [ 1, 6, 0 ], "overmap": "LIXA_road_north" },
6447-
{ "point": [ 1, 7, 0 ], "overmap": "LIXA_road_guard_north" },
6448-
{ "point": [ 1, 7, 1 ], "overmap": "LIXA_road_guard_roof_north" }
6408+
{ "point": [ 0, 0, 0 ], "overmap": "LIXA_surface_1a" },
6409+
{ "point": [ 1, 0, 0 ], "overmap": "LIXA_surface_1b" },
6410+
{ "point": [ 0, 1, 0 ], "overmap": "LIXA_surface_2a" },
6411+
{ "point": [ 1, 1, 0 ], "overmap": "LIXA_surface_2b" },
6412+
{ "point": [ 0, 0, 1 ], "overmap": "LIXA_roof_1a" },
6413+
{ "point": [ 1, 0, 1 ], "overmap": "LIXA_roof_1b" },
6414+
{ "point": [ 0, 1, 1 ], "overmap": "LIXA_roof_2a" },
6415+
{ "point": [ 1, 1, 1 ], "overmap": "LIXA_roof_2b" },
6416+
{ "point": [ 0, 0, -1 ], "overmap": "LIXA_stairshaft_1a" },
6417+
{ "point": [ 1, 0, -1 ], "overmap": "LIXA_stairshaft_1b" },
6418+
{ "point": [ 0, 1, -1 ], "overmap": "LIXA_stairshaft_1c" },
6419+
{ "point": [ 1, 1, -1 ], "overmap": "LIXA_stairshaft_1d" },
6420+
{ "point": [ 0, 0, -2 ], "overmap": "LIXA_stairshaft_2a" },
6421+
{ "point": [ 1, 0, -2 ], "overmap": "LIXA_stairshaft_2b" },
6422+
{ "point": [ 0, 1, -2 ], "overmap": "LIXA_stairshaft_2c" },
6423+
{ "point": [ 1, 1, -2 ], "overmap": "LIXA_stairshaft_2d" },
6424+
{ "point": [ 0, 0, -3 ], "overmap": "LIXA_workfloor_1a" },
6425+
{ "point": [ 1, 0, -3 ], "overmap": "LIXA_workfloor_1b" },
6426+
{ "point": [ 0, 1, -3 ], "overmap": "LIXA_workfloor_2a" },
6427+
{ "point": [ 1, 1, -3 ], "overmap": "LIXA_workfloor_2b" },
6428+
{ "point": [ 1, 2, -3 ], "overmap": "LIXA_device_2_roof" },
6429+
{ "point": [ 1, 3, -3 ], "overmap": "LIXA_device_3_roof" },
6430+
{ "point": [ 1, 1, -4 ], "overmap": "LIXA_device_1" },
6431+
{ "point": [ 1, 2, -4 ], "overmap": "LIXA_device_2" },
6432+
{ "point": [ 1, 3, -4 ], "overmap": "LIXA_device_3" },
6433+
{ "point": [ 1, 0, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6434+
{ "point": [ 1, 1, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6435+
{ "point": [ 1, 2, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6436+
{ "point": [ 1, 3, -8 ], "overmap": "LIXA_device_unfolded_A" },
6437+
{ "point": [ 1, 4, -8 ], "overmap": "LIXA_device_unfolded_B" },
6438+
{ "point": [ 1, 5, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6439+
{ "point": [ 1, 6, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6440+
{ "point": [ 1, 7, -8 ], "overmap": "LIXA_device_unfolded_noaccess" },
6441+
{ "point": [ 0, 2, 0 ], "overmap": "LIXA_entry_1" },
6442+
{ "point": [ 1, 2, 0 ], "overmap": "LIXA_entry_2" },
6443+
{ "point": [ 1, 3, 0 ], "overmap": "LIXA_road" },
6444+
{ "point": [ 1, 4, 0 ], "overmap": "LIXA_road" },
6445+
{ "point": [ 1, 5, 0 ], "overmap": "LIXA_road" },
6446+
{ "point": [ 1, 6, 0 ], "overmap": "LIXA_road" },
6447+
{ "point": [ 1, 7, 0 ], "overmap": "LIXA_road_guard" },
6448+
{ "point": [ 1, 7, 1 ], "overmap": "LIXA_road_guard_roof" }
64496449
],
64506450
"connections": [ { "point": [ 1, 8, 0 ], "terrain": "road", "connection": "local_road", "existing": true, "from": [ 1, 7, 0 ] } ],
64516451
"city_distance": [ 3, -1 ],
64526452
"city_sizes": [ 4, -1 ],
64536453
"occurrences": [ 75, 100 ],
64546454
"priority": 1,
6455-
"flags": [ "GLOBALLY_UNIQUE", "MAN_MADE", "SAFE_AT_WORLDGEN" ]
6455+
"rotate": false,
6456+
"flags": [ "GLOBALLY_UNIQUE", "MAN_MADE", "NO_ROTATE", "SAFE_AT_WORLDGEN" ]
64566457
},
64576458
{
64586459
"type": "overmap_special",

‎data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"vision_levels": "large_building",
77
"sym": "l",
88
"color": "light_gray",
9-
"see_cost": "full_high"
9+
"see_cost": "full_high",
10+
"flags": [ "NO_ROTATE" ]
1011
},
1112
{
1213
"type": "overmap_terrain",
@@ -15,7 +16,8 @@
1516
"name": "research facility roof",
1617
"sym": "l",
1718
"color": "light_gray",
18-
"see_cost": "full_high"
19+
"see_cost": "full_high",
20+
"flags": [ "NO_ROTATE" ]
1921
},
2022
{
2123
"type": "overmap_terrain",
@@ -24,7 +26,8 @@
2426
"vision_levels": "large_building",
2527
"sym": "l",
2628
"color": "light_gray",
27-
"see_cost": "full_high"
29+
"see_cost": "full_high",
30+
"flags": [ "NO_ROTATE" ]
2831
},
2932
{
3033
"type": "overmap_terrain",
@@ -33,7 +36,8 @@
3336
"name": "research facility access road",
3437
"sym": "l",
3538
"color": "light_gray",
36-
"see_cost": "none"
39+
"see_cost": "none",
40+
"flags": [ "NO_ROTATE" ]
3741
},
3842
{
3943
"type": "overmap_terrain",
@@ -42,7 +46,8 @@
4246
"vision_levels": "large_building",
4347
"sym": "l",
4448
"color": "light_gray",
45-
"see_cost": "full_high"
49+
"see_cost": "full_high",
50+
"flags": [ "NO_ROTATE" ]
4651
},
4752
{
4853
"type": "overmap_terrain",
@@ -60,7 +65,8 @@
6065
"vision_levels": "underground_stone",
6166
"sym": "l",
6267
"color": "light_gray",
63-
"see_cost": "full_high"
68+
"see_cost": "full_high",
69+
"flags": [ "NO_ROTATE" ]
6470
},
6571
{
6672
"type": "overmap_terrain",
@@ -69,7 +75,8 @@
6975
"name": "LIXA research floor",
7076
"sym": "L",
7177
"color": "light_blue",
72-
"see_cost": "full_high"
78+
"see_cost": "full_high",
79+
"flags": [ "NO_ROTATE" ]
7380
},
7481
{
7582
"type": "overmap_terrain",
@@ -78,7 +85,8 @@
7885
"vision_levels": "underground_stone",
7986
"sym": "L",
8087
"color": "light_blue",
81-
"see_cost": "full_high"
88+
"see_cost": "full_high",
89+
"flags": [ "NO_ROTATE" ]
8290
},
8391
{
8492
"type": "overmap_terrain",
@@ -87,6 +95,7 @@
8795
"name": "unfolded space",
8896
"sym": "!",
8997
"color": "white",
90-
"see_cost": "full_high"
98+
"see_cost": "full_high",
99+
"flags": [ "NO_ROTATE" ]
91100
}
92101
]

0 commit comments

Comments
 (0)