Skip to content

Commit

Permalink
Ребаланс двигателей и добавление новых (#430)
Browse files Browse the repository at this point in the history
* Фикс Гекко + небольшая переделка Комода

* Ребаланс двигателей по-Туроновски

* Revert "Фикс Гекко + небольшая переделка Комода"

This reverts commit 8c47ba9.
  • Loading branch information
RalseiDreemuurr committed Apr 20, 2024
1 parent 719eb7b commit 12d9d54
Show file tree
Hide file tree
Showing 10 changed files with 190 additions and 9 deletions.
4 changes: 2 additions & 2 deletions code/game/machinery/shuttle/custom_shuttle.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/machinery/power/shuttle
/* /obj/machinery/power/shuttle // MOD_CELADON-CHANGES -> mod_celadon\balance\code\engine\circuits.dm
name = "shuttle component"
desc = "Something for shuttles."
density = TRUE
Expand All @@ -9,7 +9,7 @@
circuit = /obj/item/circuitboard/machine/shuttle/engine
var/icon_state_closed = "burst_plasma"
var/icon_state_open = "burst_plasma_open"
var/icon_state_off = "burst_plasma_off"
var/icon_state_off = "burst_plasma_off" */

/obj/machinery/power/shuttle/attackby(obj/item/I, mob/living/user, params)
if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_closed, I))
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/shuttle/shuttle_engine_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
update_icon_state()
return TRUE

/obj/machinery/power/shuttle/engine/fueled/plasma
/* /obj/machinery/power/shuttle/engine/fueled/plasma // MOD_CELADON-CHANGES -> mod_celadon\balance\code\engine\enginebalance.dm
name = "plasma thruster"
desc = "A thruster that burns plasma from an adjacent heater to create thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/plasma
Expand Down Expand Up @@ -128,7 +128,7 @@
desc = "An expensive variant of a standard ion thruster, using highest quality components in order to achieve much better performance."
thrust = 30
power_per_burn = 65000

*/
/obj/machinery/power/smes/shuttle
name = "electric engine precharger"
desc = "A medium-capacity, high transfer superconducting magnetic energy storage unit specially made for use with shuttle engines."
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/shuttle/shuttle_heater.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
//but instead of changing temp, it stores plasma and uses
//it for the engine.
//-----------------------------------------------
/obj/machinery/atmospherics/components/unary/shuttle
/* /obj/machinery/atmospherics/components/unary/shuttle // MOD_CELADON-CHANGES -> mod_celadon\balance\code\engine\circuits.dm
name = "shuttle atmospherics device"
desc = "This does something to do with shuttle atmospherics"
icon_state = "heater"
icon = 'icons/obj/shuttle.dmi'

*/
/obj/machinery/atmospherics/components/unary/shuttle/heater
name = "engine heater"
desc = "Directs energy into compressed particles in order to power an attached thruster."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/techweb/all_nodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
export_price = 5000

/////////////////////////shuttle tech/////////////////////////
/datum/techweb_node/basic_shuttle_tech
/* /datum/techweb_node/basic_shuttle_tech // MOD_CELADON-CHANGES -> mod_celadon\balance\code\engine\rnd.dm
id = "basic_shuttle"
display_name = "Basic Shuttle Research"
description = "Research the technology required to create and use basic shuttles."
Expand All @@ -1157,7 +1157,7 @@
design_ids = list("engine_expulsion")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 2500

*/
////////////////////// IPC Parts ///////////////////////
/datum/techweb_node/ipc_organs
id = "ipc_organs"
Expand Down
2 changes: 1 addition & 1 deletion mod_celadon/balance/_balance.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/balance
name = "Изменения в балансе"
desc = "Различные зменения в балансе"
author = "Yata9arasu"
author = "Кинетик Крашер - Yata9arasu, двигатели - RalseiDreemuurr"
3 changes: 3 additions & 0 deletions mod_celadon/balance/_balance.dme
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#include "_balance.dm"

#include "code/kinetic_crusher.dm"
#include "code/engine/circuits.dm"
#include "code/engine/enginebalance.dm"
#include "code/engine/rnd.dm"
36 changes: 36 additions & 0 deletions mod_celadon/balance/code/engine/circuits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/obj/item/circuitboard/machine/shuttle/engine/electric/tech1
name = "1st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech1
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/electric/tech2
name = "2st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech2
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/item/circuitboard/machine/shuttle/engine/electric/tech3
name = "3st Ion Thruster (Machine Board)"
build_path = /obj/machinery/power/shuttle/engine/electric/tech3
req_components = list(/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/micro_laser = 2)

/obj/machinery/power/shuttle // Взято из code\game\machinery\shuttle\custom_shuttle.dm строка 1
name = "shuttle component"
desc = "Something for shuttles."
density = TRUE
obj_integrity = 250
max_integrity = 250
icon = 'mod_celadon/balance/icons/shuttle.dmi'
icon_state = "burst_plasma"
circuit = /obj/item/circuitboard/machine/shuttle/engine
var/icon_state_closed = "burst_plasma"
var/icon_state_open = "burst_plasma_open"
var/icon_state_off = "burst_plasma_off"

