From 38a30a9b01b8fe5598792d4d4975010691cf5498 Mon Sep 17 00:00:00 2001
From: Kabby <1925023+tehkab@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:38:09 -0400
Subject: [PATCH 1/3] Replace banked potion item with new template inheriting
 from vanilla potion.xml

---
 noita_mod/core/files/entities/empty_flask.xml | 202 ------------------
 noita_mod/core/files/entities/potion_bank.xml |   7 +
 .../core/files/scripts/spell_spitter.lua      |   2 +-
 3 files changed, 8 insertions(+), 203 deletions(-)
 delete mode 100644 noita_mod/core/files/entities/empty_flask.xml
 create mode 100644 noita_mod/core/files/entities/potion_bank.xml

diff --git a/noita_mod/core/files/entities/empty_flask.xml b/noita_mod/core/files/entities/empty_flask.xml
deleted file mode 100644
index 1320139..0000000
--- a/noita_mod/core/files/entities/empty_flask.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<Entity tags="item_physics,hittable,teleportable_NOT" >
-
-  <!-- physical presence -->
-  
-  <PhysicsBodyComponent 
-    _tags="enabled_in_world"
-    uid="1" 
-    allow_sleep="1" 
-    angular_damping="0" 
-    fixed_rotation="0" 
-    is_bullet="1" 
-    linear_damping="0"
-    auto_clean="0"
-    on_death_leave_physics_body="1"
-    hax_fix_going_through_ground="1"
-  ></PhysicsBodyComponent>
-  
-  <PhysicsImageShapeComponent 
-    body_id="1"
-    centered="1"
-    image_file="data/items_gfx/potion_normals.png"
-    material="potion_glass_box2d"
-  ></PhysicsImageShapeComponent>
-  
-  <PhysicsThrowableComponent
-    max_throw_speed="180"
-    throw_force_coeff="1.5"
-  ></PhysicsThrowableComponent>
-
-  <ProjectileComponent
-    _tags="enabled_in_world"
-    lifetime="100000"
-    penetrate_entities="1"
-  ></ProjectileComponent>
-
-  <VelocityComponent
-    _tags="enabled_in_world"
-  ></VelocityComponent>
-  
-  <!-- potion logic -->
-   
-	<LuaComponent 
-		remove_after_executed="1"
-		script_item_picked_up="data/scripts/items/potion_effect.lua"
-	></LuaComponent>
-
-  <PotionComponent
-    _tags="enabled_in_hand,enabled_in_world"
-    spray_velocity_coeff="75"
-    spray_velocity_normalized_min="0.75"
-  ></PotionComponent>
-
-  <MaterialSuckerComponent 
-    _tags="enabled_in_world,enabled_in_hand"
-    barrel_size="1000"
-    num_cells_sucked_per_frame="5"
-  ></MaterialSuckerComponent>
-
-  <MaterialInventoryComponent 
-    _tags="enabled_in_world,enabled_in_hand"
-    drop_as_item="0" 
-    on_death_spill="1"
-    leak_pressure_min="0.07"
-    leak_pressure_min="0.1"
-    leak_on_damage_percent="1"
-    min_damage_to_leak="0.0"
-    death_throw_particle_velocity_coeff="0.5" >
-    <count_per_material_type>
-    </count_per_material_type>
-  </MaterialInventoryComponent>
-
-  <DamageModelComponent 
-    _tags="enabled_in_world"
-    air_needed="0" 
-    blood_material="" 
-    drop_items_on_death="0" 
-    falling_damages="0" 
-    fire_damage_amount="0.2" 
-    fire_probability_of_ignition="0" 
-	critical_damage_resistance="1"
-    hp="0.5" 
-    is_on_fire="0" 
-    materials_create_messages="0" 
-    materials_damage="1" 
-    materials_that_damage="lava"
-    materials_how_much_damage="0.001"
-    ragdoll_filenames_file=""
-    ragdoll_material=""
-  ></DamageModelComponent>
-
-  <ExplodeOnDamageComponent
-    _tags="enabled_in_world"
-    explode_on_death_percent="1"
-    explode_on_damage_percent="0"
-    physics_body_destruction_required="0.51"
-    physics_body_modified_death_probability="1" >
-    <config_explosion
-      never_cache="0"
-      damage="0"
-      camera_shake="10" 
-      explosion_radius="3" 
-      explosion_sprite="" 
-      explosion_sprite_lifetime="10" 
-      hole_destroy_liquid="0" 
-      hole_enabled="0" 
-      ray_energy="100000"
-      particle_effect="0" 
-      damage_mortals="1" 
-      physics_explosion_power.max="5" 
-      shake_vegetation="1" 
-      sparks_count_min="1" 
-      sparks_count_max="2" 
-      sparks_enabled="0" 
-      stains_enabled="1" 
-      stains_radius="0" >
-    </config_explosion>
-  </ExplodeOnDamageComponent>
-
-  <PhysicsBodyCollisionDamageComponent 
-    _tags="enabled_in_world" 
-    speed_threshold="80.0"
-  ></PhysicsBodyCollisionDamageComponent>
-
-  <!-- item -->
-
-  <SpriteComponent
-    _tags="enabled_in_hand"
-    _enabled="false"
-    offset_x="4"
-    offset_y="4"
-    image_file="data/items_gfx/potion.png"
-  ></SpriteComponent>
-
-  <ItemComponent
-    _tags="enabled_in_world"
-    item_name="$item_potion"
-    max_child_items="0"
-    is_pickable="1"
-    is_equipable_forced="1"
-    ui_sprite="data/ui_gfx/items/potion.png"
-    ui_description="$item_description_potion"
-    preferred_inventory="QUICK"
-  ></ItemComponent>
-
-  <AbilityComponent
-    ui_name="$item_potion_with_material"
-    throw_as_item="1"
-  ><gun_config
-    deck_capacity="0"
-  ></gun_config>
-  </AbilityComponent>
-
-  <UIInfoComponent
-    _tags="enabled_in_world"
-    name="">
-  </UIInfoComponent>
-  
-  <SpriteParticleEmitterComponent
-		sprite_file="data/particles/ray.xml" 
-		delay="0"
-		lifetime="1.5"
-		color.r="1" color.g="0.5" color.b="1" color.a="1.0"
-		color_change.r="0" color_change.g="0" color_change.b="0" color_change.a="-3.5"
-		velocity.x="0" velocity.y="0"
-		gravity.x="0" gravity.y="0"
-		velocity_slowdown="0"
-		rotation="0"
-		angular_velocity="0"
-		scale.x="1" scale.y="0"
-		scale_velocity.x="-0.3" scale_velocity.y="3"
-		emission_interval_min_frames="3"
-		emission_interval_max_frames="6"
-		emissive="1"
-		additive="1"
-		count_min="1" count_max="1"
-		use_velocity_as_rotation="1"
-		randomize_position.min_x="-2"
-		randomize_position.max_x="2"
-		randomize_position.min_y="-2"
-		randomize_position.max_y="2"
-		randomize_velocity.min_x="-30"
-		randomize_velocity.max_x="30"
-		randomize_velocity.min_y="-30"
-		randomize_velocity.max_y="30"
-		velocity_always_away_from_center="1">
-	</SpriteParticleEmitterComponent>
-
-  <AudioLoopComponent
-    _tags="sound_spray,enabled_in_world,enabled_in_hand"
-    file="data/audio/Desktop/materials.snd"
-    event_name="materials/spray_potion" 
-    volume_autofade_speed="0.1" >
-  </AudioLoopComponent>
-
-  <AudioComponent
-    _tags="enabled_in_world"
-    file="data/audio/Desktop/materials.snd"
-    event_root="collision/glass_potion"
-    set_latest_event_position="1" >
-  </AudioComponent>
-
-</Entity>
\ No newline at end of file
diff --git a/noita_mod/core/files/entities/potion_bank.xml b/noita_mod/core/files/entities/potion_bank.xml
new file mode 100644
index 0000000..5d79bf5
--- /dev/null
+++ b/noita_mod/core/files/entities/potion_bank.xml
@@ -0,0 +1,7 @@
+<Entity>
+	<Base file="data/entities/items/pickup/potion.xml">
+		<LuaComponent 
+			_enabled="0"
+		></LuaComponent>
+	</Base>
+</Entity>
diff --git a/noita_mod/core/files/scripts/spell_spitter.lua b/noita_mod/core/files/scripts/spell_spitter.lua
index e551f25..3edb2d3 100644
--- a/noita_mod/core/files/scripts/spell_spitter.lua
+++ b/noita_mod/core/files/scripts/spell_spitter.lua
@@ -72,7 +72,7 @@ function SpawnWand(wand, x, y)
 end
 
 function SpawnFlask(contents, x,y)
