Skip to content

Commit

Permalink
generate diffs for SotA
Browse files Browse the repository at this point in the history
  • Loading branch information
@cooljeanius
cooljeanius committed Sep 15, 2021
1 parent 85f48b5 commit 06a5ab6
Show file tree
Hide file tree
Showing 8 changed files with 533 additions and 0 deletions.
111 changes: 111 additions & 0 deletions campaigns/Secrets_of_the_Ancients/08_Carcyn.cfg.diff
View file
@@ -0,0 +1,111 @@
--- /Applications/MacPorts/The Battle for Wesnoth.app/Contents/Resources/data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg 2021-09-05 22:32:23.000000000 -0400
+++ 08_Carcyn.cfg 2021-03-15 01:54:57.000000000 -0400
@@ -41,13 +41,14 @@

{DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
- {TURNS 28 28 28}
+ {TURNS 30 29 28}

[side]
# wmllint: who SIDE_1_RAS-TABAHN is Ras-Tabahn
# wmllint: unwho RECALL_LOYAL_UNITS
{SIDE_1_RAS-TABAHN}
- {GOLD 200 200 200}
+ {GOLD 220 210 200}
+ {INCOME 3 2 1}
[/side]

[side]
@@ -94,17 +95,17 @@
[/unit]
[unit]
type=Ghost
- experience=6
+ experience={ON_DIFFICULTY 8 7 6}
side=1
[/unit]
[unit]
type=Skeleton
- experience=3
+ experience={ON_DIFFICULTY 7 5 3}
side=1
[/unit]
[unit]
type=Skeleton
- experience=16
+ experience={ON_DIFFICULTY 20 18 16} # (out of 35)
side=1
[/unit]

@@ -140,7 +141,8 @@
[/label]
[label]
x,y=6,4
- text= _ "Tackle Shop" #po: or Fishing Supplies
+ #po: or Fishing Supplies
+ text= _ "Tackle Shop"
color=255, 255, 255
[/label]
[label]
@@ -150,32 +152,38 @@
[/label]
[label]
x,y=10,9
- text= _ "Mercantile" #po: the old word for "general store"
+ #po: the old word for "general store"
+ text= _ "Mercantile"
color=255, 255, 255
[/label]
[label]
x,y=18,8
- text= _ "Carcyn" #po: The name of the city
+ #po: The name of the city
+ text= _ "Carcyn"
color=255, 255, 255
[/label]
[label]
x,y=18,13
- text= _ "Public House" #po: the old word for "pub". "Bar" is about the same.
+ #po: the old word for "pub". "Bar" is about the same.
+ text= _ "Public House"
color=255, 255, 255
[/label]
[label]
x,y=4,12
- text= _ "Jailhouse" #po: or just "Jail"
+ #po: or prison, or just "Jail"
+ text= _ "Jailhouse"
color=255, 255, 255
[/label]
[label]
x,y=23,3
- text= _ "Boatworks" #po: or Boatyard
+ #po: or Boatyard
+ text= _ "Boatworks"
color=255, 255, 255
[/label]
[label]
x,y=25,8
- text= _ "Grange Hall" #po: "Grange" in the American usage: farmers' association
+ #po: "Grange" in the American usage: farmers' association
+ text= _ "Grange Hall"
color=255, 255, 255
[/label]
[item]
@@ -248,6 +256,7 @@
x,y=5,12
type=Delinquent
side=1
+ # po: female name
name= _ "Shynal"
id=Shynal
gender=female
@@ -268,6 +277,7 @@
x,y=5,13
type=Ruffian SotA
side=1
+ # po: male name
name= _ "Carcyn"
id=Carcyn
{IS_LOYAL}
32 changes: 32 additions & 0 deletions campaigns/Secrets_of_the_Ancients/11_Battleground.cfg.diff
View file
@@ -0,0 +1,32 @@
--- /Applications/MacPorts/The Battle for Wesnoth.app/Contents/Resources/data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg 2021-09-05 22:32:23.000000000 -0400
+++ 11_Battleground.cfg 2021-05-06 00:23:36.000000000 -0400
@@ -49,7 +49,7 @@

{DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
- {TURNS 30 31 32}
+ {TURNS 34 33 32}

[side]
{SIDE_1_ARDONNA}
@@ -83,7 +83,7 @@
id=Blianxkep
facing=sw
recruit=Naga Fighter,Naga Warrior
- {GOLD 180 230 300}
+ {GOLD 160 230 300}
[/side]

# *************************** PRESTART ***************************
@@ -94,9 +94,9 @@
name=prestart

[gold]
- # This is actually the default starting gold.
+ # 100 is the default starting gold; add some variance for difficulty, though
side=1
- amount=100
+ amount={ON_DIFFICULTY 120 110 100}
[/gold]

[objectives]
82 changes: 82 additions & 0 deletions campaigns/Secrets_of_the_Ancients/12_Walking_Trees.cfg.diff
View file
@@ -0,0 +1,82 @@
--- /Applications/MacPorts/The Battle for Wesnoth.app/Contents/Resources/data/campaigns/Secrets_of_the_Ancients/scenarios/12_Walking_Trees.cfg 2021-09-05 22:32:23.000000000 -0400
+++ 12_Walking_Trees.cfg 2021-05-09 00:44:47.000000000 -0400
@@ -18,6 +18,7 @@
image=story/elf-road.jpg
scale=no
[/background_layer]
+ # po: the "elf sorceress" is actually of the type Elvish Enchantress, not Elvish Sorceress
story= _ "17 IV, 23 YW

My primary objective was met, and I had been able to press a number of ghosts into service. Also, I had a new companion with a talent for healing. I doubted that Ras-Tabahn was already waiting at the appointed place, but I still wanted to hurry, so we followed the elf road north as quickly as we could. Fortunately, it was not in bad repair, though in many places it was overgrown, leaving only a few smooth cobbles to mark the way. The second day, we were still deep in the woods when we encountered an elf sorceress."
@@ -27,12 +28,12 @@

{DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST}
- {TURNS 18 18 18}
+ {TURNS 20 19 18}
victory_when_enemies_defeated=no

[side]
{SIDE_1_ARDONNA}
- {GOLD 200 190 180}
+ {GOLD 218 199 180}
[/side]

[side]
@@ -60,19 +61,19 @@
{FLAG_VARIANT wood-elvish}
[/side]

- # For each difficulty level, the first 16 woses are level-1, the rest are level-2.
+ # For each difficulty level, the first {18 17 16} woses are level-1, the rest are level-2.
#ifdef EASY
#define MAX_NUMBER_OF_WOSES
- 18
+ 17 # yes, this is less than the number L2 woses start spawning at; I think it's ok to disallow them completely on EASY
#enddef
#define WOSES_PER_TURN
- 4
+ 3
#enddef
#endif

#ifdef NORMAL
#define MAX_NUMBER_OF_WOSES
- 22
+ 21
#enddef
#define WOSES_PER_TURN
4
@@ -161,7 +162,7 @@
[and]
x=$wose_x
y=$wose_y
- radius=7 # Too close to the player’s keep.
+ radius={ON_DIFFICULTY 9 8 7} # No good. Too close to the player’s keep.
[/and]
[/or]

@@ -172,9 +173,11 @@
[and]
x=$wose_x
y=$wose_y
- radius=2
- # The wose would be adjacent to one of the
- # player's units after it moved one hex.
+ radius={ON_DIFFICULTY 4 3 2}
+ # No good. The wose would be adjacent to
+ # one of the player's units after it moved
+ # {3 2 1} hex(es).
+ # FIXME: do I have this correct?
[/and]
[/or]

@@ -221,7 +224,7 @@
[if]
[variable]
name=number_of_woses
- greater_than=16
+ greater_than={ON_DIFFICULTY 18 17 16} # prevents Elder Woses from being selected on EASY
[/variable]
[then]
[set_variable]
46 changes: 46 additions & 0 deletions campaigns/Secrets_of_the_Ancients/14_Entering_the_Northlands.cfg.diff
View file
@@ -0,0 +1,46 @@
--- /Applications/MacPorts/The Battle for Wesnoth.app/Contents/Resources/data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg 2021-09-05 22:32:23.000000000 -0400
+++ 14_Entering_the_Northlands.cfg 2021-06-22 01:08:06.000000000 -0400
@@ -43,7 +43,8 @@
# wmllint: who SIDE_1_BOTH is Ardonna,Ras-Tabahn
# wmllint: who RECALL_LOYAL_UNITS is Bone Captain, Vendraxis, Shynal, Carcyn
{SIDE_1_BOTH}
- {GOLD 170 170 170}
+ {GOLD 198 184 170}
+ {INCOME 9 6 3}
[/side]

[side]
@@ -55,8 +56,8 @@
id=Rod-Ishnak
team_name=bad
recruit=Orcish Crossbowman,Orcish Warrior
- {GOLD 100 140 200}
- {INCOME 17 22 28}
+ {GOLD 80 140 200}
+ {INCOME 16 22 28}
{FLAG_VARIANT6 ragged}
[/side]

@@ -76,8 +77,8 @@
id=Krongk
[/unit]
recruit=Orcish Crossbowman,Orcish Warrior
- {GOLD 100 140 200}
- {INCOME 15 20 26}
+ {GOLD 80 140 200}
+ {INCOME 14 20 26}
{FLAG_VARIANT6 ragged}
[/side]

@@ -128,7 +129,11 @@
name=starting_orc_units
mode=append
[split]
+#ifdef EASY
+ list="Orcish Archer,Orcish Archer,Wolf Rider,Wolf Rider,Goblin Spearman"
+#else
list="Orcish Archer,Orcish Archer,Wolf Rider,Wolf Rider,Goblin Pillager"
+#endif
key=type
separator=","
[/split]

0 comments on commit 06a5ab6

Please sign in to comment.