Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring reloading time costs in accordance to number of rounds crafted #114

Merged
merged 1 commit into from
Feb 26, 2013
Merged

Bring reloading time costs in accordance to number of rounds crafted #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions crafting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,39 +221,39 @@ 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);
COMP(itm_smpistol_primer, 50, NULL);
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);
COMP(itm_smpistol_primer, 25, NULL);
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);
COMP(itm_smpistol_primer, 10, NULL);
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);
COMP(itm_smpistol_primer, 50, NULL);
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);
Expand All @@ -269,159 +269,159 @@ 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);
COMP(itm_lgpistol_primer, 50, NULL);
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);
COMP(itm_lgpistol_primer, 50, NULL);
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);
COMP(itm_lgpistol_primer, 50, NULL);
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);
COMP(itm_lgpistol_primer, 10, NULL);
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);
COMP(itm_smrifle_primer, 100, NULL);
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);
COMP(itm_smpistol_primer, 100, NULL);
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);
COMP(itm_lgrifle_primer, 80, NULL);
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);
COMP(itm_lgrifle_primer, 80, NULL);
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);
COMP(itm_smrifle_primer, 40, NULL);
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);
COMP(itm_smrifle_primer, 40, NULL);
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);
COMP(itm_smrifle_primer, 30, NULL);
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);
COMP(itm_lgrifle_primer, 20, NULL);
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);
COMP(itm_lgrifle_primer, 10, NULL);
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);
COMP(itm_lgrifle_primer, 5, NULL);
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);
COMP(itm_lgrifle_primer, 20, NULL);
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);
COMP(itm_lgrifle_primer, 20, NULL);
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);
COMP(itm_lgrifle_primer, 10, NULL);
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);
COMP(itm_shotgun_primer, 25, NULL);
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);
COMP(itm_shotgun_primer, 25, NULL);
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);
Expand Down