From ce694dd8740fb3c2653e285c68eb2272d71aec85 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Tue, 21 Jan 2025 23:00:04 +0700 Subject: [PATCH 01/20] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=8D=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=BE=D0=BC=D0=B8=D0=BA=D0=B8,=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B0=D1=8F=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/roguetown/roguestock/stockpile.dm | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/code/modules/roguetown/roguestock/stockpile.dm b/code/modules/roguetown/roguestock/stockpile.dm index 4a60994eaf7..108749f460f 100644 --- a/code/modules/roguetown/roguestock/stockpile.dm +++ b/code/modules/roguetown/roguestock/stockpile.dm @@ -26,12 +26,12 @@ desc = "High quality rocks of stone used for construction." item_type = /obj/item/natural/stone held_items = list(2, 0) - payout_price = 2 + payout_price = 0 withdraw_price = 4 transport_fee = 3 export_price = 4 importexport_amt = 10 - passive_generation = 5 + passive_generation = 15 /datum/roguestock/stockpile/coal name = "Coal" @@ -86,10 +86,10 @@ desc = "Chunks of unrefined gold." item_type = /obj/item/rogueore/gold held_items = list(0, 0) - payout_price = 50 - withdraw_price = 75 + payout_price = 10 + withdraw_price = 20 transport_fee = 10 - export_price = 75 + export_price = 15 importexport_amt = 10 /datum/roguestock/stockpile/silver @@ -97,10 +97,10 @@ desc = "Chunks of unrefined silver." item_type = /obj/item/rogueore/silver held_items = list(0, 0) - payout_price = 75 - withdraw_price = 100 + payout_price = 10 + withdraw_price = 20 transport_fee = 10 - export_price = 100 + export_price = 15 importexport_amt = 10 /datum/roguestock/stockpile/cloth @@ -132,10 +132,10 @@ desc = "Cured Leather ready to be worked." item_type = /obj/item/natural/hide/cured held_items = list(2, 0) - payout_price = 5 - withdraw_price = 7 + payout_price = 10 + withdraw_price = 15 transport_fee = 1 - export_price = 7 + export_price = 15 importexport_amt = 10 /datum/roguestock/stockpile/hide @@ -143,10 +143,10 @@ desc = "Stripped hide from animals." item_type = /obj/item/natural/hide held_items = list(0, 0) - payout_price = 10 - withdraw_price = 15 + payout_price = 5 + withdraw_price = 10 transport_fee = 3 - export_price = 15 + export_price = 10 importexport_amt = 5 passive_generation = 2 @@ -155,10 +155,10 @@ desc = "Hide with a long winter coat from animals." item_type = /obj/item/natural/fur held_items = list(0, 0) - payout_price = 15 - withdraw_price = 23 + payout_price = 5 + withdraw_price = 15 transport_fee = 5 - export_price = 23 + export_price = 15 importexport_amt = 5 passive_generation = 1 @@ -179,7 +179,7 @@ desc = "Spelt grain." item_type = /obj/item/reagent_containers/food/snacks/grown/wheat held_items = list(0, 4) - payout_price = 2 + payout_price = 1 withdraw_price = 3 transport_fee = 1 export_price = 3 @@ -191,7 +191,7 @@ desc = "A cereal grain." item_type = /obj/item/reagent_containers/food/snacks/grown/oat held_items = list(0, 4) - payout_price = 2 + payout_price = 1 withdraw_price = 3 transport_fee = 1 export_price = 3 @@ -203,7 +203,7 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/apple held_items = list(0, 0) - payout_price = 3 + payout_price = 2 withdraw_price = 5 transport_fee = 1 export_price = 5 @@ -216,7 +216,7 @@ item_type = /obj/item/reagent_containers/food/snacks/rogue/meat/steak held_items = list(0, 0) payout_price = 5 - withdraw_price = 8 + withdraw_price = 10 transport_fee = 2 export_price = 8 importexport_amt = 5 @@ -227,10 +227,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/beet held_items = list(0, 0) - payout_price = 5 + payout_price = 2 withdraw_price = 6 transport_fee = 2 - export_price = 8 + export_price = 6 importexport_amt = 5 passive_generation = 2 @@ -239,10 +239,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/cabbage/rogue held_items = list(0, 0) - payout_price = 5 + payout_price = 2 withdraw_price = 6 transport_fee = 2 - export_price = 8 + export_price = 6 importexport_amt = 5 passive_generation = 2 @@ -251,10 +251,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/potato/rogue held_items = list(0, 0) - payout_price = 5 + payout_price = 2 withdraw_price = 6 transport_fee = 2 - export_price = 8 + export_price = 6 importexport_amt = 5 passive_generation = 2 @@ -263,10 +263,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/onion/rogue held_items = list(0, 0) - payout_price = 5 + payout_price = 2 withdraw_price = 6 transport_fee = 2 - export_price = 8 + export_price = 6 importexport_amt = 5 passive_generation = 2 @@ -276,9 +276,9 @@ item_type = /obj/item/reagent_containers/food/snacks/rogue/meat/poultry held_items = list(0, 0) payout_price = 5 - withdraw_price = 8 + withdraw_price = 10 transport_fee = 2 - export_price = 8 + export_price = 10 importexport_amt = 5 passive_generation = 2 @@ -287,10 +287,10 @@ desc = "Egg laid by a hen." item_type = /obj/item/reagent_containers/food/snacks/egg held_items = list(0, 0) - payout_price = 3 - withdraw_price = 5 + payout_price = 2 + withdraw_price = 6 transport_fee = 2 - export_price = 5 + export_price = 6 importexport_amt = 5 passive_generation = 2 From 5e41fcc14ba26015207c01bab2b70e0c3b610b00 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Thu, 23 Jan 2025 22:15:07 +0700 Subject: [PATCH 02/20] =?UTF-8?q?=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D1=8F?= =?UTF-8?q?=D1=80=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/roguetown/roguestock/stockpile.dm | 68 +++++++++--------- .../modules/economy_fixes/economy_fixes.dm | 70 +++++++++++++++++++ roguetown.dme | 1 + 3 files changed, 105 insertions(+), 34 deletions(-) create mode 100644 modular_redmoon/modules/economy_fixes/economy_fixes.dm diff --git a/code/modules/roguetown/roguestock/stockpile.dm b/code/modules/roguetown/roguestock/stockpile.dm index 108749f460f..4a60994eaf7 100644 --- a/code/modules/roguetown/roguestock/stockpile.dm +++ b/code/modules/roguetown/roguestock/stockpile.dm @@ -26,12 +26,12 @@ desc = "High quality rocks of stone used for construction." item_type = /obj/item/natural/stone held_items = list(2, 0) - payout_price = 0 + payout_price = 2 withdraw_price = 4 transport_fee = 3 export_price = 4 importexport_amt = 10 - passive_generation = 15 + passive_generation = 5 /datum/roguestock/stockpile/coal name = "Coal" @@ -86,10 +86,10 @@ desc = "Chunks of unrefined gold." item_type = /obj/item/rogueore/gold held_items = list(0, 0) - payout_price = 10 - withdraw_price = 20 + payout_price = 50 + withdraw_price = 75 transport_fee = 10 - export_price = 15 + export_price = 75 importexport_amt = 10 /datum/roguestock/stockpile/silver @@ -97,10 +97,10 @@ desc = "Chunks of unrefined silver." item_type = /obj/item/rogueore/silver held_items = list(0, 0) - payout_price = 10 - withdraw_price = 20 + payout_price = 75 + withdraw_price = 100 transport_fee = 10 - export_price = 15 + export_price = 100 importexport_amt = 10 /datum/roguestock/stockpile/cloth @@ -132,10 +132,10 @@ desc = "Cured Leather ready to be worked." item_type = /obj/item/natural/hide/cured held_items = list(2, 0) - payout_price = 10 - withdraw_price = 15 + payout_price = 5 + withdraw_price = 7 transport_fee = 1 - export_price = 15 + export_price = 7 importexport_amt = 10 /datum/roguestock/stockpile/hide @@ -143,10 +143,10 @@ desc = "Stripped hide from animals." item_type = /obj/item/natural/hide held_items = list(0, 0) - payout_price = 5 - withdraw_price = 10 + payout_price = 10 + withdraw_price = 15 transport_fee = 3 - export_price = 10 + export_price = 15 importexport_amt = 5 passive_generation = 2 @@ -155,10 +155,10 @@ desc = "Hide with a long winter coat from animals." item_type = /obj/item/natural/fur held_items = list(0, 0) - payout_price = 5 - withdraw_price = 15 + payout_price = 15 + withdraw_price = 23 transport_fee = 5 - export_price = 15 + export_price = 23 importexport_amt = 5 passive_generation = 1 @@ -179,7 +179,7 @@ desc = "Spelt grain." item_type = /obj/item/reagent_containers/food/snacks/grown/wheat held_items = list(0, 4) - payout_price = 1 + payout_price = 2 withdraw_price = 3 transport_fee = 1 export_price = 3 @@ -191,7 +191,7 @@ desc = "A cereal grain." item_type = /obj/item/reagent_containers/food/snacks/grown/oat held_items = list(0, 4) - payout_price = 1 + payout_price = 2 withdraw_price = 3 transport_fee = 1 export_price = 3 @@ -203,7 +203,7 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/apple held_items = list(0, 0) - payout_price = 2 + payout_price = 3 withdraw_price = 5 transport_fee = 1 export_price = 5 @@ -216,7 +216,7 @@ item_type = /obj/item/reagent_containers/food/snacks/rogue/meat/steak held_items = list(0, 0) payout_price = 5 - withdraw_price = 10 + withdraw_price = 8 transport_fee = 2 export_price = 8 importexport_amt = 5 @@ -227,10 +227,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/beet held_items = list(0, 0) - payout_price = 2 + payout_price = 5 withdraw_price = 6 transport_fee = 2 - export_price = 6 + export_price = 8 importexport_amt = 5 passive_generation = 2 @@ -239,10 +239,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/cabbage/rogue held_items = list(0, 0) - payout_price = 2 + payout_price = 5 withdraw_price = 6 transport_fee = 2 - export_price = 6 + export_price = 8 importexport_amt = 5 passive_generation = 2 @@ -251,10 +251,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/potato/rogue held_items = list(0, 0) - payout_price = 2 + payout_price = 5 withdraw_price = 6 transport_fee = 2 - export_price = 6 + export_price = 8 importexport_amt = 5 passive_generation = 2 @@ -263,10 +263,10 @@ desc = "Harvested produce." item_type = /obj/item/reagent_containers/food/snacks/grown/onion/rogue held_items = list(0, 0) - payout_price = 2 + payout_price = 5 withdraw_price = 6 transport_fee = 2 - export_price = 6 + export_price = 8 importexport_amt = 5 passive_generation = 2 @@ -276,9 +276,9 @@ item_type = /obj/item/reagent_containers/food/snacks/rogue/meat/poultry held_items = list(0, 0) payout_price = 5 - withdraw_price = 10 + withdraw_price = 8 transport_fee = 2 - export_price = 10 + export_price = 8 importexport_amt = 5 passive_generation = 2 @@ -287,10 +287,10 @@ desc = "Egg laid by a hen." item_type = /obj/item/reagent_containers/food/snacks/egg held_items = list(0, 0) - payout_price = 2 - withdraw_price = 6 + payout_price = 3 + withdraw_price = 5 transport_fee = 2 - export_price = 6 + export_price = 5 importexport_amt = 5 passive_generation = 2 diff --git a/modular_redmoon/modules/economy_fixes/economy_fixes.dm b/modular_redmoon/modules/economy_fixes/economy_fixes.dm new file mode 100644 index 00000000000..c23cd96f8be --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/economy_fixes.dm @@ -0,0 +1,70 @@ + +/datum/roguestock/stockpile/stone + payout_price = 0 + passive_generation = 15 + +/datum/roguestock/stockpile/gold + payout_price = 10 + withdraw_price = 20 + export_price = 20 + +/datum/roguestock/stockpile/silver + payout_price = 10 + withdraw_price = 20 + export_price = 20 + +/datum/roguestock/stockpile/cured + payout_price = 10 + withdraw_price = 15 + export_price = 15 + +/datum/roguestock/stockpile/hide + payout_price = 5 + withdraw_price = 10 + export_price = 10 + +/datum/roguestock/stockpile/fur + payout_price = 10 + withdraw_price = 15 + export_price = 15 + + +/datum/roguestock/stockpile/grain + payout_price = 1 + +/datum/roguestock/stockpile/oat + payout_price = 1 + +/datum/roguestock/stockpile/apple + payout_price = 2 + withdraw_price = 5 + +/datum/roguestock/stockpile/meat + payout_price = 5 + withdraw_price = 10 + export_price = 10 + +/datum/roguestock/stockpile/beet + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/cabbage + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/potato + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/onion + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/poultry + payout_price = 5 + withdraw_price = 10 + export_price = 10 diff --git a/roguetown.dme b/roguetown.dme index cdfab544435..5b19f88b5b6 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2087,6 +2087,7 @@ #include "modular_redmoon\modules\client\preferences.dm" #include "modular_redmoon\modules\client\preferences_savefile.dm" #include "modular_redmoon\modules\cloak_hoods_fix\cloak_hoods_fix.dm" +#include "modular_redmoon\modules\economy_fixes\economy_fixes.dm" #include "modular_redmoon\modules\events\goblininvasion.dm" #include "modular_redmoon\modules\events\haunts.dm" #include "modular_redmoon\modules\events\poltergeist.dm" From 285e5da05d57a2911adb13022b635cf47bdc02d9 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Fri, 24 Jan 2025 00:45:58 +0700 Subject: [PATCH 03/20] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D1=83?= =?UTF-8?q?=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D1=82=D0=B0=20=D1=81=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BA=D0=B8=D0=BD=D0=B6=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm index 0074a115776..ae656df9e9a 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/weapons.dm @@ -112,7 +112,7 @@ req_bar = /obj/item/ingot/steel created_item = /obj/item/rogueweapon/sword/iron/messer/steel -/datum/anvil_recipe/weapons/iron/dagger +/datum/anvil_recipe/weapons/steel/dagger // REDMOON EDIT - фикс пути для крафта стального кинжала - WAS: /datum/anvil_recipe/weapons/iron/dagger name = "Dagger" req_bar = /obj/item/ingot/steel created_item = /obj/item/rogueweapon/huntingknife/idagger/steel From 764d633211a522176fdd0855b18cf7f5cbee9857 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Fri, 24 Jan 2025 00:46:23 +0700 Subject: [PATCH 04/20] =?UTF-8?q?=D0=A6=D0=B5=D0=BD=D1=8B=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=81=D1=82=D0=BE=D0=BA=D0=BF=D0=B0=D0=B9=D0=BB=D0=B0?= =?UTF-8?q?,=20=D1=81=D0=BA=D0=B8=D0=BB=D0=BB=D1=8B=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BA=D1=80=D0=B0=D1=84=D1=82=D0=B0,=20=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=BB=D0=BB=20=D0=B4=D0=BB=D1=8F=20=D1=88=D0=B8=D1=82=D1=8C?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=BE=D1=80=D0=BE=D0=B3=D0=BE=D0=B9=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=B5=D0=B6=D0=B4=D1=8B,=20=D1=86=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D1=8B=20?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BA=D0=BE=D1=88=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/economy_fixes/items_prices.dm | 11 +++ .../modules/economy_fixes/sewing.dm | 6 ++ .../modules/economy_fixes/smithing.dm | 40 +++++++++++ .../modules/economy_fixes/stockpile.dm | 69 +++++++++++++++++++ roguetown.dme | 5 +- 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 modular_redmoon/modules/economy_fixes/items_prices.dm create mode 100644 modular_redmoon/modules/economy_fixes/sewing.dm create mode 100644 modular_redmoon/modules/economy_fixes/smithing.dm create mode 100644 modular_redmoon/modules/economy_fixes/stockpile.dm diff --git a/modular_redmoon/modules/economy_fixes/items_prices.dm b/modular_redmoon/modules/economy_fixes/items_prices.dm new file mode 100644 index 00000000000..feef131d7d9 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/items_prices.dm @@ -0,0 +1,11 @@ +/obj/item/reagent_containers/glass/cup/golden + sellprice = 40 // было 50 + +/obj/item/dildo/gold + sellprice = 30 // было 50. Хватит продавать ИХ + +/obj/item/natural/fur + sellprice = 23 // как в стокпайле + +/obj/item/natural/cured/essence + sellprice = 15 // корм дровосеков diff --git a/modular_redmoon/modules/economy_fixes/sewing.dm b/modular_redmoon/modules/economy_fixes/sewing.dm new file mode 100644 index 00000000000..0eb53c377f1 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/sewing.dm @@ -0,0 +1,6 @@ +/datum/crafting_recipe/roguetown/sewing/wizrobeblue + name = "robe (wizard) - (4 cloths, 2 silk, 3 fibers; MASTER)" + reqs = list(/obj/item/natural/cloth = 4, + /obj/item/natural/fibers = 3, + /obj/item/natural/silk = 2) + skill_level = 5 diff --git a/modular_redmoon/modules/economy_fixes/smithing.dm b/modular_redmoon/modules/economy_fixes/smithing.dm new file mode 100644 index 00000000000..91971517cac --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/smithing.dm @@ -0,0 +1,40 @@ +// Золотым вещам в среднем пятый навык, если они идут на продажу из города или стоят 120+ + +/datum/anvil_recipe/cutlery/cupsgold + skill_level = 5 // Роскошь + +/datum/anvil_recipe/valuables/gold + skill_level = 5 // Роскошь + +/datum/anvil_recipe/gold_dildo + skill_level = 5 // Псайдона четвертовали за вас + +/datum/anvil_recipe/weapons/decsword + skill_level = 4 // Оружие продаётся за себестоимость + +/datum/anvil_recipe/weapons/decsaber + skill_level = 4 // Оружие продаётся за себестоимость + +/datum/anvil_recipe/weapons/decrapier + skill_level = 4 // Оружие продаётся за себестоимость + +/datum/anvil_recipe/weapons/terminus + skill_level = 5 // 2 слитка золота + +/* + * СЕРЕБРО +*/ + +// Серебрянным вещам, если они идут на продажу или как драгоценности, четвертый навык + +/datum/anvil_recipe/valuables/silver + skill_level = 4 // Роскошь + +/datum/anvil_recipe/cutlery/silver + skill_level = 4 // Роскошь + +/datum/anvil_recipe/silver_dildo + skill_level = 4 // Псайдона четвертовали за вас + +/datum/anvil_recipe/weapons/silver + skill_level = 3 // Оружие продаётся за себестоимость diff --git a/modular_redmoon/modules/economy_fixes/stockpile.dm b/modular_redmoon/modules/economy_fixes/stockpile.dm new file mode 100644 index 00000000000..6d548669dd8 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/stockpile.dm @@ -0,0 +1,69 @@ + +/datum/roguestock/stockpile/stone + payout_price = 0 + passive_generation = 15 + +/datum/roguestock/stockpile/gold + payout_price = 15 + withdraw_price = 80 + export_price = 80 + +/datum/roguestock/stockpile/silver // Используется в крафте оружия против нечисти И драгоценностях + payout_price = 15 + withdraw_price = 65 + export_price = 65 + +/datum/roguestock/stockpile/cured + payout_price = 10 + withdraw_price = 15 + export_price = 15 + +/datum/roguestock/stockpile/hide + payout_price = 5 + withdraw_price = 10 + export_price = 10 + +/datum/roguestock/stockpile/fur + payout_price = 10 + withdraw_price = 15 + export_price = 15 + +/datum/roguestock/stockpile/grain + payout_price = 1 + +/datum/roguestock/stockpile/oat + payout_price = 1 + +/datum/roguestock/stockpile/apple + payout_price = 2 + withdraw_price = 5 + +/datum/roguestock/stockpile/meat + payout_price = 5 + withdraw_price = 10 + export_price = 10 + +/datum/roguestock/stockpile/beet + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/cabbage + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/potato + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/onion + payout_price = 2 + withdraw_price = 6 + export_price = 6 + +/datum/roguestock/stockpile/poultry + payout_price = 5 + withdraw_price = 10 + export_price = 10 diff --git a/roguetown.dme b/roguetown.dme index 5b19f88b5b6..386811ee47a 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2087,7 +2087,10 @@ #include "modular_redmoon\modules\client\preferences.dm" #include "modular_redmoon\modules\client\preferences_savefile.dm" #include "modular_redmoon\modules\cloak_hoods_fix\cloak_hoods_fix.dm" -#include "modular_redmoon\modules\economy_fixes\economy_fixes.dm" +#include "modular_redmoon\modules\economy_fixes\items_prices.dm" +#include "modular_redmoon\modules\economy_fixes\sewing.dm" +#include "modular_redmoon\modules\economy_fixes\smithing.dm" +#include "modular_redmoon\modules\economy_fixes\stockpile.dm" #include "modular_redmoon\modules\events\goblininvasion.dm" #include "modular_redmoon\modules\events\haunts.dm" #include "modular_redmoon\modules\events\poltergeist.dm" From 36101aec673f8ec593b377ebe0c004add83b69f6 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Fri, 24 Jan 2025 01:05:59 +0700 Subject: [PATCH 05/20] =?UTF-8?q?=D0=9B=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/economy_fixes/economy_fixes.dm | 70 ------------------- 1 file changed, 70 deletions(-) delete mode 100644 modular_redmoon/modules/economy_fixes/economy_fixes.dm diff --git a/modular_redmoon/modules/economy_fixes/economy_fixes.dm b/modular_redmoon/modules/economy_fixes/economy_fixes.dm deleted file mode 100644 index c23cd96f8be..00000000000 --- a/modular_redmoon/modules/economy_fixes/economy_fixes.dm +++ /dev/null @@ -1,70 +0,0 @@ - -/datum/roguestock/stockpile/stone - payout_price = 0 - passive_generation = 15 - -/datum/roguestock/stockpile/gold - payout_price = 10 - withdraw_price = 20 - export_price = 20 - -/datum/roguestock/stockpile/silver - payout_price = 10 - withdraw_price = 20 - export_price = 20 - -/datum/roguestock/stockpile/cured - payout_price = 10 - withdraw_price = 15 - export_price = 15 - -/datum/roguestock/stockpile/hide - payout_price = 5 - withdraw_price = 10 - export_price = 10 - -/datum/roguestock/stockpile/fur - payout_price = 10 - withdraw_price = 15 - export_price = 15 - - -/datum/roguestock/stockpile/grain - payout_price = 1 - -/datum/roguestock/stockpile/oat - payout_price = 1 - -/datum/roguestock/stockpile/apple - payout_price = 2 - withdraw_price = 5 - -/datum/roguestock/stockpile/meat - payout_price = 5 - withdraw_price = 10 - export_price = 10 - -/datum/roguestock/stockpile/beet - payout_price = 2 - withdraw_price = 6 - export_price = 6 - -/datum/roguestock/stockpile/cabbage - payout_price = 2 - withdraw_price = 6 - export_price = 6 - -/datum/roguestock/stockpile/potato - payout_price = 2 - withdraw_price = 6 - export_price = 6 - -/datum/roguestock/stockpile/onion - payout_price = 2 - withdraw_price = 6 - export_price = 6 - -/datum/roguestock/stockpile/poultry - payout_price = 5 - withdraw_price = 10 - export_price = 10 From 943dd3d142e4fac74099d996b91a01238fe1ce55 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Fri, 24 Jan 2025 03:22:58 +0700 Subject: [PATCH 06/20] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D1=85=D0=B0=D1=80=D0=B4-=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=BD=D0=B0=20=D1=81=D0=BA=D0=B8=D0=BB=D0=BB=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BA=D1=83=D0=B7=D0=BD=D0=B5=D1=87=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=B5=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roguetown/roguejobs/blacksmith/anvil.dm | 14 ++++++++++++-- .../modules/economy_fixes/smithing.dm | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm index 4020d0d3621..14ffd80cc80 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm @@ -68,6 +68,11 @@ if(!hingot.currecipe) if(!choose_recipe(user)) return + // REDMOON ADD START - economy-fix - проверка на достаточный уровень навыка для продолжения крафта + if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < hingot.currecipe.skill_level) + to_chat(user, span_warning(hingot.currecipe.low_skill_message)) + return FALSE + // REDMOON ADD END advance_multiplier = 1 //Manual striking more effective than manual striking. user.doing = FALSE spawn(1) @@ -120,7 +125,7 @@ return ..() -/obj/machinery/anvil/proc/choose_recipe(user) +/obj/machinery/anvil/proc/choose_recipe(mob/user) if(!hingot || !hott) return @@ -151,7 +156,12 @@ appro_recipe -= R if(appro_recipe.len) - var/datum/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) + var/datum/anvil_recipe/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) // REDMOON ADD EDIT - economy-fix - обновлён датум для потребностей следующего изменения - WAS: var/datum/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) + // REDMOON ADD START - economy-fix - проверка на возможность начать крафт с текущми уровнем навыка + if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < chosen_recipe.skill_level) + to_chat(user, span_warning("This recipe is too hard for me... I need to be more skilled.")) + return FALSE + // REDMOON ADD END if(!hingot.currecipe && chosen_recipe) hingot.currecipe = new chosen_recipe.type(hingot) return TRUE diff --git a/modular_redmoon/modules/economy_fixes/smithing.dm b/modular_redmoon/modules/economy_fixes/smithing.dm index 91971517cac..54581c87410 100644 --- a/modular_redmoon/modules/economy_fixes/smithing.dm +++ b/modular_redmoon/modules/economy_fixes/smithing.dm @@ -1,12 +1,21 @@ -// Золотым вещам в среднем пятый навык, если они идут на продажу из города или стоят 120+ +/datum/anvil_recipe + // Сообщение, выдающееся юзеру, если ему не хватает навыка персонажа для крафта на наковальне + var/low_skill_message = "This recipe is too hard for me... I need to be more skilled." -/datum/anvil_recipe/cutlery/cupsgold +/* +* ЗОЛОТО - Золотым вещам в среднем пятый навык, если они идут на продажу из города или стоят 120+ +*/ + +/datum/anvil_recipe/cutlery + low_skill_message = "This recipe is too hard for me... I need to be more skilled to craft golden cutlery." skill_level = 5 // Роскошь /datum/anvil_recipe/valuables/gold + low_skill_message = "This recipe is too hard for me... I need to be more skilled to craft golden valuables." skill_level = 5 // Роскошь /datum/anvil_recipe/gold_dildo + low_skill_message = "This recipe is too hard for me... I need to be more skilled to craft it." skill_level = 5 // Псайдона четвертовали за вас /datum/anvil_recipe/weapons/decsword @@ -22,11 +31,9 @@ skill_level = 5 // 2 слитка золота /* - * СЕРЕБРО +* СЕРЕБРО - Серебрянным вещам, если они идут на продажу или как драгоценности, четвертый навык */ -// Серебрянным вещам, если они идут на продажу или как драгоценности, четвертый навык - /datum/anvil_recipe/valuables/silver skill_level = 4 // Роскошь From 81714257c45d2c0eb9b43c660ac6b2a5f8d134f2 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sun, 2 Feb 2025 15:23:51 +0700 Subject: [PATCH 07/20] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=B9=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/roguetown/roguejobs/blacksmith/anvil.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm index 14ffd80cc80..27d22def34e 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm @@ -158,9 +158,10 @@ if(appro_recipe.len) var/datum/anvil_recipe/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) // REDMOON ADD EDIT - economy-fix - обновлён датум для потребностей следующего изменения - WAS: var/datum/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) // REDMOON ADD START - economy-fix - проверка на возможность начать крафт с текущми уровнем навыка - if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < chosen_recipe.skill_level) - to_chat(user, span_warning("This recipe is too hard for me... I need to be more skilled.")) - return FALSE + if(chosen_recipe) + if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < chosen_recipe.skill_level) + to_chat(user, span_warning("This recipe is too hard for me... I need to be more skilled.")) + return FALSE // REDMOON ADD END if(!hingot.currecipe && chosen_recipe) hingot.currecipe = new chosen_recipe.type(hingot) From 459989f3e5e30c6f1ca7fac1b8fe2e110abc7ae7 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Mon, 3 Feb 2025 13:40:56 +0700 Subject: [PATCH 08/20] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=BE=D0=B8=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D1=8D=D1=81=D1=81=D0=B5=D0=BD=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_redmoon/modules/economy_fixes/items_prices.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_redmoon/modules/economy_fixes/items_prices.dm b/modular_redmoon/modules/economy_fixes/items_prices.dm index feef131d7d9..f0bdc353230 100644 --- a/modular_redmoon/modules/economy_fixes/items_prices.dm +++ b/modular_redmoon/modules/economy_fixes/items_prices.dm @@ -9,3 +9,6 @@ /obj/item/natural/cured/essence sellprice = 15 // корм дровосеков + +/obj/item/reagent_containers/powder + sellprice = 1 // Фикс возможности перемолоть камень за 2 маммона в пыль за 10 маммонов From c562fdcd6acfb1a71b5ea35a718fcb92ac072b64 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Mon, 3 Feb 2025 17:51:46 +0700 Subject: [PATCH 09/20] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D0=BC=20?= =?UTF-8?q?=D1=84=D0=B0=D1=80=D0=BC=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20?= =?UTF-8?q?=D0=BE=D1=85=D0=BE=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roguetown/roguejobs/tailor/tanning.dm | 2 +- .../modules/economy_fixes/items_prices.dm | 8 +- .../modules/economy_fixes/mobs_loot.dm | 21 ++++ .../modules/economy_fixes/stockpile.dm | 10 +- .../modules/economy_fixes/tailoring.dm | 116 ++++++++++++++++++ roguetown.dme | 2 + 6 files changed, 152 insertions(+), 7 deletions(-) create mode 100644 modular_redmoon/modules/economy_fixes/mobs_loot.dm create mode 100644 modular_redmoon/modules/economy_fixes/tailoring.dm diff --git a/code/modules/roguetown/roguejobs/tailor/tanning.dm b/code/modules/roguetown/roguejobs/tailor/tanning.dm index 841a8ca49b5..6cbad98e4c3 100644 --- a/code/modules/roguetown/roguejobs/tailor/tanning.dm +++ b/code/modules/roguetown/roguejobs/tailor/tanning.dm @@ -41,7 +41,7 @@ if(anchored) var/skill_level = user.mind.get_skill_level(/datum/skill/craft/hunting) var/work_time = (120 - (skill_level * 15)) - var/pieces_to_spawn = rand(1, min(skill_level + 1, 6)) //Random number from 1 to skill level + var/pieces_to_spawn = skill_level > 3 ? 2 : 1 // REDMOON EDIT - economy_fix - уменьшаем среднее количество добываемой отчищенной кожи - WAS rand(1, min(skill_level + 1, 6)) //Random number from 1 to skill level var/sound_played = FALSE to_chat(user, span_warning("I begin scraping the hide's skin...")) if(!do_after(user, work_time, target = user)) diff --git a/modular_redmoon/modules/economy_fixes/items_prices.dm b/modular_redmoon/modules/economy_fixes/items_prices.dm index f0bdc353230..b3e940f9fb2 100644 --- a/modular_redmoon/modules/economy_fixes/items_prices.dm +++ b/modular_redmoon/modules/economy_fixes/items_prices.dm @@ -5,7 +5,13 @@ sellprice = 30 // было 50. Хватит продавать ИХ /obj/item/natural/fur - sellprice = 23 // как в стокпайле + sellprice = 15 // как в стокпайле + +/obj/item/natural/hide + sellprice = 15 // нельзя выгодно продать голым на корабле (в обход казначея) + +/obj/item/natural/hide/cured + sellprice = 10 // нельзя выгодно продать голым на корабле (в обход казначея) /obj/item/natural/cured/essence sellprice = 15 // корм дровосеков diff --git a/modular_redmoon/modules/economy_fixes/mobs_loot.dm b/modular_redmoon/modules/economy_fixes/mobs_loot.dm new file mode 100644 index 00000000000..77511a38da0 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/mobs_loot.dm @@ -0,0 +1,21 @@ +/mob/living/simple_animal/hostile/retaliate/rogue/goatmale + butcher_results = list(/obj/item/reagent_containers/food/snacks/rogue/meat/steak = 3, // на 1 меньше + /obj/item/reagent_containers/food/snacks/fat = 1, + /obj/item/natural/hide = 1, // на 1 меньше + /obj/item/natural/fur = 1) + +/mob/living/simple_animal/hostile/retaliate/rogue/goat + butcher_results = list(/obj/item/reagent_containers/food/snacks/rogue/meat/steak = 3, // на 1 меньше + /obj/item/reagent_containers/food/snacks/fat = 2, + /obj/item/natural/hide = 1, // на 1 меньше + /obj/item/natural/fur = 1) + +/mob/living/simple_animal/hostile/retaliate/rogue/saiga + butcher_results = list(/obj/item/reagent_containers/food/snacks/rogue/meat/steak = 3, // на 1 меньше + /obj/item/reagent_containers/food/snacks/fat = 2, + /obj/item/natural/hide = 3) // на 1 меньше + +/mob/living/simple_animal/hostile/retaliate/rogue/saigabuck + butcher_results = list(/obj/item/reagent_containers/food/snacks/rogue/meat/steak = 3, // на 1 меньше + /obj/item/reagent_containers/food/snacks/fat = 1, + /obj/item/natural/hide = 3) // на 1 меньше diff --git a/modular_redmoon/modules/economy_fixes/stockpile.dm b/modular_redmoon/modules/economy_fixes/stockpile.dm index 6d548669dd8..9bf8f9195cf 100644 --- a/modular_redmoon/modules/economy_fixes/stockpile.dm +++ b/modular_redmoon/modules/economy_fixes/stockpile.dm @@ -14,15 +14,15 @@ export_price = 65 /datum/roguestock/stockpile/cured - payout_price = 10 - withdraw_price = 15 - export_price = 15 - -/datum/roguestock/stockpile/hide payout_price = 5 withdraw_price = 10 export_price = 10 +/datum/roguestock/stockpile/hide + payout_price = 10 + withdraw_price = 15 + export_price = 15 + /datum/roguestock/stockpile/fur payout_price = 10 withdraw_price = 15 diff --git a/modular_redmoon/modules/economy_fixes/tailoring.dm b/modular_redmoon/modules/economy_fixes/tailoring.dm new file mode 100644 index 00000000000..569c805ca3a --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/tailoring.dm @@ -0,0 +1,116 @@ + +/datum/crafting_recipe/roguetown/hunting + skill_level = 2 + sellprice = 15 + +// Лёгкие крафты. Не оказывают сильного влияния на игру + +/datum/crafting_recipe/roguetown/hunting/belt + name = "Leather Belt - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/gloves + name = "Leather Gloves - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/lcollar + name = "Leather Collar - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/lleash + name = "Leather Leash - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/bracers + name = "Leather Bracers - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/boots + name = "Leather Boots - (1 cured leather; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/pouch + name = "Leather Pouch - (1 cured leather, 1 fibre; APPRENTICE)" + skill_level = 2 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/cloak + name = "Leather Cloak - (2 cured leathers; APPRENTICE)" + skill_level = 2 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/pants + name = "Leather Trousers - (2 cured leathers; APPRENTICE)" + skill_level = 2 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/quiver + name = "Quiver - (2 cured leathers, 2 fibers; APPRENTICE)" + skill_level = 2 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/whip + name = "Leather Whip - (2 cured leathers, 1 stone; APPRENTICE)" + skill_level = 2 + sellprice = 30 // 2 шкуры + +// Крафты уровня опытного + +/datum/crafting_recipe/roguetown/hunting/satchel + name = "Leather Satchel - (2 cured leathers, 1 fiber; JOURNEYMAN)" + skill_level = 3 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/waterskin + name = "Waterskin - (1 cured leather, 2 fibers; JOURNEYMAN)" + skill_level = 3 + sellprice = 15 // 1 шкура + +/datum/crafting_recipe/roguetown/hunting/powderflask + name = "Powderflask - (2 cured leathers, 1 fibers, 15 syrum of fire; JOURNEYMAN)" + skill_level = 3 + sellprice = 35 // 2 шкуры и порох + +/datum/crafting_recipe/roguetown/hunting/bulletpouch + name = "Bullet Pouch - (2 cured leathers, 2 fibers; JOURNEYMAN)" + skill_level = 3 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/saddle + name = "Saddle - (2 cured leathers; JOURNEYMAN)" + skill_level = 3 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/bedroll + name = "Bedroll - (2 cured leathers, 2 clothes, 1 rope; JOURNEYMAN)" + skill_level = 3 + sellprice = 35 // 2 шкуры и допы + +/datum/crafting_recipe/roguetown/hunting/drum + name = "Drum - (1 cured leather, 1 small log; JOURNEYMAN)" + skill_level = 3 + sellprice = 15 // 1 шкура + +// Крафты уровня охотника. То, за счёт чего он может быть особенно полезен + +/datum/crafting_recipe/roguetown/hunting/helmet + name = "Leather Helmet - (2 cured leathers; EXPERT)" + reqs = list(/obj/item/natural/hide/cured = 2) + skill_level = 4 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/armor + name = "Leather Armor - (2 cured leathers; EXPERT)" + skill_level = 4 + sellprice = 30 // 2 шкуры + +/datum/crafting_recipe/roguetown/hunting/backpack + name = "Leather Backpack - (2 cured leathers, 1 fiber; EXPERT)" + skill_level = 4 + sellprice = 45 // 3 шкуры diff --git a/roguetown.dme b/roguetown.dme index 738cd27d070..4cf091c523c 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2125,10 +2125,12 @@ #include "modular_redmoon\modules\client\preferences_savefile.dm" #include "modular_redmoon\modules\cloak_hoods_fix\cloak_hoods_fix.dm" #include "modular_redmoon\modules\economy_fixes\items_prices.dm" +#include "modular_redmoon\modules\economy_fixes\mobs_loot.dm" #include "modular_redmoon\modules\economy_fixes\sewing.dm" #include "modular_redmoon\modules\economy_fixes\smithing.dm" #include "modular_redmoon\modules\economy_fixes\stockpile.dm" #include "modular_redmoon\modules\commend_comments\commend_comments.dm" +#include "modular_redmoon\modules\economy_fixes\tailoring.dm" #include "modular_redmoon\modules\events\goblininvasion.dm" #include "modular_redmoon\modules\events\haunts.dm" #include "modular_redmoon\modules\events\poltergeist.dm" From f0613aba97d5f38f89adc00668818e5a90719b9e Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Tue, 4 Feb 2025 21:44:16 +0700 Subject: [PATCH 10/20] =?UTF-8?q?=D0=9E=D1=85=D0=BE=D1=82=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D1=81=D1=82=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B0=D0=BD=D0=BA=D1=83?= =?UTF-8?q?=20=D0=B2=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=BE=D1=82.=20?= =?UTF-8?q?=D0=A0=D1=8B=D0=B1=D0=B0=D0=BA=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=BB=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B4=D1=80=D0=B0?= =?UTF-8?q?=D0=B3=D0=BE=D1=86=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=BE=D1=82.=20=D0=94?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B3=D0=B0=D1=8F=20=20=D1=80=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=D0=B8=D1=82=D1=81=D1=8F=20=D0=B2?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=BE=D1=82.=20=D0=94=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8F=20=D0=B2=D0=BD=D0=B5=20=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D1=82=20=D0=BF=D1=80=D0=B8=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=8F=D1=82=20=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=20=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=B8=D1=81=D0=B8=D0=BD=D1=8B,=20=D0=B0=20?= =?UTF-8?q?=D1=8D=D1=81=D1=81=D0=B5=D0=BD=D1=86=D0=B8=D0=B9=20=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=BE=D0=B2=D1=81=D0=B5=20=D0=BD=D0=B5=D1=82=20=D0=B2?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=BE=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/structures/roguetown/newtree.dm | 3 + .../structures/roguetown/rogueflora.dm | 2 +- code/game/turfs/closed/minerals.dm | 2 +- .../modules/roguetown/roguejobs/fisher/rod.dm | 3 + .../towners_should_work_in_bog.dm | 112 ++++++++++++++++++ roguetown.dme | 1 + 6 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm diff --git a/code/game/objects/structures/roguetown/newtree.dm b/code/game/objects/structures/roguetown/newtree.dm index e374b2d8efa..7ddf058e95c 100644 --- a/code/game/objects/structures/roguetown/newtree.dm +++ b/code/game/objects/structures/roguetown/newtree.dm @@ -69,6 +69,9 @@ if(!istype(NT, /turf/open/transparent/openspace) && !(locate(/obj/structure/flora/roguetree/stump) in NT))//if i don't add the stump check it spawns however many zlevels it goes up because of src recursion new /obj/structure/flora/roguetree/stump(NT) playsound(src, 'sound/misc/treefall.ogg', 100, FALSE) + if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX // Оповещение для лесоруба, чтобы шёл бить лес + if(prob(20)) + visible_message(span_warning(user.client.prefs.be_russian ? "Дерево было уже слишком старым. Лес в болото значительно качественнее..." : "The tree was already too old for good gatherting. The one in the bog would be more profitable...")) // REDMOON ADD END . = ..() /obj/structure/flora/newtree/attack_hand(mob/user) diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm index a379b4cc43c..453a25bef9d 100644 --- a/code/game/objects/structures/roguetown/rogueflora.dm +++ b/code/game/objects/structures/roguetown/rogueflora.dm @@ -184,7 +184,7 @@ lumber_amount = rand(lumber_amount, max(lumber_amount, round(skill_level / 2))) var/essense_sound_played = FALSE //This is here so the sound wont play multiple times if the essense itself spawns multiple times for(var/i = 0; i < lumber_amount; i++) - if(prob(skill_level + user.goodluck(2))) + if(prob(skill_level + user.goodluck(2)) && istype(get_area(loc), /area/rogue/outdoors/bog)) // REDMOON EDIT - ECONOMY-FIX - Дендор не одобряет лесорубство вне болота - WAS: if(prob(skill_level + user.goodluck(2))) new /obj/item/grown/log/tree/small/essence(get_turf(src)) if(!essense_sound_played) essense_sound_played = TRUE diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index b5ab12c600a..3ea3fd85c12 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -170,7 +170,7 @@ /turf/closed/mineral/random/Initialize() - mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList) +// mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList) -- REDMOON REMOVAL - ECONOMY-FIX - не даёт работать функции check_for_bog_area() if (display_icon_state) icon_state = display_icon_state diff --git a/code/modules/roguetown/roguejobs/fisher/rod.dm b/code/modules/roguetown/roguejobs/fisher/rod.dm index 9b3221c1a20..b8f64a56aab 100644 --- a/code/modules/roguetown/roguejobs/fisher/rod.dm +++ b/code/modules/roguetown/roguejobs/fisher/rod.dm @@ -97,6 +97,9 @@ update_icon() return + if(baited.check_for_bait_location()) // REDMOON ADD START - ECONOMY-FIX - рыбачить не в болоте можно разве что за еду + if(prob(5)) + to_chat(current_fisherman, user.client.prefs.be_russian ? "Здесь хорошего улова не дождёшься... В реке у болот шансы выше." : "I will not catch anything valuable here, but fish... Bog river would be more fitting.") // REDMOON ADD END var/caught_thing = pickweight(baited.fishloot) new caught_thing(current_fisherman.loc) amt2raise = current_fisherman.STAINT * 2 diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm new file mode 100644 index 00000000000..971981482a5 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -0,0 +1,112 @@ +// Охота в окрестностях города - бесполезная затея +/obj/item/bait/attack_self(mob/user) + if(!istype(get_area(src), /area/rogue/outdoors/bog)) + to_chat(user, span_warning(user.client.prefs.be_russian ? "В окрестностях Рокхилла не осталось живности... В болотах шансов приманить кого-нибудь больше." : "There will not be enought wildlife here. I should place [src] in the bog...")) + return FALSE + . = ..() + +// С деревьев у рокхилла доходность леса очень сильно падает +/obj/structure/flora/newtree + var/tree_not_in_bog = FALSE // оповещение для дровосека, чтобы шёл рубить болото + +/obj/structure/flora/newtree/Initialize() + if(!istype(get_area(loc), /area/rogue/outdoors/bog)) + static_debris = list(/obj/item/grown/log/tree/small = 1) + tree_not_in_bog = TRUE + if(istype(get_turf(src), /turf/open/transparent/openspace)) + static_debris = list() // отсутствие древесины в целом, фармите болото, дровосеки + tree_not_in_bog = FALSE // некому показывать + . = ..() + +// Добыча в шахтах рокхилла - не особо прибыльное дело, но кузнец явно скажет спасибо. Золото и другие ценные руды можно добыть за городом +/turf/closed/mineral/random/rogue/Initialize() + check_for_bog_area() + . = ..() + +/turf/closed/mineral/random/proc/check_for_bog_area() + return TRUE + +/turf/closed/mineral/random/rogue/med/check_for_bog_area() + if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) + +/turf/closed/mineral/random/rogue/high/check_for_bog_area() + if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) + +// Рыбаку ловить у города для удачного подъёма смысла мало +/obj/item/proc/check_for_bait_location() + return FALSE + +/obj/item/natural/worms/check_for_bait_location() + if(!istype(get_area(src), /area/rogue/outdoors/bog) || !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + fishloot = list(\ + /obj/item/trash/applecore = 50, + /obj/item/trash/pearcore = 25, //Pears, in Rockhill? Perish the thought. + /obj/item/natural/fibers = 15, //It's pretty hard to hook a fiber. + /obj/item/grown/log/tree/stick = 2, //Single stick + /obj/item/reagent_containers/food/snacks/fish/carp = 214, + /obj/item/reagent_containers/food/snacks/fish/eel = 214, + /obj/item/reagent_containers/food/snacks/fish/angler = 214, + /obj/item/reagent_containers/food/snacks/fish/shrimp = 180, //Shrimp man gone. Life bad. + /obj/item/reagent_containers/food/snacks/fish/clownfish = 214, + /obj/item/natural/bundle/stick = 15, //Bundle of sticks + /obj/item/natural/stone = 15, //Hard to catch stones! + /obj/item/clothing/head/roguetown/helmet/tricorn = 25, + /obj/item/clothing/head/roguetown/helmet/bandana = 25, + /obj/item/clothing/head/roguetown/roguehood = 25, + /obj/item/clothing/under/roguetown/loincloth/brown = 25, + /obj/item/clothing/shoes/roguetown/sandals = 25, + /obj/item/clothing/shoes/roguetown/simpleshoes = 25, + /obj/item/clothing/gloves/roguetown/fingerless = 25, + /obj/item/clothing/gloves/roguetown/leather = 25, + /obj/item/clothing/shoes/roguetown/armor/leather = 25, + /obj/item/reagent_containers/syringe = 1, //These are terrifyingly powerful. + /obj/item/reagent_containers/glass/cup/wooden = 27, + /obj/item/ammo_casing/caseless/rogue/arrow = 45, + /obj/item/roguecoin/copper = 45, + /obj/item/leash = 15, + /obj/item/customlock = 35, + /obj/item/shard = 1, //Bait is smaller + /obj/item/natural/feather = 15, + /obj/item/natural/cloth = 15, + /obj/item/kitchen/spoon = 1,) + return TRUE + return FALSE + +/obj/item/natural/worms/grubs/check_for_bait_location() + if(!istype(get_area(src), /area/rogue/outdoors/bog) || !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + fishloot = list(\ + /obj/item/trash/applecore = 625, + /obj/item/trash/pearcore = 625, + /obj/item/natural/fibers = 625, + /obj/item/grown/log/tree/stick = 625, + /obj/item/reagent_containers/food/snacks/fish/carp = 214, + /obj/item/reagent_containers/food/snacks/fish/eel = 214, + /obj/item/reagent_containers/food/snacks/fish/angler = 214, + /obj/item/reagent_containers/food/snacks/fish/shrimp = 214, + /obj/item/reagent_containers/food/snacks/fish/clownfish = 214, + /obj/item/natural/bundle/stick = 214, + /obj/item/natural/stone = 214, + /obj/item/clothing/head/roguetown/helmet/tricorn = 45, + /obj/item/clothing/head/roguetown/helmet/bandana = 45, + /obj/item/clothing/head/roguetown/roguehood = 45, + /obj/item/clothing/under/roguetown/loincloth/brown = 45, + /obj/item/clothing/shoes/roguetown/sandals = 45, + /obj/item/clothing/shoes/roguetown/simpleshoes = 45, + /obj/item/clothing/gloves/roguetown/fingerless = 45, + /obj/item/clothing/gloves/roguetown/leather = 45, + /obj/item/clothing/shoes/roguetown/armor/leather = 45, + /obj/item/reagent_containers/syringe = 1, + /obj/item/reagent_containers/glass/cup/wooden = 45, + /obj/projectile/bullet/reusable/bolt = 45, + /obj/item/ammo_casing/caseless/rogue/arrow = 45, + /obj/item/roguecoin/copper = 45, + /obj/item/leash = 45, + /obj/item/customlock = 45, + /obj/item/shard = 45, + /obj/item/natural/feather = 45, + /obj/item/natural/cloth = 45, + /obj/item/kitchen/spoon = 45,) + return TRUE + return FALSE diff --git a/roguetown.dme b/roguetown.dme index 4cf091c523c..3e02a136ec1 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2131,6 +2131,7 @@ #include "modular_redmoon\modules\economy_fixes\stockpile.dm" #include "modular_redmoon\modules\commend_comments\commend_comments.dm" #include "modular_redmoon\modules\economy_fixes\tailoring.dm" +#include "modular_redmoon\modules\economy_fixes\towners_should_work_in_bog.dm" #include "modular_redmoon\modules\events\goblininvasion.dm" #include "modular_redmoon\modules\events\haunts.dm" #include "modular_redmoon\modules\events\poltergeist.dm" From 741ae45f4c4c8587779f731868448456bdcfc194 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Tue, 4 Feb 2025 22:02:22 +0700 Subject: [PATCH 11/20] =?UTF-8?q?=D0=AD=D0=BA=D1=81=D1=82=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=82=D0=B0=D0=B9=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/structures/roguetown/newtree.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/roguetown/newtree.dm b/code/game/objects/structures/roguetown/newtree.dm index 7ddf058e95c..c5360e33717 100644 --- a/code/game/objects/structures/roguetown/newtree.dm +++ b/code/game/objects/structures/roguetown/newtree.dm @@ -69,9 +69,9 @@ if(!istype(NT, /turf/open/transparent/openspace) && !(locate(/obj/structure/flora/roguetree/stump) in NT))//if i don't add the stump check it spawns however many zlevels it goes up because of src recursion new /obj/structure/flora/roguetree/stump(NT) playsound(src, 'sound/misc/treefall.ogg', 100, FALSE) - if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX // Оповещение для лесоруба, чтобы шёл бить лес - if(prob(20)) - visible_message(span_warning(user.client.prefs.be_russian ? "Дерево было уже слишком старым. Лес в болото значительно качественнее..." : "The tree was already too old for good gatherting. The one in the bog would be more profitable...")) // REDMOON ADD END +// if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX // Оповещение для лесоруба, чтобы шёл бить лес +// if(prob(20)) +// visible_message(span_warning(user.client.prefs.be_russian ? "Дерево было уже слишком старым. Лес в болото значительно качественнее..." : "The tree was already too old for good gatherting. The one in the bog would be more profitable...")) // REDMOON ADD END . = ..() /obj/structure/flora/newtree/attack_hand(mob/user) From 036263bf998d1f624c7c534daacd1e9ed4cc171a Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Thu, 6 Feb 2025 20:22:02 +0700 Subject: [PATCH 12/20] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B8=D0=BA=D0=B8=20=D1=80=D1=8B=D0=B1=D0=B0=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/economy_fixes/towners_should_work_in_bog.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index 971981482a5..233430eeeea 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -39,7 +39,7 @@ return FALSE /obj/item/natural/worms/check_for_bait_location() - if(!istype(get_area(src), /area/rogue/outdoors/bog) || !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + if(!istype(get_area(src), /area/rogue/outdoors/bog) && !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) fishloot = list(\ /obj/item/trash/applecore = 50, /obj/item/trash/pearcore = 25, //Pears, in Rockhill? Perish the thought. @@ -75,7 +75,7 @@ return FALSE /obj/item/natural/worms/grubs/check_for_bait_location() - if(!istype(get_area(src), /area/rogue/outdoors/bog) || !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + if(!istype(get_area(src), /area/rogue/outdoors/bog) && !istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) fishloot = list(\ /obj/item/trash/applecore = 625, /obj/item/trash/pearcore = 625, From 5a3a5b23f45744f6e609d8bbd7c1190ac7f3252f Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Thu, 6 Feb 2025 20:40:29 +0700 Subject: [PATCH 13/20] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B4?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BE=D1=81=D0=B5=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/structures/roguetown/newtree.dm | 3 --- .../structures/roguetown/rogueflora.dm | 5 +++- .../towners_should_work_in_bog.dm | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/roguetown/newtree.dm b/code/game/objects/structures/roguetown/newtree.dm index c5360e33717..e374b2d8efa 100644 --- a/code/game/objects/structures/roguetown/newtree.dm +++ b/code/game/objects/structures/roguetown/newtree.dm @@ -69,9 +69,6 @@ if(!istype(NT, /turf/open/transparent/openspace) && !(locate(/obj/structure/flora/roguetree/stump) in NT))//if i don't add the stump check it spawns however many zlevels it goes up because of src recursion new /obj/structure/flora/roguetree/stump(NT) playsound(src, 'sound/misc/treefall.ogg', 100, FALSE) -// if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX // Оповещение для лесоруба, чтобы шёл бить лес -// if(prob(20)) -// visible_message(span_warning(user.client.prefs.be_russian ? "Дерево было уже слишком старым. Лес в болото значительно качественнее..." : "The tree was already too old for good gatherting. The one in the bog would be more profitable...")) // REDMOON ADD END . = ..() /obj/structure/flora/newtree/attack_hand(mob/user) diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm index 453a25bef9d..96b5a83d21f 100644 --- a/code/game/objects/structures/roguetown/rogueflora.dm +++ b/code/game/objects/structures/roguetown/rogueflora.dm @@ -181,7 +181,10 @@ playsound(src, 'sound/misc/woodhit.ogg', 100, TRUE) if(!do_after(user, lumber_time, target = user)) return - lumber_amount = rand(lumber_amount, max(lumber_amount, round(skill_level / 2))) + if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX - деревья в окрестностях Рокхилла приносят мало древисины + lumber_amount = 1 + else // REDMOON ADD END + lumber_amount = rand(lumber_amount, max(lumber_amount, round(skill_level / 2))) var/essense_sound_played = FALSE //This is here so the sound wont play multiple times if the essense itself spawns multiple times for(var/i = 0; i < lumber_amount; i++) if(prob(skill_level + user.goodluck(2)) && istype(get_area(loc), /area/rogue/outdoors/bog)) // REDMOON EDIT - ECONOMY-FIX - Дендор не одобряет лесорубство вне болота - WAS: if(prob(skill_level + user.goodluck(2))) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index 233430eeeea..bca32a395ff 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -13,11 +13,36 @@ if(!istype(get_area(loc), /area/rogue/outdoors/bog)) static_debris = list(/obj/item/grown/log/tree/small = 1) tree_not_in_bog = TRUE + desc += " Seems like this tree is very old. The one in the Bog would have better wood." if(istype(get_turf(src), /turf/open/transparent/openspace)) static_debris = list() // отсутствие древесины в целом, фармите болото, дровосеки tree_not_in_bog = FALSE // некому показывать . = ..() +/obj/structure/flora/newtree/obj_destruction(damage_flag) + if(tree_not_in_bog) + if(prob(20)) + visible_message(span_info("The tree was too old. The one the Bog have better wood."), vision_distance = 2) + . = ..() + +/obj/structure/flora/roguetree + var/tree_not_in_bog = FALSE // оповещение для дровосека, чтобы шёл рубить болото + +/obj/structure/flora/roguetree/Initialize() + if(!istype(get_area(loc), /area/rogue/outdoors/bog)) + static_debris = list(/obj/item/grown/log/tree/small = 1) + tree_not_in_bog = TRUE + desc += " Seems like this tree is very old. The one in the Bog would have better wood." + stump_type = null + . = ..() + +/obj/structure/flora/roguetree/obj_destruction(damage_flag) + if(tree_not_in_bog) + if(prob(20)) + visible_message(span_info("The tree was too old and rotten. The one the Bog would have better wood."), vision_distance = 2) + + . = ..() + // Добыча в шахтах рокхилла - не особо прибыльное дело, но кузнец явно скажет спасибо. Золото и другие ценные руды можно добыть за городом /turf/closed/mineral/random/rogue/Initialize() check_for_bog_area() From f1da67eb8ed95e2f50458a9bff96ca66fdef59c0 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Thu, 6 Feb 2025 22:38:42 +0700 Subject: [PATCH 14/20] =?UTF-8?q?=D0=90=D0=BF=D0=B4=D0=B5=D0=B9=D1=82=20?= =?UTF-8?q?=D1=88=D0=B0=D1=85=D1=82=D1=91=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../towners_should_work_in_bog.dm | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index bca32a395ff..a53052d44d1 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -48,6 +48,18 @@ check_for_bog_area() . = ..() +/turf/closed/mineral/random/rogue + mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) + mineralChance = 25 + +/turf/closed/mineral/random/rogue/med + mineralChance = 30 + mineralSpawnChanceList = list(/turf/closed/mineral/rogue/gold = 3,/turf/closed/mineral/rogue/silver = 2,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/copper = 10,/turf/closed/mineral/rogue/tin = 10,/turf/closed/mineral/rogue/coal = 5, /turf/closed/mineral/rogue/gem = 3) + +/turf/closed/mineral/random/rogue/high + mineralChance = 50 + mineralSpawnChanceList = list(/turf/closed/mineral/rogue/gold = 9,/turf/closed/mineral/rogue/silver = 5,/turf/closed/mineral/rogue/iron = 20,/turf/closed/mineral/rogue/copper = 10,/turf/closed/mineral/rogue/tin = 10, /turf/closed/mineral/rogue/gem = 5) + /turf/closed/mineral/random/proc/check_for_bog_area() return TRUE @@ -59,6 +71,68 @@ if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) +/turf/closed/mineral/rogue + var/ore_overlay = null + var/ore_overlay_icon = 'icons/roguetown/items/ore.dmi' + +/turf/closed/mineral/rogue/proc/update_ore_overlay() + var/ore_overlay_icon_state = get_ore_overlay_icon_state() + var/mutable_appearance/M = mutable_appearance(ore_overlay_icon, ore_overlay_icon_state, layer = ABOVE_NORMAL_TURF_LAYER) + M.pixel_y = rand(-12, 12) + M.pixel_x = rand(-12, 12) + + var/matrix/M_matrix = new + M_matrix.Scale(0.3,rand(0.3, 0.6)) + M_matrix.Turn(rand(1,360)) + M.transform = M_matrix + add_overlay(M) + +/turf/closed/mineral/rogue/proc/get_ore_overlay_icon_state() + return "[ore_overlay][rand(1,3)]" + +/turf/closed/mineral/rogue/Initialize() + . = ..() + if(ore_overlay) + update_ore_overlay() + +/turf/closed/mineral/rogue/gold + ore_overlay = "oregold" + +/turf/closed/mineral/rogue/silver + ore_overlay = "oresilv" + +/turf/closed/mineral/rogue/salt + ore_overlay = "salt" + ore_overlay_icon = 'icons/roguetown/items/produce.dmi' + +/turf/closed/mineral/rogue/salt/get_ore_overlay_icon_state() + return ore_overlay // нет рандомных иконок + +/turf/closed/mineral/rogue/copper + ore_overlay = "orecop" + +/turf/closed/mineral/rogue/tin + ore_overlay = "oretin" + +/turf/closed/mineral/rogue/iron + ore_overlay = "oreiron" + +/turf/closed/mineral/rogue/coal + ore_overlay = "orecoal" + +/turf/closed/mineral/rogue/cinnabar + ore_overlay = "orecinnabar" + +/turf/closed/mineral/rogue/cinnabar/get_ore_overlay_icon_state() + return ore_overlay // нет рандомных иконок + +/turf/closed/mineral/rogue/gem + ore_overlay = "saphire" + ore_overlay_icon = 'icons/roguetown/items/gems.dmi' + +/turf/closed/mineral/rogue/gem/get_ore_overlay_icon_state() + return pick("saphire", "ruby", "emerald", "topaz", "diamond", "quartz") // нет рандомных иконок, но есть множество всяких иконок + // Рыбаку ловить у города для удачного подъёма смысла мало /obj/item/proc/check_for_bait_location() return FALSE From f2a5575c27b1017ae944c44cfa0be9a34349536c Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sat, 8 Feb 2025 17:18:34 +0700 Subject: [PATCH 15/20] =?UTF-8?q?=D0=94=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/structures/roguetown/rogueflora.dm | 4 ++-- code/game/turfs/closed/minerals.dm | 2 +- code/modules/roguetown/roguejobs/blacksmith/anvil.dm | 6 +++--- code/modules/roguetown/roguejobs/fisher/rod.dm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm index 96b5a83d21f..70b7ed97660 100644 --- a/code/game/objects/structures/roguetown/rogueflora.dm +++ b/code/game/objects/structures/roguetown/rogueflora.dm @@ -181,13 +181,13 @@ playsound(src, 'sound/misc/woodhit.ogg', 100, TRUE) if(!do_after(user, lumber_time, target = user)) return - if(tree_not_in_bog) // REDMOON ADD START - ECONOMY-FIX - деревья в окрестностях Рокхилла приносят мало древисины + if(tree_not_in_bog) // REDMOON ADD START - economy_fix - деревья в окрестностях Рокхилла приносят мало древисины lumber_amount = 1 else // REDMOON ADD END lumber_amount = rand(lumber_amount, max(lumber_amount, round(skill_level / 2))) var/essense_sound_played = FALSE //This is here so the sound wont play multiple times if the essense itself spawns multiple times for(var/i = 0; i < lumber_amount; i++) - if(prob(skill_level + user.goodluck(2)) && istype(get_area(loc), /area/rogue/outdoors/bog)) // REDMOON EDIT - ECONOMY-FIX - Дендор не одобряет лесорубство вне болота - WAS: if(prob(skill_level + user.goodluck(2))) + if(prob(skill_level + user.goodluck(2)) && istype(get_area(loc), /area/rogue/outdoors/bog)) // REDMOON EDIT - economy_fix - Дендор не одобряет лесорубство вне болота - WAS: if(prob(skill_level + user.goodluck(2))) new /obj/item/grown/log/tree/small/essence(get_turf(src)) if(!essense_sound_played) essense_sound_played = TRUE diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 3ea3fd85c12..07a1033cf0d 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -170,7 +170,7 @@ /turf/closed/mineral/random/Initialize() -// mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList) -- REDMOON REMOVAL - ECONOMY-FIX - не даёт работать функции check_for_bog_area() +// mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList) -- REDMOON REMOVAL - economy_fix - не даёт работать функции check_for_bog_area() if (display_icon_state) icon_state = display_icon_state diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm index 54387470ae2..b7e97a1b2b3 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm @@ -68,7 +68,7 @@ if(!hingot.currecipe) if(!choose_recipe(user)) return - // REDMOON ADD START - economy-fix - проверка на достаточный уровень навыка для продолжения крафта + // REDMOON ADD START - economy_fix - проверка на достаточный уровень навыка для продолжения крафта if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < hingot.currecipe.skill_level) to_chat(user, span_warning(hingot.currecipe.low_skill_message)) return FALSE @@ -156,8 +156,8 @@ appro_recipe -= R if(appro_recipe.len) - var/datum/anvil_recipe/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) // REDMOON ADD EDIT - economy-fix - обновлён датум для потребностей следующего изменения - WAS: var/datum/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) - // REDMOON ADD START - economy-fix - проверка на возможность начать крафт с текущми уровнем навыка + var/datum/anvil_recipe/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) // REDMOON ADD EDIT - economy_fix - обновлён датум для потребностей следующего изменения - WAS: var/datum/chosen_recipe = input(user, "Choose A Creation", "Anvil") as null|anything in sortNames(appro_recipe.Copy()) + // REDMOON ADD START - economy_fix - проверка на возможность начать крафт с текущми уровнем навыка if(chosen_recipe) if(user.mind.get_skill_level(/datum/skill/craft/blacksmithing) < chosen_recipe.skill_level) to_chat(user, span_warning("This recipe is too hard for me... I need to be more skilled.")) diff --git a/code/modules/roguetown/roguejobs/fisher/rod.dm b/code/modules/roguetown/roguejobs/fisher/rod.dm index b8f64a56aab..7ee9cfdb8a8 100644 --- a/code/modules/roguetown/roguejobs/fisher/rod.dm +++ b/code/modules/roguetown/roguejobs/fisher/rod.dm @@ -97,7 +97,7 @@ update_icon() return - if(baited.check_for_bait_location()) // REDMOON ADD START - ECONOMY-FIX - рыбачить не в болоте можно разве что за еду + if(baited.check_for_bait_location()) // REDMOON ADD START - economy_fix - рыбачить не в болоте можно разве что за еду if(prob(5)) to_chat(current_fisherman, user.client.prefs.be_russian ? "Здесь хорошего улова не дождёшься... В реке у болот шансы выше." : "I will not catch anything valuable here, but fish... Bog river would be more fitting.") // REDMOON ADD END var/caught_thing = pickweight(baited.fishloot) From 0955d63239817b5d6ba8e0e36d126646a48668dc Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sat, 8 Feb 2025 17:21:16 +0700 Subject: [PATCH 16/20] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=B1=D0=BE=D0=BB=D0=BE=D1=82=D0=BD=D0=BE=D0=B9=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/roguetown/roguejobs/fisher/rod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/roguetown/roguejobs/fisher/rod.dm b/code/modules/roguetown/roguejobs/fisher/rod.dm index 7ee9cfdb8a8..56b7b093750 100644 --- a/code/modules/roguetown/roguejobs/fisher/rod.dm +++ b/code/modules/roguetown/roguejobs/fisher/rod.dm @@ -99,7 +99,7 @@ if(baited.check_for_bait_location()) // REDMOON ADD START - economy_fix - рыбачить не в болоте можно разве что за еду if(prob(5)) - to_chat(current_fisherman, user.client.prefs.be_russian ? "Здесь хорошего улова не дождёшься... В реке у болот шансы выше." : "I will not catch anything valuable here, but fish... Bog river would be more fitting.") // REDMOON ADD END + to_chat(current_fisherman, user.client.prefs.be_russian ? "Здесь я драгоценности не выловлю... В реке у болот шансы выше." : "I will not catch any treasure here, but fish... Bog river would be more fitting.") // REDMOON ADD END var/caught_thing = pickweight(baited.fishloot) new caught_thing(current_fisherman.loc) amt2raise = current_fisherman.STAINT * 2 From 552e2dd62324fed7fcc8dc860ab1867b3487e31d Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sun, 9 Feb 2025 21:28:59 +0700 Subject: [PATCH 17/20] =?UTF-8?q?=D0=9C=D0=B0=D1=82=D1=82=D0=B8=D0=BE?= =?UTF-8?q?=D1=81=D0=B8=D1=82=D0=B0=D0=BC=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=81=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=B5=D0=B5=20=D0=BA=D0=BE=D0=BF=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=B0=D0=BB=D1=8B.=20?= =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D1=8B=D0=BA=20=D1=88=D0=B0=D1=85=D1=82=D1=91?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BD=D0=B0=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=81=D0=B8=D0=BB=D1=8C=D0=BD=D0=B5=D0=B5=20=D0=B2=D0=BB=D0=B8?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=BD=D0=B0=20=D1=8D=D1=84=D1=84=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=87=D0=B8=20=D0=BA=D0=B0=D0=BC=D0=BD=D1=8F?= =?UTF-8?q?.=20=D0=A6=D0=B5=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BA=D1=83=D0=BF?= =?UTF-8?q?=D0=B0=20=D0=B6=D0=B5=D0=BB=D0=B5=D0=B7=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D1=88=D0=B5=D0=BD=D0=B0.=20=D0=A1=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D1=80=D0=BE=D1=81=D1=82=20=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=D1=82=D0=BE=D0=BA=20=D1=83=D1=81=D1=82=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D0=B7=D0=B0=20=D0=BE=D1=82=D0=B4=D1=8B?= =?UTF-8?q?=D1=85.=20(=D0=BE=D1=82=D0=B4=D1=8B=D1=85=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D0=B8=20=D0=B2=D1=81=D1=91=20?= =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D1=8D=D1=84=D1=84=D0=B5=D0=BA=D1=82=D0=B8?= =?UTF-8?q?=D0=B2=D0=B5=D0=BD,=20=D0=B0=20=D0=B2=D0=BE=D1=82=20=D0=B2?= =?UTF-8?q?=D0=BD=D0=B5=20-=20=D0=B2=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=B5=D1=82).=20=D0=9A=D0=BE=D0=BF=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BB=D1=91=D0=B6=D0=B0=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B5=D0=BB=D1=8C=D0=B7=D1=8F.=20=D0=98=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=80=D1=83=D0=B4=D1=8B,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/_onclick/item_attack.dm | 9 ++- code/modules/mob/living/carbon/life.dm | 15 +++-- .../modules/economy_fixes/shipping.dm | 2 + .../towners_should_work_in_bog.dm | 56 +++++++++++++------ roguetown.dme | 1 + 5 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 modular_redmoon/modules/economy_fixes/shipping.dm diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 5edfbc8e99e..27cda5c25d9 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -295,13 +295,18 @@ if(!cont) return 0 if(DULLING_PICK) //cannot deal damage if not a pick item. aka rock walls - if(user.used_intent.blade_class != BCLASS_PICK) if(user.used_intent.blade_class != BCLASS_DRILL) return 0 + if(!(user.mobility_flags & MOBILITY_STAND)) // REDMOON ADD START - economy_fix - копать можно только стоя + return FALSE + if(user.patron?.type == /datum/patron/inhumen/matthios) // Бандиты и другие маттиоситы презирают подобный тяжёлый труд + newforce *= 0.1 + if(prob(2)) + to_chat(user, span_warning(pick("Я служу Маттиосу чтобы заниматься этим дерьмом?..", "А я Малума не разгневаю, что в его камнях копаюсь...", "Я что, лох, чтобы этим заниматься?", "Грабануть было бы легче..."))) // REDMOON ADD END var/mob/living/miner = user var/mineskill = miner.mind.get_skill_level(/datum/skill/labor/mining) - newforce = newforce * (8+(mineskill*1.5)) + newforce = newforce * (1.5+(mineskill*3.65)) // REDMOON EDIT - economy_fix - скилл шахтёров влияет в 5 раза сильнее, чем раньше - WAS: newforce = newforce * (8+(mineskill*1.5)) shake_camera(user, 1, 1) miner.mind.add_sleep_experience(/datum/skill/labor/mining, (miner.STAINT*0.2)) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index dfc610f7a8c..feb2ddf137c 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -754,9 +754,14 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put var/obj/structure/bed/rogue/bed = locate() in loc if(bed) bed_recovery_modifier = bed.sleepy - if(IsSleeping()) - recovery_amt = (max_energy * 0.10) * bed_recovery_modifier // Example: max energy 1000 -> 100 energy on ground, 300 on bed - else - recovery_amt = (max_energy * 0.02) * bed_recovery_modifier // Example: max energy 1000 -> 20 energy on ground, 60 on bed - + if(IsSleeping()) // REDMOON EDIT - добавлена 1 таблуяция + recovery_amt = (max_energy * 0.015) * bed_recovery_modifier // REDMOON EDIT - 45 секунд в хорошей кровати, около 1.5 минут в плохой с 0 до 100% - WAS: recovery_amt = (max_energy * 0.10) * bed_recovery_modifier // Example: max energy 1000 -> 100 energy on ground, 300 on bed + else // REDMOON EDIT - добавлена 1 таблуяция + recovery_amt = (max_energy * 0.007) * bed_recovery_modifier // REDMOON EDIT - 1.5 минуты за лежание на хорошей кровати, 3 минуты за лежание на убогой кровати - WAS: recovery_amt = (max_energy * 0.02) * bed_recovery_modifier // Example: max energy 1000 -> 20 energy on ground, 60 on bed + else // REDMOON ADD START - сон на полу ЗНАЧИТЕЛЬНО хуже сна в кровати + if(IsSleeping()) + recovery_amt = max_energy * 0.005 // 7.5 минут на полный отдых за сон на земле + else + recovery_amt = max_energy * 0.0035 // REDMOON ADD END - 10 минут на полный отдых за лежание на земле без сна, чтобы был смысл искать кровати + energy_add(recovery_amt) diff --git a/modular_redmoon/modules/economy_fixes/shipping.dm b/modular_redmoon/modules/economy_fixes/shipping.dm new file mode 100644 index 00000000000..26ac4a4aaa3 --- /dev/null +++ b/modular_redmoon/modules/economy_fixes/shipping.dm @@ -0,0 +1,2 @@ +/datum/supply_pack/rogue/rawmats/iron + cost = 80 // Стратегический материал (а также, повышает ценность шахтёров) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index a53052d44d1..e2800c935d3 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -49,27 +49,49 @@ . = ..() /turf/closed/mineral/random/rogue - mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) - mineralChance = 25 + mineralChance = 20 + mineralSpawnChanceList = list( + /turf/closed/mineral/rogue/salt = 5, // 10% + /turf/closed/mineral/rogue/iron = 15, // 30% + /turf/closed/mineral/rogue/copper = 10, // 20% + /turf/closed/mineral/rogue/coal = 20) // 40% /turf/closed/mineral/random/rogue/med - mineralChance = 30 - mineralSpawnChanceList = list(/turf/closed/mineral/rogue/gold = 3,/turf/closed/mineral/rogue/silver = 2,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/copper = 10,/turf/closed/mineral/rogue/tin = 10,/turf/closed/mineral/rogue/coal = 5, /turf/closed/mineral/rogue/gem = 3) - -/turf/closed/mineral/random/rogue/high - mineralChance = 50 - mineralSpawnChanceList = list(/turf/closed/mineral/rogue/gold = 9,/turf/closed/mineral/rogue/silver = 5,/turf/closed/mineral/rogue/iron = 20,/turf/closed/mineral/rogue/copper = 10,/turf/closed/mineral/rogue/tin = 10, /turf/closed/mineral/rogue/gem = 5) - -/turf/closed/mineral/random/proc/check_for_bog_area() + mineralChance = 30 // 1430 у лавы, 4097 в пещере, 14400 в шахте, 1254 в месте бойни + mineralSpawnChanceList = list( + /turf/closed/mineral/rogue/salt = 5, // 10% + /turf/closed/mineral/rogue/gold = 3, // 6% + /turf/closed/mineral/rogue/silver = 1, // 2% + /turf/closed/mineral/rogue/iron = 25, // 50% + /turf/closed/mineral/rogue/copper = 5, // 10% + /turf/closed/mineral/rogue/tin = 5, // 10% + /turf/closed/mineral/rogue/coal = 5, // 10% + /turf/closed/mineral/rogue/gem = 1) // 2% + +/turf/closed/mineral/random/rogue/high // 701 у лавы всего, 111 в месте бойни + mineralChance = 50 + mineralSpawnChanceList = list( // ДЕЛИМ ЦИФРЫ БЛОКОВ НА 2, Т.К. ШАНС СПАВНА 50% + /turf/closed/mineral/rogue/gold = 2, // 10% или около 70 блоков у лавы (7000-9100 маммонов через корабль) + /turf/closed/mineral/rogue/silver = 1, // 5% или около 35 блоков у лавы + /turf/closed/mineral/rogue/iron = 10, // 50% или около 350 блоков у лавы + /turf/closed/mineral/rogue/copper = 3, // 15% или около 105 блоков у лавы + /turf/closed/mineral/rogue/tin = 3, // 15% или около 105 блоков у лавы + /turf/closed/mineral/rogue/gem = 1) // 5% или около 35 блоков у лавы + +/turf/closed/mineral/random/proc/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) return TRUE -/turf/closed/mineral/random/rogue/med/check_for_bog_area() - if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) - mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) - -/turf/closed/mineral/random/rogue/high/check_for_bog_area() - if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) - mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/copper = 15,/turf/closed/mineral/rogue/coal = 25) +/turf/closed/mineral/random/rogue/med/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) + if(SSmapping.config.map_file == "rockhill.dmm") // На тестовой карте можно иметь где угодно + if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) // Только болотные пещеры + mineralSpawnChanceList = standart_mineral.mineralSpawnChanceList // Копируются значения у обычного камня, чтобы не нужно было изменять карту + mineralChance = standart_mineral.mineralChance // Копируются значения у обычного камня, чтобы не нужно было изменять карту + +/turf/closed/mineral/random/rogue/high/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) + if(SSmapping.config.map_file == "rockhill.dmm") + if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) + mineralSpawnChanceList = standart_mineral.mineralSpawnChanceList + mineralChance = standart_mineral.mineralChance /turf/closed/mineral/rogue var/ore_overlay = null diff --git a/roguetown.dme b/roguetown.dme index 6ecc6e8b896..2cf15c64c14 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2157,6 +2157,7 @@ #include "modular_redmoon\modules\economy_fixes\items_prices.dm" #include "modular_redmoon\modules\economy_fixes\mobs_loot.dm" #include "modular_redmoon\modules\economy_fixes\sewing.dm" +#include "modular_redmoon\modules\economy_fixes\shipping.dm" #include "modular_redmoon\modules\economy_fixes\smithing.dm" #include "modular_redmoon\modules\economy_fixes\stockpile.dm" #include "modular_redmoon\modules\commend_comments\commend_comments.dm" From fbf08725f7940150e05f518d0f60dbe6ad842457 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sun, 9 Feb 2025 21:33:45 +0700 Subject: [PATCH 18/20] =?UTF-8?q?=D0=92=D0=B0=D0=BC=D0=BF=D0=B8=D1=80?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=B1=D0=B0=D0=BD=D0=B4=D0=B8=D1=82=D1=8B=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B3=D1=83=D1=82=20=D1=81=D0=BF=D0=BE=D0=BA=D0=BE?= =?UTF-8?q?=D0=B9=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D1=8B=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=B2=D0=BE=D1=91=D0=BC=20=D0=BB=D0=B0=D0=B3=D0=B5=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../towners_should_work_in_bog.dm | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index e2800c935d3..521fdcb9746 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -10,13 +10,14 @@ var/tree_not_in_bog = FALSE // оповещение для дровосека, чтобы шёл рубить болото /obj/structure/flora/newtree/Initialize() - if(!istype(get_area(loc), /area/rogue/outdoors/bog)) - static_debris = list(/obj/item/grown/log/tree/small = 1) - tree_not_in_bog = TRUE - desc += " Seems like this tree is very old. The one in the Bog would have better wood." - if(istype(get_turf(src), /turf/open/transparent/openspace)) - static_debris = list() // отсутствие древесины в целом, фармите болото, дровосеки - tree_not_in_bog = FALSE // некому показывать + if(!is_centcom_level(z)) // Чтобы бандиты и вампиры могли добывать у себя спокойно + if(!istype(get_area(loc), /area/rogue/outdoors/bog)) + static_debris = list(/obj/item/grown/log/tree/small = 1) + tree_not_in_bog = TRUE + desc += " Seems like this tree is very old. The one in the Bog would have better wood." + if(istype(get_turf(src), /turf/open/transparent/openspace)) + static_debris = list() // отсутствие древесины в целом, фармите болото, дровосеки + tree_not_in_bog = FALSE // некому показывать . = ..() /obj/structure/flora/newtree/obj_destruction(damage_flag) @@ -29,11 +30,12 @@ var/tree_not_in_bog = FALSE // оповещение для дровосека, чтобы шёл рубить болото /obj/structure/flora/roguetree/Initialize() - if(!istype(get_area(loc), /area/rogue/outdoors/bog)) - static_debris = list(/obj/item/grown/log/tree/small = 1) - tree_not_in_bog = TRUE - desc += " Seems like this tree is very old. The one in the Bog would have better wood." - stump_type = null + if(!is_centcom_level(z)) // Чтобы бандиты и вампиры могли добывать у себя спокойно + if(!istype(get_area(loc), /area/rogue/outdoors/bog)) + static_debris = list(/obj/item/grown/log/tree/small = 1) + tree_not_in_bog = TRUE + desc += " Seems like this tree is very old. The one in the Bog would have better wood." + stump_type = null . = ..() /obj/structure/flora/roguetree/obj_destruction(damage_flag) From 26d3ddb2a759fceb2fc7104e4f9da2feb1f1a6cd Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Sun, 9 Feb 2025 22:51:09 +0700 Subject: [PATCH 19/20] =?UTF-8?q?=D0=A1=D1=80=D0=BE=D1=87=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81.=20=D0=9A=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=87=D0=BD=D0=B5=D0=B5=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../towners_should_work_in_bog.dm | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm index 521fdcb9746..158142fcdc9 100644 --- a/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm +++ b/modular_redmoon/modules/economy_fixes/towners_should_work_in_bog.dm @@ -80,20 +80,28 @@ /turf/closed/mineral/rogue/tin = 3, // 15% или около 105 блоков у лавы /turf/closed/mineral/rogue/gem = 1) // 5% или около 35 блоков у лавы -/turf/closed/mineral/random/proc/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) +/turf/closed/mineral/random/proc/check_for_bog_area() return TRUE -/turf/closed/mineral/random/rogue/med/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) +/turf/closed/mineral/random/rogue/med/check_for_bog_area() if(SSmapping.config.map_file == "rockhill.dmm") // На тестовой карте можно иметь где угодно if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) // Только болотные пещеры - mineralSpawnChanceList = standart_mineral.mineralSpawnChanceList // Копируются значения у обычного камня, чтобы не нужно было изменять карту - mineralChance = standart_mineral.mineralChance // Копируются значения у обычного камня, чтобы не нужно было изменять карту - -/turf/closed/mineral/random/rogue/high/check_for_bog_area(var/turf/closed/mineral/random/rogue/standart_mineral) + mineralChance = 20 + mineralSpawnChanceList = list( + /turf/closed/mineral/rogue/salt = 5, // 10% + /turf/closed/mineral/rogue/iron = 15, // 30% + /turf/closed/mineral/rogue/copper = 10, // 20% + /turf/closed/mineral/rogue/coal = 20) // 40% + +/turf/closed/mineral/random/rogue/high/check_for_bog_area() if(SSmapping.config.map_file == "rockhill.dmm") if(!istype(get_area(src), /area/rogue/under/cavewet/bogcaves)) - mineralSpawnChanceList = standart_mineral.mineralSpawnChanceList - mineralChance = standart_mineral.mineralChance + mineralChance = 20 + mineralSpawnChanceList = list( + /turf/closed/mineral/rogue/salt = 5, // 10% + /turf/closed/mineral/rogue/iron = 15, // 30% + /turf/closed/mineral/rogue/copper = 10, // 20% + /turf/closed/mineral/rogue/coal = 20) // 40% /turf/closed/mineral/rogue var/ore_overlay = null From d34325e8950e57e8ce9fb5c1857d0a2fefbfc13e Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Tue, 11 Feb 2025 19:42:48 +0700 Subject: [PATCH 20/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8?= =?UTF-8?q?=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=80=D0=B4=D0=B6=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/structures/roguetown/rogueflora.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm index 08bd47c5e07..a336301fef1 100644 --- a/code/game/objects/structures/roguetown/rogueflora.dm +++ b/code/game/objects/structures/roguetown/rogueflora.dm @@ -184,7 +184,7 @@ playsound(src, 'sound/misc/woodhit.ogg', 100, TRUE) if(!do_after(user, lumber_time, target = user)) return - if(tree_not_in_bog) // REDMOON ADD START - economy_fix - деревья в окрестностях Рокхилла приносят мало древисины + if(!istype(get_area(loc), /area/rogue/outdoors/bog)) // REDMOON ADD START - economy_fix - деревья в окрестностях Рокхилла приносят мало древисины lumber_amount = 1 else // REDMOON ADD END lumber_amount = rand(lumber_amount, max(lumber_amount, round(skill_level / 2)))