Merge branch 'knyghtmare:master' into master

cooljeanius · Jun 9, 2024 · 19b7d40 · 19b7d40
2 parents 6f8d113 + b99fa9e
commit 19b7d40
Show file tree

Hide file tree

Showing 98 changed files with 1,282 additions and 80 deletions.
diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
@@ -0,0 +1,10 @@
+name: Luacheck
+on: [push, pull_request]
+jobs:
+  sile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Luacheck linter
+        uses: nebularg/actions-luacheck@v1
diff --git a/.luacheckrc b/.luacheckrc
@@ -0,0 +1,13 @@
+max_line_length=190
+-- show the warning/error codes as well
+codes=true
+-- skip showing files with no issues
+quiet=1
+-- skip showing undefined variable usage
+-- there are thousands of warnings here because luacheck is unaware of Wesnoth's
+-- lua environment and has no way to check which have been loaded
+global=false
+-- skip showing unused variables
+unused=false
+-- skip showing warnings about shadowing upvalues and empty if branches
+ignore={"431","542"}
diff --git a/_main.cfg b/_main.cfg
@@ -49,9 +49,7 @@
 
     [resistance_defaults]
         id="arcane_focus"
-        # please do not ask me why I did
-        # this but this works so, yeah...
-        default="( 200 - (resistance.arcane) )"
+        default="((200 - arcane)+10)"
     [/resistance_defaults]
 
     {~add-ons/War_of_Legends/units}

diff --git a/campaign.cfg b/campaign.cfg
@@ -34,7 +34,7 @@
 
     [resistance_defaults]
         id="arcane_focus"
-        default="( 200 - (resistance.arcane) )"
+        default="((200 - arcane)+10)"
     [/resistance_defaults]
     # load units
     {~add-ons/War_of_Legends/units}

diff --git a/contributing.md b/contributing.md
@@ -1,12 +1,15 @@
 ## Contributing
 
 ### Artists
+
 If you are good at pixel artist and would like to animate some of the units, do get in touch.
 
 ### Translations
+
 The POT file is ready and can be translated. I do not attend on adding any new content soon, so it is more or less stable in terms of content.
 
 ### Lore discussions
+
 _War of Legends_ is set on the fantasy world of Irdya and follows the _Dark Irdya_ timeline of events. Any discussions or inquires can be answered by contacting me.
 
 ## Bug Reports
@@ -25,4 +28,4 @@ We have several issue templates to choose from when opening a bug report. Please
 
 Pull requests (PRs) can be created by forking the repository on the github website, making your own changes to your forked repository, and then clicking the "Pull request" button.  All pull requests must follow the above guidelines in order to be merged and whenever possible should include additional unit tests in order to both prove the proposed fix or feature works as intended as well as to allow quickly detecting other bugs in that area of code the future. It is also highly recommended to use an editor that at least support syntax highlighting (such as VSCode or Notepad++) regardless of what you're changing - just because you *can* edit files through the github website or with plain Notepad does not mean you *should*.
 
-One additional thing I would like to mention is that you really do not need to make any PR's since reporting it as an issue or on the Forums, usually gets my attention for it to be patched.
+One additional thing I would like to mention is that you really do not need to make any PR's since reporting it as an issue or on the Forums, usually gets my attention for it to be patched.
diff --git a/documentations/CHANGELOG.txt b/documentations/CHANGELOG.txt
@@ -1,5 +1,44 @@
 War of Legends
-Change-Log v1.2.7.45
+Change-Log v1.2.7.52
+
+version v1.2.7.52:
+--> 
+
+version v1.2.7.51:
+--> Outlaws:
+    --> rebalance the Shadow Initiate-line
+--> Steelhive:
+    --> Add Steel Dominant, a boss class campaign-only unit
+--> Loyalists:
+    --> Chevalier: add weapon special holy
+    --> Javelin Master: +2 ranged damage
+--> Campaigns:
+    --> New trait: summoned
+    --> New ability: conjuror (+20% to units with summoned trait)
+        --> This might be for the upcoming elemental units setup
+
+version v1.2.7.48
+--> Outlaws:
+    --> Arcane Enforcer: -10% cold RES, +10% blade/pierce/impact RES
+--> Deep Elves:
+    --> Forgotten Minotaur:
+        --> Fixed incorrect movement type and adjusted defence and resistance
+
+version v1.2.7.47
+--> Outlaws:
+    --> New unit tree: Rogue Hunter
+        --> role: ranged damage specialist (poison)
+        --> note: might superseed Huntsman at level 3
+
+version v1.2.7.46
+--> Code
+    --> Better UX: you can pick all dropped gear in one go now.
+    --> Changed formula for type: arcane_focus
+--> Northerners:
+    --> Orcish Shaman-line: boosted magical resistance
+    --> Orcish Marauder-line: added portrait
+--> Nightmares:
+    --> Scornful Watcher: fixed portrait not showing up
 
 version v1.2.7.45
 --> Aragwaithi:

