From bef38b47f18812e2d6a1b35a5f46a80bf7adcb72 Mon Sep 17 00:00:00 2001 From: Voker57 Date: Tue, 26 Feb 2013 15:05:05 +0400 Subject: [PATCH] Bring reloading time costs in accordance to number of rounds crafted --- crafting.cpp | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/crafting.cpp b/crafting.cpp index 83158d46cbe00..51d1633636e12 100644 --- a/crafting.cpp +++ b/crafting.cpp @@ -221,7 +221,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_battery, 2, NULL); COMP(itm_power_supply, 1, NULL); - RECIPE(itm_9mm, CC_AMMO, "gun", "mechanics", 2, 30000, false); + RECIPE(itm_9mm, CC_AMMO, "gun", "mechanics", 2, 25000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_9mm_casing, 50, NULL); @@ -229,7 +229,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 200, NULL); COMP(itm_lead, 200, NULL); - RECIPE(itm_9mmP, CC_AMMO, "gun", "mechanics", 4, 30000, false); + RECIPE(itm_9mmP, CC_AMMO, "gun", "mechanics", 4, 12500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_9mm_casing, 25, NULL); @@ -237,7 +237,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 125, NULL); COMP(itm_lead, 100, NULL); - RECIPE(itm_9mmP2, CC_AMMO, "gun", "mechanics", 6, 30000, false); + RECIPE(itm_9mmP2, CC_AMMO, "gun", "mechanics", 6, 5000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_9mm_casing, 10, NULL); @@ -245,7 +245,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 60, NULL); COMP(itm_lead, 40, NULL); - RECIPE(itm_38_special, CC_AMMO, "gun", "mechanics", 2, 30000, false); + RECIPE(itm_38_special, CC_AMMO, "gun", "mechanics", 2, 25000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_38_casing, 50, NULL); @@ -253,7 +253,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 250, NULL); COMP(itm_lead, 250, NULL); - RECIPE(itm_38_super, CC_AMMO, "gun", "mechanics", 4, 30000, false); + RECIPE(itm_38_super, CC_AMMO, "gun", "mechanics", 4, 12500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_38_casing, 25, NULL); @@ -269,7 +269,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 300, NULL); COMP(itm_lead, 300, NULL); - RECIPE(itm_10mm, CC_AMMO, "gun", "mechanics", 5, 30000, false); + RECIPE(itm_10mm, CC_AMMO, "gun", "mechanics", 5, 25000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_40_casing, 50, NULL); @@ -277,7 +277,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 400, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_44magnum, CC_AMMO, "gun", "mechanics", 4, 30000, false); + RECIPE(itm_44magnum, CC_AMMO, "gun", "mechanics", 4, 25000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_44_casing, 50, NULL); @@ -285,7 +285,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 500, NULL); COMP(itm_lead, 500, NULL); - RECIPE(itm_45_acp, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_45_acp, CC_AMMO, "gun", "mechanics", 3, 25000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_45_casing, 50, NULL); @@ -293,7 +293,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 500, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_45_super, CC_AMMO, "gun", "mechanics", 6, 30000, false); + RECIPE(itm_45_super, CC_AMMO, "gun", "mechanics", 6, 5000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_45_casing, 10, NULL); @@ -301,7 +301,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 120, NULL); COMP(itm_lead, 100, NULL); - RECIPE(itm_57mm, CC_AMMO, "gun", "mechanics", 4, 30000, false); + RECIPE(itm_57mm, CC_AMMO, "gun", "mechanics", 4, 50000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_57mm_casing, 100, NULL); @@ -309,7 +309,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 400, NULL); COMP(itm_lead, 200, NULL); - RECIPE(itm_46mm, CC_AMMO, "gun", "mechanics", 4, 30000, false); + RECIPE(itm_46mm, CC_AMMO, "gun", "mechanics", 4, 50000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_46mm_casing, 100, NULL); @@ -317,7 +317,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 400, NULL); COMP(itm_lead, 200, NULL); - RECIPE(itm_762_m43, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_762_m43, CC_AMMO, "gun", "mechanics", 3, 40000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_762_casing, 80, NULL); @@ -325,7 +325,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 560, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_762_m87, CC_AMMO, "gun", "mechanics", 5, 30000, false); + RECIPE(itm_762_m87, CC_AMMO, "gun", "mechanics", 5, 40000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_762_casing, 80, NULL); @@ -333,7 +333,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 640, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_223, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_223, CC_AMMO, "gun", "mechanics", 3, 20000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_223_casing, 40, NULL); @@ -341,7 +341,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 160, NULL); COMP(itm_lead, 80, NULL); - RECIPE(itm_556, CC_AMMO, "gun", "mechanics", 5, 30000, false); + RECIPE(itm_556, CC_AMMO, "gun", "mechanics", 5, 20000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_223_casing, 40, NULL); @@ -349,7 +349,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 240, NULL); COMP(itm_lead, 80, NULL); - RECIPE(itm_556_incendiary, CC_AMMO, "gun", "mechanics", 6, 30000, false); + RECIPE(itm_556_incendiary, CC_AMMO, "gun", "mechanics", 6, 15000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_223_casing, 30, NULL); @@ -357,7 +357,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 180, NULL); COMP(itm_incendiary, 60, NULL); - RECIPE(itm_270, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_270, CC_AMMO, "gun", "mechanics", 3, 10000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_3006_casing, 20, NULL); @@ -365,7 +365,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 200, NULL); COMP(itm_lead, 100, NULL); - RECIPE(itm_3006, CC_AMMO, "gun", "mechanics", 5, 30000, false); + RECIPE(itm_3006, CC_AMMO, "gun", "mechanics", 5, 5000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_3006_casing, 10, NULL); @@ -373,7 +373,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 120, NULL); COMP(itm_lead, 80, NULL); - RECIPE(itm_3006_incendiary, CC_AMMO, "gun", "mechanics", 7, 30000, false); + RECIPE(itm_3006_incendiary, CC_AMMO, "gun", "mechanics", 7, 2500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_3006_casing, 5, NULL); @@ -381,7 +381,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 60, NULL); COMP(itm_incendiary, 40, NULL); - RECIPE(itm_308, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_308, CC_AMMO, "gun", "mechanics", 3, 10000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_308_casing, 20, NULL); @@ -389,7 +389,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 160, NULL); COMP(itm_lead, 120, NULL); - RECIPE(itm_762_51, CC_AMMO, "gun", "mechanics", 5, 30000, false); + RECIPE(itm_762_51, CC_AMMO, "gun", "mechanics", 5, 10000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_308_casing, 20, NULL); @@ -397,7 +397,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 200, NULL); COMP(itm_lead, 120, NULL); - RECIPE(itm_762_51_incendiary, CC_AMMO, "gun", "mechanics", 6, 30000, false); + RECIPE(itm_762_51_incendiary, CC_AMMO, "gun", "mechanics", 6, 5000, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_308_casing, 10, NULL); @@ -405,7 +405,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 100, NULL); COMP(itm_incendiary, 60, NULL); - RECIPE(itm_shot_bird, CC_AMMO, "gun", "mechanics", 2, 30000, false); + RECIPE(itm_shot_bird, CC_AMMO, "gun", "mechanics", 2, 12500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_shot_hull, 25, NULL); @@ -413,7 +413,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 300, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_shot_00, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_shot_00, CC_AMMO, "gun", "mechanics", 3, 12500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_shot_hull, 25, NULL); @@ -421,7 +421,7 @@ RECIPE(itm_lighter, CC_NONCRAFT, NULL, NULL, 0, 100, true); COMP(itm_gunpowder, 600, NULL); COMP(itm_lead, 400, NULL); - RECIPE(itm_shot_slug, CC_AMMO, "gun", "mechanics", 3, 30000, false); + RECIPE(itm_shot_slug, CC_AMMO, "gun", "mechanics", 3, 12500, false); TOOL(itm_press, -1, NULL); TOOL(itm_fire, -1, itm_toolset, 1, itm_hotplate, 4, itm_press, 2, NULL); COMP(itm_shot_hull, 25, NULL);