Skip to content

Commit

Permalink
initial attempt at applying my patches
Browse files Browse the repository at this point in the history
  • Loading branch information
cooljeanius committed Feb 17, 2024
1 parent 7a3a72e commit 0b0f4d9
Show file tree
Hide file tree
Showing 15 changed files with 855 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@
message= _ "But between here and there is a particularly barren stretch of the sands, with only a few oases and watering holes. Luckily I think there used to be an old caravan route leading north, which went from oasis to oasis. The oases aren’t easy to find but occasionally the sands blow away, revealing old stone roads that lead from oasis to oasis. Once the path must have formed a great thoroughfare for commerce."
[/message]

#ifndef EASY
[place_shroud]
side=1
x=19-23,20-22,21
Expand All @@ -318,6 +319,7 @@
[redraw]
side=1
[/redraw]
#endif

[message]
speaker=Zhul
Expand Down Expand Up @@ -1044,7 +1046,7 @@
unrenamable=yes
profile=portraits/elyssa.webp
gender=female
experience=15
experience={ON_DIFFICULTY 17 16 15}
[modifications]
{TRAIT_LOYAL}
{TRAIT_QUICK}
Expand Down Expand Up @@ -1420,7 +1422,7 @@
[/event]

#Encounter 7 Mirage
#Oasis disappears as soon as player moves to the location
#Oasis disappears as soon as player moves to the location (unless on EASY)
[event]
name=moveto

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
***************
*** 5,11 ****
name= _ "Across the Harsh Sands"
{UTBS_MAP 02_Across_the_Harsh_Sands.map}
next_scenario=03_Stirring_in_the_Night
- {TURNS 62 60 58}
victory_when_enemies_defeated=no

{TWO_SUNS_DEFAULT_SCHEDULE}
--- 5,11 ----
name= _ "Across the Harsh Sands"
{UTBS_MAP 02_Across_the_Harsh_Sands.map}
next_scenario=03_Stirring_in_the_Night
+ {TURNS 69 60 58}
victory_when_enemies_defeated=no

{TWO_SUNS_DEFAULT_SCHEDULE}
***************
*** 24,31 ****
id=Kaleh
type=Quenoth Youth
canrecruit=yes
- gold=200
- {INCOME 17 14 11}
controller=human
recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,Quenoth Mystic
shroud=yes
--- 24,31 ----
id=Kaleh
type=Quenoth Youth
canrecruit=yes
+ {GOLD 220 210 200}
+ {INCOME 19 15 11}
controller=human
recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,Quenoth Mystic
shroud=yes
***************
*** 1430,1449 ****
y=18-19
[/filter]

#x coor: 9 to 13
#y coor: 19 to 18
-
[terrain]
terrain=Dd
x=10,10,11,11,11,12,12
y=14,15,15,16,17,15,16
[/terrain]

{CHECK_EXPLORER}
[message]
speaker=$explorer.id
message= _ "Dang. I was sure I saw an oasis here. Must have been a mirage. I’ve been out in the sand for too long."
[/message]
{CLEAR_VARIABLE explorer}
[/event]

--- 1432,1472 ----
y=18-19
[/filter]

+ #ifndef EASY
#x coor: 9 to 13
#y coor: 19 to 18
[terrain]
terrain=Dd
x=10,10,11,11,11,12,12
y=14,15,15,16,17,15,16
[/terrain]
+ #endif

