Skip to content

Commit 8a3fea6

Browse files
committed
dupe tower wands/curse of greed/moon radar
1 parent efeb80a commit 8a3fea6

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

ewext/src/modules/entity_sync.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ impl Default for EntitySync {
8484
}
8585

8686
fn entity_is_excluded(entity: EntityID) -> eyre::Result<bool> {
87+
let good = "data/entities/items/wands/wand_good/wand_good_";
8788
let filename = entity.filename()?;
8889
Ok(entity.has_tag("ew_no_enemy_sync")
8990
|| entity.has_tag("polymorphed_player")
9091
|| entity.has_tag("gold_nugget")
91-
|| ENTITY_EXCLUDES.contains(&filename))
92+
|| ENTITY_EXCLUDES.contains(&filename)
93+
|| filename.starts_with(good))
9294
}
9395

9496
impl EntitySync {
@@ -104,6 +106,7 @@ impl EntitySync {
104106
"seed_c",
105107
"perk_fungus_tiny",
106108
"helpless_animal",
109+
"nest",
107110
]
108111
.iter()
109112
.any(|tag| entity.has_tag(tag))

ewext/src/modules/entity_sync/diff_model.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,8 +1460,13 @@ impl RemoteDiffModel {
14601460
"data/scripts/animals/blob_damage.lua",
14611461
]
14621462
.contains(&&*lua.script_damage_received()?)
1463-
|| ["data/scripts/props/suspended_container_physics_objects.lua"]
1464-
.contains(&&*lua.script_source_file()?)
1463+
|| [
1464+
"data/scripts/props/suspended_container_physics_objects.lua",
1465+
"data/scripts/buildings/firebugnest.lua",
1466+
"data/scripts/buildings/flynest.lua",
1467+
"data/scripts/buildings/spidernest.lua",
1468+
]
1469+
.contains(&&*lua.script_source_file()?)
14651470
{
14661471
entity.remove_component(*lua)?;
14671472
}

quant.ew/files/system/wang_hooks/files_with_spawnhooks.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data/scripts/biomes/sandroom.lua
2222
data/scripts/biomes/temple_altar_right_empty.lua
2323
data/scripts/biomes/robot_egg.lua
2424
data/scripts/biomes/temple_altar_right_snowcave.lua
25-
data/scripts/biomes/moon_room.lua
25+
#data/scripts/biomes/moon_room.lua
2626
data/scripts/biomes/tower.lua
2727
data/scripts/biomes/temple_wall_ending.lua
2828
data/scripts/biomes/secret_entrance.lua
@@ -98,7 +98,7 @@ data/scripts/biomes/watercave.lua
9898
data/scripts/biomes/niilo_testroom_c.lua
9999
data/scripts/biomes/rainforest_dark.lua
100100
data/scripts/biomes/lavalake.lua
101-
data/scripts/biomes/greed_room.lua
101+
#data/scripts/biomes/greed_room.lua
102102
data/scripts/biomes/wizardcave_entrance.lua
103103
data/scripts/biomes/hills.lua
104104
data/scripts/biomes/bridge.lua
@@ -136,7 +136,7 @@ data/scripts/biomes/mystery_teleport.lua
136136
data/scripts/biomes/snowcave_secret_chamber.lua
137137
data/scripts/biomes/gourd_room.lua
138138
data/scripts/biomes/coalmine_alt.lua
139-
data/scripts/biomes/tower_end.lua
139+
#data/scripts/biomes/tower_end.lua
140140
data/scripts/biomes/temple_altar_left.lua
141141
data/scripts/biomes/mestari_secret.lua
142142
data/scripts/biomes/ocarina.lua
@@ -145,4 +145,4 @@ data/scripts/biomes/desert.lua
145145
data/scripts/biomes/friend_1.lua
146146
data/scripts/biomes/smokecave_left.lua
147147
data/scripts/biomes/snowcave.lua
148-
data/scripts/biomes/sandcave.lua
148+
data/scripts/biomes/sandcave.lua

0 commit comments

Comments
 (0)