Add some notes, edit Alliance stock

3 files changed, 33 insertions, 12 deletions

diff --git a/db/constants.conf b/db/constants.conf
index d4e6dac74..022026b64 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2410,6 +2410,7 @@ constants_db: {
 	PCB_SPLASHMASTER:   65536
 	PCB_RANGEMASTER:    131072
 	PCB_LEGENDARY:      262144
+	//PCB_MONEYDROP:
 
 	@include "db/si_config.conf"
 	@include "conf/import/constants.conf"
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index f59463089..731937b21 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -109,9 +109,9 @@ OnInit:
     sellitem ArcmageBoxset,     10000, 4+$FIRESOFSTEAM-1;
     sellitem ScholarshipBadge,  -1, 3+$FIRESOFSTEAM-1;
     sellitem Bullet,            4, 90000+($FIRESOFSTEAM*1000-1000);
-    sellitem Lifestone,         -1, 800+$FIRESOFSTEAM-1;
-    sellitem Bread,             -1, 750+$FIRESOFSTEAM-1;
-    sellitem Cheese,            -1, 400+$FIRESOFSTEAM-1;
+    sellitem Lifestone,         -1, 500+$FIRESOFSTEAM-1;
+    sellitem Bread,             -1, 450+$FIRESOFSTEAM-1;
+    sellitem Cheese,            -1, 300+$FIRESOFSTEAM-1;
     sellitem Aquada,            -1, 200+$FIRESOFSTEAM-1;
 
     sellitem WhiteFur,          -1, 1+rand2(50)+$FIRESOFSTEAM;
@@ -131,7 +131,7 @@ OnInit:
     if (!$BETASERVER && !debug)
         disablenpc .name$;
 
-    if ($FIRESOFSTEAM && gettime(7) == 2021 &&!$@FOS_MOBDROP) {
+    if ($BETASERVER &&!$@FOS_MOBDROP) {
         /* This code is overriden by seasons.txt
         addmonsterdrop(Scar, DarkCrystal, 500);
         addmonsterdrop(Crafty, DarkCrystal, 500);
@@ -146,7 +146,7 @@ OnInit:
         addmonsterdrop(CopperSkullSlime, DarkCrystal, 500);
         addmonsterdrop(MonsterGeneral, DarkCrystal, 10000);
         */
-        setiteminfo(DarkCrystal, ITEMINFO_SELLPRICE, rand2(100, 200));
+        setiteminfo(DarkCrystal, ITEMINFO_SELLPRICE, rand2(150, 250));
         $@FOS_MOBDROP=true;
     }
     end;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 02734d1da..3c639e31d 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -549,13 +549,6 @@ function	script	HUB_SkillInvoke	{
 
 
 
-        // TODO Assassin skill
-        // Higher chance of success if monster HP+ATK < your own HP
-        // (Maybe put level on that?) Never works on boss
-        case TMW2_ASSASSINATE:
-            // SC_COMA TODO
-            break;
-
         // Physical Class - mostly builtin
         // TODO: Archery effect-absorb skill
         case TMW2_ARROWOFDEVOUR:
@@ -584,6 +577,33 @@ function	script	HUB_SkillInvoke	{
             // if SC_FREEZE or SC_COLD
             break;
 
+
+        // TODO Assassin skill
+        // Higher chance of success if monster HP+ATK < your own HP
+        // (Maybe put level on that?) Never works on boss
+        // Maybe arrow only?
+        case TMW2_ASSASSINATE:
+            // SC_COMA TODO
+            break;
+
+        case TMW2_SNARE:
+            // 100.00% inflict STUN/SLEEP/whatever
+            // Does not work on boss monsters
+            // (Maybe the one which makes next hit critical?)
+            // Was it SC_STONE?
+            break;
+        // Arrow pierce? (Maybe arrow shot disregarding defense, HARM_MISC ?)
+
+
+        case TMW2_RICHNESS:
+            // Passive, bonus2 bAddGetZenyNum, 5, 100; - Better not
+            break;
+        // TODO: Effect resisting passives?
+        // Windwalker... No wait.
+        // Immunity to knockback? Meeeeh. Easier to have a trait-giving quest.
+        // After all, we have about 20 traits and you can only pick 5.
+
+
         // XXX: Sword skills are a 5-skills combo
         // No cast time, but cooldown present
         // DEF lowers as cast, damage based on combo.