Merge branch 'dev' into magic-2024

Warcraft-GoA-Development-Team · Sep 18, 2024 · c3c8ea8 · c3c8ea8
2 parents 1c04ffb + f82eac6
commit c3c8ea8
Show file tree

Hide file tree

Showing 62 changed files with 1,441 additions and 71 deletions.
diff --git a/.github/workflows/branch-naming-scheme.yml b/.github/workflows/branch-naming-scheme.yml
@@ -0,0 +1,26 @@
+name: Branch Naming Policy Action
+
+on:
+  create:
+  delete:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  branch-naming-policy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Branch Naming Policy Action
+        uses: nicklegan/[email protected]
+        if: github.ref_type == 'branch' || github.ref_type == 'pull_request'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          regex: '^(feat|fix)\/(mixed|code|2D|3D|map|char|l10n|magic)\/([a-z0-9]+)'
+          flags: i
+          # token: ${{ secrets.REPO_TOKEN }}
+          # delete: true
diff --git a/common/buildings/wc_special_buildings.txt b/common/buildings/wc_special_buildings.txt
@@ -64,6 +64,10 @@ corpse_of_agamaggan_01 = {
 
 dark_portal_01 = {
 	type_icon = "icon_structure_dark_portal.dds"
+	asset = {
+		type = pdxmesh
+		name = "building_special_dark_portal2_mesh"
+	}
 
 	is_enabled = {
 		dark_portal_building_enabled_trigger = yes
@@ -85,6 +89,10 @@ dark_portal_01 = {
 
 dark_portal_02 = {
 	type_icon = "icon_structure_dark_portal.dds"
+	asset = {
+		type = pdxmesh
+		name = "building_special_dark_portal_mesh"
+	}
 
 	is_enabled = {
 		dark_portal_building_enabled_trigger = yes

diff --git a/common/culture/name_lists/wc_orcish.txt b/common/culture/name_lists/wc_orcish.txt
@@ -14,7 +14,7 @@
         Gozar'Gen Gozurmok Gramgal Gramugg Grim'Guld Grimmurarm Grimnarton Grimramm Grom'Tur Gromphon Grugurdar Gullgas Gulnarru Hargargul Hog'Guld Honuda Hormurokk Hun'Thunk
         Hunmurul Itave Kafar Kalgar'Tur Kallzul Kalmak Kaltuda Kalturkuda Kamgak Karm'Ral Karnarmok Karogul Kartur'Ruz Kel'Phan Kelgas Kelrum Kil'Geld Kolmos Komgarlak Komnaram
         Komosh Kordurokk Kradurrak Kragaru Kulmur'Thak Kurnurus Kurom Kuzurolek Laarg Lamdurdu Lumtar'Raz Lumurg Maggarstan Magven Mahlgurton Makban Maknurgorn Mal'Gan Maldru
-        Maosh Marmurak Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Neezurthus Oggumargul Ogufur
+        Maosh Marmurak Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Nazgrim Neezurthus Oggumargul Ogufur
         Ogugarmar Ogunogg Okgorm Oko'Dar Okturthas Ollaramm Ollazgorm Orloch Oroam Orodaruld Orogurdan Oroma Orrus Ragnar Ronagarstan Ronamar Rongorm Ronllak Sadaragg Sargam
         Sargarom Sarrek Sarzphan Somurrek Sorgogg Tartarians Thadurgorm Tharosh Thok Thragagus Thrarus Throdran Throguld Thronurstan Thrugor Trakgarven Trukaro Trukgar'Dur
         Ukru'Gald Ukrugron Ukruu Ullagvor Ullatgron Ullathus Urdurgeld Urthaban Urthazuk Urthuurg Urtruok Utok Zasma Zatzal Zevnarg Zuda Zuloch Zurmolak Zurrus Zuslaro Zusrak
@@ -262,7 +262,7 @@ name_list_burning_blade = {
 		Gozar'Gen Gozurmok Gramgal Gramugg Grim'Guld Grimmurarm Grimnarton Grimramm Grom'Tur Gromphon Grugurdar Gullgas Gulnarru Hargargul Hog'Guld Honuda Hormurokk Hun'Thunk
 		Hunmurul Itave Kafar Kalgar'Tur Kallzul Kalmak Kaltuda Kalturkuda Kamgak Karm'Ral Karnarmok Karogul Kartur'Ruz Kel'Phan Kelgas Kelrum Kil'Geld Kolmos Komgarlak Komnaram
 		Komosh Kordurokk Kradurrak Kragaru Kulmur'Thak Kurnurus Kurom Kuzurolek Laarg Lamdurdu Lumtar'Raz Lumurg Maggarstan Magven Mahlgurton Makban Maknurgorn Mal'Gan Maldru
-		Maosh Marmurak Moogul Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Neezurthus Oggumargul Ogufur
+		Mankrik Maosh Marmurak Moogul Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Neezurthus Oggumargul Ogufur
 		Ogugarmar Ogunogg Okgorm Oko'Dar Okturthas Ollaramm Ollazgorm Orloch Oroam Orodaruld Orogurdan Oroma Orrus Ragnar Ronagarstan Ronamar Rongorm Ronllak Sadaragg Sargam
 		Sargarom Sarrek Sarzphan Somurrek Sorgogg Tartarians Thadurgorm Tharosh Thok Thragagus Thrarus Throdran Throguld Thronurstan Thrugor Trakgarven Trukaro Trukgar'Dur
 		Ukru'Gald Ukrugron Ukruu Ullagvor Ullatgron Ullathus Urdurgeld Urthaban Urthazuk Urthuurg Urtruok Utok Xerash Zasma Zatzal Zevnarg Zuda Zuloch Zurmolak Zurrus Zuslaro Zusrak
@@ -607,7 +607,7 @@ name_list_frostwolf = {
 	female_names = {
 		Aggralan Aldaryla Aldis Alguna Alika Eluja Falgynu Feldarner Felmuroda Fol'Kuno Foldis Fulkes Gaedo Gagurras Gartras Gatarliku Gath'ras
         Gayra Geyah Gigardres Giguris Gijaina Gikumo Gilika Ginarika Giulo Gomuros Gootra Gorkes Goyno Greturkit Gronardrus Kagra Keryle
-        Ket'Tur Ketra Kidrus Kikamo Kotdurotra Kureda Kutdardris Lokra Merkit Mernaradu Mordarodu Mormardres Nizka Olgdas Olldis Rahklatra
+        Ket'Tur Ketra Kidrus Kikamo Kotdurotra Kureda Kutdardris Lokra Merkit Mernaradu Mordarodu Mormardres Nizka Olgdas Olgra Olldis Rahklatra
         Rahklthas Ramdis Rashket Rastra Rawdarviu Rawstrom Rawturyla Rawyl Rawynu Raylu Rehze Rohkkamo Rohknuranu Rohonu Rokuno
         Roshka Rozina Ryal Sannarodu Santhas Sarrak Semyja Sendulo Senlami Senus Shaksa Shaliko Shedurkuji Shekumo Sheturano Sheyro Shuddus Shudes
         Shuloda Shutyna Sinlinu Suira Suis Sukis Summaryle Sumnurkys Sumyja Sun'Kuna Suyno Tamdus Tamkumo Temmurynu Umagaredo
@@ -770,7 +770,7 @@ name_list_durotaric = {
         Gozar'Gen Gozurmok Gramgal Gramugg Grim'Guld Grimmurarm Grimnarton Grimramm Grom'Tur Gromphon Grugurdar Gullgas Gulnarru Hargargul Hog'Guld Honuda Hormurokk Hun'Thunk
         Hunmurul Itave Kafar Kalgar'Tur Kallzul Kalmak Kaltuda Kalturkuda Kamgak Karm'Ral Karnarmok Karogul Kartur'Ruz Kel'Phan Kelgas Kelrum Kil'Geld Kolmos Komgarlak Komnaram
         Komosh Kordurokk Kradurrak Kragaru Kruk Kug Kulmur'Thak Kurnurus Kurom Kuzurolek Laarg Lamdurdu Lumtar'Raz Lumurg Maggarstan Magven Mahlgurton Makban Maknurgorn Mal'Gan Maldru
-        Maosh Marmurak Mathogg Maug Mogrin Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Neezurthus Oggumargul Ogufur
+        Mankrik Maosh Marmurak Mathogg Maug Mogrin Mordargeld Morlgal Mouda Mu'Dur Mugmak Mugoran Mugturfur Mukdarokk Mukdgald Mukud Mulzok Muramur'Phan Murarost Muthuk Nastrac Nazgrim Neezurthus Oggumargul Ogufur
         Ogugarmar Ogunogg Okgorm Oko'Dar Okturthas Ollaramm Ollazgorm Orloch Oroam Orodaruld Orogurdan Oroma Orrus Ragnar Ronagarstan Ronamar Rongorm Ronllak Sadaragg Sargam
         Sargarom Sarrek Sarzphan Somurrek Sorgogg Tartarians Thadurgorm Tharosh Thok Thragagus Thrarus Throdran Throguld Thronurstan Thrugor Trakgarven Trukaro Trukgar'Dur
         Ukru'Gald Ukrugron Ukruu Ullagvor Ullatgron Ullathus Urdurgeld Urthaban Urthazuk Urthuurg Urtruok Utok Zasma Zatzal Zevnarg Zuda Zuloch Zurmolak Zurrus Zuslaro Zusrak
@@ -779,7 +779,7 @@ name_list_durotaric = {
 	female_names = {
 		Aldaryla Aldis Alguna Alika Eluja Falgynu Feldarner Felmuroda Fol'Kuno Foldis Fulkes Gaedo Gagurras Gartras Gatarliku
         Gayra Gigardres Giguris Gijaina Gikumo Gilika Ginarika Giulo Gomuros Gootra Gorkes Goyno Greturkit Gronardrus Keryle
-        Ket'Tur Ketra Kidrus Kikamo Kotdurotra Kureda Kutdardris Merkit Mernaradu Mordarodu Mormardres Olgdas Olldis Rahklatra
+        Ket'Tur Ketra Kidrus Kikamo Kotdurotra Kureda Kutdardris Merkit Mernaradu Mordarodu Mormardres Olgdas Olgra Olldis Rahklatra
         Rahklthas Ramdis Rashket Rastra Rawdarviu Rawstrom Rawturyla Rawyl Rawynu Raylu Rehze Rohkkamo Rohknuranu Rohonu Rokuno
         Roshka Rozina Sannarodu Santhas Semyja Sendulo Senlami Senus Shaliko Shedurkuji Shekumo Sheturano Sheyro Shuddus Shudes
         Shuloda Shutyna Sinlinu Suira Suis Sukis Summaryle Sumnurkys Sumyja Sun'Kuna Suyno Tamdus Tamkumo Temmurynu Umagaredo