diff --git a/documentations/CREDITS.txt b/documentations/CREDITS.txt
@@ -108,3 +108,10 @@ Dalas
 Mechanical
 --> Queen Scorpion
 --> Goblin Spearmaster (defend + ranged)
+--> Female Orcish Shaman-line
+
+Kordov
+--> Orcish Shaman female portrait
+
+ihybriedur
+--> Steel Dominant
diff --git a/images/misc/firststrike-1.png b/images/misc/firststrike-1.png
diff --git a/images/misc/firststrike-2.png b/images/misc/firststrike-2.png
diff --git a/images/misc/firststrike-3.png b/images/misc/firststrike-3.png
diff --git a/images/misc/summoned-status-icon.png b/images/misc/summoned-status-icon.png
diff --git a/images/portraits/orc-raider.png b/images/portraits/orc-raider.png
diff --git a/images/portraits/orc-shaman+female.webp b/images/portraits/orc-shaman+female.webp
diff --git a/images/units/human-outlaws/archer-bow-attack-1.png b/images/units/human-outlaws/archer-bow-attack-1.png
diff --git a/images/units/human-outlaws/archer-bow-attack-2.png b/images/units/human-outlaws/archer-bow-attack-2.png
diff --git a/images/units/human-outlaws/archer-bow-attack-3.png b/images/units/human-outlaws/archer-bow-attack-3.png
diff --git a/images/units/human-outlaws/archer-bow-attack-4.png b/images/units/human-outlaws/archer-bow-attack-4.png
diff --git a/images/units/human-outlaws/archer-bow-defend.png b/images/units/human-outlaws/archer-bow-defend.png
diff --git a/images/units/human-outlaws/archer-bow.png b/images/units/human-outlaws/archer-bow.png
diff --git a/images/units/human-outlaws/archer-melee-attack-1.png b/images/units/human-outlaws/archer-melee-attack-1.png
diff --git a/images/units/human-outlaws/archer-melee-attack-2.png b/images/units/human-outlaws/archer-melee-attack-2.png
diff --git a/images/units/human-outlaws/archer-melee-attack-3.png b/images/units/human-outlaws/archer-melee-attack-3.png
diff --git a/images/units/human-outlaws/archer-melee-attack-4.png b/images/units/human-outlaws/archer-melee-attack-4.png
diff --git a/images/units/human-outlaws/archer-melee-defend-1.png b/images/units/human-outlaws/archer-melee-defend-1.png
diff --git a/images/units/human-outlaws/archer-melee-defend-2.png b/images/units/human-outlaws/archer-melee-defend-2.png
diff --git a/images/units/human-outlaws/archer.png b/images/units/human-outlaws/archer.png
diff --git a/images/units/human-outlaws/cutthroat-bow-attack-1.png b/images/units/human-outlaws/cutthroat-bow-attack-1.png
diff --git a/images/units/human-outlaws/cutthroat-bow-attack-2.png b/images/units/human-outlaws/cutthroat-bow-attack-2.png
diff --git a/images/units/human-outlaws/cutthroat-bow-attack-3.png b/images/units/human-outlaws/cutthroat-bow-attack-3.png
diff --git a/images/units/human-outlaws/cutthroat-bow-attack-4.png b/images/units/human-outlaws/cutthroat-bow-attack-4.png
diff --git a/images/units/human-outlaws/cutthroat-bow-defend.png b/images/units/human-outlaws/cutthroat-bow-defend.png
diff --git a/images/units/human-outlaws/cutthroat-bow.png b/images/units/human-outlaws/cutthroat-bow.png
diff --git a/images/units/human-outlaws/cutthroat-melee-attack-1.png b/images/units/human-outlaws/cutthroat-melee-attack-1.png
diff --git a/images/units/human-outlaws/cutthroat-melee-attack-2.png b/images/units/human-outlaws/cutthroat-melee-attack-2.png
diff --git a/images/units/human-outlaws/cutthroat-melee-attack-3.png b/images/units/human-outlaws/cutthroat-melee-attack-3.png
diff --git a/images/units/human-outlaws/cutthroat-melee-attack-4.png b/images/units/human-outlaws/cutthroat-melee-attack-4.png
diff --git a/images/units/human-outlaws/cutthroat-melee-defend-1.png b/images/units/human-outlaws/cutthroat-melee-defend-1.png
diff --git a/images/units/human-outlaws/cutthroat-melee-defend-2.png b/images/units/human-outlaws/cutthroat-melee-defend-2.png
diff --git a/images/units/human-outlaws/cutthroat.png b/images/units/human-outlaws/cutthroat.png
diff --git a/images/units/human-outlaws/exterminator-bow-attack-1.png b/images/units/human-outlaws/exterminator-bow-attack-1.png
diff --git a/images/units/human-outlaws/exterminator-bow-attack-2.png b/images/units/human-outlaws/exterminator-bow-attack-2.png
diff --git a/images/units/human-outlaws/exterminator-bow-attack-3.png b/images/units/human-outlaws/exterminator-bow-attack-3.png
diff --git a/images/units/human-outlaws/exterminator-bow-attack-4.png b/images/units/human-outlaws/exterminator-bow-attack-4.png
diff --git a/images/units/human-outlaws/exterminator-bow-defend.png b/images/units/human-outlaws/exterminator-bow-defend.png
diff --git a/images/units/human-outlaws/exterminator-bow.png b/images/units/human-outlaws/exterminator-bow.png
diff --git a/images/units/human-outlaws/exterminator-melee-attack-1.png b/images/units/human-outlaws/exterminator-melee-attack-1.png
diff --git a/images/units/human-outlaws/exterminator-melee-attack-2.png b/images/units/human-outlaws/exterminator-melee-attack-2.png
diff --git a/images/units/human-outlaws/exterminator-melee-attack-3.png b/images/units/human-outlaws/exterminator-melee-attack-3.png
diff --git a/images/units/human-outlaws/exterminator-melee-attack-4.png b/images/units/human-outlaws/exterminator-melee-attack-4.png
diff --git a/images/units/human-outlaws/exterminator-melee-defend-1.png b/images/units/human-outlaws/exterminator-melee-defend-1.png
diff --git a/images/units/human-outlaws/exterminator-melee-defend-2.png b/images/units/human-outlaws/exterminator-melee-defend-2.png
diff --git a/images/units/human-outlaws/exterminator.png b/images/units/human-outlaws/exterminator.png
diff --git a/images/units/steelhive/steel_dominant.png b/images/units/steelhive/steel_dominant.png
diff --git a/lua/theme.lua b/lua/theme.lua
@@ -60,6 +60,13 @@ function wesnoth.interface.game_display.unit_status()
 		} } )
 	end
 
