Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*Some quick fixes by InVain
- Flora Kinds
- Comment out the ambience sound.
  • Loading branch information
khamukkamu committed Apr 23, 2017
1 parent bf6bc53 commit 3be24c4
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 7 deletions.
10 changes: 9 additions & 1 deletion Data/flora_kinds.py
Expand Up @@ -984,7 +984,15 @@ def density(g):
[['Jaakko_new_cypress', 'bo_Jaakko_new_cypress'],
['Jaakko_new_cypress2', 'bo_Jaakko_new_cypress2'],
]),


('grass_flower_white_nofade',
0,
[['PW_grass_flower_c_xx', '0'], ['PW_grass_flower_c_xx', '0']]),

('grass_flower_yellow_nofade',
0,
[['PW_grass_flower_e_xx', '0'], ['PW_grass_flower_e_xx', '0']]),

]


Expand Down
8 changes: 7 additions & 1 deletion Data/flora_kinds.txt
@@ -1,4 +1,4 @@
168
170
grass 6442469688324 5
PW_grass_a_xx 0
PW_grass_b_xx 0
Expand Down Expand Up @@ -636,4 +636,10 @@ Jaakko_new_tree_a 0 2
Jaakko_new_cypress 0 2
Jaakko_new_cypress bo_Jaakko_new_cypress
Jaakko_new_cypress2 bo_Jaakko_new_cypress2
grass_flower_white_nofade 0 2
PW_grass_flower_c_xx 0
PW_grass_flower_c_xx 0
grass_flower_yellow_nofade 0 2
PW_grass_flower_e_xx 0
PW_grass_flower_e_xx 0

4 changes: 2 additions & 2 deletions ModuleSystem/module_scripts.py
Expand Up @@ -10188,7 +10188,7 @@ def set_item_score():
(eq,":landmark","p_town_dol_amroth"),
(assign, ":native_terrain_to_use", rt_plain), # gondor default
(store_random_in_range, ":scene_to_use", "scn_dolamroth_outside_1", "scn_morannon_outside_1"),
(assign, "$bs_day_sound", "snd_seaside_occasional"),
# (assign, "$bs_day_sound", "snd_seaside_occasional"),
(else_try),
(eq,":landmark","p_town_morannon"),
(store_random_in_range, ":scene_to_use", "scn_morannon_outside_1", "scn_dolguldur_outside_1"),
Expand All @@ -10202,7 +10202,7 @@ def set_item_score():
(else_try),
(eq,":landmark","p_town_beorn_house"),
(store_random_in_range, ":scene_to_use", "scn_beorn_outside_1", "scn_moria_outside_1"),
(assign, "$bs_day_sound", "snd_beorn_occasional"),
# (assign, "$bs_day_sound", "snd_beorn_occasional"),
(assign, "$bs_night_sound", "snd_night_ambiance"),
(else_try),
(eq,":landmark","p_town_moria"), #InVain: Keep this BEFORE region_dimrill!
Expand Down
Binary file modified Resource/JB_terrain_borders_TLD.brf
Binary file not shown.
8 changes: 7 additions & 1 deletion _wb/Data/flora_kinds.txt
@@ -1,4 +1,4 @@
168
170
grass 6442469688324 5
PW_grass_a_xx 0
PW_grass_b_xx 0
Expand Down Expand Up @@ -811,3 +811,9 @@ Jaakko_new_tree_a 0 2
Jaakko_new_cypress 0 2
Jaakko_new_cypress bo_Jaakko_new_cypress
Jaakko_new_cypress2 bo_Jaakko_new_cypress2
grass_flower_white_nofade 0 2
PW_grass_flower_c_xx 0
PW_grass_flower_c_xx 0
grass_flower_yellow_nofade 0 2
PW_grass_flower_e_xx 0
PW_grass_flower_e_xx 0
2 changes: 1 addition & 1 deletion _wb/scripts.txt
Expand Up @@ -367,7 +367,7 @@ tld_party_relocate_near_party -1
region_get_faction -1
53 21 1 1224979098644774912 22 1 1224979098644774913 4 0 31 2 1224979098644774912 20 30 2 1224979098644774913 1 2133 2 72057594037927937 19 5 0 33 3 1224979098644774912 7 9 30 2 1224979098644774913 1 2133 2 72057594037927937 6 5 0 31 2 1224979098644774912 9 30 2 1224979098644774913 1 2133 2 72057594037927937 12 5 0 31 2 1224979098644774912 2 30 2 1224979098644774913 1 2133 2 72057594037927937 15 5 0 33 3 1224979098644774912 0 13 2133 2 72057594037927937 3 5 0 33 3 1224979098644774912 13 21 2133 2 72057594037927937 5 5 0 31 2 1224979098644774912 24 2133 2 72057594037927937 7 5 0 31 2 1224979098644774912 32 2133 2 72057594037927937 8 5 0 31 2 1224979098644774912 34 2133 2 72057594037927937 10 5 0 31 2 1224979098644774912 26 2133 2 72057594037927937 14 5 0 31 2 1224979098644774912 35 2133 2 72057594037927937 17 5 0 31 2 1224979098644774912 39 2133 2 72057594037927937 16 5 0 31 2 1224979098644774912 40 2133 2 72057594037927937 11 5 0 1073741855 2 1224979098644774912 38 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 30 2133 2 72057594037927937 6 5 0 2133 2 72057594037927937 -1 3 0
jump_to_random_scene -1
210 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 2133 2 144115188075856058 250 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856058 237 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 2133 2 144115188075856058 256 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 2133 2 144115188075856058 256 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 5 0 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 3 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 169 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 170 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 3 0 3 0 3 0 2133 2 72057594037927946 1224979098644774917 1910 1 1224979098644774917
208 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 2133 2 144115188075856058 256 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 2133 2 144115188075856058 256 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 5 0 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 3 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 169 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 170 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 3 0 3 0 3 0 2133 2 72057594037927946 1224979098644774917 1910 1 1224979098644774917
maybe_relocate_player_from_z0 -1
5 4 0 31 2 144115188075856318 1 2133 2 144115188075856318 0 1623 3 0 169 0 3 0
enter_dungeon -1
Expand Down

0 comments on commit 3be24c4

Please sign in to comment.