Fix craft & inventory button click overlap & add more fruits to ecbox

phobos2077 · Jun 5, 2024 · 802d37f · 802d37f
1 parent 9cf689f
commit 802d37f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/docs/ecco_readme.txt b/docs/ecco_readme.txt
@@ -223,6 +223,8 @@ Inventory Filter (2.0.3+ from github):
 FO2Tweaks:
 - Don't use with default settings! Some of them has conflicts with EcCo features
 - Disable the following (EcCo already includes similar changes):
+max_knockback=-1
+healing_revision=0
 molotov_fire=0
 damage_mod=0
 

diff --git a/docs/todo.txt b/docs/todo.txt
@@ -1,4 +1,4 @@
-for 0.9.6:
+for 0.9.7:
 - playtest
 
 
@@ -9,8 +9,6 @@ for "future":
 
 
 Considering:
-- take another look at incenirator balance
-- Reduce ammo/drug loot in containers similar to critter loot and FNV Famine mod (less reduction for closed containers, etc.)
 - add Cattle Prod to Modoc, VC, Gecko, Broken Hills (check balance)
 - add crafting components like rocks and junk to human enemy bodies on death with small probability
 - Hunting Rifle -> Scoped for Slags rewards
@@ -20,6 +18,7 @@ Considering:
 
 
 IDEAS:
+- map loot reduction based on removal statistics, with no random rolls?
 - don't allow to craft "factory-level" items like Metal armor, but allow upgrades to Mk2
 - crafting some advanced leather armor
 - crafting robes?

diff --git a/scripts_src/_pbs_craft/gl_pbs_craft.ssl b/scripts_src/_pbs_craft/gl_pbs_craft.ssl
@@ -45,6 +45,7 @@ end
 #define BUTTON_HEIGHT         24
 #define BUTTON_BOTTOM_OFFSET  62
 #define BUTTON_RIGHT_OFFSET   399
+#define BUTTON_CLICK_LEFT_OFFSET  2
 
 #define can_enter_crafting    (not(get_game_mode) and craft_ui_mode <= MODE_EXIT)
 
@@ -187,8 +188,8 @@ procedure mouse_over_button begin
    // TODO: after sfall update
    // if (get_window_under_mouse != iface_window_id) then return false;
    variable x := get_mouse_x, y := get_mouse_y;
-   return x >= button_global_x
-      and x < button_global_x + BUTTON_WIDTH
+   return x >= button_global_x + BUTTON_CLICK_LEFT_OFFSET
+      and x < button_global_x + BUTTON_WIDTH - BUTTON_CLICK_LEFT_OFFSET
       and y >= button_global_y
       and y < button_global_y + BUTTON_HEIGHT;
 end

diff --git a/scripts_src/rndenctr/ecbox.ssl b/scripts_src/rndenctr/ecbox.ssl
@@ -117,7 +117,7 @@ procedure CreateZone1 begin
    check_restock_item(PID_SPEAR, 1, 1, 5)
    check_restock_item(PID_ROCK, 1, 10, 40) // pbs: prob was 20
    check_restock_item(PID_HEALING_POWDER, 1, 1, 5)
-   check_restock_item(PID_MUTATED_FRUIT, 1, 2, 10)
+   check_restock_item(PID_MUTATED_FRUIT, 1, 2, 20) // pbs: prob was 10
    // added by phobos2077:
    check_restock_item(PID_ROPE, 1, 1, 10)
 end
@@ -144,6 +144,7 @@ procedure CreateZone2 begin
    check_restock_item(PID_9MM_BALL, 1, 1, 2)
    check_restock_item(PID_PBS_FOOD_1, 1, 1, 2)
    check_restock_item(PID_PBS_FOOD_2, 1, 1, 2)
+   check_restock_item(PID_MUTATED_FRUIT, 1, 3, 20)
 end
 
 procedure CreateZone3 begin
@@ -153,7 +154,7 @@ procedure CreateZone3 begin
    check_restock_item(PID_5MM_AP, 1, 1, 1)
    check_restock_item(PID_5MM_JHP, 1, 1, 1)
    check_restock_item(PID_FRAG_GRENADE, 1, 2, 2)
-   check_restock_item(PID_MUTATED_FRUIT, 1, 5, 10)
+   check_restock_item(PID_MUTATED_FRUIT, 1, 5, 20) // pbs: prob was 10
    check_restock_item(PID_IGUANA_ON_A_STICK, 1, 5, 10)
    check_restock_item(PID_JET, 1, 2, 10)
    check_restock_item(PID_BEER, 1, 2, 10)
@@ -178,7 +179,7 @@ procedure CreateZone4 begin
    check_restock_item(PID_5MM_AP, 1, 1, 1)
    check_restock_item(PID_SMALL_ENERGY_CELL, 1, 1, 3)
    check_restock_item(PID_MICRO_FUSION_CELL, 1, 1, 3)
-   check_restock_item(PID_MUTATED_FRUIT, 1, 3, 8)
+   check_restock_item(PID_MUTATED_FRUIT, 1, 3, 16) // pbs: prob was 8
    check_restock_item(PID_IGUANA_ON_A_STICK, 1, 3, 8)
    check_restock_item(PID_BOOZE, 1, 2, 7)
    check_restock_item(PID_JET, 1, 2, 20)