{CHECK_EXPLORER}
+ #ifdef EASY
+ [message]
+ speaker=$explorer.id
+ message= _ "Phew, thank goodness that this oasis is here! After hearing about the bandits in this area, I was beginning to worry that they had created a mirage to trick thirsty travelers such as ourselves!"
+ [/message]
+ [message]
+ speaker=Nym
+ message= _ "I know these bandits are evil, but do you really think they'd stoop so low as to get their victims' hopes up before crushing them?"
+ image=portraits/nym_moody.png
+ [/message]
+ [message]
+ speaker=Zhul
+ message= _ "It has been known to happen before."
+ [/message]
+ [message]
+ speaker=Kaleh
+ message= _ "Truly, there are some depraved and cruel individuals in this world."
+ [/message]
+ #else
[message]
speaker=$explorer.id
message= _ "Dang. I was sure I saw an oasis here. Must have been a mirage. I’ve been out in the sand for too long."
[/message]
+ #endif
{CLEAR_VARIABLE explorer}
[/event]

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
***************
*** 21,28 ****
id=Kaleh
type=Quenoth Youth
canrecruit=yes
- gold=200
- {INCOME 6 4 2}
controller=human
shroud=yes
fog=no
--- 21,28 ----
id=Kaleh
type=Quenoth Youth
canrecruit=yes
+ {GOLD 280 240 200}
+ {INCOME 9 6 3}
controller=human
shroud=yes
fog=no
***************
*** 46,52 ****
#endif
canrecruit=yes

- {INCOME 3 5 7}
{GOLD 75 100 125}
controller=ai
shroud=no
--- 46,52 ----
#endif
canrecruit=yes

+ {INCOME 1 4 7}
{GOLD 75 100 125}
controller=ai
shroud=no
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
[ai]
#ifdef EASY
recruitment_pattern=fighter,fighter
simple_targeting=yes
grouping=no
#endif
#ifdef NORMAL
recruitment_pattern=fighter,fighter,mixed fighter
Expand All @@ -90,7 +92,7 @@
recruitment_pattern=fighter,fighter,mixed fighter
#endif

aggression=0.6
aggression={ON_DIFFICULTY 0.4 0.5 0.6}
[/ai]
[/side]

Expand Down Expand Up @@ -121,7 +123,7 @@

[ai]
recruitment_pattern=fighter,fighter,mixed fighter
aggression=0.6
aggression={ON_DIFFICULTY 0.4 0.5 0.6}
[/ai]
[/side]

Expand Down Expand Up @@ -156,7 +158,7 @@

village_value=0

#fire guardians can't leave lava cavern
#fire guardians cannot leave lava cavern:
[avoid]
x=39-46, 30-34
y=77-81,92-100
Expand Down Expand Up @@ -736,7 +738,7 @@

# Event 2.2: Wounded Dwarf

# Troll whelp tries to kill wounded Dwarvish Stalwart
# Troll whelp tries to kill wounded Dwarvish Stalwart (or Sentinel on EASY)

[event]
name=moveto
Expand Down Expand Up @@ -786,7 +788,8 @@
# Event 3: Troll Lava Maze

# At the start of each turn, all units except winged ones standing
# on a lava hex take 25 damage. This damage can kill units.
# on a lava hex take 15 (EASY), 20 (NORMAL), or 25 (HARD) damage, depending on difficulty.
# This damage can kill units.

[event]
name=new turn
Expand All @@ -805,7 +808,7 @@
terrain=*^Yl
[/filter_location]
[/filter]
amount=25
amount=$lava_damage
damage_type=fire
animate=yes
[/harm_unit]
Expand Down Expand Up @@ -929,7 +932,7 @@

[message]
speaker=narrator
message= _ "Any unit that ends its turn on a lava hex, except those who can fly over the lava, will take 25 damage at the beginning of the next turn. This lava damage can kill units. Flying units will just take $heat_damage damage per turn when flying over lava, though they too can die if they spend too much time over it. Also because of the heat in the cavern, all units on cave floor hexes will take $heat_damage damage at the start of each turn. This heat damage can reduce a unit to 1 hit point, but it can’t kill it."
message= _ "Any unit that ends its turn on a lava hex, except those who can fly over the lava, will take $lava_damage damage at the beginning of the next turn. This lava damage can kill units. Flying units will just take $heat_damage damage per turn when flying over lava, though they too can die if they spend too much time over it. Also because of the heat in the cavern, all units on cave floor hexes will take $heat_damage damage at the start of each turn. This heat damage can reduce a unit to 1 hit point, but it can’t kill it."
image=wesnoth-icon.png
[/message]

Expand Down

0 comments on commit 0b0f4d9

Please sign in to comment.