/obj/machinery/atmospherics/components/unary/shuttle // Взято из code\game\machinery\shuttle\shuttle_heater.dm строка 7
name = "shuttle atmospherics device"
desc = "This does something to do with shuttle atmospherics"
icon_state = "heater"
icon = 'mod_celadon/balance/icons/shuttle.dmi'
71 changes: 71 additions & 0 deletions mod_celadon/balance/code/engine/enginebalance.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/obj/machinery/power/shuttle/engine/fueled/plasma // Взято из mod_celadon\balance\code\engine\enginebalance.dm строка 88
name = "plasma thruster"
desc = "A thruster that burns plasma from an adjacent heater to create thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/plasma
fuel_type = GAS_PLASMA
fuel_use = 30
thrust = 10

/obj/machinery/power/shuttle/engine/fueled/expulsion
name = "expulsion thruster"
desc = "A thruster that expels gas inefficiently to create thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/expulsion
fuel_use = 90
thrust = 8

/obj/machinery/power/shuttle/engine/electric
name = "ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric
icon_state = "burst"
icon_state_off = "burst_off"
icon_state_closed = "burst"
icon_state_open = "burst_open"
thrust = 1
///Amount, in kilojoules, needed for a full burn.
var/power_per_burn = 25000

/obj/machinery/power/shuttle/engine/electric/tech1
name = "1-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
icon_state = "tech1"
icon_state_off = "tech1_off"
icon_state_closed = "tech1"
icon_state_open = "tech1_open"
thrust = 2
power_per_burn = 35000

/obj/machinery/power/shuttle/engine/electric/tech2
name = "2-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
icon_state = "tech2"
icon_state_off = "tech2_off"
icon_state_closed = "tech2"
icon_state_open = "tech2_open"
thrust = 4
power_per_burn = 50000

/obj/machinery/power/shuttle/engine/electric/tech3
name = "3-st ion thruster"
desc = "A thruster that expels charged particles to generate thrust."
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
icon_state = "tech3"
icon_state_off = "tech3_off"
icon_state_closed = "tech3"
icon_state_open = "tech3_open"
thrust = 6
power_per_burn = 65000

/obj/machinery/power/shuttle/engine/electric/bad
name = "Outdated Ion Thruster"
circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/bad
thrust = 2
power_per_burn = 70000

/obj/machinery/power/shuttle/engine/electric/premium
name = "high performance ion thruster"
desc = "An expensive variant of a standard ion thruster, using highest quality components in order to achieve much better performance."
thrust = 10
power_per_burn = 30000
71 changes: 71 additions & 0 deletions mod_celadon/balance/code/engine/rnd.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/datum/design/board/shuttle/engine/electric/tech1
name = "Machine Design (Ion Thruster Board) 1st generation"
desc = "The circuit board for an 1st generation ion thruster."
id = "engine_ion_t1"
materials = list(/datum/material/glass = 1000, /datum/material/silver = 2000, /datum/material/bluespace = 1000)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/electric/tech2
name = "Machine Design (Ion Thruster Board) 2nd generation"
desc = "The circuit board for an 2nd generation ion thruster."
id = "engine_ion_t2"
materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/design/board/shuttle/engine/electric/tech3
name = "Machine Design (Ion Thruster Board) 3nd generation"
desc = "The circuit board for an 3nd generation ion thruster."
id = "engine_ion_t3"
materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000,/datum/material/diamond = 1500)
build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE

/datum/techweb_node/basic_shuttle_tech // Взято из code\modules\research\techweb\all_nodes.dm строка 1143
id = "basic_shuttle"
display_name = "Basic Shuttle Research"
description = "Research the technology required to create and use basic shuttles."
prereq_ids = list("bluespace_travel", "adv_engi")
design_ids = list("engine_plasma", "engine_ion", "engine_heater", "engine_smes", "shuttle_helm", "rapid_shuttle_designator")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 2500

/datum/techweb_node/t1_shuttle_tech
id = "t1_ion"
display_name = "First generation ion Propulsion"
description = "Pioneer space travel with First Gen ion engines—where it all began."
prereq_ids = list("basic_shuttle")
design_ids = list("engine_ion_t1")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
export_price = 5000

/datum/techweb_node/t2_shuttle_tech
id = "t2_ion"
display_name = "Second generation ion Propulsion"
description = "Upgrade to Second Gen ion engines for advanced cosmic navigation."
prereq_ids = list("t1_ion")
design_ids = list("engine_ion_t2")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 7500

/datum/techweb_node/t3_shuttle_tech
id = "t3_ion"
display_name = "Third generation ion Propulsion"
description = "Unleash ultimate exploration with Third Gen ion propulsion."
prereq_ids = list("t2_ion")
design_ids = list("engine_ion_t3")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 10000

/datum/techweb_node/exp_shuttle_tech
id = "exp_shuttle"
display_name = "Experimental Shuttle Research"
description = "A bunch of engines and related shuttle parts that are likely not really that useful, but could be in strange situations."
prereq_ids = list("t3_ion")
design_ids = list("engine_expulsion")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 7500
Binary file added mod_celadon/balance/icons/shuttle.dmi
Binary file not shown.

0 comments on commit 12d9d54

Please sign in to comment.