zopflipng for most textures; added tobacco

2018-10-11 14:28:04 +02:00 · 2018-10-11 14:28:04 +02:00 · 87c22728dd
parent 4a0df0b02d
commit 87c22728dd
161 changed files with 33 additions and 32 deletions
--- a/README.txt
+++ b/README.txt
@ -52,3 +52,4 @@ Created by ademant (CC BY 3.0):
  farming_mustard
  farming_spelt (based on farming_barley)
  farming_hop
+  farming_tobaco (based on pictures of wikimedia)
--- a/crops.csv
+++ b/crops.csv
@ -1,31 +1,31 @@
-name,enabled,next_plant,rarety,steps,harvest_max,eat_hp,to_culture,to_dig,has_harvest,on_soil,punchable,infectable,seed_extractable,use_flail,use_trellis,for_coffee,snappy,temperature_min,temperature_max,humidity_min,humidity_max,elevation_min,elevation_max,light_min,light_max,infect_rate_base,infect_rate_monoculture,spread_rate,grow_time_mean,straw,culture_rate
-default,1,,10,8,2,1,,,,,,,,,,,3,15,50,10,50,0,31000,11,14,1E-05,0.001,0.001,120,,
-barley,1,,10,7,2,1,,,1,1,,1,,1,,1,3,25,80,30,80,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,
-beetroot,1,,10,5,2,2,,1,,1,,,,,,,3,35,80,30,80,0,100,9,14,1E-05,0.001,0.001,120,,
-blackberry,1,,10,4,2,1,,,,,1,,,,,,3,15,90,20,80,0,100,9,14,1E-05,0.001,0.001,120,,
-blueberry,1,,10,4,2,1,,,,,1,,,,,,3,45,90,40,90,0,100,9,14,1E-05,0.001,0.001,120,,
-carrot,1,,10,8,2,2,,1,,1,,,,,,,3,45,80,30,90,0,100,8,14,1E-05,0.001,0.001,120,,
-chili,1,,20,8,2,1,,,,,1,,,,,,3,45,90,10,50,50,1000,11,14,1E-05,0.001,0.001,120,,
-coffee,1,,20,5,2,1,,,,,1,,,,,1,3,50,120,50,150,50,1000,12,14,1E-05,0.001,0.001,120,,
-cocoa,1,,20,4,2,1,,,,,1,,,,,1,3,50,120,40,150,50,1000,12,14,1E-05,0.001,0.001,120,,
-corn,1,,10,8,2,2,,,,1,,1,,,,,3,35,90,30,80,0,100,11,14,1E-05,0.001,0.001,120,,
-cotton,1,,10,8,2,2,,,1,1,,1,,1,,,3,45,90,20,60,0,100,12,14,1E-05,0.001,0.001,120,,
-culturewheat,1,,100,4,2,1,1,,1,1,,1,,1,,1,3,25,80,40,80,0,100,10,14,1E-05,0.001,0.001,100,farming:straw,
-flax,,,10,7,2,1,,,1,1,,1,,1,,,3,25,80,30,80,0,100,11,14,1E-05,0.001,0.001,120,farming:flaw,
-garlic,,,10,5,2,2,,1,,1,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-grapes,1,,10,8,2,2,1,,,1,1,1,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-hemp,1,,10,8,2,2,,,1,,,,,1,,,3,15,120,10,,0,,6,14,1E-05,0.001,1E-05,90,farming:hemp_fibre,
-hop,1,,10,7,2,1,1,,,1,1,1,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-mustard,1,,10,5,2,1,,,,,,1,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-potato,1,,10,4,2,2,,,,1,,1,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-raspberry,1,,10,4,2,1,,,,,1,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
-rhubarb,1,,10,3,2,2,,1,,1,,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
-spelt,1,,10,7,2,1,,,1,1,,1,,1,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,
-strawberry,1,,10,4,2,1,,,,,1,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
-tea,,,20,5,2,1,,,,,1,,1,,,,3,30,70,30,70,50,100,11,14,1E-05,0.001,0.001,120,,
-tobaco,,,10,8,2,2,,,,1,,1,1,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-tomato,1,,10,8,2,1,,,1,1,1,1,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
-urtica,1,,10,5,2,1,,,1,,,,,1,,,3,5,150,10,100,0,2000,6,14,1E-05,0.001,0.001,80,farming:urtica_fibre,
-wheat,1,culturewheat,10,8,2,1,,,1,1,,1,,1,,1,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,10
-wildhop,1,hop,10,6,2,1,,,,,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,5
-wildgrapes,1,grapes,10,4,2,1,,,,,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,5
+name,enabled,next_plant,rarety,steps,harvest_max,eat_hp,to_culture,to_dig,has_harvest,on_soil,punchable,infectable,infection_defence,seed_extractable,use_flail,use_trellis,for_coffee,snappy,temperature_min,temperature_max,humidity_min,humidity_max,elevation_min,elevation_max,light_min,light_max,infect_rate_base,infect_rate_monoculture,spread_rate,grow_time_mean,straw,culture_rate
+default,1,,10,8,2,1,,,,,,,,,,,,3,15,50,10,50,0,31000,11,14,1E-05,0.001,0.001,120,,
+barley,1,,10,7,2,,,,1,1,,1,,,1,,1,3,25,80,30,80,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,
+beetroot,1,,10,5,2,2,,1,,1,,,,,,,,3,35,80,30,80,0,100,9,14,1E-05,0.001,0.001,120,,
+blackberry,1,,10,4,2,1,,,,,1,,,,,,,3,15,90,20,80,0,100,9,14,1E-05,0.001,0.001,120,,
+blueberry,1,,10,4,2,1,,,,,1,,,,,,,3,45,90,40,90,0,100,9,14,1E-05,0.001,0.001,120,,
+carrot,1,,10,8,2,2,,1,,1,,,,,,,,3,45,80,30,90,0,100,8,14,1E-05,0.001,0.001,120,,
+chili,1,,20,8,2,1,,,,,1,,,,,,,3,45,90,10,50,50,1000,11,14,1E-05,0.001,0.001,120,,
+coffee,1,,20,5,2,1,,,,,1,,,,,,1,3,50,120,50,150,50,1000,12,14,1E-05,0.001,0.001,120,,
+cocoa,1,,20,4,2,1,,,,,1,,,,,,1,3,50,120,40,150,50,1000,12,14,1E-05,0.001,0.001,120,,
+corn,1,,10,8,2,2,,,,1,,1,,,,,,3,35,90,30,80,0,100,11,14,1E-05,0.001,0.001,120,,
+cotton,1,,10,8,2,,,,1,1,,1,,,1,,,3,45,90,20,60,0,100,12,14,1E-05,0.001,0.001,120,,
+culturewheat,1,,100,4,2,,1,,1,1,,1,,,1,,1,3,25,80,40,80,0,100,10,14,1E-05,0.001,0.001,100,farming:straw,
+flax,,,10,7,2,,,,1,1,,1,,,1,,,3,25,80,30,80,0,100,11,14,1E-05,0.001,0.001,120,farming:flaw,
+garlic,,,10,5,2,1,,1,,1,,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+grapes,1,,10,8,2,2,1,,,1,1,1,,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+hemp,1,,10,8,2,,,,1,,,,,,1,,,3,15,120,10,,0,,6,14,1E-05,0.001,1E-05,90,farming:hemp_fibre,
+hop,1,,10,7,2,1,1,,,1,1,1,,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+mustard,1,,10,5,2,,,,,,,1,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+potato,1,,10,4,2,2,,,,1,,1,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+raspberry,1,,10,4,2,1,,,,,1,,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
+rhubarb,1,,10,3,2,2,,1,,1,,,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
+spelt,1,,10,7,2,,,,1,1,,1,,,1,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,
+strawberry,1,,10,4,2,1,,,,,1,,,,,,,3,15,50,10,50,0,100,9,14,1E-05,0.001,0.001,120,,
+tea,,,20,5,2,1,,,,,1,,,1,,,,3,30,70,30,70,50,100,11,14,1E-05,0.001,0.001,120,,
+tobaco,1,,10,8,2,,,,1,1,1,,2,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+tomato,1,,10,8,2,1,,,1,1,1,1,,,,1,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,
+urtica,1,,10,5,2,1,,,1,,,,1,,1,,,3,5,150,10,100,0,2000,6,14,1E-05,0.001,0.001,80,farming:urtica_fibre,
+wheat,1,culturewheat,10,8,2,,,,1,1,,1,,,1,,1,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,farming:straw,10
+wildhop,1,hop,10,6,2,,,,,,,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,5
+wildgrapes,1,grapes,10,4,2,1,,,,,,,,,,,,3,15,50,10,50,0,100,11,14,1E-05,0.001,0.001,120,,5
--- a/crops.lua
+++ b/crops.lua
@ -13,7 +13,7 @@ end

 local crop_definition = {}
 local crop_numeric_values = {"rarety","steps","harvest_max","eat_hp","temperature_min","temperature_max","humidity_min","humidity_max","elevation_min","elevation_max","light_min","light_max","infect_rate_base","infect_rate_monoculture","spread_rate","grow_time_mean"}
