Merge c113ea4a6c into c636c538eb

src/Abilities.cpp

@@ -76,20 +76,12 @@ static SkillResult handleSkillDamageNDebuff(SkillData* skill, int power, ICombat
     }
 
     sSkillResult_Damage_N_Debuff result{};
-
     result.iDamage = duration / 10; // we use the duration as the damage number (why?)
     result.iHP = target->getCurrentHP();
     result.eCT = target->getCharType();
     result.iID = target->getID();
     result.bProtected = blocked;
     result.iConditionBitFlag = target->getCompositeCondition();
-
-    // for player targets, make sure to update Nano stamina
-    if (target->getCharType() == 1) {
-        Player *plr = dynamic_cast<Player*>(target);
-        result.iStamina = plr->getActiveNano()->iStamina;
-    }
-
     return SkillResult(sizeof(sSkillResult_Damage_N_Debuff), &result);
 }
 
@@ -131,7 +123,7 @@ static SkillResult handleSkillBuff(SkillData* skill, int power, ICombatant* sour
     int combatLifetime = 0;
     if(!target->addBuff(timeBuffId,
         [drainType](EntityRef self, Buff* buff, int status, BuffStack* stack) {
-            if(buff->id == ECSB_BOUNDINGBALL && status == ETBU_ADD) {
+            if(buff->id == ECSB_BOUNDINGBALL) {
                 // drain
                 ICombatant* combatant = dynamic_cast<ICombatant*>(self.getEntity());
                 combatant->takeDamage(buff->getLastSource(), 0); // aggro
@@ -146,7 +138,7 @@ static SkillResult handleSkillBuff(SkillData* skill, int power, ICombatant* sour
                 Buffs::tickDrain(self, buff, COMBAT_TICKS_PER_DRAIN_PROC); // drain
             combatLifetime++;
         },
-        &passiveBuff)) return SkillResult();
+        &passiveBuff)) return SkillResult(); // no result if already buffed
 
     sSkillResult_Buff result{};
     result.eCT = target->getCharType();

src/Abilities.hpp

@@ -15,12 +15,12 @@ constexpr size_t MAX_SKILLRESULT_SIZE = sizeof(sSkillResult_BatteryDrain);
 enum class SkillType {
     DAMAGE = 1,
     HEAL_HP = 2,
-    KNOCKDOWN = 3, // uses DamageNDebuff
-    SLEEP = 4, // uses DamageNDebuff
-    SNARE = 5, // uses DamageNDebuff
+    KNOCKDOWN = 3, // dnd
+    SLEEP = 4, // dnd
+    SNARE = 5, // dnd
     HEAL_STAMINA = 6,
     STAMINA_SELF = 7,
-    STUN = 8, // uses DamageNDebuff
+    STUN = 8, // dnd
     WEAPONSLOW = 9,
     JUMP = 10,
     RUN = 11,

src/BuiltinCommands.cpp

@@ -72,10 +72,10 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
     // Handle serverside value-changes
     switch (setData->iSetValueType) {
-    case CN_GM_SET_VALUE_TYPE__HP:
+    case 1:
         response.iSetValue = plr->HP = setData->iSetValue;
         break;
-    case CN_GM_SET_VALUE_TYPE__WEAPON_BATTERY :
+    case 2:
         plr->batteryW = setData->iSetValue;
 
         // caps
@@ -84,7 +84,7 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
         response.iSetValue = plr->batteryW;
         break;
-    case CN_GM_SET_VALUE_TYPE__NANO_BATTERY:
+    case 3:
         plr->batteryN = setData->iSetValue;
 
         // caps
@@ -93,17 +93,13 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
         response.iSetValue = plr->batteryN;
         break;
-    case CN_GM_SET_VALUE_TYPE__FUSION_MATTER:
+    case 4:
         Missions::updateFusionMatter(sock, setData->iSetValue - plr->fusionmatter);
         response.iSetValue = plr->fusionmatter;
         break;
-    case CN_GM_SET_VALUE_TYPE__CANDY:
+    case 5:
         response.iSetValue = plr->money = setData->iSetValue;
         break;
-    case CN_GM_SET_VALUE_TYPE__SPEED:
-    case CN_GM_SET_VALUE_TYPE__JUMP:
-        response.iSetValue = setData->iSetValue;
-        break;
     }
 
     response.iPC_ID = setData->iPC_ID;

src/Combat.cpp

@@ -175,13 +175,10 @@ void Player::step(time_t currTime) {
 #pragma endregion
 
 #pragma region CombatNPC
-bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) {
+bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) { /* stubbed */
     if(!isAlive())
         return false;
 
-    if (this->state != AIState::COMBAT && this->state != AIState::ROAMING)
-        return false;
-
     if(!hasBuff(buffId)) {
         buffs[buffId] = new Buff(buffId, getRef(), onUpdate, onTick, stack);
         return true;
@@ -192,7 +189,7 @@ bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, Buff
     return false;
 }
 
-Buff* CombatNPC::getBuff(int buffId) {
+Buff* CombatNPC::getBuff(int buffId) { /* stubbed */
     if(hasBuff(buffId)) {
         return buffs[buffId];
     }