-    local flask = EntityLoad("mods/noita-together/files/entities/empty_flask.xml", x, y)
+    local flask = EntityLoad("mods/noita-together/files/entities/potion_bank.xml", x, y)
     for i, inv in ipairs(contents) do
         AddMaterialInventoryMaterial(flask, CellFactory_GetName(inv.id), inv.amount)
     end

From cc89e3e2eb9a3c5fc13ceafb5b833c28d816d1a0 Mon Sep 17 00:00:00 2001
From: Kabby <1925023+tehkab@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:08:19 -0400
Subject: [PATCH 2/3] Replace banked powder stash item with new template
 inheriting from vanilla powder_stash.xml

---
 noita_mod/core/files/entities/powder_stash_bank.xml | 11 +++++++++++
 noita_mod/core/files/scripts/spell_spitter.lua      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 noita_mod/core/files/entities/powder_stash_bank.xml

diff --git a/noita_mod/core/files/entities/powder_stash_bank.xml b/noita_mod/core/files/entities/powder_stash_bank.xml
new file mode 100644
index 0000000..4f4c052
--- /dev/null
+++ b/noita_mod/core/files/entities/powder_stash_bank.xml
@@ -0,0 +1,11 @@
+<Entity>
+	<Base file="data/entities/items/pickup/powder_stash.xml">
+        <!-- leave FIRST lua component alone -->
+        <LuaComponent 
+        ></LuaComponent>
+        <!-- SECOND lua component needs to be disabled -->
+		<LuaComponent 
+			_enabled="0"
+		></LuaComponent>
+	</Base>
+</Entity>
diff --git a/noita_mod/core/files/scripts/spell_spitter.lua b/noita_mod/core/files/scripts/spell_spitter.lua
index 3edb2d3..24c27e1 100644
--- a/noita_mod/core/files/scripts/spell_spitter.lua
+++ b/noita_mod/core/files/scripts/spell_spitter.lua
@@ -79,7 +79,7 @@ function SpawnFlask(contents, x,y)
 end
 
 function SpawnPowderStash(contents, x,y)
