Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Фикс исследования НОВЫХ аспектов на культе (и еще кое-что) #13744

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Фикс исследования НОВЫХ аспектов на культе (и еще кое-что) #13744

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/gamemodes/modes_gameplays/cult/structures/tech_table.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

to_chat(user, "<span class='notice'>Вы начали изучение [chosen_tech.info.name].</span>")

current_research = initial(chosen_tech.info.name)
current_research = chosen_tech.info.name
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Фикс экзамайна

chosen_tech.researching = TRUE
start_activity(CALLBACK(src, PROC_REF(research_tech), chosen_tech))

Expand Down
5 changes: 5 additions & 0 deletions code/modules/religion/building_agent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@
favor_cost = 0
piety_cost = 100

/datum/building_agent/tech/aspect/New(name, icon, icon_state)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Прост для красоты

src.name = name
src.icon = icon
src.icon_state = icon_state

/datum/building_agent/tech/cult

/datum/building_agent/tech/cult/memorize_rune
Expand Down
5 changes: 1 addition & 4 deletions code/modules/religion/religion_types/cult.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@
var/datum/religion_tech/upgrade_aspect/tech = new
tech.id = A.name
tech.aspect_type = type
tech.info = new /datum/building_agent/tech/aspect
tech.info.name = A.name
tech.info.icon = A.icon
tech.info.icon_state = A.icon_state
tech.info = new /datum/building_agent/tech/aspect(A.name, A.icon, A.icon_state)
tech.calculate_costs(src)
available_techs += tech
qdel(A)
Expand Down
9 changes: 4 additions & 5 deletions code/modules/religion/tech.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,14 @@
var/datum/aspect/A = R.aspects[aspect_type::name]
A.power += 1
else
R.add_aspects(list(aspect_type = 1))
var/list/L = list()
L[aspect_type] = 1
R.add_aspects(L)
Comment on lines +75 to +77
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aspect_type был строкой и все ломал 😢


var/datum/religion_tech/upgrade_aspect/tech = new
tech.id = id + "+"
tech.aspect_type = aspect_type
tech.info = new /datum/building_agent/tech/aspect
tech.info.name = info.name
tech.info.icon = info.icon
tech.info.icon_state = info.icon_state
tech.info = new /datum/building_agent/tech/aspect(info.name, info.icon, info.icon_state)
tech.calculate_costs(R)
R.available_techs += tech

Expand Down
Loading