-local crop_groups = {"to_culture","to_dig","has_harvest","on_soil","punchable","infectable","seed_extractable","use_flail","use_trellis","snappy"}
+local crop_groups = {"to_culture","to_dig","has_harvest","on_soil","punchable","infectable","seed_extractable","use_flail","use_trellis","snappy","infection_defence"}

 -- import configurations from crops.csv
 local file = io.open(farming.path .. "/crops.csv", "r")
--- a/textures/farming_beetroot_1.png
+++ b/textures/farming_beetroot_1.png
--- a/textures/farming_beetroot_2.png
+++ b/textures/farming_beetroot_2.png
--- a/textures/farming_beetroot_3.png
+++ b/textures/farming_beetroot_3.png
--- a/textures/farming_beetroot_4.png
+++ b/textures/farming_beetroot_4.png
--- a/textures/farming_beetroot_5.png
+++ b/textures/farming_beetroot_5.png
--- a/textures/farming_beetroot_seed.png
+++ b/textures/farming_beetroot_seed.png
--- a/textures/farming_beetroot_soup.png
+++ b/textures/farming_beetroot_soup.png
--- a/textures/farming_blackberry_2.png
+++ b/textures/farming_blackberry_2.png
--- a/textures/farming_blackberry_3.png
+++ b/textures/farming_blackberry_3.png
--- a/textures/farming_blackberry_4.png
+++ b/textures/farming_blackberry_4.png
--- a/textures/farming_blackberry_seed.png
+++ b/textures/farming_blackberry_seed.png
--- a/textures/farming_blackberry_smoothie.png
+++ b/textures/farming_blackberry_smoothie.png
--- a/textures/farming_blueberry_1.png
+++ b/textures/farming_blueberry_1.png
--- a/textures/farming_blueberry_2.png
+++ b/textures/farming_blueberry_2.png
--- a/textures/farming_blueberry_3.png
+++ b/textures/farming_blueberry_3.png
--- a/textures/farming_blueberry_4.png
+++ b/textures/farming_blueberry_4.png
--- a/textures/farming_blueberry_muffin.png
+++ b/textures/farming_blueberry_muffin.png
--- a/textures/farming_blueberry_pie.png
+++ b/textures/farming_blueberry_pie.png
--- a/textures/farming_blueberry_seed.png
+++ b/textures/farming_blueberry_seed.png
--- a/textures/farming_carrot_1.png
+++ b/textures/farming_carrot_1.png
--- a/textures/farming_carrot_2.png
+++ b/textures/farming_carrot_2.png
--- a/textures/farming_carrot_3.png
+++ b/textures/farming_carrot_3.png
--- a/textures/farming_carrot_4.png
+++ b/textures/farming_carrot_4.png
--- a/textures/farming_carrot_5.png
+++ b/textures/farming_carrot_5.png
--- a/textures/farming_carrot_6.png
+++ b/textures/farming_carrot_6.png
--- a/textures/farming_carrot_7.png
+++ b/textures/farming_carrot_7.png
--- a/textures/farming_carrot_8.png
+++ b/textures/farming_carrot_8.png
--- a/textures/farming_carrot_gold.png
+++ b/textures/farming_carrot_gold.png
--- a/textures/farming_carrot_seed.png
+++ b/textures/farming_carrot_seed.png
--- a/textures/farming_chili.png
+++ b/textures/farming_chili.png
--- a/textures/farming_chili_1.png
+++ b/textures/farming_chili_1.png
--- a/textures/farming_chili_2.png
+++ b/textures/farming_chili_2.png
--- a/textures/farming_chili_3.png
+++ b/textures/farming_chili_3.png
--- a/textures/farming_chili_4.png
+++ b/textures/farming_chili_4.png
--- a/textures/farming_chili_5.png
+++ b/textures/farming_chili_5.png
--- a/textures/farming_chili_6.png
+++ b/textures/farming_chili_6.png
--- a/textures/farming_chili_7.png
+++ b/textures/farming_chili_7.png
--- a/textures/farming_chili_8.png
+++ b/textures/farming_chili_8.png
--- a/textures/farming_chili_bowl.png
+++ b/textures/farming_chili_bowl.png
--- a/textures/farming_cocoa_1.png
+++ b/textures/farming_cocoa_1.png
--- a/textures/farming_cocoa_2.png
+++ b/textures/farming_cocoa_2.png
--- a/textures/farming_cocoa_3.png
+++ b/textures/farming_cocoa_3.png
--- a/textures/farming_cocoa_4.png
+++ b/textures/farming_cocoa_4.png
--- a/textures/farming_cocoa_beans.png
+++ b/textures/farming_cocoa_beans.png
--- a/textures/farming_cocoa_seed.png
+++ b/textures/farming_cocoa_seed.png
--- a/textures/farming_coffee_1.png
+++ b/textures/farming_coffee_1.png
--- a/textures/farming_coffee_2.png
+++ b/textures/farming_coffee_2.png
--- a/textures/farming_coffee_3.png
+++ b/textures/farming_coffee_3.png
--- a/textures/farming_coffee_4.png
+++ b/textures/farming_coffee_4.png
--- a/textures/farming_coffee_5.png
+++ b/textures/farming_coffee_5.png
--- a/textures/farming_coffee_beans.png
+++ b/textures/farming_coffee_beans.png
--- a/textures/farming_coffee_cup.png
+++ b/textures/farming_coffee_cup.png
--- a/textures/farming_coffee_seed.png
+++ b/textures/farming_coffee_seed.png
--- a/textures/farming_corn_1.png
+++ b/textures/farming_corn_1.png
--- a/textures/farming_corn_2.png
+++ b/textures/farming_corn_2.png
--- a/textures/farming_corn_3.png
+++ b/textures/farming_corn_3.png
--- a/textures/farming_corn_4.png
+++ b/textures/farming_corn_4.png
--- a/textures/farming_corn_5.png
+++ b/textures/farming_corn_5.png
--- a/textures/farming_corn_6.png
+++ b/textures/farming_corn_6.png
--- a/textures/farming_corn_7.png
+++ b/textures/farming_corn_7.png
--- a/textures/farming_corn_8.png
+++ b/textures/farming_corn_8.png
--- a/textures/farming_corn_cob.png
+++ b/textures/farming_corn_cob.png
--- a/textures/farming_corn_ill.png
+++ b/textures/farming_corn_ill.png
--- a/textures/farming_corn_seed.png
+++ b/textures/farming_corn_seed.png
--- a/textures/farming_cornstarch.png
+++ b/textures/farming_cornstarch.png
--- a/textures/farming_cotton_ill.png
+++ b/textures/farming_cotton_ill.png
--- a/textures/farming_culturewheat_1.png
+++ b/textures/farming_culturewheat_1.png
--- a/textures/farming_culturewheat_4.png
+++ b/textures/farming_culturewheat_4.png
--- a/textures/farming_garlic.png
+++ b/textures/farming_garlic.png
--- a/textures/farming_garlic_braid.png
+++ b/textures/farming_garlic_braid.png
--- a/textures/farming_garlic_braid_side.png
+++ b/textures/farming_garlic_braid_side.png
--- a/textures/farming_garlic_clove.png
+++ b/textures/farming_garlic_clove.png
--- a/textures/farming_garlic_plant_1.png
+++ b/textures/farming_garlic_plant_1.png
--- a/textures/farming_garlic_plant_2.png
+++ b/textures/farming_garlic_plant_2.png
--- a/textures/farming_garlic_plant_3.png
+++ b/textures/farming_garlic_plant_3.png
--- a/textures/farming_garlic_plant_4.png
+++ b/textures/farming_garlic_plant_4.png
--- a/textures/farming_garlic_plant_5.png
+++ b/textures/farming_garlic_plant_5.png
--- a/textures/farming_grapes_3.png
+++ b/textures/farming_grapes_3.png
--- a/textures/farming_grapes_6.png
+++ b/textures/farming_grapes_6.png
--- a/textures/farming_grapes_7.png
+++ b/textures/farming_grapes_7.png
--- a/textures/farming_grapes_8.png
+++ b/textures/farming_grapes_8.png
--- a/textures/farming_hemp.png
+++ b/textures/farming_hemp.png
--- a/textures/farming_hemp_7.png
+++ b/textures/farming_hemp_7.png
--- a/textures/farming_hop_1.png
+++ b/textures/farming_hop_1.png
--- a/textures/farming_hop_2.png
+++ b/textures/farming_hop_2.png
--- a/textures/farming_hop_5.png
+++ b/textures/farming_hop_5.png
--- a/textures/farming_hop_6.png
+++ b/textures/farming_hop_6.png
--- a/textures/farming_hop_7.png
+++ b/textures/farming_hop_7.png
--- a/textures/farming_hop_ill.png
+++ b/textures/farming_hop_ill.png
--- a/textures/farming_mustard_5.png
+++ b/textures/farming_mustard_5.png
--- a/textures/farming_mustard_ill.png
+++ b/textures/farming_mustard_ill.png
--- a/textures/farming_mustard_seed.png
+++ b/textures/farming_mustard_seed.png
--- a/textures/farming_potato_3.png
+++ b/textures/farming_potato_3.png
--- a/textures/farming_potato_baked.png
+++ b/textures/farming_potato_baked.png
--- a/textures/farming_potato_ill.png
+++ b/textures/farming_potato_ill.png
--- a/textures/farming_potato_seed.png
+++ b/textures/farming_potato_seed.png
--- a/textures/farming_raspberry_2.png
+++ b/textures/farming_raspberry_2.png
--- a/Show More
+++ b/Show More