-    local flask = EntityLoad("mods/noita-together/files/entities/empty_powder_stash.xml", x, y)
+    local flask = EntityLoad("mods/noita-together/files/entities/powder_stash_bank.xml", x, y)
     for i, inv in ipairs(contents) do
         AddMaterialInventoryMaterial(flask, CellFactory_GetName(inv.id), inv.amount)
     end

From 33e73a3e0608939ee2865eff6dab3bbe1ac015aa Mon Sep 17 00:00:00 2001
From: Kabby <1925023+tehkab@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:08:43 -0400
Subject: [PATCH 3/3] remove old bank powder stash xml

---
 .../files/entities/empty_powder_stash.xml     | 210 ------------------
 1 file changed, 210 deletions(-)
 delete mode 100644 noita_mod/core/files/entities/empty_powder_stash.xml

diff --git a/noita_mod/core/files/entities/empty_powder_stash.xml b/noita_mod/core/files/entities/empty_powder_stash.xml
deleted file mode 100644
index caaddee..0000000
--- a/noita_mod/core/files/entities/empty_powder_stash.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<Entity tags="hittable,teleportable_NOT,item_physics,item_pickup" >
-  
-  <PhysicsBodyComponent 
-    _tags="enabled_in_world"
-    uid="1" 
-    allow_sleep="1" 
-    angular_damping="0" 
-    fixed_rotation="0" 
-    is_bullet="1" 
-    linear_damping="0"
-    auto_clean="0"
-    on_death_leave_physics_body="1"
-    hax_fix_going_through_ground="1"
-  ></PhysicsBodyComponent>
-  
-  <PhysicsImageShapeComponent 
-    body_id="1"
-    centered="1"
-    image_file="data/items_gfx/material_pouch.png"
-    material="cloth_box2d"
-  ></PhysicsImageShapeComponent>
-  
-  <PhysicsThrowableComponent
-    max_throw_speed="180"
-    throw_force_coeff="1.5"
-  ></PhysicsThrowableComponent>
-
-  <ProjectileComponent
-    _tags="enabled_in_world"
-    lifetime="-1"
-    penetrate_entities="1"
-  ></ProjectileComponent>
-
-  <VelocityComponent
-    _tags="enabled_in_world"
-  ></VelocityComponent>
-  
-  <!-- potion logic -->  
-  <!--
-  <LuaComponent 
-    execute_on_added="1"
-    remove_after_executed="1"
-    call_init_function="1"
-    script_source_file="data/scripts/items/potion.lua" 
-  ></LuaComponent>
-  -->
-	<LuaComponent 
-		remove_after_executed="1"
-		script_item_picked_up="data/scripts/items/potion_effect.lua"
-	></LuaComponent>
-
-  <PotionComponent
-    _tags="enabled_in_hand,enabled_in_world"
-    spray_velocity_coeff="75"
-    spray_velocity_normalized_min="0.75"
-	never_color="1"
-  ></PotionComponent>
-
-  <MaterialSuckerComponent 
-    _tags="enabled_in_world,enabled_in_hand"
-    material_type="1"
-    barrel_size="1500"
-    num_cells_sucked_per_frame="10"
-    randomized_position.min_x="-4"
-    randomized_position.max_x="4"
-    randomized_position.min_y="-2"
-    randomized_position.max_y="7"
-  ></MaterialSuckerComponent>
-
-  <MaterialInventoryComponent 
-    _tags="enabled_in_world,enabled_in_hand"
-    drop_as_item="0" 
-    on_death_spill="1"
-    leak_pressure_min="0.07"
-    leak_pressure_min="0.1"
-    leak_on_damage_percent="1"
-    min_damage_to_leak="0.0"
-    death_throw_particle_velocity_coeff="0.5" >
-    <count_per_material_type>
-    </count_per_material_type>
-  </MaterialInventoryComponent>
-
-  <DamageModelComponent 
-    _tags="enabled_in_world"
-    air_needed="0" 
-    blood_material="" 
-    drop_items_on_death="0" 
-    falling_damages="0" 
-    fire_damage_amount="0.2" 
-    fire_probability_of_ignition="0" 
-	critical_damage_resistance="1"
-    hp="2.5" 
-    is_on_fire="0" 
-    materials_create_messages="0" 
-    materials_damage="1" 
-    materials_that_damage="lava"
-    materials_how_much_damage="0.001"
-    ragdoll_filenames_file=""
-    ragdoll_material=""
-  ></DamageModelComponent>
-
-  <ExplodeOnDamageComponent
-    _tags="enabled_in_world"
-    explode_on_death_percent="1"
-    explode_on_damage_percent="0"
-    physics_body_destruction_required="0.51"
-    physics_body_modified_death_probability="1" >
-    <config_explosion
-      never_cache="0"
-      damage="0"
-      camera_shake="10" 
-      explosion_radius="3" 
-      explosion_sprite="" 
-      explosion_sprite_lifetime="10" 
-      hole_destroy_liquid="0" 
-      hole_enabled="0" 
-      ray_energy="100000"
-      particle_effect="0" 
-      damage_mortals="1" 
-      physics_explosion_power.max="5" 
-      shake_vegetation="1" 
-      sparks_count_min="10" 
-      sparks_count_max="20" 
-      sparks_enabled="1" 
-	  spark_material="wood_prop"
-      stains_enabled="1" 
-      stains_radius="8" >
-    </config_explosion>
-  </ExplodeOnDamageComponent>
-
-  <!-- item -->
-
-  <SpriteComponent
-    _tags="enabled_in_hand"
-    _enabled="0"
-    offset_x="4"
-    offset_y="4"
-    image_file="data/items_gfx/material_pouch.png"
-  ></SpriteComponent>
-
-  <ItemComponent
-    _tags="enabled_in_world"
-    item_name="$item_powder_stash_3"
-    max_child_items="0"
-    is_pickable="1"
-    is_equipable_forced="1"
-    ui_sprite="data/ui_gfx/items/material_pouch.png"
-    ui_description="$itemdesc_powder_stash_3"
-    preferred_inventory="QUICK"
-	drinkable="0"
-  ></ItemComponent>
-
-  <AbilityComponent
-    ui_name="$item_powder_stash_with_material_3"
-    throw_as_item="1"
-  ><gun_config
-    deck_capacity="0"
-  ></gun_config>
-  </AbilityComponent>
-
-  <UIInfoComponent
-    _tags="enabled_in_world"
-    name="">
-  </UIInfoComponent>
-  
-  <SpriteParticleEmitterComponent
-		sprite_file="data/particles/ray.xml" 
-		delay="0"
-		lifetime="1.5"
-		color.r="1" color.g="0.5" color.b="1" color.a="1.0"
-		color_change.r="0" color_change.g="0" color_change.b="0" color_change.a="-3.5"
-		velocity.x="0" velocity.y="0"
-		gravity.x="0" gravity.y="0"
-		velocity_slowdown="0"
-		rotation="0"
-		angular_velocity="0"
-		scale.x="1" scale.y="0"
-		scale_velocity.x="-0.3" scale_velocity.y="3"
-		emission_interval_min_frames="3"
-		emission_interval_max_frames="6"
-		emissive="1"
-		additive="1"
-		count_min="1" count_max="1"
-		use_velocity_as_rotation="1"
-		randomize_position.min_x="-2"
-		randomize_position.max_x="2"
-		randomize_position.min_y="-2"
-		randomize_position.max_y="2"
-		randomize_velocity.min_x="-30"
-		randomize_velocity.max_x="30"
-		randomize_velocity.min_y="-30"
-		randomize_velocity.max_y="30"
-		velocity_always_away_from_center="1">
-	</SpriteParticleEmitterComponent>
-
-  <AudioLoopComponent
-    _tags="sound_spray,enabled_in_world,enabled_in_hand"
-    file="data/audio/Desktop/materials.bank"
-    event_name="materials/spray_powder" 
-    volume_autofade_speed="0.1" >
-  </AudioLoopComponent>
-
-  <AudioComponent
-    _tags="enabled_in_world"
-    file="data/audio/Desktop/materials.bank"
-    event_root="collision/wood_crate"
-    set_latest_event_position="1" >
-  </AudioComponent>
-
-</Entity>