Fixed crude_oil's material and ammo type, removed processed fuel and …

…the rope leading to the crane, replaced forklifts by trolleys, increased minimum city distance and liquid amount in containers
CleverRaven · May 5, 2024 · a4ba1f0 · a4ba1f0
1 parent 4559da7
commit a4ba1f0
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 69 deletions.
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -449,6 +449,12 @@
     "name": "motor oil",
     "default": "motor_oil"
   },
+  {
+    "type": "ammunition_type",
+    "id": "crude_oil",
+    "name": "crude oil",
+    "default": "crude_oil"
+  },
   {
     "type": "ammunition_type",
     "id": "thread",

diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json
@@ -221,11 +221,11 @@
     "sealed": false,
     "symbol": "=",
     "color": "black",
-    "material": [ "motor_oil" ],
-    "ammo_type": "motor_oil",
-    "range": 6,
-    "damage": { "damage_type": "heat", "amount": 2, "armor_penetration": 2 },
-    "effects": [ "FLAME", "STREAM" ]
+    "material": [ "crude_oil" ],
+    "ammo_type": "crude_oil",
+    "range": 3,
+    "damage": { "damage_type": "heat", "amount": 5, "armor_penetration": 5 },
+    "effects": [ "FLAME", "STREAM", "INCENDIARY" ]
   },
   {
     "id": "napalm",

diff --git a/data/json/mapgen/oil_platform/oil_platform_z2.json b/data/json/mapgen/oil_platform/oil_platform_z2.json
@@ -16,27 +16,27 @@
         ".=ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ=.",
         ".=ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ=.",
         ".=ZZ__________________________________________________=<=___________ZZ=.",
-        ".=ZZ__________________________________________________===___________ZZ=.",
+        ".=ZZ_______________²__________________________________===___________ZZ=.",
         ".=ZZ____________________________________________T______T______T_____ZZ=.",
         ".=ZZ_____õõ_________________________________________________________ZZ=.",
-        ".=ZZ_____õõ_________________↓____õõõ________________________________ZZ=.",
+        ".=ZZ_____õõ______________________õõõ________________________________ZZ=.",
         ".=ZZ____________õõõõ________________________________________________ZZ=.",
         ".=ZZ_____________õõõ________________________________________________ZZ=.",
         ".=ZZt___________________________________________T______T______T____tZZ=.",
         ".=ZZ______________________________________6_________________________ZZ=.",
         ".=ZZ_____####*#####*########*++*##77777777###*#####*#######*###_____ZZ=.",
-        ".=Z=_____#õ_õõõ_õõ____+___________________6Q¼KKQ#p__ppppppp__ψ#_____=Z=.",
-        ".=<=t____#õõ_õ_õ______+________________________Q#p____________+____t=<=.",
+        ".=Z=_____#õ`õõõ`õõ____+___________________6Q¼KKQ#p__ppppppp__ψ#_____=Z=.",
+        ".=<=t____#õõ`õ_õ______+________________________Q#p____________+____t=<=.",
         ".=Z=_____*õ___________############õ____↨_______Q#p__bbbbbbb___#_____=Z=.",
         ".=ZZ_____#____________#ψ»»»»╜1»»»#õ_______²____«#p____________*_____ZZ=.",
         ".=ZZ_____#__õooo_oooψ_#»←____Ƨ___+_____________K#p__ppppppp___#_____ZZ=.",
         ".=ZZt____#__1o•o_o•o1_#╜Ƨ_______;#______________+_____________#____tZZ=.",
         ".=ZZ____õ*__Qo##?##oQ_#1___1☼_←_»#<__<#ψ________#___1##?##1___#_____ZZ=.",
-        ".=ZZ___õ_#__Qo#o_o#oQ_#`__Ƨ♀o`__»##**##C___õõ__¿#oooo#o_o#oo__*_____ZZ=.",
+        ".=ZZ___õ_#__Qo#o_o#oQ_#♫__Ƨ♀o`__»##**##C___õõ__¿#oooo#o_o#oo__*_____ZZ=.",
         ".=ZZ____õ#__Qo#.v.#oQ_#___←Ko`__»#ZZZZ#º__õõõ__K#o__•#.v.#•o__#_____ZZ=.",
         ".=ZZt___õ#__Qo#o_o#oQ_#__♀K♀oψ___#ZvvZ*K_______Q#o_oo#o.o#oo♫_#____tZZ=.",
         ".=Z=_____*__1o#####o1_#_1╟1┼o1←__#ZZZZ#QQQ_____Q#o_o_#####_oõ_#_____=Z=.",
-        ".=<=_____#__oo•o_o•ooo#_`æ_0•…`__#=__=#####*++*##############+#_____=<=.",
+        ".=<=_____#__oo•o_o•ooo#_♫æ_0•…`__#=__=#####*++*##############+#_____=<=.",
         ".=Z=_____+__o_oo_oo__o#_←o_o_o`__#=__=___________o_o_______o________=Z=.",
         ".=ZZt____#õõo_o___o__o#_1o•o•o1__#_______________o_ooo_ooooo_______tZZ=.",
         ".=ZZ_____##############+########+#____T______T___o_==o_o==_________ZZZ=.",
@@ -45,12 +45,12 @@
         ".=ZZ______==o_o==________o_o_o_______↨_______________o_o___t_______ZZnZ.",
         ".=ZZ_______<oto<_________o_o_ooo_______ooooo…______…oo_oo0_________ZZZZ.",
         ".=ZZ______==o_o==_________________________o•1______1•o_o•1_________Z1==.",
-        ".=ZZ________o_o___________________________oo…______…oo_oo0_________ZZ...",
+        ".=ZZ________o_o________________²__________oo…______…oo_oo0_________ZZ...",
         ".=ZZ_______oo╟o``_________________________o•1______1•o_o•1_________ZZ...",
         ".=ZZ_________1oooo_______o_o_____=____=___oo…______…oo_oo0_________Z1==.",
-        ".=ZZ_____t_____o•o1______o_o__====ZZZZ====o________1•o_o•1_________ZZnZ.",
+        ".=ZZ_____t____♫o•o1______o_o__====ZZZZ====o________1•o_o•1_________ZZnZ.",
         ".=ZZ___________0_0____=_=o_o__=tZZZZZZZZt=o___=_=__…oo_oo0_t_______ZZZZ.",
-        ".=ZZ___________o•o1___=<=o1o1ooZZZ====ZZZoo1__=<=____o_o•1_________Z1==.",
+        ".=ZZ___________o•o1___=<=o1o1ooZZZ====ZZZoo1__=<=___♫o_o•1_________Z1==.",
         ".=ZZ____u^u____oooooooooooooooZZZ==••==ZZZoooooooooooo_oo0_010_____ZZnZ.",
         ".=ZZ_____ooo_t_________t_o╟o┼oZZZ=•‼o•=ZZZo┼o__t______to♫__o•o_____ZZZZ.",
         ".=ZZ____u^uoæoooooooooooooooooZZZ==••==ZZZoooooooooooooooooooo_____Z1==.",
@@ -68,7 +68,7 @@
         ".=ZZ____ooooooo___________________===___________6___________oooo____ZZ=.",
         ".=ZZt___o###W##W##W##W++W##W###*####*###*++*###*#77777777#*####o___tZZ=.",
         ".=ZZ____o#3┴┴3┴┴DbbFψ________#bbb#ψ_QQKK____CKQ_6__________QQK#o____ZZ=.",
-        ".=ZZ____oW3__________________+___+___________________________K*o____ZZ=.",
+        ".=ZZ____oW3__________________+___+____________________²______K*o____ZZ=.",
         ".=Z=____o#3______________##?###+##___________________________¿#o____=Z=.",
         ".=<=t___o#b__jjjjjjjjjjjj#N_N#__h#õ__________________________K*o___t=<=.",
         ".=Z=____oWb__jI┴_jI┴_jI┴_#N__?_eé#õõ_____õõõKQQKKKQK¼KQ______ψ#o____=Z=.",
@@ -77,10 +77,10 @@
         ".=ZZt___o#_____õõõõKKQK¼CKKQQQKKC_õõõ________________________K*o___tZZ=.",
         ".=ZZ____oW____õõ__õ______________õ_õ______________________Q¿KK#o____ZZ=.",
         ".=ZZ____o#______________________________________Qψ######+######o____ZZ=.",
-        ".=ZZ____o#_________________õõ♫____õ____õ_õõõ_____##♫_________Q#o____ZZ=.",
-        ".=ZZt___oW______õ_õ_________õ♫__________õõ_______+______oo0___#o___tZZ=.",
+        ".=ZZ____o#____________²____õõ♫____õ____õ_õõõ_____##♫_________Q#o____ZZ=.",
+        ".=ZZt___oW______õ_õ_________õ♫__________õõ_______+______oo…___#o___tZZ=.",
         ".=Z=____o#<___õõõõõQ¿KK__________________________#_1ψQQ_o•91__*o____=Z=.",
-        ".=<=____o###############_________#<__<#_________õ#_oooo_oo0___#o____=<=.",
+        ".=<=____o###############_________#<__<#_________õ#_oooo_oo…___#o____=<=.",
         ".=Z=____o#ψ____________+________õ##**##õ______õ_õ#_o•_o_oõ___õ#o____=Z=.",
         ".=ZZt___o*___1##?##õõ__#õõ______õ#ZZZZ#õ_______õõ#_o###?###_õ_*o___tZZ=.",
         ".=ZZ____o#__oo#o_o#oo__#________õ*ZvvZ*_õ_______♫#_o##o_o##_õõ#o____ZZ=.",
@@ -91,7 +91,7 @@
         ".=ZZ____o#_õ_o__•o1____+___õõ______↨____õõ_________ooooooooo________ZZ=.",
         ".=ZZ____o#õ__o___oooæ__*___õõ___________õõ_____________1____________ZZ=.",
         ".=ZZ____o#õõ_o_________#___õõ_______________________________________ZZ=.",
-        ".=ZZ____o#õõ_o♫♫♫♫♫____#___________õõ______↓__õõõõ__________________ZZ=.",
+        ".=ZZ____o#õõ_o`````____#___________õõ_________õõõõ__________________ZZ=.",
         ".=ZZ____o###############___________õõ_________õõõõ__________________ZZ=.",
         ".=ZZ____o____o_=<___õõõõ____________________________________________ZZ=.",
         ".=ZZ____oooooo_===__________________________________________________ZZ=.",
@@ -113,21 +113,12 @@
       "signs": {  },
       "liquids": {
         "_": [
-          { "liquid": "diesel", "amount": [ 1, 4 ], "chance": 240 },
-          { "liquid": "motor_oil", "amount": [ 1, 4 ], "chance": 220 },
-          { "liquid": "gasoline", "amount": [ 1, 4 ], "chance": 240 },
+          { "liquid": "motor_oil", "amount": [ 1, 4 ], "chance": 190 },
           { "liquid": "salt_water", "amount": [ 1, 4 ], "chance": 70 },
-          { "liquid": "chem_benzene", "amount": [ 1, 4 ], "chance": 220 },
-          { "liquid": "crude_oil", "amount": [ 1, 4 ], "chance": 120 },
-          { "liquid": "lamp_oil", "amount": [ 1, 4 ], "chance": 220 }
+          { "liquid": "crude_oil", "amount": [ 1, 4 ], "chance": 120 }
         ],
-        "…": { "liquid": "salt_water", "amount": [ 250, 1000 ] },
-        "0": [
-          { "liquid": "crude_oil", "amount": [ 300, 2250 ], "chance": 6 },
-          { "liquid": "propane", "amount": [ 300, 2200 ], "chance": 3 },
-          { "liquid": "motor_oil", "amount": [ 300, 2250 ], "chance": 1 }
-        ],
-        "æ": [ { "liquid": "propane", "amount": [ 300, 1200 ], "chance": 6 } ]
+        "…": { "liquid": "salt_water", "amount": [ 25000, 300000 ] },
+        "0": [ { "liquid": "crude_oil", "amount": [ 50000, 300000 ] } ]
       },
       "furniture": { "♀": "f_sink", "☼": "f_catalytic_cracking_reactor" },
       "terrain": { "n": "t_bridge", "‼": "t_drill_string" },

diff --git a/data/json/mapgen/oil_platform/oil_platform_z3.json b/data/json/mapgen/oil_platform/oil_platform_z3.json
@@ -19,24 +19,24 @@
         "..............................................=ZZZZZZZZZZZZZZZZZ=.......",
         "..............................................=Z_______________Z=.......",
         "..............................................=Z_______________Z=.......",
-        "............................↓.................=Z______===______Z=.......",
+        "..............................................=Z______===______Z=.......",
         "..............................................=Z______=u^______Z=.......",
         "............................===...............=Z______===______Z=.......",
         "..===========================<=================Z_______________Z======..",
         "..=ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ_______________ZZZZZZ=..",
         "..=Z####W#####W##############################*#####*##+##*#####*####Z=..",
         ".==Z#,hhh,hh,,,,ý#&&&&#},}#Q_øøøøøøøøøøøøøø2222#22222222222222222__#Z==.",
         ".=>ZW3333333,,,,,+,,,,#},}#Q_OOOOqqqqqqOOOO____+________________2__*Z>=.",
-        ".=<Z#hhh,hh,,,,,ý#&&&&#ψ,z#Q__________________®#########®QQ_____2__#Z<=.",
-        ".==Z#########+##########+######+##*##*##+#######_®oo0oo#oo8888882__#Z==.",
+        ".=<Z#hhh,hh,,,,,ý#&&&&#ψ,z#Q__________________®#########®QQ_____2_♫#Z<=.",
+        ".==Z#########+##########+######+##*##*##+#######_®oo0oo#oo8888882_♫#Z==.",
         "..=Z#BB,,,,,,,,,,,,ý#,,,,,,,,,,,,,,,,,,,,,,,,,ψ#_1o•9__#__8888882_Q*Z=..",
         "..=ZW,,,hh,hhh,h,,,,+,,,,,,,,,,,,,,,,,,,,,,,,,,+__oo0oo#oo8888882_Q#Z=..",
         "..=Z#,,,33333333h,,,#ýbbbbbý,,,,#<>,,><#,,,,,,,#_1o•9__#__8888882_Q#Z=..",
         "..=Z#,é,(((((((3h,,,########*++*########*++*#,,#__oo0oo#oo8888882_Q*Z=..",
         "..=ZWƧc,(((((((3h,,B#&,,BBB,,,,,,Ƨc&&cƧ,,,,,#,,#_1o•9__#__8888882_Q#Z=..",
-        ".==Z#,z,(((((((3h,,B#&,,,,,,,,,,céc,,céc,,,,+,,#__oo0oo#oo8888882__#Z==.",
-        ".=<Z#,,,33333333h,,&#&,,,,,,,,,,,,,,,,,,,,,z#,,#_1o•9__#____↨______*Z<=.",
-        ".=>ZW,,,hhhhhh,h,,,&#&,,,,,#ccc,,,,,,,,,,ccc#+##__o____#®_______♫♫♫#Z>=.",
+        ".==Z#,z,(((((((3h,,B#&,,,,,,,,,,céc,,céc,,,,+,,#__oo0oo#oo8888882_♫#Z==.",
+        ".=<Z#,,,33333333h,,&#&,,,,,,,,,,,,,,,,,,,,,z#,,#_1o•9__#____↨_____♫*Z<=.",
+        ".=>ZW,,,hhhhhh,h,,,&#&,,,,,#ccc,,,,,,,,,,ccc#+##__o____#®________♫♫#Z>=.",
         ".==Z#BB,,,,,,,,,,,,ψ#ý&&,,,##éè,Ƨ,,,,,,,Ƨèé##)S##*##*#####*+*###*###Z==.",
         "..=Z###W##W#+#W##W######,,,ψ*éè,,Ƨ,Ƨ,,Ƨ,,èé##)))#.o..=ZZZZZZZZZZZZZZZ=..",
         "..=ZZZZZZZZZZZZZZZZZZZZ+,,,,*éèèèèèèèèèèèèé##+#+#oo.==Z===============..",
@@ -91,7 +91,7 @@
         ".......=Z_______________Z=........====............===========...........",
         ".......=Z______===______Z=..............................................",
         ".......=Z______^u=______Z=..............................................",
-        ".......=Z______===______Z=.................↓............................",
+        ".......=Z______===______Z=..............................................",
         ".......=Z_______________Z=..............................................",
         ".......=ZZZZZZZZ>ZZZZZZZZ=..............................................",
         ".......===================..............................................",

diff --git a/data/json/mapgen/oil_platform/oil_platform_z4.json b/data/json/mapgen/oil_platform/oil_platform_z4.json
@@ -19,7 +19,7 @@
         "........................................................................",
         "........................................................................",
         "........................................................................",
-        "............................↓.........................====..............",
+        "......................................................====..............",
         "......................................................=uX=..............",
         "............................===.......................====..............",
         "............................=>=..........===............................",
@@ -91,7 +91,7 @@
         "..................................====..................................",
         "..............====......................................................",
         "..............=Xu=......................................................",
-        "..............====.........................↓............................",
+        "..............====......................................................",
         "........................................................................",
         "........................................................................",
         "........................................................................",

diff --git a/data/json/mapgen/oil_platform/oil_platform_z5.json b/data/json/mapgen/oil_platform/oil_platform_z5.json
@@ -19,7 +19,7 @@
         "........................................................................",
         "........................................................................",
         "......................................................[]][==............",
-        "............................↓.........................]éƧ]8=............",
+        "......................................................]éƧ]8=............",
         "......................................................]Yv]8=............",
         "......................................................[]][^=............",
         ".........................................===............................",
@@ -91,7 +91,7 @@
         "........................................................................",
         "............=^[]][......................................................",
         "............=8]vY]......................................................",
-        "............=8]Ƨé].........................↓............................",
+        "............=8]Ƨé]......................................................",
         "............==[]][......................................................",
         "........................................................................",
         "........................................................................",
@@ -129,8 +129,8 @@
         "τ": { "item": "laundry", "chance": 50, "repeat": [ 5, 15 ] }
       },
       "liquids": {
-        "…": { "liquid": "water_clean", "amount": [ 250, 1000 ] },
-        "0": { "liquid": "water_sewage", "amount": [ 300, 1200 ] }
+        "…": { "liquid": "water_clean", "amount": [ 25000, 250000 ] },
+        "0": { "liquid": "water_sewage", "amount": [ 25000, 150000 ] }
       }
     }
   }

diff --git a/data/json/mapgen/oil_platform/oil_platform_z6.json b/data/json/mapgen/oil_platform/oil_platform_z6.json
@@ -19,7 +19,7 @@
         "........................................................................",
         "........................................................................",
         "...................................................... ↑  ..............",
-        "..........................↑.↓.↑...↑...↑...↑...↑...↑...    ↑Z88..........",
+        "..........................↑...↑...↑...↑...↑...↑...↑...    ↑Z88..........",
         ".........................ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ ↑  ZZ88..........",
         "..........................================================X==...........",
         "........................................................................",
@@ -91,7 +91,7 @@
         "........................................................................",
         "...........==X================================..........................",
         "..........##ZZ  ↑ ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ.........................",
-        "..........##Z↑    ...↑...↑...↑...↑...↑...↑.↓.↑..........................",
+        "..........##Z↑    ...↑...↑...↑...↑...↑...↑...↑..........................",
         "..............  ↑ ......................................................",
         "........................................................................",
         "........................................................................",