API tools faq
paste
Guest User

Untitled

a guest
Dec 17th, 2020
69
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Lua 81.93 KB | None | 0 0
raw download clone embed print report
  1. diff -C3 -r angelsindustries_0.4.6/data-final-fixes.lua angelsindustries_0.4.6-apmpatch/data-final-fixes.lua
  2. *** angelsindustries_0.4.6/data-final-fixes.lua 2020-08-17 11:52:21.000000000 +0200
  3. --- angelsindustries_0.4.6-apmpatch/data-final-fixes.lua    2020-09-06 02:15:10.723848434 +0200
  4. ***************
  5. *** 58,60 ****
  6. --- 58,67 ----
  7.  
  8.   --OTHER OVERRIDES
  9.   --require("prototypes.overrides.global-loaders")
  10. +
  11. + OV.remove_science_pack("logistics-0", "datacore-basic")
  12. + OV.remove_science_pack("logistics-0", "angels-science-pack-grey")
  13. + OV.remove_science_pack("basic-logistics-2", "datacore-basic")
  14. + OV.remove_science_pack("basic-logistics-2", "angels-science-pack-grey")
  15. +
  16. + OV.execute()
  17. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-basic.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-basic.lua
  18. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-basic.lua   2020-08-17 11:52:26.000000000 +0200
  19. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-basic.lua  2020-09-06 02:26:02.385817523 +0200
  20. ***************
  21. *** 6,11 ****
  22. --- 6,326 ----
  23.     return rich_text_icons
  24.   end
  25.   if angelsmods.industries.tech then
  26. + if mods ["apm-power-notnotmelon"] then
  27. + data:extend(
  28. +   {
  29. +     --BASIC LABs
  30. +     {
  31. +       type = "item",
  32. +       name = "angels-basic-lab",
  33. +       icons = {
  34. +         {
  35. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  36. +         },
  37. +         {
  38. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  39. +           tint = angelsmods.industries.number_tint,
  40. +           scale = 0.32,
  41. +           shift = {-12, -12}
  42. +         }
  43. +       },
  44. +       icon_size = 32,
  45. +       subgroup = "angels-labs-1",
  46. +       order = "g[angels-basic-lab]",
  47. +       place_result = "angels-basic-lab",
  48. +       stack_size = 10
  49. +     },
  50. +     {
  51. +       type = "lab",
  52. +       name = "angels-basic-lab",
  53. +       localised_description = {
  54. +         "",
  55. +         {"entity-description.angels-basic-lab"},
  56. +         "\n",
  57. +         {
  58. +           "entity-description.angels-lab-inputs",
  59. +           create_rich_text_icons {
  60. +             "angels-science-pack-grey",
  61. +             "datacore-basic",
  62. +             "apm_industrial_science_pack",
  63. +             "apm_steam_science_pack"
  64. +           }
  65. +         }
  66. +       },
  67. +       icons = {
  68. +         {
  69. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  70. +         },
  71. +         {
  72. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  73. +           tint = angelsmods.industries.number_tint,
  74. +           scale = 0.32,
  75. +           shift = {-12, -12}
  76. +         }
  77. +       },
  78. +       icon_size = 32,
  79. +       flags = {"placeable-player", "player-creation"},
  80. +       minable = {mining_time = 1, result = "angels-basic-lab"},
  81. +       max_health = 150,
  82. +       corpse = "big-remnants",
  83. +       dying_explosion = "medium-explosion",
  84. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  85. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  86. +       light = {intensity = 0.75, size = 8},
  87. +       on_animation = {
  88. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
  89. +         width = 160,
  90. +         height = 160,
  91. +         frame_count = 36,
  92. +         line_length = 6,
  93. +         animation_speed = 0.5,
  94. +         shift = {0, 0}
  95. +       },
  96. +       off_animation = {
  97. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
  98. +         width = 160,
  99. +         height = 160,
  100. +         frame_count = 1,
  101. +         shift = {0, 0}
  102. +       },
  103. +       working_sound = {
  104. +         sound = {
  105. +           filename = "__base__/sound/lab.ogg",
  106. +           volume = 0.7
  107. +         },
  108. +         apparent_volume = 1
  109. +       },
  110. +       energy_source = {
  111. +         type = "electric",
  112. +         usage_priority = "secondary-input"
  113. +       },
  114. +       energy_usage = "100kW",
  115. +       researching_speed = 1.5,
  116. +
  117. +       inputs = {
  118. +         "angels-science-pack-grey",
  119. +         "datacore-basic",
  120. +         "apm_industrial_science_pack",
  121. +         "apm_steam_science_pack"
  122. +       },
  123. +       module_specification = {
  124. +         module_slots = 2,
  125. +         max_entity_info_module_icons_per_row = 3,
  126. +         max_entity_info_module_icon_rows = 1,
  127. +         module_info_icon_shift = {0, 0.9}
  128. +       }
  129. +     },
  130. +     {
  131. +       type = "item",
  132. +       name = "angels-basic-lab-2",
  133. +       icons = {
  134. +         {
  135. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  136. +         },
  137. +         {
  138. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  139. +           tint = angelsmods.industries.number_tint,
  140. +           scale = 0.32,
  141. +           shift = {-12, -12}
  142. +         }
  143. +       },
  144. +       icon_size = 32,
  145. +       subgroup = "angels-labs-2",
  146. +       order = "g[angels-basic-lab]",
  147. +       place_result = "angels-basic-lab-2",
  148. +       stack_size = 10
  149. +     },
  150. +     {
  151. +       type = "lab",
  152. +       name = "angels-basic-lab-2",
  153. +       localised_description = {
  154. +         "",
  155. +         {"entity-description.angels-basic-lab"},
  156. +         "\n",
  157. +         {
  158. +           "entity-description.angels-lab-inputs",
  159. +           create_rich_text_icons {
  160. +             "angels-science-pack-red",
  161. +             "angels-science-pack-green",
  162. +             "angels-science-pack-orange",
  163. +             "angels-science-pack-blue",
  164. +             "angels-science-pack-yellow",
  165. +             "datacore-basic",
  166. +             "apm_industrial_science_pack",
  167. +             "apm_steam_science_pack"
  168. +           }
  169. +         }
  170. +       },
  171. +       icons = {
  172. +         {
  173. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  174. +         },
  175. +         {
  176. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  177. +           tint = angelsmods.industries.number_tint,
  178. +           scale = 0.32,
  179. +           shift = {-12, -12}
  180. +         }
  181. +       },
  182. +       icon_size = 32,
  183. +       flags = {"placeable-player", "player-creation"},
  184. +       minable = {mining_time = 1, result = "angels-basic-lab-2"},
  185. +       max_health = 150,
  186. +       corpse = "big-remnants",
  187. +       dying_explosion = "medium-explosion",
  188. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  189. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  190. +       light = {intensity = 0.75, size = 8},
  191. +       on_animation = {
  192. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
  193. +         width = 160,
  194. +         height = 160,
  195. +         frame_count = 36,
  196. +         line_length = 6,
  197. +         animation_speed = 0.5,
  198. +         shift = {0, 0}
  199. +       },
  200. +       off_animation = {
  201. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
  202. +         width = 160,
  203. +         height = 160,
  204. +         frame_count = 1,
  205. +         shift = {0, 0}
  206. +       },
  207. +       working_sound = {
  208. +         sound = {
  209. +           filename = "__base__/sound/lab.ogg",
  210. +           volume = 0.7
  211. +         },
  212. +         apparent_volume = 1
  213. +       },
  214. +       energy_source = {
  215. +         type = "electric",
  216. +         usage_priority = "secondary-input"
  217. +       },
  218. +       energy_usage = "150kW",
  219. +       researching_speed = 2,
  220. +       inputs = {
  221. +         "angels-science-pack-red",
  222. +         "angels-science-pack-green",
  223. +         "angels-science-pack-orange",
  224. +         "angels-science-pack-blue",
  225. +         "angels-science-pack-yellow",
  226. +         "datacore-basic",
  227. +         "apm_industrial_science_pack",
  228. +         "apm_steam_science_pack"
  229. +       },
  230. +       module_specification = {
  231. +         module_slots = 2,
  232. +         max_entity_info_module_icons_per_row = 3,
  233. +         max_entity_info_module_icon_rows = 1,
  234. +         module_info_icon_shift = {0, 0.9}
  235. +       }
  236. +     },
  237. +     {
  238. +       type = "item",
  239. +       name = "angels-basic-lab-3",
  240. +       icons = {
  241. +         {
  242. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  243. +         },
  244. +         {
  245. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  246. +           tint = angelsmods.industries.number_tint,
  247. +           scale = 0.32,
  248. +           shift = {-12, -12}
  249. +         }
  250. +       },
  251. +       icon_size = 32,
  252. +       subgroup = "angels-labs-3",
  253. +       order = "g[angels-basic-lab]",
  254. +       place_result = "angels-basic-lab-3",
  255. +       stack_size = 10
  256. +     },
  257. +     {
  258. +       type = "lab",
  259. +       name = "angels-basic-lab-3",
  260. +       localised_description = {
  261. +         "",
  262. +         {"entity-description.angels-basic-lab"},
  263. +         "\n",
  264. +         {
  265. +           "entity-description.angels-lab-inputs",
  266. +           create_rich_text_icons {
  267. +             "angels-science-pack-white",
  268. +             "datacore-basic",
  269. +             "apm_industrial_science_pack",
  270. +             "apm_steam_science_pack"
  271. +           }
  272. +         }
  273. +       },
  274. +       icons = {
  275. +         {
  276. +           icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
  277. +         },
  278. +         {
  279. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  280. +           tint = angelsmods.industries.number_tint,
  281. +           scale = 0.32,
  282. +           shift = {-12, -12}
  283. +         }
  284. +       },
  285. +       icon_size = 32,
  286. +       flags = {"placeable-player", "player-creation"},
  287. +       minable = {mining_time = 1, result = "angels-basic-lab-3"},
  288. +       max_health = 150,
  289. +       corpse = "big-remnants",
  290. +       dying_explosion = "medium-explosion",
  291. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  292. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  293. +       light = {intensity = 0.75, size = 8},
  294. +       on_animation = {
  295. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
  296. +         width = 160,
  297. +         height = 160,
  298. +         frame_count = 36,
  299. +         line_length = 6,
  300. +         animation_speed = 0.5,
  301. +         shift = {0, 0}
  302. +       },
  303. +       off_animation = {
  304. +         filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
  305. +         width = 160,
  306. +         height = 160,
  307. +         frame_count = 1,
  308. +         shift = {0, 0}
  309. +       },
  310. +       working_sound = {
  311. +         sound = {
  312. +           filename = "__base__/sound/lab.ogg",
  313. +           volume = 0.7
  314. +         },
  315. +         apparent_volume = 1
  316. +       },
  317. +       energy_source = {
  318. +         type = "electric",
  319. +         usage_priority = "secondary-input"
  320. +       },
  321. +       energy_usage = "200kW",
  322. +       researching_speed = 2.5,
  323. +       inputs = {
  324. +         "angels-science-pack-white",
  325. +         "datacore-basic",
  326. +         "apm_industrial_science_pack",
  327. +         "apm_steam_science_pack"
  328. +       },
  329. +       module_specification = {
  330. +         module_slots = 3,
  331. +         max_entity_info_module_icons_per_row = 3,
  332. +         max_entity_info_module_icon_rows = 1,
  333. +         module_info_icon_shift = {0, 0.9}
  334. +       }
  335. +     }
  336. +   }
  337. + )
  338. +
  339. + else
  340. +
  341.   data:extend(
  342.     {
  343.       --BASIC LABs
  344. ***************
  345. *** 93,98 ****
  346. --- 408,414 ----
  347.         },
  348.         energy_usage = "100kW",
  349.         researching_speed = 1.5,
  350. +
  351.         inputs = {
  352.           "angels-science-pack-grey",
  353.           "datacore-basic"
  354. ***************
  355. *** 304,310 ****
  356.       }
  357.     }
  358.   )
  359.   angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true
  360.   angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true
  361.   angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true
  362. ! end
  363. \ Kein Zeilenumbruch am Dateiende.
  364. --- 620,629 ----
  365.       }
  366.     }
  367.   )
  368. + end
  369. +
  370. +
  371.   angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true
  372.   angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true
  373.   angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true
  374. ! end
  375. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-energy.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-energy.lua
  376. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-energy.lua  2020-08-17 11:52:26.000000000 +0200
  377. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-energy.lua 2020-09-06 02:33:16.082024034 +0200
  378. ***************
  379. *** 6,11 ****
  380. --- 6,290 ----
  381.     return rich_text_icons
  382.   end
  383.   if angelsmods.industries.tech then
  384. + if mods ["apm-power-notnotmelon"] then
  385. + data:extend(
  386. +   {
  387. +     --ENERGY LAB
  388. +     {
  389. +       type = "item",
  390. +       name = "angels-energy-lab-1",
  391. +       icons = {
  392. +         {
  393. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  394. +         },
  395. +         {
  396. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  397. +           tint = angelsmods.industries.number_tint,
  398. +           scale = 0.32,
  399. +           shift = {-12, -12}
  400. +         }
  401. +       },
  402. +       icon_size = 32,
  403. +       subgroup = "angels-labs-1",
  404. +       order = "c[angels-energy-lab-1]",
  405. +       place_result = "angels-energy-lab-1",
  406. +       stack_size = 10
  407. +     },
  408. +     {
  409. +       type = "lab",
  410. +       name = "angels-energy-lab-1",
  411. +       localised_description = {"",
  412. +         {"entity-description.angels-energy-lab"}, "\n",
  413. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  414. +           "angels-science-pack-red",
  415. +           "angels-science-pack-green",
  416. +           "angels-science-pack-orange",
  417. +           "datacore-energy-1",
  418. +           "apm_industrial_science_pack",
  419. +           "apm_steam_science_pack"
  420. +         }}
  421. +       },
  422. +       icons = {
  423. +         {
  424. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  425. +         },
  426. +         {
  427. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  428. +           tint = angelsmods.industries.number_tint,
  429. +           scale = 0.32,
  430. +           shift = {-12, -12}
  431. +         }
  432. +       },
  433. +       icon_size = 32,
  434. +       flags = {"placeable-player", "player-creation"},
  435. +       minable = {mining_time = 1, result = "angels-energy-lab-1"},
  436. +       max_health = 150,
  437. +       corpse = "big-remnants",
  438. +       dying_explosion = "medium-explosion",
  439. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  440. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  441. +       light = {intensity = 0.75, size = 8},
  442. +       on_animation = {
  443. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
  444. +         width = 160,
  445. +         height = 160,
  446. +         frame_count = 36,
  447. +         line_length = 6,
  448. +         animation_speed = 0.5,
  449. +         shift = {0, 0}
  450. +       },
  451. +       off_animation = {
  452. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
  453. +         width = 160,
  454. +         height = 160,
  455. +         frame_count = 1,
  456. +         shift = {0, 0}
  457. +       },
  458. +       working_sound = {
  459. +         sound = {
  460. +           filename = "__base__/sound/lab.ogg",
  461. +           volume = 0.7
  462. +         },
  463. +         apparent_volume = 1
  464. +       },
  465. +       energy_source = {
  466. +         type = "electric",
  467. +         usage_priority = "secondary-input"
  468. +       },
  469. +       energy_usage = "125kW",
  470. +       researching_speed = 1,
  471. +       inputs = {
  472. +         "angels-science-pack-red",
  473. +         "angels-science-pack-green",
  474. +         "angels-science-pack-orange",
  475. +         "datacore-energy-1",
  476. +         "apm_industrial_science_pack",
  477. +         "apm_steam_science_pack"
  478. +       },
  479. +       module_specification = {
  480. +         module_slots = 2,
  481. +         max_entity_info_module_icons_per_row = 3,
  482. +         max_entity_info_module_icon_rows = 1,
  483. +         module_info_icon_shift = {0, 0.9}
  484. +       }
  485. +     },
  486. +     {
  487. +       type = "item",
  488. +       name = "angels-energy-lab-2",
  489. +       icons = {
  490. +         {
  491. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  492. +         },
  493. +         {
  494. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  495. +           tint = angelsmods.industries.number_tint,
  496. +           scale = 0.32,
  497. +           shift = {-12, -12}
  498. +         }
  499. +       },
  500. +       icon_size = 32,
  501. +       subgroup = "angels-labs-2",
  502. +       order = "c[angels-energy-lab-2]",
  503. +       place_result = "angels-energy-lab-2",
  504. +       stack_size = 10
  505. +     },
  506. +     {
  507. +       type = "lab",
  508. +       name = "angels-energy-lab-2",
  509. +       localised_description = {"",
  510. +         {"entity-description.angels-energy-lab"}, "\n",
  511. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  512. +           "angels-science-pack-blue",
  513. +           "angels-science-pack-yellow",
  514. +           "datacore-energy-2",
  515. +           "apm_industrial_science_pack",
  516. +           "apm_steam_science_pack"
  517. +         }}
  518. +       },
  519. +       icons = {
  520. +         {
  521. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  522. +         },
  523. +         {
  524. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  525. +           tint = angelsmods.industries.number_tint,
  526. +           scale = 0.32,
  527. +           shift = {-12, -12}
  528. +         }
  529. +       },
  530. +       icon_size = 32,
  531. +       flags = {"placeable-player", "player-creation"},
  532. +       minable = {mining_time = 1, result = "angels-energy-lab-2"},
  533. +       max_health = 150,
  534. +       corpse = "big-remnants",
  535. +       dying_explosion = "medium-explosion",
  536. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  537. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  538. +       light = {intensity = 0.75, size = 8},
  539. +       on_animation = {
  540. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
  541. +         width = 160,
  542. +         height = 160,
  543. +         frame_count = 36,
  544. +         line_length = 6,
  545. +         animation_speed = 0.5,
  546. +         shift = {0, 0}
  547. +       },
  548. +       off_animation = {
  549. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
  550. +         width = 160,
  551. +         height = 160,
  552. +         frame_count = 1,
  553. +         shift = {0, 0}
  554. +       },
  555. +       energy_source = {
  556. +         type = "electric",
  557. +         usage_priority = "secondary-input"
  558. +       },
  559. +       energy_usage = "250kW",
  560. +       researching_speed = 2,
  561. +       inputs = {
  562. +         "angels-science-pack-blue",
  563. +         "angels-science-pack-yellow",
  564. +         "datacore-energy-2",
  565. +         "apm_industrial_science_pack",
  566. +         "apm_steam_science_pack"
  567. +       },
  568. +       module_specification = {
  569. +         module_slots = 2,
  570. +         max_entity_info_module_icons_per_row = 3,
  571. +         max_entity_info_module_icon_rows = 1,
  572. +         module_info_icon_shift = {0, 0.9}
  573. +       }
  574. +     },
  575. +     {
  576. +       type = "item",
  577. +       name = "angels-energy-lab-3",
  578. +       icons = {
  579. +         {
  580. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  581. +         },
  582. +         {
  583. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  584. +           tint = angelsmods.industries.number_tint,
  585. +           scale = 0.32,
  586. +           shift = {-12, -12}
  587. +         }
  588. +       },
  589. +       icon_size = 32,
  590. +       subgroup = "angels-labs-3",
  591. +       order = "c[angels-energy-lab-3]",
  592. +       place_result = "angels-energy-lab-3",
  593. +       stack_size = 10
  594. +     },
  595. +     {
  596. +       type = "lab",
  597. +       name = "angels-energy-lab-3",
  598. +       localised_description = {"",
  599. +         {"entity-description.angels-energy-lab"}, "\n",
  600. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  601. +           "angels-science-pack-white",
  602. +           "datacore-energy-2"
  603. +         }}
  604. +       },
  605. +       icons = {
  606. +         {
  607. +           icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
  608. +         },
  609. +         {
  610. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  611. +           tint = angelsmods.industries.number_tint,
  612. +           scale = 0.32,
  613. +           shift = {-12, -12}
  614. +         }
  615. +       },
  616. +       icon_size = 32,
  617. +       flags = {"placeable-player", "player-creation"},
  618. +       minable = {mining_time = 1, result = "angels-energy-lab-3"},
  619. +       max_health = 150,
  620. +       corpse = "big-remnants",
  621. +       dying_explosion = "medium-explosion",
  622. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  623. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  624. +       light = {intensity = 0.75, size = 8},
  625. +       on_animation = {
  626. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
  627. +         width = 160,
  628. +         height = 160,
  629. +         frame_count = 36,
  630. +         line_length = 6,
  631. +         animation_speed = 0.5,
  632. +         shift = {0, 0}
  633. +       },
  634. +       off_animation = {
  635. +         filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
  636. +         width = 160,
  637. +         height = 160,
  638. +         frame_count = 1,
  639. +         shift = {0, 0}
  640. +       },
  641. +       energy_source = {
  642. +         type = "electric",
  643. +         usage_priority = "secondary-input"
  644. +       },
  645. +       energy_usage = "300kW",
  646. +       researching_speed = 3,
  647. +       inputs = {
  648. +         "angels-science-pack-white",
  649. +         "datacore-energy-2",
  650. +         "apm_industrial_science_pack",
  651. +         "apm_steam_science_pack"
  652. +       },
  653. +       module_specification = {
  654. +         module_slots = 3,
  655. +         max_entity_info_module_icons_per_row = 3,
  656. +         max_entity_info_module_icon_rows = 1,
  657. +         module_info_icon_shift = {0, 0.9}
  658. +       }
  659. +     }
  660. +   }
  661. + )
  662. + else
  663.   data:extend(
  664.     {
  665.       --ENERGY LAB
  666. ***************
  667. *** 273,280 ****
  668.       }
  669.     }
  670.   )
  671. !
  672.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true
  673.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true
  674.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true
  675. ! end
  676. \ Kein Zeilenumbruch am Dateiende.
  677. --- 552,559 ----
  678.       }
  679.     }
  680.   )
  681. ! end
  682.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true
  683.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true
  684.   angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true
  685. ! end
  686. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-enhance.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-enhance.lua
  687. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-enhance.lua 2020-08-17 11:52:26.000000000 +0200
  688. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-enhance.lua    2020-09-06 02:34:37.654627141 +0200
  689. ***************
  690. *** 6,11 ****
  691. --- 6,292 ----
  692.     return rich_text_icons
  693.   end
  694.   if angelsmods.industries.tech then
  695. + if mods ["apm-power-notnotmelon"] then
  696. + data:extend(
  697. +   {
  698. +     --ENHANCE LAB
  699. +     {
  700. +       type = "item",
  701. +       name = "angels-enhance-lab-1",
  702. +       icons = {
  703. +         {
  704. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  705. +         },
  706. +         {
  707. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  708. +           tint = angelsmods.industries.number_tint,
  709. +           scale = 0.32,
  710. +           shift = {-12, -12}
  711. +         }
  712. +       },
  713. +       icon_size = 32,
  714. +       subgroup = "angels-labs-1",
  715. +       order = "b[angels-enhance-lab-1]",
  716. +       place_result = "angels-enhance-lab-1",
  717. +       stack_size = 10
  718. +     },
  719. +     {
  720. +       type = "lab",
  721. +       name = "angels-enhance-lab-1",
  722. +       localised_description = {"",
  723. +         {"entity-description.angels-enhance-lab"}, "\n",
  724. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  725. +           "angels-science-pack-red",
  726. +           "angels-science-pack-green",
  727. +           "angels-science-pack-orange",
  728. +           "datacore-enhance-1",
  729. +           "apm_industrial_science_pack",
  730. +           "apm_steam_science_pack"
  731. +         }}
  732. +       },
  733. +       icons = {
  734. +         {
  735. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  736. +         },
  737. +         {
  738. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  739. +           tint = angelsmods.industries.number_tint,
  740. +           scale = 0.32,
  741. +           shift = {-12, -12}
  742. +         }
  743. +       },
  744. +       icon_size = 32,
  745. +       flags = {"placeable-player", "player-creation"},
  746. +       minable = {mining_time = 1, result = "angels-enhance-lab-1"},
  747. +       max_health = 150,
  748. +       corpse = "big-remnants",
  749. +       dying_explosion = "medium-explosion",
  750. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  751. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  752. +       light = {intensity = 0.75, size = 8},
  753. +       on_animation = {
  754. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab.png",
  755. +         width = 160,
  756. +         height = 160,
  757. +         frame_count = 36,
  758. +         line_length = 6,
  759. +         animation_speed = 0.5,
  760. +         shift = {0, 0}
  761. +       },
  762. +       off_animation = {
  763. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab-off.png",
  764. +         width = 160,
  765. +         height = 160,
  766. +         frame_count = 1,
  767. +         shift = {0, 0}
  768. +       },
  769. +       working_sound = {
  770. +         sound = {
  771. +           filename = "__base__/sound/lab.ogg",
  772. +           volume = 0.7
  773. +         },
  774. +         apparent_volume = 1
  775. +       },
  776. +       energy_source = {
  777. +         type = "electric",
  778. +         usage_priority = "secondary-input"
  779. +       },
  780. +       energy_usage = "125kW",
  781. +       researching_speed = 1,
  782. +       inputs = {
  783. +         "angels-science-pack-red",
  784. +         "angels-science-pack-green",
  785. +         "angels-science-pack-orange",
  786. +         "datacore-enhance-1",
  787. +         "apm_industrial_science_pack",
  788. +         "apm_steam_science_pack"
  789. +       },
  790. +       module_specification = {
  791. +         module_slots = 2,
  792. +         max_entity_info_module_icons_per_row = 3,
  793. +         max_entity_info_module_icon_rows = 1,
  794. +         module_info_icon_shift = {0, 0.9}
  795. +       }
  796. +     },
  797. +     {
  798. +       type = "item",
  799. +       name = "angels-enhance-lab-2",
  800. +       icons = {
  801. +         {
  802. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  803. +         },
  804. +         {
  805. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  806. +           tint = angelsmods.industries.number_tint,
  807. +           scale = 0.32,
  808. +           shift = {-12, -12}
  809. +         }
  810. +       },
  811. +       icon_size = 32,
  812. +       subgroup = "angels-labs-2",
  813. +       order = "b[angels-enhance-lab-2]",
  814. +       place_result = "angels-enhance-lab-2",
  815. +       stack_size = 10
  816. +     },
  817. +     {
  818. +       type = "lab",
  819. +       name = "angels-enhance-lab-2",
  820. +       localised_description = {"",
  821. +         {"entity-description.angels-enhance-lab"}, "\n",
  822. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  823. +           "angels-science-pack-blue",
  824. +           "angels-science-pack-yellow",
  825. +           "datacore-enhance-2",
  826. +           "apm_industrial_science_pack",
  827. +           "apm_steam_science_pack"
  828. +         }}
  829. +       },
  830. +       icons = {
  831. +         {
  832. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  833. +         },
  834. +         {
  835. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  836. +           tint = angelsmods.industries.number_tint,
  837. +           scale = 0.32,
  838. +           shift = {-12, -12}
  839. +         }
  840. +       },
  841. +       icon_size = 32,
  842. +       flags = {"placeable-player", "player-creation"},
  843. +       minable = {mining_time = 1, result = "angels-enhance-lab-2"},
  844. +       max_health = 150,
  845. +       corpse = "big-remnants",
  846. +       dying_explosion = "medium-explosion",
  847. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  848. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  849. +       light = {intensity = 0.75, size = 8},
  850. +       on_animation = {
  851. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab.png",
  852. +         width = 160,
  853. +         height = 160,
  854. +         frame_count = 36,
  855. +         line_length = 6,
  856. +         animation_speed = 0.5,
  857. +         shift = {0, 0}
  858. +       },
  859. +       off_animation = {
  860. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab-off.png",
  861. +         width = 160,
  862. +         height = 160,
  863. +         frame_count = 1,
  864. +         shift = {0, 0}
  865. +       },
  866. +       energy_source = {
  867. +         type = "electric",
  868. +         usage_priority = "secondary-input"
  869. +       },
  870. +       energy_usage = "250kW",
  871. +       researching_speed = 2,
  872. +       inputs = {
  873. +         "angels-science-pack-blue",
  874. +         "angels-science-pack-yellow",
  875. +         "datacore-enhance-2",
  876. +         "apm_industrial_science_pack",
  877. +         "apm_steam_science_pack"
  878. +       },
  879. +       module_specification = {
  880. +         module_slots = 2,
  881. +         max_entity_info_module_icons_per_row = 3,
  882. +         max_entity_info_module_icon_rows = 1,
  883. +         module_info_icon_shift = {0, 0.9}
  884. +       }
  885. +     },
  886. +     {
  887. +       type = "item",
  888. +       name = "angels-enhance-lab-3",
  889. +       icons = {
  890. +         {
  891. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  892. +         },
  893. +         {
  894. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  895. +           tint = angelsmods.industries.number_tint,
  896. +           scale = 0.32,
  897. +           shift = {-12, -12}
  898. +         }
  899. +       },
  900. +       icon_size = 32,
  901. +       subgroup = "angels-labs-3",
  902. +       order = "b[angels-enhance-lab-3]",
  903. +       place_result = "angels-enhance-lab-3",
  904. +       stack_size = 10
  905. +     },
  906. +     {
  907. +       type = "lab",
  908. +       name = "angels-enhance-lab-3",
  909. +       localised_description = {"",
  910. +         {"entity-description.angels-enhance-lab"}, "\n",
  911. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  912. +           "angels-science-pack-white",
  913. +           "datacore-enhance-2",
  914. +           "apm_industrial_science_pack",
  915. +           "apm_steam_science_pack"
  916. +         }}
  917. +       },
  918. +       icons = {
  919. +         {
  920. +           icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
  921. +         },
  922. +         {
  923. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  924. +           tint = angelsmods.industries.number_tint,
  925. +           scale = 0.32,
  926. +           shift = {-12, -12}
  927. +         }
  928. +       },
  929. +       icon_size = 32,
  930. +       flags = {"placeable-player", "player-creation"},
  931. +       minable = {mining_time = 1, result = "angels-enhance-lab-3"},
  932. +       max_health = 150,
  933. +       corpse = "big-remnants",
  934. +       dying_explosion = "medium-explosion",
  935. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  936. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  937. +       light = {intensity = 0.75, size = 8},
  938. +       on_animation = {
  939. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab.png",
  940. +         width = 160,
  941. +         height = 160,
  942. +         frame_count = 36,
  943. +         line_length = 6,
  944. +         animation_speed = 0.5,
  945. +         shift = {0, 0}
  946. +       },
  947. +       off_animation = {
  948. +         filename = "__angelsindustries__/graphics/entity/enhance-lab/enhance-lab-off.png",
  949. +         width = 160,
  950. +         height = 160,
  951. +         frame_count = 1,
  952. +         shift = {0, 0}
  953. +       },
  954. +       energy_source = {
  955. +         type = "electric",
  956. +         usage_priority = "secondary-input"
  957. +       },
  958. +       energy_usage = "300kW",
  959. +       researching_speed = 3,
  960. +       inputs = {
  961. +         "angels-science-pack-white",
  962. +         "datacore-enhance-2",
  963. +         "apm_industrial_science_pack",
  964. +         "apm_steam_science_pack"
  965. +       },
  966. +       module_specification = {
  967. +         module_slots = 3,
  968. +         max_entity_info_module_icons_per_row = 3,
  969. +         max_entity_info_module_icon_rows = 1,
  970. +         module_info_icon_shift = {0, 0.9}
  971. +       }
  972. +     }
  973. +   }
  974. + )
  975. + else
  976.   data:extend(
  977.     {
  978.       --ENHANCE LAB
  979. ***************
  980. *** 273,280 ****
  981.       }
  982.     }
  983.   )
  984. !
  985.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-1"] = true
  986.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-2"] = true
  987.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-3"] = true
  988. ! end
  989. \ Kein Zeilenumbruch am Dateiende.
  990. --- 554,561 ----
  991.       }
  992.     }
  993.   )
  994. ! end
  995.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-1"] = true
  996.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-2"] = true
  997.   angelsmods.triggers.lab_ignore_token["angels-enhance-lab-3"] = true
  998. ! end
  999. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-exploration.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-exploration.lua
  1000. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-exploration.lua 2020-08-17 11:52:26.000000000 +0200
  1001. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-exploration.lua    2020-09-06 02:35:36.085059145 +0200
  1002. ***************
  1003. *** 6,11 ****
  1004. --- 6,12 ----
  1005.     return rich_text_icons
  1006.   end
  1007.   if angelsmods.industries.tech then
  1008. + if mods ["apm-power-notnotmelon"] then
  1009.     data:extend(
  1010.       {
  1011.         --EXPLORATION LAB
  1012. ***************
  1013. *** 43,49 ****
  1014.                 "angels-science-pack-green",
  1015.                 "angels-science-pack-orange",
  1016.                 "datacore-exploration-1",
  1017. !               "token-bio"
  1018.               }
  1019.             }
  1020.           },
  1021. --- 44,52 ----
  1022.                 "angels-science-pack-green",
  1023.                 "angels-science-pack-orange",
  1024.                 "datacore-exploration-1",
  1025. !               "token-bio",
  1026. !               "apm_industrial_science_pack",
  1027. !               "apm_steam_science_pack"
  1028.               }
  1029.             }
  1030.           },
  1031. ***************
  1032. *** 100,106 ****
  1033.             "angels-science-pack-red",
  1034.             "angels-science-pack-green",
  1035.             "angels-science-pack-orange",
  1036. !           "datacore-exploration-1"
  1037.           },
  1038.           module_specification = {
  1039.             module_slots = 2,
  1040. --- 103,111 ----
  1041.             "angels-science-pack-red",
  1042.             "angels-science-pack-green",
  1043.             "angels-science-pack-orange",
  1044. !           "datacore-exploration-1",
  1045. !           "apm_industrial_science_pack",
  1046. !           "apm_steam_science_pack"
  1047.           },
  1048.           module_specification = {
  1049.             module_slots = 2,
  1050. ***************
  1051. *** 141,147 ****
  1052.               create_rich_text_icons {
  1053.                 "angels-science-pack-blue",
  1054.                 "angels-science-pack-yellow",
  1055. !               "datacore-exploration-2"
  1056.               }
  1057.             }
  1058.           },
  1059. --- 146,154 ----
  1060.               create_rich_text_icons {
  1061.                 "angels-science-pack-blue",
  1062.                 "angels-science-pack-yellow",
  1063. !               "datacore-exploration-2",
  1064. !               "apm_industrial_science_pack",
  1065. !               "apm_steam_science_pack"
  1066.               }
  1067.             }
  1068.           },
  1069. ***************
  1070. *** 190,196 ****
  1071.           inputs = {
  1072.             "angels-science-pack-blue",
  1073.             "angels-science-pack-yellow",
  1074. !           "datacore-exploration-2"
  1075.           },
  1076.           module_specification = {
  1077.             module_slots = 2,
  1078. --- 197,205 ----
  1079.           inputs = {
  1080.             "angels-science-pack-blue",
  1081.             "angels-science-pack-yellow",
  1082. !           "datacore-exploration-2",
  1083. !           "apm_industrial_science_pack",
  1084. !           "apm_steam_science_pack"
  1085.           },
  1086.           module_specification = {
  1087.             module_slots = 2,
  1088. ***************
  1089. *** 230,236 ****
  1090.               "entity-description.angels-lab-inputs",
  1091.               create_rich_text_icons {
  1092.                 "angels-science-pack-white",
  1093. !               "datacore-exploration-2"
  1094.               }
  1095.             }
  1096.           },
  1097. --- 239,247 ----
  1098.               "entity-description.angels-lab-inputs",
  1099.               create_rich_text_icons {
  1100.                 "angels-science-pack-white",
  1101. !               "datacore-exploration-2",
  1102. !               "apm_industrial_science_pack",
  1103. !               "apm_steam_science_pack"
  1104.               }
  1105.             }
  1106.           },
  1107. ***************
  1108. *** 278,284 ****
  1109.           researching_speed = 3,
  1110.           inputs = {
  1111.             "angels-science-pack-white",
  1112. !           "datacore-exploration-2"
  1113.           },
  1114.           module_specification = {
  1115.             module_slots = 3,
  1116. --- 289,297 ----
  1117.           researching_speed = 3,
  1118.           inputs = {
  1119.             "angels-science-pack-white",
  1120. !           "datacore-exploration-2",
  1121. !           "apm_industrial_science_pack",
  1122. !           "apm_steam_science_pack"
  1123.           },
  1124.           module_specification = {
  1125.             module_slots = 3,
  1126. ***************
  1127. *** 289,295 ****
  1128.         }
  1129.       }
  1130.     )
  1131. !
  1132.     -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-1"] = true
  1133.     angelsmods.triggers.lab_ignore_token["angels-exploration-lab-2"] = true
  1134.     angelsmods.triggers.lab_ignore_token["angels-exploration-lab-3"] = true
  1135. --- 302,592 ----
  1136.         }
  1137.       }
  1138.     )
  1139. ! else
  1140. ! data:extend(
  1141. !   {
  1142. !     --EXPLORATION LAB
  1143. !     {
  1144. !       type = "item",
  1145. !       name = "angels-exploration-lab-1",
  1146. !       icons = {
  1147. !         {
  1148. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1149. !         },
  1150. !         {
  1151. !           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1152. !           tint = angelsmods.industries.number_tint,
  1153. !           scale = 0.32,
  1154. !           shift = {-12, -12}
  1155. !         }
  1156. !       },
  1157. !       icon_size = 32,
  1158. !       subgroup = "angels-labs-1",
  1159. !       order = "a[angels-exploration-lab-1]",
  1160. !       place_result = "angels-exploration-lab-1",
  1161. !       stack_size = 10
  1162. !     },
  1163. !     {
  1164. !       type = "lab",
  1165. !       name = "angels-exploration-lab-1",
  1166. !       localised_description = {
  1167. !         "",
  1168. !         {"entity-description.angels-exploration-lab"},
  1169. !         "\n",
  1170. !         {
  1171. !           "entity-description.angels-lab-inputs",
  1172. !           create_rich_text_icons {
  1173. !             "angels-science-pack-red",
  1174. !             "angels-science-pack-green",
  1175. !             "angels-science-pack-orange",
  1176. !             "datacore-exploration-1",
  1177. !             "token-bio"
  1178. !           }
  1179. !         }
  1180. !       },
  1181. !       icons = {
  1182. !         {
  1183. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1184. !         },
  1185. !         {
  1186. !           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1187. !           tint = angelsmods.industries.number_tint,
  1188. !           scale = 0.32,
  1189. !           shift = {-12, -12}
  1190. !         }
  1191. !       },
  1192. !       icon_size = 32,
  1193. !       flags = {"placeable-player", "player-creation"},
  1194. !       minable = {mining_time = 1, result = "angels-exploration-lab-1"},
  1195. !       max_health = 150,
  1196. !       corpse = "big-remnants",
  1197. !       dying_explosion = "medium-explosion",
  1198. !       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1199. !       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1200. !       light = {intensity = 0.75, size = 8},
  1201. !       on_animation = {
  1202. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab.png",
  1203. !         width = 160,
  1204. !         height = 160,
  1205. !         frame_count = 36,
  1206. !         line_length = 6,
  1207. !         animation_speed = 0.5,
  1208. !         shift = {0, 0}
  1209. !       },
  1210. !       off_animation = {
  1211. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab-off.png",
  1212. !         width = 160,
  1213. !         height = 160,
  1214. !         frame_count = 1,
  1215. !         shift = {0, 0}
  1216. !       },
  1217. !       working_sound = {
  1218. !         sound = {
  1219. !           filename = "__base__/sound/lab.ogg",
  1220. !           volume = 0.7
  1221. !         },
  1222. !         apparent_volume = 1
  1223. !       },
  1224. !       energy_source = {
  1225. !         type = "electric",
  1226. !         usage_priority = "secondary-input"
  1227. !       },
  1228. !       energy_usage = "125kW",
  1229. !       researching_speed = 1,
  1230. !       inputs = {
  1231. !         "angels-science-pack-red",
  1232. !         "angels-science-pack-green",
  1233. !         "angels-science-pack-orange",
  1234. !         "datacore-exploration-1"
  1235. !       },
  1236. !       module_specification = {
  1237. !         module_slots = 2,
  1238. !         max_entity_info_module_icons_per_row = 3,
  1239. !         max_entity_info_module_icon_rows = 1,
  1240. !         module_info_icon_shift = {0, 0.9}
  1241. !       }
  1242. !     },
  1243. !     {
  1244. !       type = "item",
  1245. !       name = "angels-exploration-lab-2",
  1246. !       icons = {
  1247. !         {
  1248. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1249. !         },
  1250. !         {
  1251. !           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1252. !           tint = angelsmods.industries.number_tint,
  1253. !           scale = 0.32,
  1254. !           shift = {-12, -12}
  1255. !         }
  1256. !       },
  1257. !       icon_size = 32,
  1258. !       subgroup = "angels-labs-2",
  1259. !       order = "a[angels-exploration-lab-2]",
  1260. !       place_result = "angels-exploration-lab-2",
  1261. !       stack_size = 10
  1262. !     },
  1263. !     {
  1264. !       type = "lab",
  1265. !       name = "angels-exploration-lab-2",
  1266. !       localised_description = {
  1267. !         "",
  1268. !         {"entity-description.angels-exploration-lab"},
  1269. !         "\n",
  1270. !         {
  1271. !           "entity-description.angels-lab-inputs",
  1272. !           create_rich_text_icons {
  1273. !             "angels-science-pack-blue",
  1274. !             "angels-science-pack-yellow",
  1275. !             "datacore-exploration-2"
  1276. !           }
  1277. !         }
  1278. !       },
  1279. !       icons = {
  1280. !         {
  1281. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1282. !         },
  1283. !         {
  1284. !           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1285. !           tint = angelsmods.industries.number_tint,
  1286. !           scale = 0.32,
  1287. !           shift = {-12, -12}
  1288. !         }
  1289. !       },
  1290. !       icon_size = 32,
  1291. !       flags = {"placeable-player", "player-creation"},
  1292. !       minable = {mining_time = 1, result = "angels-exploration-lab-2"},
  1293. !       max_health = 150,
  1294. !       corpse = "big-remnants",
  1295. !       dying_explosion = "medium-explosion",
  1296. !       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1297. !       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1298. !       light = {intensity = 0.75, size = 8},
  1299. !       on_animation = {
  1300. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab.png",
  1301. !         width = 160,
  1302. !         height = 160,
  1303. !         frame_count = 36,
  1304. !         line_length = 6,
  1305. !         animation_speed = 0.5,
  1306. !         shift = {0, 0}
  1307. !       },
  1308. !       off_animation = {
  1309. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab-off.png",
  1310. !         width = 160,
  1311. !         height = 160,
  1312. !         frame_count = 1,
  1313. !         shift = {0, 0}
  1314. !       },
  1315. !       energy_source = {
  1316. !         type = "electric",
  1317. !         usage_priority = "secondary-input"
  1318. !       },
  1319. !       energy_usage = "250kW",
  1320. !       researching_speed = 2,
  1321. !       inputs = {
  1322. !         "angels-science-pack-blue",
  1323. !         "angels-science-pack-yellow",
  1324. !         "datacore-exploration-2"
  1325. !       },
  1326. !       module_specification = {
  1327. !         module_slots = 2,
  1328. !         max_entity_info_module_icons_per_row = 3,
  1329. !         max_entity_info_module_icon_rows = 1,
  1330. !         module_info_icon_shift = {0, 0.9}
  1331. !       }
  1332. !     },
  1333. !     {
  1334. !       type = "item",
  1335. !       name = "angels-exploration-lab-3",
  1336. !       icons = {
  1337. !         {
  1338. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1339. !         },
  1340. !         {
  1341. !           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1342. !           tint = angelsmods.industries.number_tint,
  1343. !           scale = 0.32,
  1344. !           shift = {-12, -12}
  1345. !         }
  1346. !       },
  1347. !       icon_size = 32,
  1348. !       subgroup = "angels-labs-3",
  1349. !       order = "a[angels-exploration-lab-3]",
  1350. !       place_result = "angels-exploration-lab-3",
  1351. !       stack_size = 10
  1352. !     },
  1353. !     {
  1354. !       type = "lab",
  1355. !       name = "angels-exploration-lab-3",
  1356. !       localised_description = {
  1357. !         "",
  1358. !         {"entity-description.angels-exploration-lab"},
  1359. !         "\n",
  1360. !         {
  1361. !           "entity-description.angels-lab-inputs",
  1362. !           create_rich_text_icons {
  1363. !             "angels-science-pack-white",
  1364. !             "datacore-exploration-2"
  1365. !           }
  1366. !         }
  1367. !       },
  1368. !       icons = {
  1369. !         {
  1370. !           icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
  1371. !         },
  1372. !         {
  1373. !           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1374. !           tint = angelsmods.industries.number_tint,
  1375. !           scale = 0.32,
  1376. !           shift = {-12, -12}
  1377. !         }
  1378. !       },
  1379. !       icon_size = 32,
  1380. !       flags = {"placeable-player", "player-creation"},
  1381. !       minable = {mining_time = 1, result = "angels-exploration-lab-3"},
  1382. !       max_health = 150,
  1383. !       corpse = "big-remnants",
  1384. !       dying_explosion = "medium-explosion",
  1385. !       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1386. !       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1387. !       light = {intensity = 0.75, size = 8},
  1388. !       on_animation = {
  1389. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab.png",
  1390. !         width = 160,
  1391. !         height = 160,
  1392. !         frame_count = 36,
  1393. !         line_length = 6,
  1394. !         animation_speed = 0.5,
  1395. !         shift = {0, 0}
  1396. !       },
  1397. !       off_animation = {
  1398. !         filename = "__angelsindustries__/graphics/entity/exploration-lab/exploration-lab-off.png",
  1399. !         width = 160,
  1400. !         height = 160,
  1401. !         frame_count = 1,
  1402. !         shift = {0, 0}
  1403. !       },
  1404. !       energy_source = {
  1405. !         type = "electric",
  1406. !         usage_priority = "secondary-input"
  1407. !       },
  1408. !       energy_usage = "300kW",
  1409. !       researching_speed = 3,
  1410. !       inputs = {
  1411. !         "angels-science-pack-white",
  1412. !         "datacore-exploration-2"
  1413. !       },
  1414. !       module_specification = {
  1415. !         module_slots = 3,
  1416. !         max_entity_info_module_icons_per_row = 3,
  1417. !         max_entity_info_module_icon_rows = 1,
  1418. !         module_info_icon_shift = {0, 0.9}
  1419. !       }
  1420. !     }
  1421. !   }
  1422. ! )
  1423. ! end
  1424.     -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-1"] = true
  1425.     angelsmods.triggers.lab_ignore_token["angels-exploration-lab-2"] = true
  1426.     angelsmods.triggers.lab_ignore_token["angels-exploration-lab-3"] = true
  1427. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-logistic.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-logistic.lua
  1428. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-logistic.lua    2020-08-17 11:52:26.000000000 +0200
  1429. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-logistic.lua   2020-09-06 02:36:59.113673014 +0200
  1430. ***************
  1431. *** 6,11 ****
  1432. --- 6,292 ----
  1433.     return rich_text_icons
  1434.   end
  1435.   if angelsmods.industries.tech then
  1436. + if mods ["apm-power-notnotmelon"] then
  1437. + data:extend(
  1438. +   {
  1439. +     --LOGISTIC LAB
  1440. +     {
  1441. +       type = "item",
  1442. +       name = "angels-logistic-lab-1",
  1443. +       icons = {
  1444. +         {
  1445. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1446. +         },
  1447. +         {
  1448. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1449. +           tint = angelsmods.industries.number_tint,
  1450. +           scale = 0.32,
  1451. +           shift = {-12, -12}
  1452. +         }
  1453. +       },
  1454. +       icon_size = 32,
  1455. +       subgroup = "angels-labs-1",
  1456. +       order = "d[angels-logistic-lab-1]",
  1457. +       place_result = "angels-logistic-lab-1",
  1458. +       stack_size = 10
  1459. +     },
  1460. +     {
  1461. +       type = "lab",
  1462. +       name = "angels-logistic-lab-1",
  1463. +       localised_description = {"",
  1464. +         {"entity-description.angels-logistic-lab"}, "\n",
  1465. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1466. +           "angels-science-pack-red",
  1467. +           "angels-science-pack-green",
  1468. +           "angels-science-pack-orange",
  1469. +           "datacore-logistic-1",
  1470. +           "apm_industrial_science_pack",
  1471. +           "apm_steam_science_pack"
  1472. +         }}
  1473. +       },
  1474. +       icons = {
  1475. +         {
  1476. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1477. +         },
  1478. +         {
  1479. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1480. +           tint = angelsmods.industries.number_tint,
  1481. +           scale = 0.32,
  1482. +           shift = {-12, -12}
  1483. +         }
  1484. +       },
  1485. +       icon_size = 32,
  1486. +       flags = {"placeable-player", "player-creation"},
  1487. +       minable = {mining_time = 1, result = "angels-logistic-lab-1"},
  1488. +       max_health = 150,
  1489. +       corpse = "big-remnants",
  1490. +       dying_explosion = "medium-explosion",
  1491. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1492. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1493. +       light = {intensity = 0.75, size = 8},
  1494. +       on_animation = {
  1495. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
  1496. +         width = 160,
  1497. +         height = 160,
  1498. +         frame_count = 36,
  1499. +         line_length = 6,
  1500. +         animation_speed = 0.5,
  1501. +         shift = {0, 0}
  1502. +       },
  1503. +       off_animation = {
  1504. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
  1505. +         width = 160,
  1506. +         height = 160,
  1507. +         frame_count = 1,
  1508. +         shift = {0, 0}
  1509. +       },
  1510. +       working_sound = {
  1511. +         sound = {
  1512. +           filename = "__base__/sound/lab.ogg",
  1513. +           volume = 0.7
  1514. +         },
  1515. +         apparent_volume = 1
  1516. +       },
  1517. +       energy_source = {
  1518. +         type = "electric",
  1519. +         usage_priority = "secondary-input"
  1520. +       },
  1521. +       energy_usage = "125kW",
  1522. +       researching_speed = 1,
  1523. +       inputs = {
  1524. +         "angels-science-pack-red",
  1525. +         "angels-science-pack-green",
  1526. +         "angels-science-pack-orange",
  1527. +         "datacore-logistic-1",
  1528. +         "apm_industrial_science_pack",
  1529. +         "apm_steam_science_pack"
  1530. +       },
  1531. +       module_specification = {
  1532. +         module_slots = 2,
  1533. +         max_entity_info_module_icons_per_row = 3,
  1534. +         max_entity_info_module_icon_rows = 1,
  1535. +         module_info_icon_shift = {0, 0.9}
  1536. +       }
  1537. +     },
  1538. +     {
  1539. +       type = "item",
  1540. +       name = "angels-logistic-lab-2",
  1541. +       icons = {
  1542. +         {
  1543. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1544. +         },
  1545. +         {
  1546. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1547. +           tint = angelsmods.industries.number_tint,
  1548. +           scale = 0.32,
  1549. +           shift = {-12, -12}
  1550. +         }
  1551. +       },
  1552. +       icon_size = 32,
  1553. +       subgroup = "angels-labs-2",
  1554. +       order = "d[angels-logistic-lab-2]",
  1555. +       place_result = "angels-logistic-lab-2",
  1556. +       stack_size = 10
  1557. +     },
  1558. +     {
  1559. +       type = "lab",
  1560. +       name = "angels-logistic-lab-2",
  1561. +       localised_description = {"",
  1562. +         {"entity-description.angels-logistic-lab"}, "\n",
  1563. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1564. +           "angels-science-pack-blue",
  1565. +           "angels-science-pack-yellow",
  1566. +           "datacore-logistic-2",
  1567. +           "apm_industrial_science_pack",
  1568. +           "apm_steam_science_pack"
  1569. +         }}
  1570. +       },
  1571. +       icons = {
  1572. +         {
  1573. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1574. +         },
  1575. +         {
  1576. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1577. +           tint = angelsmods.industries.number_tint,
  1578. +           scale = 0.32,
  1579. +           shift = {-12, -12}
  1580. +         }
  1581. +       },
  1582. +       icon_size = 32,
  1583. +       flags = {"placeable-player", "player-creation"},
  1584. +       minable = {mining_time = 1, result = "angels-logistic-lab-2"},
  1585. +       max_health = 150,
  1586. +       corpse = "big-remnants",
  1587. +       dying_explosion = "medium-explosion",
  1588. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1589. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1590. +       light = {intensity = 0.75, size = 8},
  1591. +       on_animation = {
  1592. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
  1593. +         width = 160,
  1594. +         height = 160,
  1595. +         frame_count = 36,
  1596. +         line_length = 6,
  1597. +         animation_speed = 0.5,
  1598. +         shift = {0, 0}
  1599. +       },
  1600. +       off_animation = {
  1601. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
  1602. +         width = 160,
  1603. +         height = 160,
  1604. +         frame_count = 1,
  1605. +         shift = {0, 0}
  1606. +       },
  1607. +       energy_source = {
  1608. +         type = "electric",
  1609. +         usage_priority = "secondary-input"
  1610. +       },
  1611. +       energy_usage = "250kW",
  1612. +       researching_speed = 2,
  1613. +       inputs = {
  1614. +         "angels-science-pack-blue",
  1615. +         "angels-science-pack-yellow",
  1616. +         "datacore-logistic-2",
  1617. +         "apm_industrial_science_pack",
  1618. +         "apm_steam_science_pack"
  1619. +       },
  1620. +       module_specification = {
  1621. +         module_slots = 2,
  1622. +         max_entity_info_module_icons_per_row = 3,
  1623. +         max_entity_info_module_icon_rows = 1,
  1624. +         module_info_icon_shift = {0, 0.9}
  1625. +       }
  1626. +     },
  1627. +     {
  1628. +       type = "item",
  1629. +       name = "angels-logistic-lab-3",
  1630. +       icons = {
  1631. +         {
  1632. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1633. +         },
  1634. +         {
  1635. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1636. +           tint = angelsmods.industries.number_tint,
  1637. +           scale = 0.32,
  1638. +           shift = {-12, -12}
  1639. +         }
  1640. +       },
  1641. +       icon_size = 32,
  1642. +       subgroup = "angels-labs-3",
  1643. +       order = "d[angels-logistic-lab-3]",
  1644. +       place_result = "angels-logistic-lab-3",
  1645. +       stack_size = 10
  1646. +     },
  1647. +     {
  1648. +       type = "lab",
  1649. +       name = "angels-logistic-lab-3",
  1650. +       localised_description = {"",
  1651. +         {"entity-description.angels-logistic-lab"}, "\n",
  1652. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1653. +           "angels-science-pack-white",
  1654. +           "datacore-logistic-2",
  1655. +           "apm_industrial_science_pack",
  1656. +           "apm_steam_science_pack"
  1657. +         }}
  1658. +       },
  1659. +       icons = {
  1660. +         {
  1661. +           icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
  1662. +         },
  1663. +         {
  1664. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1665. +           tint = angelsmods.industries.number_tint,
  1666. +           scale = 0.32,
  1667. +           shift = {-12, -12}
  1668. +         }
  1669. +       },
  1670. +       icon_size = 32,
  1671. +       flags = {"placeable-player", "player-creation"},
  1672. +       minable = {mining_time = 1, result = "angels-logistic-lab-3"},
  1673. +       max_health = 150,
  1674. +       corpse = "big-remnants",
  1675. +       dying_explosion = "medium-explosion",
  1676. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1677. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1678. +       light = {intensity = 0.75, size = 8},
  1679. +       on_animation = {
  1680. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
  1681. +         width = 160,
  1682. +         height = 160,
  1683. +         frame_count = 36,
  1684. +         line_length = 6,
  1685. +         animation_speed = 0.5,
  1686. +         shift = {0, 0}
  1687. +       },
  1688. +       off_animation = {
  1689. +         filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
  1690. +         width = 160,
  1691. +         height = 160,
  1692. +         frame_count = 1,
  1693. +         shift = {0, 0}
  1694. +       },
  1695. +       energy_source = {
  1696. +         type = "electric",
  1697. +         usage_priority = "secondary-input"
  1698. +       },
  1699. +       energy_usage = "300kW",
  1700. +       researching_speed = 3,
  1701. +       inputs = {
  1702. +         "angels-science-pack-white",
  1703. +         "datacore-logistic-2",
  1704. +         "apm_industrial_science_pack",
  1705. +         "apm_steam_science_pack"
  1706. +       },
  1707. +       module_specification = {
  1708. +         module_slots = 3,
  1709. +         max_entity_info_module_icons_per_row = 3,
  1710. +         max_entity_info_module_icon_rows = 1,
  1711. +         module_info_icon_shift = {0, 0.9}
  1712. +       }
  1713. +     }
  1714. +   }
  1715. + )
  1716. + else
  1717.   data:extend(
  1718.     {
  1719.       --LOGISTIC LAB
  1720. ***************
  1721. *** 273,280 ****
  1722.       }
  1723.     }
  1724.   )
  1725.  
  1726.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true
  1727.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true
  1728.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true
  1729. ! end
  1730. \ Kein Zeilenumbruch am Dateiende.
  1731. --- 554,562 ----
  1732.       }
  1733.     }
  1734.   )
  1735. + end
  1736.  
  1737.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true
  1738.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true
  1739.   angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true
  1740. ! end
  1741. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-processing.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-processing.lua
  1742. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-processing.lua  2020-08-17 11:52:26.000000000 +0200
  1743. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-processing.lua 2020-09-06 02:50:24.334642574 +0200
  1744. ***************
  1745. *** 6,11 ****
  1746. --- 6,301 ----
  1747.     return rich_text_icons
  1748.   end
  1749.   if angelsmods.industries.tech then
  1750. + if mods ["apm-power-notnotmelon"] then
  1751. + data:extend(
  1752. +   {
  1753. +     --PROCESSING LAB
  1754. +     {
  1755. +       type = "item",
  1756. +       name = "angels-processing-lab-1",
  1757. +       icons = {
  1758. +         {
  1759. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1760. +         },
  1761. +         {
  1762. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1763. +           tint = angelsmods.industries.number_tint,
  1764. +           scale = 0.32,
  1765. +           shift = {-12, -12}
  1766. +         }
  1767. +       },
  1768. +       icon_size = 32,
  1769. +       subgroup = "angels-labs-1",
  1770. +       order = "f",
  1771. +       place_result = "angels-processing-lab-1",
  1772. +       stack_size = 10
  1773. +     },
  1774. +     {
  1775. +       type = "lab",
  1776. +       name = "angels-processing-lab-1",
  1777. +       localised_description = {"",
  1778. +         {"entity-description.angels-processing-lab"}, "\n",
  1779. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1780. +           "angels-science-pack-red",
  1781. +           "angels-science-pack-green",
  1782. +           "angels-science-pack-orange",
  1783. +           "datacore-processing-1",
  1784. +           --"token-bio",
  1785. +           "apm_industrial_science_pack",
  1786. +           "apm_steam_science_pack"
  1787. +         }}
  1788. +       },
  1789. +       icons = {
  1790. +         {
  1791. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1792. +         },
  1793. +         {
  1794. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  1795. +           tint = angelsmods.industries.number_tint,
  1796. +           scale = 0.32,
  1797. +           shift = {-12, -12}
  1798. +         }
  1799. +       },
  1800. +       icon_size = 32,
  1801. +       flags = {"placeable-player", "player-creation"},
  1802. +       minable = {mining_time = 1, result = "angels-processing-lab-1"},
  1803. +       max_health = 150,
  1804. +       corpse = "big-remnants",
  1805. +       dying_explosion = "medium-explosion",
  1806. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1807. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1808. +       light = {intensity = 0.75, size = 8},
  1809. +       on_animation = {
  1810. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
  1811. +         width = 160,
  1812. +         height = 160,
  1813. +         frame_count = 36,
  1814. +         line_length = 6,
  1815. +         animation_speed = 0.5,
  1816. +         shift = {0, 0}
  1817. +       },
  1818. +       off_animation = {
  1819. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
  1820. +         width = 160,
  1821. +         height = 160,
  1822. +         frame_count = 1,
  1823. +         shift = {0, 0}
  1824. +       },
  1825. +       working_sound = {
  1826. +         sound = {
  1827. +           filename = "__base__/sound/lab.ogg",
  1828. +           volume = 0.7
  1829. +         },
  1830. +         apparent_volume = 1
  1831. +       },
  1832. +       energy_source = {
  1833. +         type = "electric",
  1834. +         usage_priority = "secondary-input"
  1835. +       },
  1836. +       energy_usage = "125kW",
  1837. +       researching_speed = 1,
  1838. +       inputs = {
  1839. +         "angels-science-pack-red",
  1840. +         "angels-science-pack-green",
  1841. +         "angels-science-pack-orange",
  1842. +         "datacore-processing-1",
  1843. +         "apm_industrial_science_pack",
  1844. +         "apm_steam_science_pack"
  1845. +       },
  1846. +       module_specification = {
  1847. +         module_slots = 2,
  1848. +         max_entity_info_module_icons_per_row = 3,
  1849. +         max_entity_info_module_icon_rows = 1,
  1850. +         module_info_icon_shift = {0, 0.9}
  1851. +       }
  1852. +     },
  1853. +     {
  1854. +       type = "item",
  1855. +       name = "angels-processing-lab-2",
  1856. +       icons = {
  1857. +         {
  1858. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1859. +         },
  1860. +         {
  1861. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1862. +           tint = angelsmods.industries.number_tint,
  1863. +           scale = 0.32,
  1864. +           shift = {-12, -12}
  1865. +         }
  1866. +       },
  1867. +       icon_size = 32,
  1868. +       subgroup = "angels-labs-2",
  1869. +       order = "f",
  1870. +       place_result = "angels-processing-lab-2",
  1871. +       stack_size = 10
  1872. +     },
  1873. +     {
  1874. +       type = "lab",
  1875. +       name = "angels-processing-lab-2",
  1876. +       localised_description = {"",
  1877. +         {"entity-description.angels-processing-lab"}, "\n",
  1878. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1879. +           "angels-science-pack-blue",
  1880. +           "angels-science-pack-yellow",
  1881. +           "datacore-processing-2",
  1882. +           --"token-bio",
  1883. +           "apm_industrial_science_pack",
  1884. +           "apm_steam_science_pack"
  1885. +         }}
  1886. +       },
  1887. +       icons = {
  1888. +         {
  1889. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1890. +         },
  1891. +         {
  1892. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  1893. +           tint = angelsmods.industries.number_tint,
  1894. +           scale = 0.32,
  1895. +           shift = {-12, -12}
  1896. +         }
  1897. +       },
  1898. +       icon_size = 32,
  1899. +       flags = {"placeable-player", "player-creation"},
  1900. +       minable = {mining_time = 1, result = "angels-processing-lab-2"},
  1901. +       max_health = 150,
  1902. +       corpse = "big-remnants",
  1903. +       dying_explosion = "medium-explosion",
  1904. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1905. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1906. +       light = {intensity = 0.75, size = 8},
  1907. +       on_animation = {
  1908. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
  1909. +         width = 160,
  1910. +         height = 160,
  1911. +         frame_count = 36,
  1912. +         line_length = 6,
  1913. +         animation_speed = 0.5,
  1914. +         shift = {0, 0}
  1915. +       },
  1916. +       off_animation = {
  1917. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
  1918. +         width = 160,
  1919. +         height = 160,
  1920. +         frame_count = 1,
  1921. +         shift = {0, 0}
  1922. +       },
  1923. +       energy_source = {
  1924. +         type = "electric",
  1925. +         usage_priority = "secondary-input"
  1926. +       },
  1927. +       energy_usage = "250kW",
  1928. +       researching_speed = 2,
  1929. +       inputs = {
  1930. +         "angels-science-pack-blue",
  1931. +         "angels-science-pack-yellow",
  1932. +         "datacore-processing-2",
  1933. +         --"datacore-processing-3",
  1934. +         --"datacore-processing-4",
  1935. +         --"datacore-processing-5",
  1936. +         "apm_industrial_science_pack",
  1937. +         "apm_steam_science_pack"
  1938. +       },
  1939. +       module_specification = {
  1940. +         module_slots = 2,
  1941. +         max_entity_info_module_icons_per_row = 3,
  1942. +         max_entity_info_module_icon_rows = 1,
  1943. +         module_info_icon_shift = {0, 0.9}
  1944. +       }
  1945. +     },
  1946. +     {
  1947. +       type = "item",
  1948. +       name = "angels-processing-lab-3",
  1949. +       icons = {
  1950. +         {
  1951. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1952. +         },
  1953. +         {
  1954. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1955. +           tint = angelsmods.industries.number_tint,
  1956. +           scale = 0.32,
  1957. +           shift = {-12, -12}
  1958. +         }
  1959. +       },
  1960. +       icon_size = 32,
  1961. +       subgroup = "angels-labs-3",
  1962. +       order = "f",
  1963. +       place_result = "angels-processing-lab-3",
  1964. +       stack_size = 10
  1965. +     },
  1966. +     {
  1967. +       type = "lab",
  1968. +       name = "angels-processing-lab-3",
  1969. +       localised_description = {"",
  1970. +         {"entity-description.angels-processing-lab"}, "\n",
  1971. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  1972. +           "angels-science-pack-white",
  1973. +           "datacore-processing-2",
  1974. +           --"token-bio",
  1975. +           "apm_industrial_science_pack",
  1976. +           "apm_steam_science_pack"
  1977. +         }}
  1978. +       },
  1979. +       icons = {
  1980. +         {
  1981. +           icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
  1982. +         },
  1983. +         {
  1984. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  1985. +           tint = angelsmods.industries.number_tint,
  1986. +           scale = 0.32,
  1987. +           shift = {-12, -12}
  1988. +         }
  1989. +       },
  1990. +       icon_size = 32,
  1991. +       flags = {"placeable-player", "player-creation"},
  1992. +       minable = {mining_time = 1, result = "angels-processing-lab-3"},
  1993. +       max_health = 150,
  1994. +       corpse = "big-remnants",
  1995. +       dying_explosion = "medium-explosion",
  1996. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  1997. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  1998. +       light = {intensity = 0.75, size = 8},
  1999. +       on_animation = {
  2000. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
  2001. +         width = 160,
  2002. +         height = 160,
  2003. +         frame_count = 36,
  2004. +         line_length = 6,
  2005. +         animation_speed = 0.5,
  2006. +         shift = {0, 0}
  2007. +       },
  2008. +       off_animation = {
  2009. +         filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
  2010. +         width = 160,
  2011. +         height = 160,
  2012. +         frame_count = 1,
  2013. +         shift = {0, 0}
  2014. +       },
  2015. +       energy_source = {
  2016. +         type = "electric",
  2017. +         usage_priority = "secondary-input"
  2018. +       },
  2019. +       energy_usage = "300kW",
  2020. +       researching_speed = 3,
  2021. +       inputs = {
  2022. +         "angels-science-pack-white",
  2023. +         "datacore-processing-2",
  2024. +         --"datacore-processing-3",
  2025. +         --"datacore-processing-4",
  2026. +         --"datacore-processing-5",
  2027. +         "apm_industrial_science_pack",
  2028. +         "apm_steam_science_pack"
  2029. +       },
  2030. +       module_specification = {
  2031. +         module_slots = 3,
  2032. +         max_entity_info_module_icons_per_row = 3,
  2033. +         max_entity_info_module_icon_rows = 1,
  2034. +         module_info_icon_shift = {0, 0.9}
  2035. +       }
  2036. +     }
  2037. +   }
  2038. + )
  2039. + else
  2040.   data:extend(
  2041.     {
  2042.       --PROCESSING LAB
  2043. ***************
  2044. *** 282,286 ****
  2045.       }
  2046.     }
  2047.   )
  2048.   angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true
  2049. ! end
  2050. \ Kein Zeilenumbruch am Dateiende.
  2051. --- 572,579 ----
  2052.       }
  2053.     }
  2054.   )
  2055. + end
  2056. +
  2057. +
  2058.   angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true
  2059. ! end
  2060. diff -C3 -r angelsindustries_0.4.6/prototypes/buildings/angels-labs-war.lua angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-war.lua
  2061. *** angelsindustries_0.4.6/prototypes/buildings/angels-labs-war.lua 2020-08-17 11:52:26.000000000 +0200
  2062. --- angelsindustries_0.4.6-apmpatch/prototypes/buildings/angels-labs-war.lua    2020-09-06 02:39:21.414725113 +0200
  2063. ***************
  2064. *** 6,11 ****
  2065. --- 6,292 ----
  2066.     return rich_text_icons
  2067.   end
  2068.   if angelsmods.industries.tech then
  2069. + if mods ["apm-power-notnotmelon"] then
  2070. + data:extend(
  2071. +   {
  2072. +     --WAR LAB
  2073. +     {
  2074. +       type = "item",
  2075. +       name = "angels-war-lab-1",
  2076. +       icons = {
  2077. +         {
  2078. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2079. +         },
  2080. +         {
  2081. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  2082. +           tint = angelsmods.industries.number_tint,
  2083. +           scale = 0.32,
  2084. +           shift = {-12, -12}
  2085. +         }
  2086. +       },
  2087. +       icon_size = 32,
  2088. +       subgroup = "angels-labs-1",
  2089. +       order = "e",
  2090. +       place_result = "angels-war-lab-1",
  2091. +       stack_size = 10
  2092. +     },
  2093. +     {
  2094. +       type = "lab",
  2095. +       name = "angels-war-lab-1",
  2096. +       localised_description = {"",
  2097. +         {"entity-description.angels-war-lab"}, "\n",
  2098. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  2099. +           "angels-science-pack-red",
  2100. +           "angels-science-pack-green",
  2101. +           "angels-science-pack-orange",
  2102. +           "datacore-war-1",
  2103. +           "apm_industrial_science_pack",
  2104. +           "apm_steam_science_pack"
  2105. +         }}
  2106. +       },
  2107. +       icons = {
  2108. +         {
  2109. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2110. +         },
  2111. +         {
  2112. +           icon = "__angelsrefining__/graphics/icons/num_1.png",
  2113. +           tint = angelsmods.industries.number_tint,
  2114. +           scale = 0.32,
  2115. +           shift = {-12, -12}
  2116. +         }
  2117. +       },
  2118. +       icon_size = 32,
  2119. +       flags = {"placeable-player", "player-creation"},
  2120. +       minable = {mining_time = 1, result = "angels-war-lab-1"},
  2121. +       max_health = 150,
  2122. +       corpse = "big-remnants",
  2123. +       dying_explosion = "medium-explosion",
  2124. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  2125. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  2126. +       light = {intensity = 0.75, size = 8},
  2127. +       on_animation = {
  2128. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
  2129. +         width = 160,
  2130. +         height = 160,
  2131. +         frame_count = 36,
  2132. +         line_length = 6,
  2133. +         animation_speed = 0.5,
  2134. +         shift = {0, 0}
  2135. +       },
  2136. +       off_animation = {
  2137. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
  2138. +         width = 160,
  2139. +         height = 160,
  2140. +         frame_count = 1,
  2141. +         shift = {0, 0}
  2142. +       },
  2143. +       working_sound = {
  2144. +         sound = {
  2145. +           filename = "__base__/sound/lab.ogg",
  2146. +           volume = 0.7
  2147. +         },
  2148. +         apparent_volume = 1
  2149. +       },
  2150. +       energy_source = {
  2151. +         type = "electric",
  2152. +         usage_priority = "secondary-input"
  2153. +       },
  2154. +       energy_usage = "125kW",
  2155. +       researching_speed = 1,
  2156. +       inputs = {
  2157. +         "angels-science-pack-red",
  2158. +         "angels-science-pack-green",
  2159. +         "angels-science-pack-orange",
  2160. +         "datacore-war-1",
  2161. +         "apm_industrial_science_pack",
  2162. +         "apm_steam_science_pack"
  2163. +       },
  2164. +       module_specification = {
  2165. +         module_slots = 2,
  2166. +         max_entity_info_module_icons_per_row = 3,
  2167. +         max_entity_info_module_icon_rows = 1,
  2168. +         module_info_icon_shift = {0, 0.9}
  2169. +       }
  2170. +     },
  2171. +     {
  2172. +       type = "item",
  2173. +       name = "angels-war-lab-2",
  2174. +       icons = {
  2175. +         {
  2176. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2177. +         },
  2178. +         {
  2179. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  2180. +           tint = angelsmods.industries.number_tint,
  2181. +           scale = 0.32,
  2182. +           shift = {-12, -12}
  2183. +         }
  2184. +       },
  2185. +       icon_size = 32,
  2186. +       subgroup = "angels-labs-2",
  2187. +       order = "e",
  2188. +       place_result = "angels-war-lab-2",
  2189. +       stack_size = 10
  2190. +     },
  2191. +     {
  2192. +       type = "lab",
  2193. +       name = "angels-war-lab-2",
  2194. +       localised_description = {"",
  2195. +         {"entity-description.angels-war-lab"}, "\n",
  2196. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  2197. +           "angels-science-pack-blue",
  2198. +           "angels-science-pack-yellow",
  2199. +           "datacore-war-2",
  2200. +           "apm_industrial_science_pack",
  2201. +           "apm_steam_science_pack"
  2202. +         }}
  2203. +       },
  2204. +       icons = {
  2205. +         {
  2206. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2207. +         },
  2208. +         {
  2209. +           icon = "__angelsrefining__/graphics/icons/num_2.png",
  2210. +           tint = angelsmods.industries.number_tint,
  2211. +           scale = 0.32,
  2212. +           shift = {-12, -12}
  2213. +         }
  2214. +       },
  2215. +       icon_size = 32,
  2216. +       flags = {"placeable-player", "player-creation"},
  2217. +       minable = {mining_time = 1, result = "angels-war-lab-2"},
  2218. +       max_health = 150,
  2219. +       corpse = "big-remnants",
  2220. +       dying_explosion = "medium-explosion",
  2221. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  2222. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  2223. +       light = {intensity = 0.75, size = 8},
  2224. +       on_animation = {
  2225. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
  2226. +         width = 160,
  2227. +         height = 160,
  2228. +         frame_count = 36,
  2229. +         line_length = 6,
  2230. +         animation_speed = 0.5,
  2231. +         shift = {0, 0}
  2232. +       },
  2233. +       off_animation = {
  2234. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
  2235. +         width = 160,
  2236. +         height = 160,
  2237. +         frame_count = 1,
  2238. +         shift = {0, 0}
  2239. +       },
  2240. +       energy_source = {
  2241. +         type = "electric",
  2242. +         usage_priority = "secondary-input"
  2243. +       },
  2244. +       energy_usage = "250kW",
  2245. +       researching_speed = 2,
  2246. +       inputs = {
  2247. +         "angels-science-pack-blue",
  2248. +         "angels-science-pack-yellow",
  2249. +         "datacore-war-2",
  2250. +         "apm_industrial_science_pack",
  2251. +         "apm_steam_science_pack"
  2252. +       },
  2253. +       module_specification = {
  2254. +         module_slots = 2,
  2255. +         max_entity_info_module_icons_per_row = 3,
  2256. +         max_entity_info_module_icon_rows = 1,
  2257. +         module_info_icon_shift = {0, 0.9}
  2258. +       }
  2259. +     },
  2260. +     {
  2261. +       type = "item",
  2262. +       name = "angels-war-lab-3",
  2263. +       icons = {
  2264. +         {
  2265. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2266. +         },
  2267. +         {
  2268. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  2269. +           tint = angelsmods.industries.number_tint,
  2270. +           scale = 0.32,
  2271. +           shift = {-12, -12}
  2272. +         }
  2273. +       },
  2274. +       icon_size = 32,
  2275. +       subgroup = "angels-labs-3",
  2276. +       order = "e",
  2277. +       place_result = "angels-war-lab-3",
  2278. +       stack_size = 10
  2279. +     },
  2280. +     {
  2281. +       type = "lab",
  2282. +       name = "angels-war-lab-3",
  2283. +       localised_description = {"",
  2284. +         {"entity-description.angels-war-lab"}, "\n",
  2285. +         {"entity-description.angels-lab-inputs", create_rich_text_icons{
  2286. +           "angels-science-pack-white",
  2287. +           "datacore-war-2",
  2288. +           "apm_industrial_science_pack",
  2289. +           "apm_steam_science_pack"
  2290. +         }}
  2291. +       },
  2292. +       icons = {
  2293. +         {
  2294. +           icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
  2295. +         },
  2296. +         {
  2297. +           icon = "__angelsrefining__/graphics/icons/num_3.png",
  2298. +           tint = angelsmods.industries.number_tint,
  2299. +           scale = 0.32,
  2300. +           shift = {-12, -12}
  2301. +         }
  2302. +       },
  2303. +       icon_size = 32,
  2304. +       flags = {"placeable-player", "player-creation"},
  2305. +       minable = {mining_time = 1, result = "angels-war-lab-3"},
  2306. +       max_health = 150,
  2307. +       corpse = "big-remnants",
  2308. +       dying_explosion = "medium-explosion",
  2309. +       collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
  2310. +       selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
  2311. +       light = {intensity = 0.75, size = 8},
  2312. +       on_animation = {
  2313. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
  2314. +         width = 160,
  2315. +         height = 160,
  2316. +         frame_count = 36,
  2317. +         line_length = 6,
  2318. +         animation_speed = 0.5,
  2319. +         shift = {0, 0}
  2320. +       },
  2321. +       off_animation = {
  2322. +         filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
  2323. +         width = 160,
  2324. +         height = 160,
  2325. +         frame_count = 1,
  2326. +         shift = {0, 0}
  2327. +       },
  2328. +       energy_source = {
  2329. +         type = "electric",
  2330. +         usage_priority = "secondary-input"
  2331. +       },
  2332. +       energy_usage = "300kW",
  2333. +       researching_speed = 3,
  2334. +       inputs = {
  2335. +         "angels-science-pack-white",
  2336. +         "datacore-war-2",
  2337. +         "apm_industrial_science_pack",
  2338. +         "apm_steam_science_pack"
  2339. +       },
  2340. +       module_specification = {
  2341. +         module_slots = 3,
  2342. +         max_entity_info_module_icons_per_row = 3,
  2343. +         max_entity_info_module_icon_rows = 1,
  2344. +         module_info_icon_shift = {0, 0.9}
  2345. +       }
  2346. +     }
  2347. +   }
  2348. + )
  2349. + else
  2350.   data:extend(
  2351.     {
  2352.       --WAR LAB
  2353. ***************
  2354. *** 273,280 ****
  2355.       }
  2356.     }
  2357.   )
  2358.  
  2359.   angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true
  2360.   angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true
  2361.   angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true
  2362. ! end
  2363. \ Kein Zeilenumbruch am Dateiende.
  2364. --- 554,562 ----
  2365.       }
  2366.     }
  2367.   )
  2368. + end
  2369.  
  2370.   angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true
  2371.   angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true
  2372.   angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true
  2373. ! end
  2374. diff -C3 -r angelsindustries_0.4.6/prototypes/overrides/components-base-entity-update.lua angelsindustries_0.4.6-apmpatch/prototypes/overrides/components-base-entity-update.lua
  2375. *** angelsindustries_0.4.6/prototypes/overrides/components-base-entity-update.lua   2020-08-17 11:52:26.000000000 +0200
  2376. --- angelsindustries_0.4.6-apmpatch/prototypes/overrides/components-base-entity-update.lua  2020-09-05 20:42:36.453367800 +0200
  2377. ***************
  2378. *** 3,8 ****
  2379. --- 3,27 ----
  2380.     OV.patch_recipes(
  2381.       {
  2382.         {
  2383. +         name = "boiler",
  2384. +         ingredients = {
  2385. +           {"!!"},
  2386. +           {type = "item", name = "block-construction-1", amount = 20},
  2387. +           {type = "item", name = "block-fluidbox-1", amount = 4},
  2388. +           {type = "item", name = "stone-furnace", amount = 1},
  2389. +           {type = "item", name = "stone-brick", amount = 10}
  2390. +         },
  2391. +         minable = {
  2392. +           results = {
  2393. +             {"!!"},
  2394. +             {type = "item", name = "block-construction-1", amount = 20},
  2395. +             {type = "item", name = "block-fluidbox-1", amount = 4},
  2396. +             {type = "item", name = "stone-furnace", amount = 1},
  2397. +             {type = "item", name = "stone-brick", amount = 10}
  2398. +           }
  2399. +         }
  2400. +       },
  2401. +       {
  2402.           name = "offshore-pump",
  2403.           ingredients = {
  2404.             {"block-electronics-0", "block-electronics-1"}
  2405. ***************
  2406. *** 328,331 ****
  2407.     --OV.remove_science_pack("cargo-robots-3", "chemical-science-pack")
  2408.  
  2409.     OV.add_prereq("angels-construction-robots-3", "tech-blue-circuit")
  2410. ! end
  2411. \ Kein Zeilenumbruch am Dateiende.
  2412. --- 347,350 ----
  2413.     --OV.remove_science_pack("cargo-robots-3", "chemical-science-pack")
  2414.  
  2415.     OV.add_prereq("angels-construction-robots-3", "tech-blue-circuit")
  2416. ! end
  2417. diff -C3 -r angelsindustries_0.4.6/prototypes/overrides/global-tech-base-cores.lua angelsindustries_0.4.6-apmpatch/prototypes/overrides/global-tech-base-cores.lua
  2418. *** angelsindustries_0.4.6/prototypes/overrides/global-tech-base-cores.lua  2020-08-17 11:52:26.000000000 +0200
  2419. --- angelsindustries_0.4.6-apmpatch/prototypes/overrides/global-tech-base-cores.lua 2020-09-06 02:13:41.288115151 +0200
  2420. ***************
  2421. *** 178,181 ****
  2422. --- 178,241 ----
  2423.     -- GLOBAL UPDATE TECHNOLOGY RESEARCH AMOUNT AND TIMES
  2424.     tech_unlock_reset()
  2425.     OV.execute()
  2426. +
  2427. +   if mods ["apm-power-notnotmelon"] then
  2428. +     OV.remove_science_pack("apm_water_supply-1", "datacore-processing-1")
  2429. +     OV.remove_science_pack("apm_fluid_control-1", "datacore-logistic-1")
  2430. +     OV.remove_science_pack("sand-processing", "datacore-processing-1")
  2431. +     OV.remove_science_pack("glass-processing", "datacore-processing-1")
  2432. +     OV.remove_science_pack("apm_power_automation_science_pack", "datacore-energy-1")
  2433. +     OV.remove_science_pack("electricity", "datacore-energy-1")
  2434. +     OV.remove_science_pack("electricity", "angels-science-pack-red")
  2435. +     OV.remove_science_pack("apm_power_electricity", "datacore-energy-1")
  2436. +     OV.remove_science_pack("apm_power_electricity", "angels-science-pack-red")
  2437. +     OV.remove_prereq("apm_power_electricity", "tech-specialised-labs-basic-energy-1")
  2438. +     OV.remove_prereq("apm_power_electricity", "tech-specialised-labs-basic-exploration-1")
  2439. +
  2440. +     OV.remove_science_pack("apm_power_steam", "datacore-energy-1")
  2441. +     OV.set_science_pack("angels-metallurgy-1", "apm_industrial_science_pack", 2)
  2442. +     OV.set_science_pack("angels-metallurgy-1", "apm_steam_science_pack", 2)
  2443. +     OV.remove_science_pack("angels-metallurgy-1", "datacore-processing-1")
  2444. +     OV.remove_science_pack("angels-metallurgy-1", "angels-science-pack-red")
  2445. +     OV.remove_prereq("angels-metallurgy-1", "tech-specialised-labs-basic-energy-1")
  2446. +     OV.remove_prereq("angels-metallurgy-1", "tech-specialised-labs-basic-processing-1")
  2447. +     OV.remove_prereq("angels-metallurgy-1", "tech-red-packs")
  2448. +
  2449. +     OV.set_science_pack("angels-tin-smelting-1", "apm_industrial_science_pack", 2)
  2450. +     OV.set_science_pack("angels-tin-smelting-1", "apm_steam_science_pack", 2)
  2451. +     OV.remove_science_pack("angels-tin-smelting-1", "datacore-processing-1")
  2452. +     OV.remove_science_pack("angels-tin-smelting-1", "angels-science-pack-red")
  2453. +     OV.remove_prereq("angels-tin-smelting-1", "tech-specialised-labs-basic-processing-1")
  2454. +     OV.remove_prereq("angels-tin-smelting-1", "tech-red-packs")
  2455. +
  2456. +     OV.set_science_pack("angels-solder-smelting-basic", "apm_industrial_science_pack", 2)
  2457. +     OV.set_science_pack("angels-solder-smelting-basic", "apm_steam_science_pack", 2)
  2458. +     OV.remove_science_pack("angels-solder-smelting-basic", "datacore-processing-1")
  2459. +     OV.remove_science_pack("angels-solder-smelting-basic", "angels-science-pack-red")
  2460. +     OV.remove_prereq("angels-solder-smelting-basic", "tech-specialised-labs-basic-processing-1")
  2461. +     OV.remove_prereq("angels-solder-smelting-basic", "tech-red-packs")
  2462. +
  2463. +     OV.remove_science_pack("angels-solder-smelting-basic", "datacore-basic")
  2464. +     OV.remove_science_pack("angels-solder-smelting-basic", "angels-science-pack-grey")
  2465. +     OV.remove_science_pack("steam-mining-drill", "datacore-processing-1")
  2466. +
  2467. +     OV.set_science_pack("basic-chemistry", "apm_industrial_science_pack", 2)
  2468. +     OV.set_science_pack("basic-chemistry", "apm_steam_science_pack", 2)
  2469. +     OV.remove_science_pack("basic-chemistry", "datacore-processing-1")
  2470. +     OV.remove_science_pack("basic-chemistry", "angels-science-pack-red")
  2471. +     OV.remove_prereq("basic-chemistry", "tech-specialised-labs-basic-processing-1")
  2472. +     OV.remove_prereq("basic-chemistry", "tech-red-packs")
  2473. +
  2474. +     OV.set_science_pack("angels-coal-processing", "apm_industrial_science_pack", 2)
  2475. +     OV.set_science_pack("angels-coal-processing", "apm_steam_science_pack", 2)
  2476. +     OV.remove_science_pack("angels-coal-processing", "datacore-processing-1")
  2477. +     OV.remove_science_pack("angels-coal-processing", "angels-science-pack-red")
  2478. +     OV.remove_prereq("angels-coal-processing", "tech-specialised-labs-basic-processing-1")
  2479. +     OV.remove_prereq("angels-coal-processing", "tech-red-packs")
  2480. +
  2481. +     OV.remove_science_pack("stone-walls", "datacore-war-1")
  2482. +
  2483. +     OV.execute()
  2484. +   end
  2485. +
  2486.   end
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!