+	-- for elementals
+	if u.status.summoned then
+		table.insert(s, { "element", { image = "misc/summoned-status-icon.png~CROP_TRANSPARENT()",
+			tooltip = _ "summoned: Summoned units are stronger next to units with the conjuror ability."
+		} } )
+	end
+
 
 	return s
 end
diff --git a/macros/abilities-elemental.cfg b/macros/abilities-elemental.cfg
@@ -1,8 +1,8 @@
 #textdomain wesnoth-War_of_Legends
 
-#define ABILITY_CAVEAMBUSH
+#define ABILITY_CAVE_AMBUSH
     [hides]
-        id=caveambush
+        id=cave_ambush
         name= _ "cave ambush"
         description=_"This unit can hide in cave, and remain undetected by its enemies.
 Enemy units cannot see this unit while it is in cave, except if they have units next to it. Any enemy unit that first discovers this unit immediately loses all its remaining movement."
@@ -389,3 +389,22 @@ Enemy units cannot see this unit while it is in cave, except if they have units
         {CLEAR_VARIABLE WOL_electric_status_inflictable}
     [/event]
 #enddef
+
+#define ABILITY_CONJUROR
+    [leadership]
+        id=conjuror
+        value=20
+        cumulative=yes
+        name= _ "conjuror"
+        description= _ "Adjacent units with the summoned trait will do 20% more damage"
+        affect_self=no
+        affect_allies=yes
+        affect_enemies=no
+        [affect_adjacent]
+            [filter]
+                status=summoned
+                formula="level <= other.level"
+            [/filter]
+        [/affect_adjacent]
+    [/leadership]
+#enddef
diff --git a/macros/abilities-new.cfg b/macros/abilities-new.cfg
@@ -369,3 +369,50 @@ This ability lowers enemies' health by 8, ignoring any resistances or weaknesses
         poison=cured
     [/regenerate]
 #enddef
+
+#define ABILITY_INITIATIVE
+    [firststrike]
+        id=initiative
+        name= _ "initiative"
+        description= _ "All adjacent friendly units will strike first in melee combat, even when defending."
+        special_note=_"This unit’s grasp of melee tactics allows adjacent allies to strike the first blow even when defending."
+        affect_self=no
+        affect_allies=yes
+        halo_image_self="misc/firststrike-1.png:100,misc/firststrike-2.png:100,misc/firststrike-3.png:100"
+        [filter_opponent]
+            [filter_weapon]
+                range=melee
+            [/filter_weapon]
+        [/filter_opponent]
+        [affect_adjacent]
+        [/affect_adjacent]
+    [/firststrike]
+    [firststrike]
+        id=initiative_anim
+        affect_self=no
+        affect_allies=yes
+        active_on=defense
+        [filter_student]
+            [filter_weapon]
+                special_id_active=initiative
+            [/filter_weapon]
+        [/filter_student]
+        [affect_adjacent]
+        [/affect_adjacent]
+    [/firststrike]
+#enddef
+
+#define INITIATIVE_ANIM FULL_IMAGE HALFWAYS_IMAGE
+    [teaching_anim]
+        [filter_attack]
+            special_id_active=initiative_anim
+            [not]
+                special_id_active=firststrike
+            [/not]
+        [/filter_attack]
+        start_time=-126
+        [frame]
+            image={HALFWAYS_IMAGE}:1,{FULL_IMAGE}:250,{HALFWAYS_IMAGE}:1
+        [/frame]
+    [/teaching_anim]
+#enddef