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.

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

New buildings #1254

Merged
merged 61 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
3c9a8f8
Deadmines
Grekopithikos Oct 3, 2023
905aae3
Merge branch 'master' into new-buildings
Grekopithikos Nov 4, 2023
59c8591
Mines
Grekopithikos Nov 4, 2023
eb366a9
Mines placed
Grekopithikos Nov 5, 2023
e79ade7
Obelisks
Grekopithikos Nov 7, 2023
b39a1d5
Merge branch 'master' into new-buildings
Grekopithikos Nov 8, 2023
7b882a4
Scarlet Monastery
Grekopithikos Nov 8, 2023
55c20f8
Monasteries
Grekopithikos Nov 8, 2023
ded2adc
Mine triggers
Grekopithikos Nov 10, 2023
d7fedb7
Merge branch 'master' into new-buildings
Grekopithikos Nov 21, 2023
609c07a
Northshire Abbey
Grekopithikos Nov 21, 2023
3c47c4c
Merge branch 'master' into new-buildings
Grekopithikos Nov 21, 2023
618462b
Update 00_k_gilneas.txt
Grekopithikos Nov 21, 2023
bf4e157
Greymane Wall
Grekopithikos Nov 22, 2023
d231da0
Merge branch 'master' into new-buildings
Grekopithikos Nov 26, 2023
d2eec79
religious studies
Grekopithikos Nov 26, 2023
cc4f84e
touru
Grekopithikos Nov 26, 2023
1317f43
Update wc_special_buildings.txt
Grekopithikos Nov 27, 2023
d35ef1b
loc fix
Grekopithikos Nov 27, 2023
24d85dd
icons
Grekopithikos Nov 27, 2023
5001d3b
Update 00_k_broken_shores.txt
Grekopithikos Nov 27, 2023
96c7b97
Revert "Update 00_k_broken_shores.txt"
Grekopithikos Nov 27, 2023
25b2e61
fixes
Grekopithikos Nov 27, 2023
1226712
Merge branch 'master' into new-buildings
Grekopithikos Nov 27, 2023
f672b45
Update 320000_centaur.txt
Grekopithikos Nov 27, 2023
d4bccd2
fix
Grekopithikos Nov 27, 2023
94f31e6
Merge branch 'master' into new-buildings
Grekopithikos Nov 27, 2023
6929032
Update wc_special_mines.txt
Grekopithikos Nov 28, 2023
64f75f0
Merge branch 'master' into new-buildings
Grekopithikos Nov 28, 2023
644edf7
trees
Grekopithikos Nov 30, 2023
0f8b4a3
Update common/buildings/wc_special_buildings.txt
Grekopithikos Nov 30, 2023
ff8dc42
Update common/buildings/wc_special_buildings.txt
Grekopithikos Nov 30, 2023
3eac7ef
Update common/buildings/wc_special_buildings.txt
Grekopithikos Nov 30, 2023
7e39b3b
Update common/buildings/wc_special_buildings.txt
Grekopithikos Nov 30, 2023
4c3bfd6
Update common/buildings/wc_special_buildings.txt
Grekopithikos Nov 30, 2023
0e263d2
civilized mines
Grekopithikos Nov 30, 2023
8e67f6c
Merge branch 'new-buildings' of https://github.com/Warcraft-GoA-Devel…
Grekopithikos Nov 30, 2023
697db1e
Update wc_special_buildings.txt
Grekopithikos Nov 30, 2023
e5f2946
Update common/buildings/wc_special_buildings.txt
Grekopithikos Dec 1, 2023
aac0c2c
Update wc_special_buildings.txt
Grekopithikos Dec 1, 2023
eb59cf8
Update wc_special_buildings.txt
Grekopithikos Dec 1, 2023
6eeec07
Update wc_special_mines.txt
Grekopithikos Dec 1, 2023
b84c318
Merge branch 'master' into new-buildings
Grekopithikos Dec 1, 2023
a1f3dd1
Scarlet Monastery and Greymane wall moved
Grekopithikos Dec 2, 2023
a0da42a
Update localization/english/wc_buildings_l_english.yml
Grekopithikos Dec 2, 2023
c82017c
karazhan's not popular
Grekopithikos Dec 2, 2023
4157b38
Update wc_buildings_l_english.yml
Grekopithikos Dec 2, 2023
6c4b89e
Merge branch 'master' into new-buildings
Grekopithikos Dec 4, 2023
c65d756
Bravo Company and Torq Ironblast
Grekopithikos Dec 4, 2023
d754680
narthalas icon
Grekopithikos Dec 4, 2023
b2d6367
more icons
Grekopithikos Dec 5, 2023
a86cdc6
Building Icons for Broken Isles
Rekutur Dec 5, 2023
18a4ca1
Revert "more icons"
Grekopithikos Dec 5, 2023
cb44f1b
Merge remote-tracking branch 'origin/Building-Icons-for-Broken-Isles'…
Grekopithikos Dec 5, 2023
bc175ad
structures
Grekopithikos Dec 5, 2023
f3d4e63
Update 1_azerothian.txt
Grekopithikos Dec 5, 2023
98e7761
Update wc_character_names_l_english.yml
Grekopithikos Dec 5, 2023
2781e2a
ages adjusted
Grekopithikos Dec 5, 2023
f7bbae1
Update wc_buildings_l_english.yml
Grekopithikos Dec 5, 2023
91644b8
Update 00_wc_landed_titles.txt
Grekopithikos Dec 5, 2023
7e33532
Update 00_k_lordaeron.txt
Grekopithikos Dec 5, 2023
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
Binary file not shown.
4 changes: 4 additions & 0 deletions common/activities/activity_types/feast.txt
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ activity_feast = {
limit = { has_building_or_higher = leisure_palace_01 }
add = 100
}
if = {
limit = { has_building_or_higher = gallywix_pleasure_palace_01 }
add = 100
}
#if = {
# limit = { has_building_or_higher = alhambra_01 }
# add = 100
Expand Down
55 changes: 45 additions & 10 deletions common/activities/activity_types/tournament.txt
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,12 @@
}
# Buildings
if = {
limit = { has_building_or_higher = jousting_lists_01 }
limit = {
OR ={
has_building_or_higher = jousting_lists_01
has_building_or_higher = argent_tournament_grounds_01
}
}
add = {
value = 1
desc = activity_tournament_province_jousting_lists_01_desc
Expand Down Expand Up @@ -616,13 +621,19 @@
}
if = {
limit = {
#OR = {
OR = {
has_building_or_higher = generic_university
has_building_or_higher = gearshaft_university
has_building_or_higher = scholomance
has_building_or_higher = falthrien_academy
has_building_or_higher = narthalas_academy_02
has_building_or_higher = karazhan_01
Grekopithikos marked this conversation as resolved.
Show resolved Hide resolved
has_building_or_higher = violet_citadel_01
#has_building_or_higher = al_azhar_university
#has_building_or_higher = sankore_university
#has_building_or_higher = siena_university
#has_building_or_higher = nalanda_university
#}
}
}
add = {
value = 1
Expand Down Expand Up @@ -688,7 +699,12 @@
desc = activity_tournament_province_desc_development_ok
}
triggered_desc = {
trigger = { has_building_or_higher = jousting_lists_01 }
trigger = {
OR = {
has_building_or_higher = jousting_lists_01
has_building_or_higher = argent_tournament_grounds_01
}
}
desc = activity_tournament_province_jousting_lists_01_desc
}
triggered_desc = {
Expand Down Expand Up @@ -733,13 +749,19 @@
}
triggered_desc = {
trigger = {
#OR = {
OR = {
has_building_or_higher = generic_university
has_building_or_higher = gearshaft_university
has_building_or_higher = scholomance
has_building_or_higher = falthrien_academy
has_building_or_higher = narthalas_academy_02
has_building_or_higher = karazhan_01
has_building_or_higher = violet_citadel_01
#has_building_or_higher = al_azhar_university
#has_building_or_higher = sankore_university
#has_building_or_higher = siena_university
#has_building_or_higher = nalanda_university
#}
}
}
desc = activity_tournament_province_generic_university_desc
}
Expand Down Expand Up @@ -809,6 +831,7 @@
limit = {
OR = {
has_building_or_higher = jousting_lists_01
has_building_or_higher = argent_tournament_grounds_01
has_building_or_higher = blacksmiths_01
has_building_or_higher = archery_ranges_01
has_building_or_higher = royal_armory_01
Expand Down Expand Up @@ -2335,13 +2358,19 @@
if = { #building reducing the cost
limit = {
scope:province ?= {
#OR = {
OR = {
has_building_or_higher = generic_university
has_building_or_higher = gearshaft_university
has_building_or_higher = scholomance
has_building_or_higher = falthrien_academy
has_building_or_higher = narthalas_academy_02
has_building_or_higher = karazhan_01
has_building_or_higher = violet_citadel_01
#has_building_or_higher = al_azhar_university
#has_building_or_higher = sankore_university
#has_building_or_higher = siena_university
#has_building_or_higher = nalanda_university
#}
}
}
}
add = {
Expand Down Expand Up @@ -3033,13 +3062,19 @@
if = { #building reducing the cost
limit = {
scope:province ?= {
#OR = {
OR = {
has_building_or_higher = generic_university
has_building_or_higher = gearshaft_university
has_building_or_higher = scholomance
has_building_or_higher = falthrien_academy
has_building_or_higher = narthalas_academy_02
has_building_or_higher = karazhan_01
has_building_or_higher = violet_citadel_01
#has_building_or_higher = al_azhar_university
#has_building_or_higher = sankore_university
#has_building_or_higher = siena_university
#has_building_or_higher = nalanda_university
#}
}
}
}
add = {
Expand Down
Loading
Loading