API tools faq
paste
Advertisement
tabr

Electric-Trains-Redux_0.0.7

tabr
Jul 7th, 2022
1,622
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 16.87 KB | None | 0 0
raw download clone embed print report
  1. diff -ur tmp/Electric-Trains-Redux_0.0.7_default/locale/en/en.cfg Electric-Trains-Redux_0.0.7/locale/en/en.cfg
  2. --- tmp/Electric-Trains-Redux_0.0.7_default/locale/en/en.cfg    2022-03-30 17:20:01.347414100 +0300
  3. +++ Electric-Trains-Redux_0.0.7/locale/en/en.cfg    2022-07-07 09:16:27.985275700 +0300
  4. @@ -61,6 +61,34 @@
  5.  Lax-express-train-buffer=Express electric locomotive energy buffer
  6.  Lax-maglev-train-buffer=Maglev locomotive energy buffer
  7.  Lax-add-wagons=Add Cargo/Fluid wagons
  8. +Lax-locomotiveMk1-weight=Weight of Mk1 Locomotive
  9. +Lax-locomotiveMk1-braking_force=Breaking force of Mk1 Locomotive
  10. +Lax-locomotiveMk1-max_speed=Max speed of Mk1 Locomotive
  11. +Lax-locomotiveMk1-max_power_kw=Max power of Mk1 Locomotive
  12. +Lax-locomotiveMk2-weight=Weight of Mk2 Locomotive
  13. +Lax-locomotiveMk2-braking_force=Breaking force of Mk2 Locomotive
  14. +Lax-locomotiveMk2-max_speed=Max speed of Mk2 Locomotive
  15. +Lax-locomotiveMk2-max_power_kw=Max power of Mk2 Locomotive
  16. +Lax-locomotiveMk3-weight=Weight of Mk3 Locomotive
  17. +Lax-locomotiveMk3-braking_force=Breaking force of Mk3 Locomotive
  18. +Lax-locomotiveMk3-max_speed=Max speed of Mk3 Locomotive
  19. +Lax-locomotiveMk3-max_power_kw=Max power of Mk3 Locomotive
  20. +Lax-locomotiveMk4-weight=Weight of Mk4 Locomotive
  21. +Lax-locomotiveMk4-braking_force=Breaking force of Mk4 Locomotive
  22. +Lax-locomotiveMk4-max_speed=Max speed of Mk4 Locomotive
  23. +Lax-locomotiveMk4-max_power_kw=Max power of Mk4 Locomotive
  24. +Lax-wagon1-inventory_size=Wagon Mk1 inventory size
  25. +Lax-wagon1-weight=Wagon Mk1 weight
  26. +Lax-wagon2-inventory_size=Wagon Mk2 inventory size
  27. +Lax-wagon2-weight=Wagon Mk2 weight
  28. +Lax-wagon3-inventory_size=Wagon Mk3 inventory size
  29. +Lax-wagon3-weight=Wagon Mk3 weight
  30. +Lax-fwagon1-capacity=Fluid wagon Mk1 capacity
  31. +Lax-fwagon1-weight=Fluid wagon Mk1 weight
  32. +Lax-fwagon2-capacity=Fluid wagon Mk2 capacity
  33. +Lax-fwagon2-weight=Fluid wagon Mk2 weight
  34. +Lax-fwagon3-capacity=Fluid wagon Mk3 capacity
  35. +Lax-fwagon3-weight=Fluid wagon Mk3 weight
  36.  [mod-setting-description]
  37.  Lax-train-charge-ammount=How much power the script is allowed to move to the train each time it runs
  38.  Lax-train-charge-tickrate=How often the charging script is run
  39. @@ -71,4 +99,32 @@
  40.  Lax-improved-train-buffer=Max charge ammount in MW
  41.  Lax-express-train-buffer=Max charge ammount in MW
  42.  Lax-maglev-train-buffer=Max charge ammount in MW
  43. -Lax-add-wagons=If the mod should add its own larger cargo wagons or not.
  44. \ No newline at end of file
  45. +Lax-add-wagons=If the mod should add its own larger cargo wagons or not.
  46. +Lax-locomotiveMk1-weight=Weight of Mk1 Locomotive
  47. +Lax-locomotiveMk1-braking_force=50 is standard wagon
  48. +Lax-locomotiveMk1-max_speed=Max speed of Mk1 Locomotive
  49. +Lax-locomotiveMk1-max_power_kw=Amount in KW
  50. +Lax-locomotiveMk2-weight=Weight of Mk2 Locomotive
  51. +Lax-locomotiveMk2-braking_force=50 is standard wagon
  52. +Lax-locomotiveMk2-max_speed=Max speed of Mk2 Locomotive
  53. +Lax-locomotiveMk2-max_power_kw=Amount in KW
  54. +Lax-locomotiveMk3-weight=Weight of Mk3 Locomotive
  55. +Lax-locomotiveMk3-braking_force=50 is standard wagon
  56. +Lax-locomotiveMk3-max_speed=Max speed of Mk3 Locomotive
  57. +Lax-locomotiveMk3-max_power_kw=Amount in KW
  58. +Lax-locomotiveMk4-weight=Weight of Mk4 Locomotive
  59. +Lax-locomotiveMk4-braking_force=50 is standard wagon
  60. +Lax-locomotiveMk4-max_speed=Max speed of Mk4 Locomotive
  61. +Lax-locomotiveMk4-max_power_kw=Amount in KW
  62. +Lax-wagon1-inventory_size=Wagon Mk1 inventory size
  63. +Lax-wagon1-weight=Wagon Mk1 weight
  64. +Lax-wagon2-inventory_size=Wagon Mk2 inventory size
  65. +Lax-wagon2-weight=Wagon Mk2 weight
  66. +Lax-wagon3-inventory_size=Wagon Mk3 inventory size
  67. +Lax-wagon3-weight=Wagon Mk3 weight
  68. +Lax-fwagon1-capacity=Fluid wagon Mk1 capacity
  69. +Lax-fwagon1-weight=Fluid wagon Mk1 weight
  70. +Lax-fwagon2-capacity=Fluid wagon Mk2 capacity
  71. +Lax-fwagon2-weight=Fluid wagon Mk2 weight
  72. +Lax-fwagon3-capacity=Fluid wagon Mk3 capacity
  73. +Lax-fwagon3-weight=Fluid wagon Mk3 weight
  74. diff -ur tmp/Electric-Trains-Redux_0.0.7_default/prototypes/entities.lua Electric-Trains-Redux_0.0.7/prototypes/entities.lua
  75. --- tmp/Electric-Trains-Redux_0.0.7_default/prototypes/entities.lua 2022-04-15 13:23:13.181700600 +0300
  76. +++ Electric-Trains-Redux_0.0.7/prototypes/entities.lua 2022-07-07 09:09:27.905087400 +0300
  77. @@ -1,9 +1,10 @@
  78.  local locomotiveMk1 = util.table.deepcopy(data.raw.locomotive["locomotive"])
  79.  locomotiveMk1.name = "Electrical-Locomotive"
  80.  locomotiveMk1.minable.result = "Electrical-Locomotive"
  81. -locomotiveMk1.weight = 2000
  82. -locomotiveMk1.max_speed = 1.2
  83. -locomotiveMk1.max_power = "600KW"
  84. +locomotiveMk1.weight = settings.startup["Lax-locomotiveMk1-weight"].value
  85. +locomotiveMk1.braking_force = settings.startup["Lax-locomotiveMk1-braking_force"].value
  86. +locomotiveMk1.max_speed = settings.startup["Lax-locomotiveMk1-max_speed"].value
  87. +locomotiveMk1.max_power = settings.startup["Lax-locomotiveMk1-max_power_kw"].value.."KW"
  88.  locomotiveMk1.reversing_power_modifier = 1.0
  89.  locomotiveMk1.burner.fuel_category = "train-power"
  90.  locomotiveMk1.burner.fuel_inventory_size = 0
  91. @@ -27,26 +28,26 @@
  92.  
  93.  local locomotiveMk2 = util.table.deepcopy(locomotiveMk1)
  94.  locomotiveMk2.name = "Improved-Electrical-Locomotive"
  95. -locomotiveMk2.max_speed = 1.5
  96. -locomotiveMk2.braking_force = 50
  97. -locomotiveMk2.weight = 1800
  98. -locomotiveMk2.max_power = "2MW"
  99. +locomotiveMk2.weight = settings.startup["Lax-locomotiveMk2-weight"].value
  100. +locomotiveMk2.braking_force = settings.startup["Lax-locomotiveMk2-braking_force"].value
  101. +locomotiveMk2.max_speed = settings.startup["Lax-locomotiveMk2-max_speed"].value
  102. +locomotiveMk2.max_power = settings.startup["Lax-locomotiveMk2-max_power_kw"].value.."KW"
  103.  locomotiveMk2.minable.result = "Improved-Electrical-Locomotive"
  104.  
  105.  local locomotiveMk3 = util.table.deepcopy(locomotiveMk1)
  106.  locomotiveMk3.name = "Express-Electrical-Locomotive"
  107. -locomotiveMk3.max_speed = 2
  108. -locomotiveMk3.braking_force = 100
  109. -locomotiveMk3.weight = 1600
  110. -locomotiveMk3.max_power = "4.5MW"
  111. +locomotiveMk3.weight = settings.startup["Lax-locomotiveMk3-weight"].value
  112. +locomotiveMk3.braking_force = settings.startup["Lax-locomotiveMk3-braking_force"].value
  113. +locomotiveMk3.max_speed = settings.startup["Lax-locomotiveMk3-max_speed"].value
  114. +locomotiveMk3.max_power = settings.startup["Lax-locomotiveMk3-max_power_kw"].value.."KW"
  115.  locomotiveMk3.minable.result = "Express-Electrical-Locomotive"
  116.  
  117.  local locomotiveMk4 = util.table.deepcopy(locomotiveMk1)
  118.  locomotiveMk4.name = "Maglev-Locomotive"
  119. -locomotiveMk4.weight = 1000
  120. -locomotiveMk2.braking_force = 250
  121. -locomotiveMk4.max_speed = 3.5
  122. -locomotiveMk4.max_power = "10MW"
  123. +locomotiveMk4.weight = settings.startup["Lax-locomotiveMk4-weight"].value
  124. +locomotiveMk4.braking_force = settings.startup["Lax-locomotiveMk4-braking_force"].value
  125. +locomotiveMk4.max_speed = settings.startup["Lax-locomotiveMk4-max_speed"].value
  126. +locomotiveMk4.max_power = settings.startup["Lax-locomotiveMk4-max_power_kw"].value.."KW"
  127.  locomotiveMk4.minable.result = "Maglev-Locomotive"
  128.  
  129.  
  130. @@ -54,48 +55,49 @@
  131.  
  132.  
  133.  if settings.startup["Lax-add-wagons"] then
  134. +    local max_loco_speed = math.max(settings.startup["Lax-locomotiveMk1-max_speed"].value, settings.startup["Lax-locomotiveMk2-max_speed"].value, settings.startup["Lax-locomotiveMk3-max_speed"].value)
  135.      local wagon1 = util.table.deepcopy(data.raw["cargo-wagon"]["cargo-wagon"])
  136.      wagon1.name = "improved-cargo-wagon"
  137. -    wagon1.inventory_size = 60
  138. -    wagon1.max_speed = 3.5
  139. -    wagon1.weight = 1500
  140. +    wagon1.inventory_size = settings.startup["Lax-wagon1-inventory_size"].value
  141. +    wagon1.max_speed = max_loco_speed
  142. +    wagon1.weight = settings.startup["Lax-wagon1-weight"].value
  143.      wagon1.minable.result = "improved-cargo-wagon"
  144.  
  145.      local wagon2 = util.table.deepcopy(wagon1)
  146.      wagon2.name = "express-cargo-wagon"
  147. -    wagon2.inventory_size = 80
  148. -    wagon2.max_speed = 3.5
  149. -    wagon2.weight = 2000
  150. +    wagon2.inventory_size = settings.startup["Lax-wagon2-inventory_size"].value
  151. +    wagon2.max_speed = max_loco_speed
  152. +    wagon2.weight = settings.startup["Lax-wagon2-weight"].value
  153.      wagon2.minable.result = "express-cargo-wagon"
  154.  
  155.  
  156.      local wagon3 = util.table.deepcopy(wagon1)
  157.      wagon3.name = "maglev-cargo-wagon"
  158. -    wagon3.inventory_size = 120
  159. -    wagon3.max_speed = 3.5
  160. -    wagon3.weight = 1750
  161. +    wagon3.inventory_size = settings.startup["Lax-wagon3-inventory_size"].value
  162. +    wagon3.max_speed = max_loco_speed
  163. +    wagon3.weight = settings.startup["Lax-wagon3-weight"].value
  164.      wagon3.minable.result = "maglev-cargo-wagon"
  165.  
  166.  
  167.      local fwagon1 = util.table.deepcopy(data.raw["fluid-wagon"]["fluid-wagon"])
  168.      fwagon1.name= "improved-fluid-wagon"
  169. -    fwagon1.capacity = 50000
  170. -    fwagon1.max_speed=3.5
  171. -    fwagon1.weight=1500
  172. +    fwagon1.capacity = settings.startup["Lax-fwagon1-capacity"].value
  173. +    fwagon1.max_speed=max_loco_speed
  174. +    fwagon1.weight=settings.startup["Lax-fwagon1-weight"].value
  175.      fwagon1.minable.result = "improved-fluid-wagon"
  176.  
  177.      local fwagon2 = util.table.deepcopy(fwagon1)
  178.      fwagon2.name= "express-fluid-wagon"
  179. -    fwagon2.capacity = 75000
  180. -    fwagon2.max_speed=3.5
  181. -    fwagon2.weight=2000
  182. +    fwagon2.capacity = settings.startup["Lax-fwagon2-capacity"].value
  183. +    fwagon2.max_speed=max_loco_speed
  184. +    fwagon2.weight=settings.startup["Lax-fwagon2-weight"].value
  185.      fwagon2.minable.result = "express-fluid-wagon"
  186.  
  187.      local fwagon3 = util.table.deepcopy(fwagon1)
  188.      fwagon3.name= "maglev-fluid-wagon"
  189. -    fwagon3.capacity = 100000
  190. -    fwagon3.max_speed=3.5
  191. -    fwagon3.weight=1750
  192. +    fwagon3.capacity = settings.startup["Lax-fwagon3-capacity"].value
  193. +    fwagon3.max_speed=max_loco_speed
  194. +    fwagon3.weight=settings.startup["Lax-fwagon3-weight"].value
  195.      fwagon3.minable.result = "maglev-fluid-wagon"
  196.  
  197.      data:extend({
  198. diff -ur tmp/Electric-Trains-Redux_0.0.7_default/settings.lua Electric-Trains-Redux_0.0.7/settings.lua
  199. --- tmp/Electric-Trains-Redux_0.0.7_default/settings.lua    2022-03-30 12:56:03.057505600 +0300
  200. +++ Electric-Trains-Redux_0.0.7/settings.lua    2022-07-07 09:14:51.169074800 +0300
  201. @@ -87,4 +87,256 @@
  202.          default_value = true,
  203.          order = "tfg",
  204.      },
  205. +    {
  206. +        type = "int-setting",
  207. +        name = "Lax-locomotiveMk1-weight",
  208. +        setting_type = "startup",
  209. +        default_value = 2000,
  210. +        minimum_value = 100,
  211. +        maximum_value = 100000,
  212. +        order = "uaa"
  213. +    },
  214. +    {
  215. +        type = "int-setting",
  216. +        name = "Lax-locomotiveMk1-braking_force",
  217. +        setting_type = "startup",
  218. +        default_value = 10,
  219. +        minimum_value = 1,
  220. +        maximum_value = 1000,
  221. +        order = "uab"
  222. +    },
  223. +    {
  224. +        type = "double-setting",
  225. +        name = "Lax-locomotiveMk1-max_speed",
  226. +        setting_type = "startup",
  227. +        default_value = 1.2,
  228. +        minimum_value = 0.1,
  229. +        maximum_value = 10.0,
  230. +        order = "uac"
  231. +    },
  232. +    {
  233. +        type = "int-setting",
  234. +        name = "Lax-locomotiveMk1-max_power_kw",
  235. +        setting_type = "startup",
  236. +        default_value = 600,
  237. +        minimum_value = 100,
  238. +        maximum_value = 100000,
  239. +        order = "uad"
  240. +    },
  241. +    {
  242. +        type = "int-setting",
  243. +        name = "Lax-locomotiveMk2-weight",
  244. +        setting_type = "startup",
  245. +        default_value = 1800,
  246. +        minimum_value = 100,
  247. +        maximum_value = 100000,
  248. +        order = "uba"
  249. +    },
  250. +    {
  251. +        type = "int-setting",
  252. +        name = "Lax-locomotiveMk2-braking_force",
  253. +        setting_type = "startup",
  254. +        default_value = 50,
  255. +        minimum_value = 1,
  256. +        maximum_value = 1000,
  257. +        order = "ubb"
  258. +    },
  259. +    {
  260. +        type = "double-setting",
  261. +        name = "Lax-locomotiveMk2-max_speed",
  262. +        setting_type = "startup",
  263. +        default_value = 1.5,
  264. +        minimum_value = 0.1,
  265. +        maximum_value = 10.0,
  266. +        order = "ubc"
  267. +    },
  268. +    {
  269. +        type = "int-setting",
  270. +        name = "Lax-locomotiveMk2-max_power_kw",
  271. +        setting_type = "startup",
  272. +        default_value = 2000,
  273. +        minimum_value = 100,
  274. +        maximum_value = 100000,
  275. +        order = "ubd"
  276. +    },
  277. +    {
  278. +        type = "int-setting",
  279. +        name = "Lax-locomotiveMk3-weight",
  280. +        setting_type = "startup",
  281. +        default_value = 1600,
  282. +        minimum_value = 100,
  283. +        maximum_value = 100000,
  284. +        order = "uca"
  285. +    },
  286. +    {
  287. +        type = "int-setting",
  288. +        name = "Lax-locomotiveMk3-braking_force",
  289. +        setting_type = "startup",
  290. +        default_value = 100,
  291. +        minimum_value = 1,
  292. +        maximum_value = 1000,
  293. +        order = "ucb"
  294. +    },
  295. +    {
  296. +        type = "double-setting",
  297. +        name = "Lax-locomotiveMk3-max_speed",
  298. +        setting_type = "startup",
  299. +        default_value = 2.0,
  300. +        minimum_value = 0.1,
  301. +        maximum_value = 10.0,
  302. +        order = "ucc"
  303. +    },
  304. +    {
  305. +        type = "int-setting",
  306. +        name = "Lax-locomotiveMk3-max_power_kw",
  307. +        setting_type = "startup",
  308. +        default_value = 4500,
  309. +        minimum_value = 100,
  310. +        maximum_value = 100000,
  311. +        order = "ucd"
  312. +    },
  313. +    {
  314. +        type = "int-setting",
  315. +        name = "Lax-locomotiveMk4-weight",
  316. +        setting_type = "startup",
  317. +        default_value = 1000,
  318. +        minimum_value = 100,
  319. +        maximum_value = 100000,
  320. +        order = "uda"
  321. +    },
  322. +    {
  323. +        type = "int-setting",
  324. +        name = "Lax-locomotiveMk4-braking_force",
  325. +        setting_type = "startup",
  326. +        default_value = 250,
  327. +        minimum_value = 1,
  328. +        maximum_value = 1000,
  329. +        order = "udb"
  330. +    },
  331. +    {
  332. +        type = "double-setting",
  333. +        name = "Lax-locomotiveMk4-max_speed",
  334. +        setting_type = "startup",
  335. +        default_value = 3.5,
  336. +        minimum_value = 0.1,
  337. +        maximum_value = 10.0,
  338. +        order = "udc"
  339. +    },
  340. +    {
  341. +        type = "int-setting",
  342. +        name = "Lax-locomotiveMk4-max_power_kw",
  343. +        setting_type = "startup",
  344. +        default_value = 10000,
  345. +        minimum_value = 100,
  346. +        maximum_value = 100000,
  347. +        order = "udd"
  348. +    },
  349. +    {
  350. +        type = "int-setting",
  351. +        name = "Lax-wagon1-inventory_size",
  352. +        setting_type = "startup",
  353. +        default_value = 60,
  354. +        minimum_value = 10,
  355. +        maximum_value = 500,
  356. +        order = "uea"
  357. +    },
  358. +    {
  359. +        type = "int-setting",
  360. +        name = "Lax-wagon1-weight",
  361. +        setting_type = "startup",
  362. +        default_value = 1500,
  363. +        minimum_value = 100,
  364. +        maximum_value = 100000,
  365. +        order = "ueb"
  366. +    },
  367. +    {
  368. +        type = "int-setting",
  369. +        name = "Lax-wagon2-inventory_size",
  370. +        setting_type = "startup",
  371. +        default_value = 80,
  372. +        minimum_value = 10,
  373. +        maximum_value = 500,
  374. +        order = "uec"
  375. +    },
  376. +    {
  377. +        type = "int-setting",
  378. +        name = "Lax-wagon2-weight",
  379. +        setting_type = "startup",
  380. +        default_value = 2000,
  381. +        minimum_value = 100,
  382. +        maximum_value = 100000,
  383. +        order = "ued"
  384. +    },
  385. +    {
  386. +        type = "int-setting",
  387. +        name = "Lax-wagon3-inventory_size",
  388. +        setting_type = "startup",
  389. +        default_value = 120,
  390. +        minimum_value = 10,
  391. +        maximum_value = 500,
  392. +        order = "ufa"
  393. +    },
  394. +    {
  395. +        type = "int-setting",
  396. +        name = "Lax-wagon3-weight",
  397. +        setting_type = "startup",
  398. +        default_value = 1750,
  399. +        minimum_value = 100,
  400. +        maximum_value = 100000,
  401. +        order = "ufb"
  402. +    },
  403. +    {
  404. +        type = "int-setting",
  405. +        name = "Lax-fwagon1-capacity",
  406. +        setting_type = "startup",
  407. +        default_value = 50000,
  408. +        minimum_value = 1000,
  409. +        maximum_value = 1000000,
  410. +        order = "ufc"
  411. +    },
  412. +    {
  413. +        type = "int-setting",
  414. +        name = "Lax-fwagon1-weight",
  415. +        setting_type = "startup",
  416. +        default_value = 1500,
  417. +        minimum_value = 100,
  418. +        maximum_value = 100000,
  419. +        order = "ufd"
  420. +    },
  421. +    {
  422. +        type = "int-setting",
  423. +        name = "Lax-fwagon2-capacity",
  424. +        setting_type = "startup",
  425. +        default_value = 75000,
  426. +        minimum_value = 1000,
  427. +        maximum_value = 1000000,
  428. +        order = "ufe"
  429. +    },
  430. +    {
  431. +        type = "int-setting",
  432. +        name = "Lax-fwagon2-weight",
  433. +        setting_type = "startup",
  434. +        default_value = 2000,
  435. +        minimum_value = 100,
  436. +        maximum_value = 100000,
  437. +        order = "uff"
  438. +    },
  439. +    {
  440. +        type = "int-setting",
  441. +        name = "Lax-fwagon3-capacity",
  442. +        setting_type = "startup",
  443. +        default_value = 100000,
  444. +        minimum_value = 1000,
  445. +        maximum_value = 1000000,
  446. +        order = "ufg"
  447. +    },
  448. +    {
  449. +        type = "int-setting",
  450. +        name = "Lax-fwagon3-weight",
  451. +        setting_type = "startup",
  452. +        default_value = 1750,
  453. +        minimum_value = 100,
  454. +        maximum_value = 100000,
  455. +        order = "ufh"
  456. +    },
  457.  })
  458. \ No newline at end of file
  459.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!